guix-commits
[Top][All Lists]
Advanced

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

01/04: Merge branch 'master' into staging


From: Marius Bakke
Subject: 01/04: Merge branch 'master' into staging
Date: Tue, 20 Feb 2018 12:20:27 -0500 (EST)

mbakke pushed a commit to branch staging
in repository guix.

commit 7f69459aca16756f35f08049c64a1bd77d23f33e
Merge: 4a82722 b1989c1
Author: Marius Bakke <address@hidden>
Date:   Tue Feb 20 17:36:56 2018 +0100

    Merge branch 'master' into staging

 .gitignore                                         |     1 +
 .mailmap                                           |    23 +-
 Makefile.am                                        |    33 +-
 build-aux/build-self.scm                           |     7 +-
 build-aux/hydra/gnu-system.scm                     |    57 +-
 configure.ac                                       |    20 +-
 doc/contributing.texi                              |     7 +-
 doc/guix.texi                                      |   506 +-
 doc/local.mk                                       |     8 +-
 etc/completion/bash/guix                           |    11 +-
 etc/completion/fish/guix.fish                      |   548 +
 etc/guix-daemon.cil.in                             |   285 +
 etc/guix-install.sh                                |   425 +
 gnu/bootloader/grub.scm                            |     2 +-
 gnu/bootloader/u-boot.scm                          |    44 +-
 gnu/build/file-systems.scm                         |     4 +-
 gnu/build/linux-boot.scm                           |    14 +-
 gnu/build/linux-container.scm                      |    14 +-
 gnu/build/marionette.scm                           |     7 +-
 gnu/build/vm.scm                                   |     8 +-
 gnu/local.mk                                       |    73 +-
 gnu/packages/acl.scm                               |     2 +-
 gnu/packages/admin.scm                             |   159 +-
 gnu/packages/adns.scm                              |     8 +-
 gnu/packages/algebra.scm                           |    51 +-
 gnu/packages/android.scm                           |    71 +-
 gnu/packages/aspell.scm                            |    18 +-
 gnu/packages/assembly.scm                          |     6 +-
 gnu/packages/astronomy.scm                         |    15 +-
 gnu/packages/attr.scm                              |     2 +-
 gnu/packages/audio.scm                             |   148 +-
 gnu/packages/augeas.scm                            |     6 +-
 gnu/packages/autotools.scm                         |    36 +
 gnu/packages/aux-files/linux-libre/4.1-i686.conf   |     8 +-
 gnu/packages/aux-files/linux-libre/4.1-x86_64.conf |    10 +-
 gnu/packages/aux-files/linux-libre/4.14-arm.conf   |     4 +-
 gnu/packages/aux-files/linux-libre/4.14-i686.conf  |     9 +-
 .../aux-files/linux-libre/4.14-x86_64.conf         |    12 +-
 .../linux-libre/{4.14-arm.conf => 4.15-arm.conf}   |   150 +-
 .../linux-libre/{4.14-i686.conf => 4.15-i686.conf} |   198 +-
 .../{4.14-x86_64.conf => 4.15-x86_64.conf}         |   201 +-
 gnu/packages/aux-files/linux-libre/4.4-i686.conf   |    17 +-
 gnu/packages/aux-files/linux-libre/4.4-x86_64.conf |    20 +-
 gnu/packages/aux-files/linux-libre/4.9-i686.conf   |    26 +-
 gnu/packages/aux-files/linux-libre/4.9-x86_64.conf |    31 +-
 gnu/packages/avahi.scm                             |    48 +-
 gnu/packages/avr.scm                               |     2 +-
 gnu/packages/backup.scm                            |    58 +-
 gnu/packages/base.scm                              |     2 +-
 gnu/packages/benchmark.scm                         |     4 +-
 gnu/packages/bioinformatics.scm                    |   938 +-
 gnu/packages/bittorrent.scm                        |    40 +-
 gnu/packages/boost.scm                             |     5 +-
 gnu/packages/bootloaders.scm                       |    52 +-
 gnu/packages/bootstrap.scm                         |     3 +-
 gnu/packages/c.scm                                 |     7 +-
 gnu/packages/calendar.scm                          |    10 +-
 gnu/packages/ccache.scm                            |    19 +-
 gnu/packages/cdrom.scm                             |    60 +-
 gnu/packages/certs.scm                             |     4 +-
 gnu/packages/check.scm                             |   159 +-
 gnu/packages/chez.scm                              |     7 +-
 gnu/packages/ci.scm                                |    10 +-
 gnu/packages/cobol.scm                             |    24 +-
 gnu/packages/code.scm                              |   141 +-
 gnu/packages/commencement.scm                      |    73 +-
 gnu/packages/compression.scm                       |   137 +-
 gnu/packages/conky.scm                             |    19 +-
 gnu/packages/cpp.scm                               |    68 +-
 gnu/packages/cran.scm                              |   423 +-
 gnu/packages/cross-base.scm                        |     4 +-
 gnu/packages/crypto.scm                            |    20 +-
 gnu/packages/cups.scm                              |    38 +-
 gnu/packages/curl.scm                              |    14 +
 gnu/packages/databases.scm                         |   204 +-
 gnu/packages/datastructures.scm                    |     4 +-
 gnu/packages/dav.scm                               |     4 +-
 gnu/packages/dc.scm                                |     7 +-
 gnu/packages/debug.scm                             |    35 +-
 gnu/packages/dico.scm                              |     8 +-
 gnu/packages/dictionaries.scm                      |     6 +-
 gnu/packages/disk.scm                              |     6 +-
 gnu/packages/display-managers.scm                  |     4 +-
 gnu/packages/django.scm                            |    27 +-
 gnu/packages/dns.scm                               |    18 +-
 gnu/packages/documentation.scm                     |    18 +-
 gnu/packages/elf.scm                               |    11 +-
 gnu/packages/emacs.scm                             |   668 +-
 gnu/packages/embedded.scm                          |     5 +-
 gnu/packages/engineering.scm                       |    22 +-
 gnu/packages/erlang.scm                            |    52 +-
 gnu/packages/file-systems.scm                      |    45 +-
 gnu/packages/finance.scm                           |    32 +
 gnu/packages/flashing-tools.scm                    |   117 +-
 gnu/packages/fltk.scm                              |     3 +
 gnu/packages/fonts.scm                             |   105 +-
 gnu/packages/fontutils.scm                         |    16 +-
 gnu/packages/fpga.scm                              |     7 +-
 gnu/packages/freeipmi.scm                          |     4 +-
 gnu/packages/ftp.scm                               |    10 +-
 gnu/packages/game-development.scm                  |   110 +-
 gnu/packages/games.scm                             |   497 +-
 gnu/packages/gcc.scm                               |    27 +-
 gnu/packages/gdb.scm                               |     4 +-
 gnu/packages/geo.scm                               |   151 +-
 gnu/packages/gimp.scm                              |    28 +-
 gnu/packages/gkrellm.scm                           |    14 +-
 gnu/packages/gl.scm                                |    13 +-
 gnu/packages/glib.scm                              |    58 +-
 gnu/packages/gnome.scm                             |    22 +-
 gnu/packages/gnu-doc.scm                           |     7 +-
 gnu/packages/gnunet.scm                            |    16 +-
 gnu/packages/gnupg.scm                             |    14 +-
 gnu/packages/gnustep.scm                           |    39 +-
 gnu/packages/gnuzilla.scm                          |    82 +-
 gnu/packages/golang.scm                            |    93 +-
 gnu/packages/gps.scm                               |    80 +-
 gnu/packages/graphics.scm                          |   167 +-
 gnu/packages/gsasl.scm                             |     2 +-
 gnu/packages/gtk.scm                               |    10 +-
 gnu/packages/guile.scm                             |    79 +-
 gnu/packages/haskell-check.scm                     |   155 +-
 gnu/packages/haskell-crypto.scm                    |    22 +-
 gnu/packages/haskell-web.scm                       |    93 +-
 gnu/packages/haskell.scm                           |  1586 ++-
 gnu/packages/ibus.scm                              |    11 +-
 gnu/packages/image-processing.scm                  |     5 +-
 gnu/packages/image-viewers.scm                     |    38 +-
 gnu/packages/image.scm                             |    12 +
 gnu/packages/imagemagick.scm                       |     9 +-
 gnu/packages/irc.scm                               |     6 +-
 gnu/packages/iso-codes.scm                         |    43 +
 gnu/packages/java.scm                              |   776 +-
 gnu/packages/julia.scm                             |    12 +
 gnu/packages/kde-frameworks.scm                    |   447 +-
 gnu/packages/kde.scm                               |    60 +-
 gnu/packages/language.scm                          |     3 +-
 gnu/packages/ldc.scm                               |     6 +
 gnu/packages/libcanberra.scm                       |     6 +-
 gnu/packages/libedit.scm                           |    10 +-
 gnu/packages/libffcall.scm                         |     6 +-
 gnu/packages/libreoffice.scm                       |    76 +-
 gnu/packages/libunwind.scm                         |     2 +-
 gnu/packages/libusb.scm                            |     4 +-
 gnu/packages/lighting.scm                          |     6 +-
 gnu/packages/linux.scm                             |   224 +-
 gnu/packages/lisp.scm                              |    15 +-
 gnu/packages/llvm.scm                              |    24 +-
 gnu/packages/lout.scm                              |     2 +-
 gnu/packages/lsof.scm                              |    78 +-
 gnu/packages/lua.scm                               |    28 +-
 gnu/packages/lxde.scm                              |    36 +-
 gnu/packages/machine-learning.scm                  |    35 +
 gnu/packages/mail.scm                              |   176 +-
 gnu/packages/man.scm                               |     6 +-
 gnu/packages/mate.scm                              |     9 +-
 gnu/packages/maths.scm                             |   125 +-
 gnu/packages/mc.scm                                |    32 +-
 gnu/packages/mes.scm                               |     5 +-
 gnu/packages/messaging.scm                         |     8 +-
 gnu/packages/monitoring.scm                        |   107 +-
 gnu/packages/mp3.scm                               |    15 +-
 gnu/packages/mpd.scm                               |    40 +-
 gnu/packages/mpi.scm                               |    23 +-
 gnu/packages/mtools.scm                            |     5 +-
 gnu/packages/multiprecision.scm                    |   105 +-
 gnu/packages/music.scm                             |   160 +-
 gnu/packages/nano.scm                              |     6 +-
 gnu/packages/ncdu.scm                              |     7 +-
 gnu/packages/ncurses.scm                           |     7 +-
 gnu/packages/networking.scm                        |   227 +-
 gnu/packages/nim.scm                               |    13 +-
 gnu/packages/ninja.scm                             |    52 +-
 gnu/packages/node.scm                              |     8 +-
 gnu/packages/ocaml.scm                             |   171 +-
 gnu/packages/onc-rpc.scm                           |     1 +
 gnu/packages/openldap.scm                          |     6 +-
 gnu/packages/openstack.scm                         |    13 +-
 gnu/packages/orpheus.scm                           |    20 +-
 gnu/packages/package-management.scm                |   210 +-
 gnu/packages/parallel.scm                          |    34 +-
 gnu/packages/password-utils.scm                    |    32 +-
 .../patches/clang-runtime-asan-build-fixes.patch   |    92 +
 .../patches/clang-runtime-esan-build-fixes.patch   |    19 +
 .../clementine-remove-crypto++-dependency.patch    |    19 +
 gnu/packages/patches/clisp-glibc-2.26.patch        |    20 +
 .../crypto++-fix-dos-in-asn.1-decoders.patch       |    65 -
 gnu/packages/patches/dovecot-CVE-2017-15132.patch  |    36 +
 gnu/packages/patches/dtc-32-bits-check.patch       |   134 -
 gnu/packages/patches/dtc-format-modifier.patch     |    38 -
 .../patches/emacs-browse-at-remote-cgit-gnu.patch  |    59 +
 .../patches/emacs-json-reformat-fix-tests.patch    |    32 +
 gnu/packages/patches/freetype-CVE-2018-6942.patch  |    31 +
 .../patches/gcc-4.9-libsanitizer-fix.patch         |    66 +
 .../ghc-8.0-fall-back-to-madv_dontneed.patch       |    61 +
 gnu/packages/patches/gpsbabel-minizip.patch        |    13 +
 gnu/packages/patches/gpsbabel-qstring.patch        |    69 +
 .../patches/gzdoom-search-in-installed-share.patch |    23 +
 .../patches/hwloc-tests-without-sysfs.patch        |    42 +
 .../icecat-bug-1427870-spectre-mitigation.patch    |    49 -
 gnu/packages/patches/icecat-glibc-2.26.patch       |   261 -
 .../patches/icecat-use-system-graphite2.patch      |   248 +
 .../patches/icecat-use-system-harfbuzz.patch       |   279 +
 .../patches/java-xerces-bootclasspath.patch        |    38 +
 .../patches/java-xerces-build_dont_unzip.patch     |    44 +
 .../patches/java-xerces-xjavac_taskdef.patch       |    45 +
 ...ktexteditor-5.39.0-autotests-dependencies.patch |    49 -
 gnu/packages/patches/libexif-CVE-2016-6328.patch   |    72 +
 gnu/packages/patches/libgnomeui-utf8.patch         |    51 +
 .../patches/libsndfile-CVE-2017-12562.patch        |    97 +
 gnu/packages/patches/libtasn1-CVE-2018-6003.patch  |    73 +
 gnu/packages/patches/libtiff-CVE-2017-18013.patch  |    45 +
 gnu/packages/patches/libtiff-CVE-2017-9935.patch   |   162 +
 gnu/packages/patches/luajit-symlinks.patch         |    25 -
 .../patches/lxterminal-CVE-2016-10369.patch        |    37 -
 .../patches/mailutils-uninitialized-memory.patch   |    87 +
 gnu/packages/patches/mupdf-CVE-2017-17858.patch    |   111 +
 gnu/packages/patches/ninja-zero-mtime.patch        |    19 -
 .../patches/opencascade-oce-glibc-2.26.patch       |    62 +
 gnu/packages/patches/p7zip-CVE-2017-17969.patch    |    35 +
 ...policycoreutils-make-sepolicy-use-python3.patch |   335 -
 gnu/packages/patches/python-axolotl-AES-fix.patch  |    24 +
 .../patches/python-pandas-skip-failing-tests.patch |    49 -
 .../patches/python-waitress-fix-tests.patch        |    29 +
 gnu/packages/patches/qtbase-use-TZDIR.patch        |    39 +
 gnu/packages/patches/rct-add-missing-headers.patch |    43 +
 .../reposurgeon-add-missing-docbook-files.patch    |    22 +
 gnu/packages/patches/rsync-CVE-2017-16548.patch    |    31 -
 .../patches/rsync-CVE-2017-17433-fix-tests.patch   |    42 -
 gnu/packages/patches/rsync-CVE-2017-17433.patch    |    45 -
 .../patches/rsync-CVE-2017-17434-pt1.patch         |    28 -
 .../patches/rsync-CVE-2017-17434-pt2.patch         |    39 -
 gnu/packages/patches/rtags-separate-rct.patch      |    72 +
 .../patches/ruby-rubygems-276-for-ruby24.patch     |   605 +
 .../patches/shepherd-herd-status-sorted.patch      |    79 +
 .../slurm-configure-remove-nonfree-contribs.patch  |    45 -
 .../patches/webkitgtk-mitigate-spectre.patch       |   107 -
 gnu/packages/patches/zziplib-CVE-2017-5974.patch   |    28 -
 gnu/packages/patches/zziplib-CVE-2017-5975.patch   |    32 -
 gnu/packages/patches/zziplib-CVE-2017-5976.patch   |    61 -
 gnu/packages/patches/zziplib-CVE-2017-5978.patch   |    37 -
 gnu/packages/patches/zziplib-CVE-2017-5979.patch   |    19 -
 gnu/packages/patches/zziplib-CVE-2017-5981.patch   |    19 -
 gnu/packages/patchutils.scm                        |    15 +-
 gnu/packages/pciutils.scm                          |     2 +-
 gnu/packages/pcre.scm                              |     4 +-
 gnu/packages/pdf.scm                               |    16 +-
 gnu/packages/perl-check.scm                        |     4 +-
 gnu/packages/perl.scm                              |    20 +-
 gnu/packages/photo.scm                             |    18 +-
 gnu/packages/php.scm                               |    19 +-
 gnu/packages/popt.scm                              |     3 +-
 gnu/packages/pulseaudio.scm                        |    10 +
 gnu/packages/python-crypto.scm                     |    97 +-
 gnu/packages/python-web.scm                        |    10 +-
 gnu/packages/python.scm                            |   839 +-
 gnu/packages/qt.scm                                |   201 +-
 gnu/packages/ratpoison.scm                         |     2 +-
 gnu/packages/rdf.scm                               |     5 +-
 gnu/packages/readline.scm                          |    15 +-
 gnu/packages/regex.scm                             |     4 +-
 gnu/packages/robotics.scm                          |   126 +
 gnu/packages/rrdtool.scm                           |     2 +-
 gnu/packages/rsync.scm                             |    13 +-
 gnu/packages/ruby.scm                              |   100 +-
 gnu/packages/rust.scm                              |     4 +-
 gnu/packages/samba.scm                             |    72 +-
 gnu/packages/sawfish.scm                           |     5 +-
 gnu/packages/scheme.scm                            |    47 +-
 gnu/packages/sdl.scm                               |     9 +-
 gnu/packages/search.scm                            |     5 +-
 gnu/packages/selinux.scm                           |   142 +-
 gnu/packages/shells.scm                            |    82 +-
 gnu/packages/shellutils.scm                        |    15 +-
 gnu/packages/skribilo.scm                          |     2 +-
 gnu/packages/slang.scm                             |    10 +-
 gnu/packages/speech.scm                            |    14 +-
 gnu/packages/spice.scm                             |     9 +-
 gnu/packages/ssh.scm                               |    59 +-
 gnu/packages/statistics.scm                        |   233 +-
 gnu/packages/storage.scm                           |     2 +-
 gnu/packages/sync.scm                              |     4 +-
 gnu/packages/syncthing.scm                         |   320 +-
 gnu/packages/tcl.scm                               |     5 +-
 gnu/packages/telephony.scm                         |     2 +-
 gnu/packages/terminals.scm                         |   211 +-
 gnu/packages/texinfo.scm                           |     2 +-
 gnu/packages/text-editors.scm                      |     2 +-
 gnu/packages/textutils.scm                         |    24 +
 gnu/packages/time.scm                              |     5 +-
 gnu/packages/tls.scm                               |    24 +-
 gnu/packages/toys.scm                              |    65 +
 gnu/packages/tryton.scm                            |   128 +-
 gnu/packages/upnp.scm                              |     4 +-
 gnu/packages/valgrind.scm                          |    17 +-
 gnu/packages/version-control.scm                   |    80 +-
 gnu/packages/video.scm                             |   242 +-
 gnu/packages/vim.scm                               |    26 +-
 gnu/packages/virtualization.scm                    |    25 +-
 gnu/packages/vpn.scm                               |    14 +-
 gnu/packages/vulkan.scm                            |   159 +-
 gnu/packages/w3m.scm                               |     6 +-
 gnu/packages/web.scm                               |   203 +-
 gnu/packages/webkit.scm                            |     5 +-
 gnu/packages/wget.scm                              |     4 +-
 gnu/packages/wine.scm                              |    55 +-
 gnu/packages/wm.scm                                |    28 +-
 gnu/packages/wordnet.scm                           |     8 +-
 gnu/packages/wxwidgets.scm                         |     5 +-
 gnu/packages/xdisorg.scm                           |     2 +-
 gnu/packages/xfce.scm                              |    97 +-
 gnu/packages/xiph.scm                              |    21 +-
 gnu/packages/xml.scm                               |   672 +-
 gnu/packages/xorg.scm                              |    39 +-
 gnu/services.scm                                   |    59 +-
 gnu/services/avahi.scm                             |    16 +-
 gnu/services/base.scm                              |   259 +-
 gnu/services/databases.scm                         |    40 +-
 gnu/services/games.scm                             |    81 +
 gnu/services/herd.scm                              |     9 +-
 gnu/services/messaging.scm                         |   117 +-
 gnu/services/networking.scm                        |   113 -
 gnu/services/nfs.scm                               |     2 +-
 gnu/services/shepherd.scm                          |    36 +-
 gnu/services/version-control.scm                   |     6 +-
 gnu/services/web.scm                               |   256 +-
 gnu/services/xorg.scm                              |     3 +-
 gnu/system.scm                                     |     7 +-
 gnu/system/examples/desktop.tmpl                   |     4 +-
 gnu/system/examples/lightweight-desktop.tmpl       |     2 +-
 gnu/system/install.scm                             |    70 +-
 gnu/system/linux-initrd.scm                        |     1 -
 gnu/system/locale.scm                              |    10 +-
 gnu/system/vm.scm                                  |     2 +-
 gnu/tests.scm                                      |    22 +-
 gnu/tests/base.scm                                 |     5 -
 gnu/tests/messaging.scm                            |    89 +-
 gnu/tests/version-control.scm                      |    25 +-
 gnu/tests/web.scm                                  |   123 +-
 guix/build-system/emacs.scm                        |     3 +-
 guix/build/download.scm                            |     2 +-
 guix/build/dub-build-system.scm                    |     9 +-
 guix/build/emacs-build-system.scm                  |    92 +-
 guix/build/emacs-utils.scm                         |    11 +-
 guix/build/go-build-system.scm                     |    10 +-
 guix/build/ruby-build-system.scm                   |   184 +-
 guix/build/union.scm                               |     2 +-
 guix/import/utils.scm                              |    12 +-
 guix/licenses.scm                                  |     6 +
 guix/packages.scm                                  |     8 +-
 guix/scripts/offload.scm                           |    72 +-
 guix/scripts/pack.scm                              |    21 +-
 guix/scripts/publish.scm                           |    16 +-
 guix/scripts/system.scm                            |    10 +-
 guix/ssh.scm                                       |   135 +-
 guix/ui.scm                                        |    11 +-
 po/guix/zh_CN.po                                   |  1860 ++-
 po/packages/fr.po                                  | 11166 ++++++++++++-------
 po/packages/hu.po                                  |   435 +-
 scripts/guix.in                                    |    83 +-
 tests/derivations.scm                              |    11 +-
 tests/import-utils.scm                             |    19 +
 tests/publish.scm                                  |    16 +
 tests/services.scm                                 |    32 +-
 364 files changed, 28253 insertions(+), 10711 deletions(-)

diff --cc gnu/packages/gl.scm
index 6bb5fab,125448f..cb65c9a
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@@ -6,9 -6,10 +6,10 @@@
  ;;; Copyright © 2016 ng0 <address@hidden>
  ;;; Copyright © 2016, 2017 Ricardo Wurmus <address@hidden>
  ;;; Copyright © 2016 David Thompson <address@hidden>
- ;;; Copyright © 2017 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2017, 2018 Efraim Flashner <address@hidden>
  ;;; Copyright © 2017 Arun Isaac <address@hidden>
 -;;; Copyright © 2017 Rutger Helling <address@hidden>
 +;;; Copyright © 2017, 2018 Rutger Helling <address@hidden>
+ ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;



reply via email to

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