guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'master' into core-updates


From: Mark H. Weaver
Subject: 01/01: Merge branch 'master' into core-updates
Date: Tue, 15 Aug 2017 03:14:41 -0400 (EDT)

mhw pushed a commit to branch core-updates
in repository guix.

commit 09ec5a0f0c40afde63975af9e9203884dad86ea7
Merge: 3785e42 2d430f2
Author: Mark H Weaver <address@hidden>
Date:   Tue Aug 15 03:10:14 2017 -0400

    Merge branch 'master' into core-updates

 .mailmap                                           |  19 +--
 doc/guix.texi                                      |  56 ++++++++-
 gnu/local.mk                                       |  10 ++
 gnu/packages/bioinformatics.scm                    | 106 +++++++++++++++++
 gnu/packages/code.scm                              |  55 +++++++++
 gnu/packages/crypto.scm                            | 128 +++++++++++++++++++-
 gnu/packages/curl.scm                              |   1 +
 gnu/packages/emacs.scm                             |  17 +++
 gnu/packages/enlightenment.scm                     |   6 +-
 gnu/packages/games.scm                             |  31 +++--
 gnu/packages/gcc.scm                               |   6 +-
 gnu/packages/image-viewers.scm                     |   4 +-
 gnu/packages/imagemagick.scm                       |   4 +-
 gnu/packages/ldc.scm                               |   4 +-
 gnu/packages/libreoffice.scm                       |  51 ++++++--
 gnu/packages/linux.scm                             |  17 +--
 gnu/packages/maths.scm                             |  53 +++++----
 gnu/packages/moreutils.scm                         |  10 +-
 gnu/packages/music.scm                             |   7 +-
 gnu/packages/patches/catdoc-CVE-2017-11110.patch   |  45 +++++++
 gnu/packages/patches/curl-bounds-check.patch       |  19 +++
 gnu/packages/patches/cvs-2017-12836.patch          |  45 +++++++
 .../patches/e2fsprogs-32bit-quota-warnings.patch   |  46 ++++++++
 gnu/packages/patches/qemu-CVE-2017-10664.patch     |  27 +++++
 gnu/packages/patches/qemu-CVE-2017-10806.patch     |  38 ++++++
 gnu/packages/patches/qemu-CVE-2017-10911.patch     | 106 +++++++++++++++++
 gnu/packages/patches/qemu-CVE-2017-11434.patch     |  25 ++++
 gnu/packages/perl.scm                              | 130 ++++++++++++++++++++-
 gnu/packages/python.scm                            |   4 +-
 gnu/packages/shells.scm                            |  69 +++++------
 gnu/packages/textutils.scm                         |   2 +
 gnu/packages/version-control.scm                   |  22 ++--
 gnu/packages/video.scm                             |   4 +-
 gnu/packages/virtualization.scm                    |   7 +-
 gnu/packages/xdisorg.scm                           |   8 ++
 gnu/services/audio.scm                             |  86 ++++++++++++++
 gnu/tests/audio.scm                                |  78 +++++++++++++
 37 files changed, 1220 insertions(+), 126 deletions(-)

diff --cc gnu/packages/perl.scm
index 4a87d0a,3265a55..2b2b2ea
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@@ -1,7 -1,7 +1,7 @@@
  ;;; GNU Guix --- Functional package management for GNU
 -;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
 +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès 
<address@hidden>
  ;;; Copyright © 2013 Andreas Enge <address@hidden>
- ;;; Copyright © 2015, 2016 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <address@hidden>
  ;;; Copyright © 2015, 2016 Eric Bavier <address@hidden>
  ;;; Copyright © 2015 Eric Dvorsak <address@hidden>
  ;;; Copyright © 2016 Mark H Weaver <address@hidden>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]