[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Leo Famulari |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Thu, 11 Jan 2018 17:32:41 -0500 (EST) |
lfam pushed a commit to branch core-updates
in repository guix.
commit 4adb40bffc0dda8871878283887a0e0cd88d9578
Merge: 4610ab7 138c088
Author: Leo Famulari <address@hidden>
Date: Thu Jan 11 14:22:50 2018 -0800
Merge branch 'master' into core-updates
.dir-locals.el | 1 +
README | 3 +-
config-daemon.ac | 18 +-
configure.ac | 4 +
doc/guix.texi | 195 +++++++++-
gnu/build/linux-boot.scm | 13 +-
gnu/local.mk | 15 +-
gnu/packages/admin.scm | 27 ++
gnu/packages/astronomy.scm | 49 +--
gnu/packages/audio.scm | 26 +-
gnu/packages/backup.scm | 8 +-
gnu/packages/base.scm | 4 +-
gnu/packages/benchmark.scm | 5 +-
gnu/packages/bioinformatics.scm | 45 +--
gnu/packages/bootloaders.scm | 78 +++-
gnu/packages/cdrom.scm | 12 +-
gnu/packages/check.scm | 43 ++-
gnu/packages/chemistry.scm | 119 ++++++
gnu/packages/code.scm | 44 ++-
gnu/packages/commencement.scm | 3 +-
gnu/packages/cpp.scm | 5 +-
gnu/packages/crypto.scm | 55 ++-
gnu/packages/curl.scm | 12 +-
gnu/packages/databases.scm | 25 +-
gnu/packages/dictionaries.scm | 5 +-
gnu/packages/dns.scm | 37 +-
gnu/packages/elixir.scm | 5 +-
gnu/packages/emacs.scm | 70 ++--
gnu/packages/engineering.scm | 22 +-
gnu/packages/finance.scm | 19 +-
gnu/packages/freedesktop.scm | 5 +-
gnu/packages/ftp.scm | 26 +-
gnu/packages/games.scm | 4 +-
gnu/packages/gnome.scm | 54 ++-
gnu/packages/gnucash.scm | 8 +-
gnu/packages/gnuzilla.scm | 6 +-
gnu/packages/gtk.scm | 14 +-
gnu/packages/guile.scm | 88 +----
gnu/packages/haskell-check.scm | 11 +-
gnu/packages/haskell.scm | 18 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/inkscape.scm | 7 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/iso-codes.scm | 10 +-
gnu/packages/libusb.scm | 5 +-
gnu/packages/linux.scm | 54 ++-
gnu/packages/logging.scm | 15 +-
gnu/packages/lua.scm | 60 +++
gnu/packages/machine-learning.scm | 15 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/mes.scm | 6 +-
gnu/packages/monitoring.scm | 34 ++
gnu/packages/mp3.scm | 6 -
gnu/packages/music.scm | 188 ++++++++--
gnu/packages/nano.scm | 5 +-
gnu/packages/networking.scm | 13 +-
gnu/packages/ocaml.scm | 6 +-
gnu/packages/package-management.scm | 6 +-
gnu/packages/patches/ao-cad-aarch64-support.patch | 18 +
.../patches/guile-bytestructures-name-clash.patch | 31 --
.../icecat-bug-1427870-spectre-mitigation.patch | 49 +++
.../patches/ledger-fix-uninitialized.patch | 27 ++
.../patches/ledger-revert-boost-python-fix.patch | 39 ++
.../patches/libvorbis-CVE-2017-14632.patch | 63 ++++
.../patches/libvorbis-CVE-2017-14633.patch | 43 +++
.../patches/newsbeuter-CVE-2017-12904.patch | 34 --
.../patches/newsbeuter-CVE-2017-14500.patch | 43 ---
.../patches/perl-module-pluggable-search.patch | 0
.../patches/webkitgtk-mitigate-spectre.patch | 107 ++++++
gnu/packages/pdf.scm | 10 +-
gnu/packages/perl-check.scm | 2 +-
gnu/packages/perl.scm | 6 +-
gnu/packages/python.scm | 66 +++-
gnu/packages/rrdtool.scm | 70 ++--
gnu/packages/samba.scm | 4 +-
gnu/packages/serialization.scm | 4 +-
gnu/packages/suckless.scm | 9 +-
gnu/packages/sync.scm | 5 +-
gnu/packages/syncthing.scm | 411 +++++++++++----------
gnu/packages/syndication.scm | 58 +--
gnu/packages/telephony.scm | 26 +-
gnu/packages/textutils.scm | 43 +--
gnu/packages/tor.scm | 6 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 6 +-
gnu/packages/webkit.scm | 5 +-
gnu/packages/wine.scm | 11 +-
gnu/packages/xdisorg.scm | 4 +-
gnu/packages/xiph.scm | 9 +
gnu/packages/xml.scm | 56 +++
gnu/packages/xorg.scm | 19 +-
gnu/services/base.scm | 96 +++--
gnu/services/monitoring.scm | 91 +++++
gnu/services/virtualization.scm | 267 ++++++++++++-
gnu/system.scm | 1 +
gnu/system/linux-initrd.scm | 20 +-
gnu/system/shadow.scm | 8 +-
gnu/system/vm.scm | 18 +-
gnu/tests.scm | 8 +
guix/derivations.scm | 4 +-
guix/import/crate.scm | 4 +-
guix/import/gem.scm | 2 +-
guix/import/hackage.scm | 2 +-
guix/scripts/publish.scm | 137 ++++---
guix/serialization.scm | 8 +-
guix/ssh.scm | 146 ++++++--
guix/store.scm | 8 +-
guix/ui.scm | 6 +
m4/guix.m4 | 22 +-
nix/libstore/build.cc | 83 ++++-
nix/libstore/globals.cc | 8 +-
nix/libstore/globals.hh | 11 +-
nix/local.mk | 12 +-
nix/nix-daemon/guix-daemon.cc | 27 +-
tests/guix-daemon.sh | 38 +-
tests/publish.scm | 28 ++
116 files changed, 2946 insertions(+), 1042 deletions(-)
diff --cc gnu/local.mk
index 7257a8e,eec46af..ff5fe59
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1,8 -1,8 +1,8 @@@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès
<address@hidden>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
# Copyright © 2013, 2014, 2015, 2016, 2017 Andreas Enge <address@hidden>
# Copyright © 2016 Mathieu Lirzin <address@hidden>
- # Copyright © 2013, 2014, 2015, 2016, 2017 Mark H Weaver <address@hidden>
+ # Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Mark H Weaver
<address@hidden>
# Copyright © 2016 Chris Marusich <address@hidden>
# Copyright © 2016, 2017 Kei Kebreau <address@hidden>
# Copyright © 2016, 2017 Rene Saavedra <address@hidden>
@@@ -755,6 -758,10 +758,7 @@@ dist_patch_DATA =
%D%/packages/patches/icecat-bug-1415133.patch \
%D%/packages/patches/icecat-bug-1414945.patch \
%D%/packages/patches/icecat-bug-1424373-pt2.patch \
+ %D%/packages/patches/icecat-bug-1427870-spectre-mitigation.patch \
- %D%/packages/patches/icu4c-CVE-2017-7867-CVE-2017-7868.patch \
- %D%/packages/patches/icu4c-CVE-2017-14952.patch \
- %D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
@@@ -832,9 -850,21 +838,11 @@@
%D%/packages/patches/libusb-0.1-disable-tests.patch \
%D%/packages/patches/libusb-for-axoloti.patch \
%D%/packages/patches/libvdpau-va-gl-unbundle.patch \
+ %D%/packages/patches/libvorbis-CVE-2017-14632.patch \
+ %D%/packages/patches/libvorbis-CVE-2017-14633.patch \
%D%/packages/patches/libvpx-CVE-2016-2818.patch \
%D%/packages/patches/libxcb-python-3.5-compat.patch \
- %D%/packages/patches/libxml2-CVE-2016-4658.patch \
- %D%/packages/patches/libxml2-CVE-2016-5131.patch \
- %D%/packages/patches/libxml2-CVE-2017-0663.patch \
- %D%/packages/patches/libxml2-CVE-2017-7375.patch \
- %D%/packages/patches/libxml2-CVE-2017-7376.patch \
- %D%/packages/patches/libxml2-CVE-2017-9047+CVE-2017-9048.patch \
- %D%/packages/patches/libxml2-CVE-2017-9049+CVE-2017-9050.patch \
%D%/packages/patches/libxslt-generated-ids.patch \
- %D%/packages/patches/libxslt-CVE-2016-4738.patch \
- %D%/packages/patches/libxslt-CVE-2017-5029.patch \
%D%/packages/patches/libxt-guix-search-paths.patch \
%D%/packages/patches/lierolibre-check-unaligned-access.patch \
%D%/packages/patches/lierolibre-is-free-software.patch \
@@@ -892,11 -923,9 +900,9 @@@
%D%/packages/patches/netsurf-system-utf8proc.patch \
%D%/packages/patches/netsurf-y2038-tests.patch \
%D%/packages/patches/netsurf-longer-test-timeout.patch \
- %D%/packages/patches/newsbeuter-CVE-2017-12904.patch \
- %D%/packages/patches/newsbeuter-CVE-2017-14500.patch \
+ %D%/packages/patches/nfs-utils-missing-headers.patch \
%D%/packages/patches/ngircd-handle-zombies.patch \
%D%/packages/patches/ninja-zero-mtime.patch \
- %D%/packages/patches/node-test-http2-server-rst-stream.patch \
%D%/packages/patches/nss-increase-test-timeout.patch \
%D%/packages/patches/nss-pkgconfig.patch \
%D%/packages/patches/nvi-assume-preserve-path.patch \
diff --cc gnu/packages/base.scm
index ee92c49,5fcfc90..92acbd3
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@@ -89,10 -89,12 +90,11 @@@ command-line arguments, multiple langua
version ".tar.xz"))
(sha256
(base32
- "1dcasjp3a578nrvzrcn38mpizb8w1q6mvfzhjmcqqgkf0nsivj72"))
- (patches (search-patches "grep-timing-sensitive-test.patch"
- "grep-gnulib-lock.patch"))))
+ "0zm0ywmyz9g8vn1plw14mn8kj74yipx5qsljndbyfgmvndx5qqnv"))
+ (patches (search-patches "grep-timing-sensitive-test.patch"))))
(build-system gnu-build-system)
(native-inputs `(("perl" ,perl))) ;some of the tests require it
+ (inputs `(("pcre" ,pcre)))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --cc gnu/packages/check.scm
index f5c6470,50675cb..80a5a22
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@@ -1724,3 -1771,37 +1729,37 @@@ retried."
(define-public python2-flaky
(package-with-python2 python-flaky))
+
+ (define-public python-pyhamcrest
+ (package
+ (name "python-pyhamcrest")
+ (version "1.9.0")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append
+ "https://github.com/hamcrest/PyHamcrest/archive/V";
+ version
+ ".tar.gz"))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1lqjajhwf7x7igvvnj5p1cm31y9njy07qby94w18kl6zwbdjqrwy"))))
+ (native-inputs ; All native inputs are for tests
+ `(("python-pytest-cov" ,python-pytest-cov)
+ ("python-mock" ,python-mock)
- ("python-pytest" ,python-pytest-3.0)
++ ("python-pytest" ,python-pytest)
+ ("python-hypothesis" ,python-hypothesis)))
+ (propagated-inputs
+ `(("python-six" ,python-six)))
+ (build-system python-build-system)
+ (home-page "http://hamcrest.org/";)
+ (synopsis "Hamcrest matchers for Python")
+ (description
+ "PyHamcrest is a framework for writing matcher objects,
+ allowing you to declaratively define \"match\" rules.")
+ (license license:bsd-3)))
+
+ (define-public python2-pyhamcrest
+ (package-with-python2 python-pyhamcrest))