mbakke pushed a commit to branch staging
in repository guix.

commit 5d904d63f4d43e3f0e4be38c5f5404e029c00a22
Merge: bab5f3a d0ee11b
Author: Marius Bakke <mba...@fastmail.com>
Date:   Mon Apr 16 18:15:28 2018 +0200

    Merge branch 'master' into staging

 Makefile.am                                        |    28 +-
 build-aux/build-self.scm                           |   460 +-
 build-aux/check-final-inputs-self-contained.scm    |    36 +-
 build-aux/compile-as-derivation.scm                |    53 +
 build-aux/cuirass/gnu-system.scm                   |    28 +-
 build-aux/cuirass/guix-modular.scm                 |     6 +
 .../{gnu-system.scm => hydra-to-cuirass.scm}       |     6 +-
 build-aux/hydra/evaluate.scm                       |    11 +-
 build-aux/hydra/gnu-system.scm                     |    11 +-
 build-aux/hydra/guix-modular.scm                   |    54 +-
 build-aux/hydra/guix.scm                           |     4 +-
 doc/guix.texi                                      |   583 +-
 etc/guix-install.sh                                |    19 +-
 gnu/bootloader.scm                                 |     3 +-
 gnu/build/activation.scm                           |     5 +-
 gnu/build/vm.scm                                   |    20 +-
 gnu/local.mk                                       |    19 +-
 gnu/packages.scm                                   |    27 +-
 gnu/packages/admin.scm                             |    38 +-
 gnu/packages/audio.scm                             |     4 +-
 .../linux-libre/{4.15-arm.conf => 4.16-arm.conf}   |   181 +-
 .../linux-libre/{4.15-i686.conf => 4.16-i686.conf} |   252 +-
 .../{4.15-x86_64.conf => 4.16-x86_64.conf}         |   250 +-
 gnu/packages/backup.scm                            |    15 +-
 gnu/packages/bioconductor.scm                      |    32 +-
 gnu/packages/bioinformatics.scm                    |   143 +-
 gnu/packages/bittorrent.scm                        |    46 +-
 gnu/packages/bootloaders.scm                       |    24 +-
 gnu/packages/bootstrap.scm                         |     3 +-
 gnu/packages/build-tools.scm                       |    24 +
 gnu/packages/ccache.scm                            |     6 +-
 gnu/packages/cdrom.scm                             |     6 +-
 gnu/packages/check.scm                             |    29 +-
 gnu/packages/ci.scm                                |     6 +-
 gnu/packages/cobol.scm                             |     2 +-
 gnu/packages/compression.scm                       |     9 +-
 gnu/packages/cran.scm                              |   453 +-
 gnu/packages/crypto.scm                            |    52 +-
 gnu/packages/cups.scm                              |     4 +-
 gnu/packages/databases.scm                         |    23 +-
 gnu/packages/datamash.scm                          |     6 +-
 gnu/packages/debian.scm                            |     5 +-
 gnu/packages/dictionaries.scm                      |    28 +-
 gnu/packages/disk.scm                              |    86 +
 gnu/packages/django.scm                            |    29 +-
 gnu/packages/dunst.scm                             |    14 +-
 gnu/packages/elf.scm                               |    12 +-
 gnu/packages/emacs.scm                             |   587 +-
 gnu/packages/embedded.scm                          |     4 +-
 gnu/packages/emulators.scm                         |     9 +-
 gnu/packages/engineering.scm                       |    93 +-
 gnu/packages/firmware.scm                          |    97 +-
 gnu/packages/flashing-tools.scm                    |    43 +-
 gnu/packages/fonts.scm                             |   158 +-
 gnu/packages/fontutils.scm                         |     4 +-
 gnu/packages/freedesktop.scm                       |     4 +-
 gnu/packages/fribidi.scm                           |     9 +-
 gnu/packages/ftp.scm                               |     4 +-
 gnu/packages/game-development.scm                  |     6 +-
 gnu/packages/games.scm                             |    19 +-
 gnu/packages/gnome.scm                             |    45 +-
 gnu/packages/gnunet.scm                            |     9 +-
 gnu/packages/gnupg.scm                             |    27 +-
 gnu/packages/gnuzilla.scm                          |    27 +-
 gnu/packages/gps.scm                               |     4 +-
 gnu/packages/graph.scm                             |     5 +-
 gnu/packages/graphviz.scm                          |    39 +-
 gnu/packages/gstreamer.scm                         |     1 +
 gnu/packages/gtk.scm                               |     2 +
 gnu/packages/guile.scm                             |    37 +-
 gnu/packages/haskell-check.scm                     |    31 +
 gnu/packages/haskell-crypto.scm                    |   137 +-
 gnu/packages/haskell-web.scm                       |   278 +
 gnu/packages/haskell.scm                           |   899 +-
 gnu/packages/image-viewers.scm                     |    17 +-
 gnu/packages/image.scm                             |    56 +-
 gnu/packages/java.scm                              |   779 +-
 gnu/packages/javascript.scm                        |     4 +-
 gnu/packages/kde.scm                               |    27 +-
 gnu/packages/ldc.scm                               |     8 +-
 gnu/packages/less.scm                              |     4 +-
 gnu/packages/libcanberra.scm                       |     4 +-
 gnu/packages/libffi.scm                            |     4 +-
 gnu/packages/libreoffice.scm                       |    15 +-
 gnu/packages/libusb.scm                            |    15 +-
 gnu/packages/license.scm                           |     5 +-
 gnu/packages/linux.scm                             |   101 +-
 gnu/packages/lisp.scm                              |    13 +-
 gnu/packages/llvm.scm                              |   109 +-
 gnu/packages/mail.scm                              |   106 +-
 gnu/packages/mate.scm                              |     4 +-
 gnu/packages/maths.scm                             |    76 +-
 gnu/packages/mes.scm                               |     4 +-
 gnu/packages/messaging.scm                         |    66 +-
 gnu/packages/mp3.scm                               |    17 +-
 gnu/packages/mpd.scm                               |     4 +-
 gnu/packages/mpi.scm                               |    31 +-
 gnu/packages/multiprecision.scm                    |    29 +-
 gnu/packages/music.scm                             |    94 +-
 gnu/packages/nano.scm                              |     4 +-
 gnu/packages/networking.scm                        |     7 +-
 gnu/packages/node.scm                              |     4 +-
 gnu/packages/ntp.scm                               |    19 +-
 gnu/packages/ocaml.scm                             |    11 +-
 gnu/packages/openstack.scm                         |     4 +-
 gnu/packages/package-management.scm                |    35 +-
 gnu/packages/parallel.scm                          |     4 +-
 gnu/packages/password-utils.scm                    |    49 +
 .../4store-unset-preprocessor-directive.patch      |    16 +
 ...path.patch => clang-3.5-libc-search-path.patch} |     0
 .../patches/clang-6.0-libc-search-path.patch       |    67 +
 .../patches/classpath-aarch64-support.patch        |    29 +
 .../cool-retro-term-remove-non-free-fonts.patch    |   205 -
 gnu/packages/patches/datamash-arm-tests.patch      |    71 +
 .../patches/delly-use-system-libraries.patch       |    56 +
 gnu/packages/patches/freeimage-unbundle.patch      |   550 +
 gnu/packages/patches/htop-fix-process-tree.patch   |    99 -
 .../patches/hwloc-tests-without-sysfs.patch        |    42 -
 gnu/packages/patches/libgnomeui-utf8.patch         |     6 +-
 gnu/packages/patches/libusb-for-axoloti.patch      |    14 +-
 gnu/packages/patches/links-CVE-2017-11114.patch    |    99 -
 gnu/packages/patches/lyx-2.2.3-fix-test.patch      |    13 +
 gnu/packages/patches/mupdf-CVE-2018-1000051.patch  |    88 +
 gnu/packages/patches/mupdf-CVE-2018-6544.patch     |   109 +
 .../mupen64plus-video-z64-glew-correct-path.patch  |    36 +
 gnu/packages/patches/racket-fix-xform-issue.patch  |    63 +
 .../patches/sharutils-CVE-2018-1000097.patch       |    21 +
 .../patches/translate-shell-fix-curl-tests.patch   |    60 +
 gnu/packages/pdf.scm                               |     4 +-
 gnu/packages/perl-web.scm                          |    24 +
 gnu/packages/perl.scm                              |   355 +-
 gnu/packages/photo.scm                             |     8 +-
 gnu/packages/php.scm                               |     4 +-
 gnu/packages/plotutils.scm                         |     5 +-
 gnu/packages/pure.scm                              |    68 +
 gnu/packages/python-crypto.scm                     |    21 +-
 gnu/packages/python.scm                            |    98 +-
 gnu/packages/rdf.scm                               |    15 +-
 gnu/packages/regex.scm                             |    11 +-
 gnu/packages/ruby.scm                              |    18 +-
 gnu/packages/rust.scm                              |  1467 +-
 gnu/packages/samba.scm                             |     4 +-
 gnu/packages/scheme.scm                            |     8 +-
 gnu/packages/search.scm                            |    50 +
 gnu/packages/spice.scm                             |     4 +
 gnu/packages/ssh.scm                               |    11 +-
 gnu/packages/statistics.scm                        |    39 +-
 gnu/packages/syncthing.scm                         |    14 +-
 gnu/packages/syndication.scm                       |     9 +-
 gnu/packages/terminals.scm                         |   178 +-
 gnu/packages/tex.scm                               |    92 +
 gnu/packages/text-editors.scm                      |    66 +-
 gnu/packages/textutils.scm                         |    10 +-
 gnu/packages/tls.scm                               |    50 +-
 gnu/packages/tmux.scm                              |     4 +-
 gnu/packages/tv.scm                                |     5 +-
 gnu/packages/upnp.scm                              |     4 +-
 gnu/packages/version-control.scm                   |    89 +-
 gnu/packages/video.scm                             |    81 +-
 gnu/packages/virtualization.scm                    |    10 +-
 gnu/packages/vpn.scm                               |     4 +-
 gnu/packages/web-browsers.scm                      |     7 +-
 gnu/packages/web.scm                               |    45 +-
 gnu/packages/wine.scm                              |     6 +-
 gnu/packages/wm.scm                                |    17 +-
 gnu/packages/xdisorg.scm                           |    38 +-
 gnu/packages/xorg.scm                              |    12 +-
 gnu/services.scm                                   |     7 +-
 gnu/services/certbot.scm                           |    22 +-
 gnu/services/cgit.scm                              |   133 +-
 gnu/services/desktop.scm                           |    22 +
 gnu/system.scm                                     |    11 +-
 gnu/system/examples/docker-image.tmpl              |    47 +
 gnu/system/nss.scm                                 |    10 +-
 gnu/system/shadow.scm                              |     3 +
 gnu/system/vm.scm                                  |   117 +-
 guix/build-system/cargo.scm                        |    21 +-
 guix/build/union.scm                               |    40 +-
 guix/ci.scm                                        |    78 +
 guix/discovery.scm                                 |    31 +-
 guix/docker.scm                                    |   200 +-
 guix/gexp.scm                                      |   101 +-
 guix/git.scm                                       |    82 +-
 guix/modules.scm                                   |    10 +-
 guix/scripts/build.scm                             |    16 +-
 guix/scripts/environment.scm                       |     2 +-
 guix/scripts/gc.scm                                |    10 +-
 guix/scripts/graph.scm                             |    38 +-
 guix/scripts/pack.scm                              |    73 +-
 guix/scripts/package.scm                           |    17 +-
 guix/scripts/system.scm                            |    12 +-
 guix/scripts/weather.scm                           |   109 +-
 guix/self.scm                                      |   610 +
 guix/upstream.scm                                  |     5 +-
 nix/libstore/globals.cc                            |    44 -
 nix/libstore/globals.hh                            |     4 -
 nix/libstore/local-store.cc                        |   159 +-
 nix/libstore/local-store.hh                        |     7 +-
 nix/libstore/misc.cc                               |   114 -
 nix/libstore/misc.hh                               |     7 -
 nix/libstore/store-api.cc                          |    31 -
 nix/libstore/store-api.hh                          |    17 -
 po/guix/LINGUAS                                    |     1 +
 po/guix/es.po                                      |  2994 +++
 po/packages/LINGUAS                                |     1 +
 po/packages/es.po                                  | 19381 +++++++++++++++++++
 tests/gexp.scm                                     |    84 +-
 tests/graph.scm                                    |    20 +-
 tests/guix-gc.sh                                   |     5 +-
 tests/guix-pack.sh                                 |    83 +
 tests/guix-package.sh                              |     8 +
 tests/guix-system.sh                               |    17 +
 tests/syscalls.scm                                 |    10 +-
 tests/union.scm                                    |    42 +-
 214 files changed, 32131 insertions(+), 4786 deletions(-)


Reply via email to