guix-commits
[Top][All Lists]
Advanced

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

09/09: Merge branch 'master' into staging


From: Marius Bakke
Subject: 09/09: Merge branch 'master' into staging
Date: Sat, 2 Sep 2017 09:58:31 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit 30dfac27a5642c36e7bb1ba7966566864ba2d28d
Merge: d2ee294 65e4109
Author: Marius Bakke <address@hidden>
Date:   Sat Sep 2 15:57:56 2017 +0200

    Merge branch 'master' into staging

 .mailmap                                           |     2 +-
 doc/guix.texi                                      |     3 -
 gnu/bootloader.scm                                 |     6 +-
 gnu/build/marionette.scm                           |    41 +-
 gnu/local.mk                                       |    32 +-
 gnu/packages.scm                                   |    12 +-
 gnu/packages/admin.scm                             |     2 +-
 gnu/packages/aidc.scm                              |    24 +
 gnu/packages/audio.scm                             |    28 +-
 gnu/packages/backup.scm                            |     2 +-
 gnu/packages/bioinformatics.scm                    |    64 +-
 gnu/packages/calendar.scm                          |     2 +-
 gnu/packages/check.scm                             |    47 +
 gnu/packages/compression.scm                       |    27 +-
 gnu/packages/cran.scm                              |    32 +-
 gnu/packages/databases.scm                         |    15 +-
 gnu/packages/dav.scm                               |     4 +-
 gnu/packages/disk.scm                              |     2 +-
 gnu/packages/display-managers.scm                  |    16 +-
 gnu/packages/djvu.scm                              |     8 +
 gnu/packages/dns.scm                               |     4 +-
 gnu/packages/documentation.scm                     |     2 +-
 gnu/packages/emacs.scm                             |   153 +-
 gnu/packages/embedded.scm                          |     4 +-
 gnu/packages/engineering.scm                       |     1 -
 gnu/packages/enlightenment.scm                     |     8 +-
 gnu/packages/finance.scm                           |     7 +-
 gnu/packages/fltk.scm                              |     2 +-
 gnu/packages/fonts.scm                             |     4 +-
 gnu/packages/freedesktop.scm                       |     2 +-
 gnu/packages/ftp.scm                               |    11 +-
 gnu/packages/game-development.scm                  |    14 +-
 gnu/packages/games.scm                             |    12 +-
 gnu/packages/gd.scm                                |    20 +-
 gnu/packages/gimp.scm                              |     4 +-
 gnu/packages/gnome.scm                             |    10 +-
 gnu/packages/gnunet.scm                            |     2 +-
 gnu/packages/gnupg.scm                             |    52 +-
 gnu/packages/gnustep.scm                           |     2 +-
 gnu/packages/gtk.scm                               |     2 +-
 gnu/packages/guile.scm                             |     2 +
 gnu/packages/hexedit.scm                           |     2 +-
 gnu/packages/image.scm                             |     4 +-
 gnu/packages/imagemagick.scm                       |     5 +-
 gnu/packages/java.scm                              |    27 +-
 gnu/packages/javascript.scm                        |    12 +-
 gnu/packages/jemalloc.scm                          |     8 +-
 gnu/packages/kde-frameworks.scm                    |    26 +
 gnu/packages/kde.scm                               |     8 +-
 gnu/packages/ldc.scm                               |     4 +-
 gnu/packages/linux.scm                             |    12 +-
 gnu/packages/mail.scm                              |     4 +-
 gnu/packages/maths.scm                             |   177 +-
 gnu/packages/messaging.scm                         |     4 +-
 gnu/packages/microcom.scm                          |     2 +-
 gnu/packages/music.scm                             |    96 +-
 gnu/packages/nano.scm                              |     4 +-
 gnu/packages/networking.scm                        |     2 +-
 gnu/packages/ocaml.scm                             |    40 +
 gnu/packages/package-management.scm                |    30 +-
 gnu/packages/patches/gd-CVE-2017-7890.patch        |    30 -
 .../patches/graphicsmagick-CVE-2017-13775.patch    |   195 +
 ...phicsmagick-CVE-2017-13776+CVE-2017-13777.patch |   179 +
 gnu/packages/patches/libxml2-CVE-2017-0663.patch   |    53 +
 gnu/packages/patches/libxml2-CVE-2017-7375.patch   |    45 +
 gnu/packages/patches/libxml2-CVE-2017-7376.patch   |    41 +
 .../libxml2-CVE-2017-9047+CVE-2017-9048.patch      |   130 +
 .../libxml2-CVE-2017-9049+CVE-2017-9050.patch      |   319 +
 gnu/packages/patches/libzip-CVE-2017-12858.patch   |    45 +
 gnu/packages/patches/metabat-fix-boost-issue.patch |    27 -
 .../patches/metabat-remove-compilation-date.patch  |    16 -
 .../patches/multiqc-fix-git-subprocess-error.patch |    16 -
 ...ython2-larch-coverage-4.0a6-compatibility.patch |    29 +
 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-11334.patch     |    52 -
 gnu/packages/patches/qemu-CVE-2017-11434.patch     |    25 -
 gnu/packages/patches/qemu-CVE-2017-12809.patch     |    38 -
 gnu/packages/patches/qemu-CVE-2017-7493.patch      |   182 -
 gnu/packages/patches/qemu-CVE-2017-8112.patch      |    41 -
 gnu/packages/patches/qemu-CVE-2017-8309.patch      |    46 -
 gnu/packages/patches/qemu-CVE-2017-8379.patch      |    98 -
 gnu/packages/patches/qemu-CVE-2017-8380.patch      |    53 -
 gnu/packages/patches/qemu-CVE-2017-9524.patch      |   287 -
 .../patches/ruby-2.2.7-rubygems-2613-ruby22.patch  |   355 +
 .../patches/ruby-2.3.4-rubygems-2613-ruby23.patch  |   355 +
 .../patches/ruby-rubygems-2612-ruby24.patch        |   437 +
 .../patches/ruby-rubygems-2613-ruby24.patch        |   355 +
 .../wmfire-update-for-new-gdk-versions.patch       |     2 +-
 gnu/packages/patches/wxwidgets-fix-windowGTK.patch |    18 -
 gnu/packages/perl.scm                              |    14 +-
 gnu/packages/php.scm                               |    17 +-
 gnu/packages/python.scm                            |   306 +-
 gnu/packages/ruby.scm                              |     7 +-
 gnu/packages/screen.scm                            |     4 +-
 gnu/packages/search.scm                            |    10 +-
 gnu/packages/serialization.scm                     |     8 +-
 gnu/packages/shells.scm                            |     2 +-
 gnu/packages/shellutils.scm                        |    35 +
 gnu/packages/statistics.scm                        |   146 +-
 gnu/packages/tcl.scm                               |     6 +-
 gnu/packages/tex.scm                               |    20 +
 gnu/packages/textutils.scm                         |     2 +-
 gnu/packages/tls.scm                               |     4 +-
 gnu/packages/video.scm                             |    48 +-
 gnu/packages/virtualization.scm                    |    18 +-
 gnu/packages/w3m.scm                               |     2 +-
 gnu/packages/web-browsers.scm                      |     2 +-
 gnu/packages/web.scm                               |    76 +-
 gnu/packages/wine.scm                              |     4 +-
 gnu/packages/wxwidgets.scm                         |     6 +-
 gnu/packages/xfce.scm                              |     2 +-
 gnu/packages/xml.scm                               |    31 +-
 gnu/packages/xorg.scm                              |    17 +-
 gnu/services/audio.scm                             |    35 +-
 gnu/services/base.scm                              |    13 +
 gnu/tests/base.scm                                 |    83 +
 guix/build/emacs-build-system.scm                  |    45 +-
 guix/scripts/archive.scm                           |     1 -
 guix/scripts/copy.scm                              |     1 -
 guix/scripts/environment.scm                       |     1 -
 guix/scripts/pack.scm                              |     1 -
 guix/scripts/package.scm                           |     3 +-
 guix/scripts/pull.scm                              |     1 -
 guix/scripts/system.scm                            |     1 -
 po/packages/fr.po                                  | 17387 +++++++++++++++++--
 127 files changed, 20452 insertions(+), 2701 deletions(-)




reply via email to

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