guix-commits
[Top][All Lists]
Advanced

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

02/02: Merge branch 'master' into staging


From: Marius Bakke
Subject: 02/02: Merge branch 'master' into staging
Date: Mon, 18 Jun 2018 09:42:02 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit 6969c4de445a390eaa05de22bc5a537a76a76169
Merge: 73d1891 32eb442
Author: Marius Bakke <address@hidden>
Date:   Mon Jun 18 15:29:38 2018 +0200

    Merge branch 'master' into staging

 .gitignore                                         |     2 +-
 Makefile.am                                        |    28 +-
 README                                             |     3 +-
 build-aux/hydra/gnu-system.scm                     |     3 +-
 build-aux/pre-inst-env.in                          |     6 +-
 configure.ac                                       |     5 +-
 doc/contributing.texi                              |    11 +-
 doc/guix.texi                                      |    69 +-
 etc/completion/bash/guix-daemon                    |    30 +
 gnu/build/install.scm                              |    59 +-
 gnu/build/linux-modules.scm                        |     1 +
 gnu/build/vm.scm                                   |     6 +-
 gnu/local.mk                                       |    10 +-
 gnu/packages/admin.scm                             |    80 +-
 gnu/packages/aidc.scm                              |     5 +-
 gnu/packages/audio.scm                             |     4 +-
 gnu/packages/backup.scm                            |   127 +-
 gnu/packages/base.scm                              |    11 +
 gnu/packages/benchmark.scm                         |    10 +-
 gnu/packages/bioconductor.scm                      |   308 +-
 gnu/packages/bioinformatics.scm                    |    85 +-
 gnu/packages/bootloaders.scm                       |    23 +-
 gnu/packages/check.scm                             |    19 +-
 gnu/packages/compression.scm                       |    12 +-
 gnu/packages/cran.scm                              |   327 +-
 gnu/packages/crypto.scm                            |    27 +-
 gnu/packages/databases.scm                         |     4 +-
 gnu/packages/dav.scm                               |     5 +-
 gnu/packages/dns.scm                               |     2 +
 gnu/packages/elixir.scm                            |    36 +-
 gnu/packages/emacs.scm                             |   139 +-
 gnu/packages/emulators.scm                         |     3 +-
 gnu/packages/erlang.scm                            |    24 +
 gnu/packages/fcitx.scm                             |    18 +-
 gnu/packages/fonts.scm                             |    16 +-
 gnu/packages/games.scm                             |   165 +-
 gnu/packages/geo.scm                               |     4 +-
 gnu/packages/gnome.scm                             |     4 +-
 gnu/packages/gnupg.scm                             |    29 +-
 gnu/packages/golang.scm                            |     8 +-
 gnu/packages/graphics.scm                          |     4 +-
 gnu/packages/groovy.scm                            |     3 +-
 gnu/packages/gtk.scm                               |     2 +-
 gnu/packages/guile.scm                             |    18 +-
 gnu/packages/java.scm                              |    62 +
 gnu/packages/libedit.scm                           |     4 +-
 gnu/packages/linux.scm                             |    59 +-
 gnu/packages/machine-learning.scm                  |    76 +
 gnu/packages/mail.scm                              |     4 +-
 gnu/packages/maths.scm                             |     7 +-
 gnu/packages/maven.scm                             |   948 +-
 gnu/packages/mes.scm                               |     8 +-
 gnu/packages/networking.scm                        |    46 +-
 gnu/packages/nickle.scm                            |     5 +-
 gnu/packages/package-management.scm                |    98 +-
 gnu/packages/password-utils.scm                    |     5 +-
 gnu/packages/patches/bind-CVE-2018-5738.patch      |   100 +
 .../binutils-aarch64-symbol-relocation.patch       |    36 +
 .../patches/elixir-disable-failing-tests.patch     |   284 -
 gnu/packages/patches/flann-cmake-3.11.patch        |    84 +
 .../patches/gnupg-1.4-CVE-2018-12020.patch         |    50 -
 .../patches/password-store-gnupg-compat.patch      |    28 -
 .../patches/perl-archive-tar-CVE-2018-12015.patch  |    36 +
 .../python-nose-timer-drop-ordereddict.patch       |    44 -
 gnu/packages/patches/strace-kernel-4.16.patch      |    92 -
 gnu/packages/patches/upx-fix-CVE-2017-15056.patch  |    96 +
 gnu/packages/perl-check.scm                        |    51 +
 gnu/packages/perl.scm                              |    90 +-
 gnu/packages/python.scm                            |   158 +-
 gnu/packages/qt.scm                                |    50 +
 gnu/packages/samba.scm                             |     9 +-
 gnu/packages/spice.scm                             |     4 +-
 gnu/packages/sssd.scm                              |     5 +-
 gnu/packages/statistics.scm                        |    21 +-
 gnu/packages/terminals.scm                         |    34 +
 gnu/packages/tex.scm                               |     7 +-
 gnu/packages/time.scm                              |     4 +-
 gnu/packages/tls.scm                               |    83 +-
 gnu/packages/tor.scm                               |     4 +-
 gnu/packages/version-control.scm                   |     4 +-
 gnu/packages/video.scm                             |     4 +-
 gnu/packages/vim.scm                               |    95 +-
 gnu/packages/virtualization.scm                    |   110 +
 gnu/packages/web.scm                               |   110 +-
 gnu/packages/wine.scm                              |     6 +-
 gnu/packages/xdisorg.scm                           |     4 +-
 gnu/packages/xml.scm                               |    20 +-
 gnu/packages/xorg.scm                              |    29 +
 gnu/services/base.scm                              |     5 +-
 gnu/services/networking.scm                        |     6 +-
 gnu/services/web.scm                               |     9 +-
 gnu/system.scm                                     |     8 +-
 gnu/system/file-systems.scm                        |    11 +-
 gnu/system/install.scm                             |    16 +-
 gnu/system/mapped-devices.scm                      |    16 +-
 gnu/system/vm.scm                                  |   436 +-
 gnu/tests/admin.scm                                |     7 +-
 gnu/tests/base.scm                                 |    62 +-
 gnu/tests/dict.scm                                 |     7 +-
 gnu/tests/mail.scm                                 |    13 +-
 gnu/tests/messaging.scm                            |    14 +-
 gnu/tests/nfs.scm                                  |     7 +-
 gnu/tests/rsync.scm                                |     7 +-
 gnu/tests/ssh.scm                                  |     8 +-
 gnu/tests/version-control.scm                      |    20 +-
 gnu/tests/web.scm                                  |     8 +-
 guix/build-system/r.scm                            |     4 +-
 guix/build/store-copy.scm                          |   121 +-
 guix/config.scm.in                                 |    12 +-
 guix/import/utils.scm                              |     2 +-
 guix/nar.scm                                       |     3 +-
 guix/scripts/offload.scm                           |    14 +-
 guix/scripts/pack.scm                              |   243 +-
 guix/scripts/pull.scm                              |   149 +-
 guix/scripts/substitute.scm                        |     4 +-
 guix/scripts/system.scm                            |     3 +-
 guix/self.scm                                      |    88 +-
 guix/store.scm                                     |    29 -
 guix/store/database.scm                            |   235 +-
 guix/store/deduplication.scm                       |    13 +-
 {nix/libstore => guix/store}/schema.sql            |     0
 guix/ui.scm                                        |     7 +-
 guix/utils.scm                                     |     6 +
 nix/guix-register/guix-register.cc                 |   254 -
 nix/libstore/store-api.cc                          |    26 -
 nix/libstore/store-api.hh                          |     4 -
 nix/local.mk                                       |    18 +-
 po/doc/guix-manual.fr.po                           | 18381 ++++---------------
 tests/gexp.scm                                     |    17 +-
 tests/guix-register.sh                             |   191 -
 tests/store-database.scm                           |    45 +-
 tests/store-deduplication.scm                      |     9 +-
 tests/store.scm                                    |    22 +-
 133 files changed, 8297 insertions(+), 17092 deletions(-)




reply via email to

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