[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'staging' into core-updates |
|
Date: |
Thu, 20 Jun 2019 17:51:22 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09
Merge: 20e4ee1 010689e
Author: Marius Bakke <address@hidden>
Date: Thu Jun 20 23:38:56 2019 +0200
Merge branch 'staging' into core-updates
doc/guix.texi | 90 +++-
gnu/local.mk | 19 +-
gnu/packages/admin.scm | 21 +-
gnu/packages/algebra.scm | 586 +++++++++++++++++++--
gnu/packages/audio.scm | 18 +-
gnu/packages/benchmark.scm | 28 +
gnu/packages/bioconductor.scm | 4 +-
gnu/packages/bioinformatics.scm | 108 ++--
gnu/packages/busybox.scm | 16 +-
gnu/packages/check.scm | 30 +-
gnu/packages/chromium.scm | 38 +-
gnu/packages/ci.scm | 141 -----
gnu/packages/connman.scm | 15 +-
gnu/packages/cran.scm | 46 +-
gnu/packages/cups.scm | 4 +-
gnu/packages/databases.scm | 5 +-
gnu/packages/dico.scm | 4 +-
gnu/packages/dns.scm | 12 +-
gnu/packages/docker.scm | 5 +-
gnu/packages/emacs-xyz.scm | 242 ++++++++-
gnu/packages/engineering.scm | 12 +-
gnu/packages/fonts.scm | 22 +
gnu/packages/ftp.scm | 9 +-
gnu/packages/games.scm | 175 ++++++
gnu/packages/gl.scm | 9 +
gnu/packages/glib.scm | 13 +-
gnu/packages/gnome.scm | 33 ++
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gnupg.scm | 6 +-
gnu/packages/graph.scm | 54 ++
gnu/packages/gstreamer.scm | 15 +-
gnu/packages/guile-xyz.scm | 99 ++--
gnu/packages/guile.scm | 12 +
gnu/packages/haskell.scm | 42 --
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/irc.scm | 6 +-
gnu/packages/linux.scm | 24 +-
gnu/packages/logging.scm | 30 ++
gnu/packages/machine-learning.scm | 168 +++++-
gnu/packages/mail.scm | 15 +-
gnu/packages/maths.scm | 45 +-
gnu/packages/mpd.scm | 8 +-
gnu/packages/nano.scm | 10 +-
gnu/packages/networking.scm | 21 +-
gnu/packages/onc-rpc.scm | 16 +-
gnu/packages/parallel.scm | 53 +-
gnu/packages/password-utils.scm | 6 +-
.../patches/benchmark-unbundle-googletest.patch | 69 +++
gnu/packages/patches/dbus-CVE-2019-12749.patch | 116 ++++
.../dstat-fix-crash-when-specifying-delay.patch | 48 ++
.../patches/dstat-skip-devices-without-io.patch | 32 ++
gnu/packages/patches/emacs-unpackaged-req.patch | 24 +
.../patches/inkscape-poppler-compat3.patch | 499 ------------------
gnu/packages/patches/open-zwave-hidapi.patch | 15 +
.../patches/ratpoints-sturm_and_rp_private.patch | 194 +++++++
gnu/packages/patches/ri-li-modernize_cpp.patch | 391 ++++++++++++++
gnu/packages/patches/symmetrica-bruch.patch | 38 ++
gnu/packages/patches/symmetrica-int32.patch | 37 ++
.../patches/symmetrica-return_values.patch | 14 +
.../patches/symmetrica-sort_sum_rename.patch | 340 ++++++++++++
gnu/packages/pdf.scm | 4 +
gnu/packages/perl.scm | 9 +-
gnu/packages/popt.scm | 13 +-
gnu/packages/python-web.scm | 19 +-
gnu/packages/python-xyz.scm | 500 +++++++++++++-----
gnu/packages/python.scm | 1 +
gnu/packages/rush.scm | 4 +-
gnu/packages/rust.scm | 22 +-
gnu/packages/sagemath.scm | 284 +++++++++-
gnu/packages/samba.scm | 4 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/sphinx.scm | 10 +-
gnu/packages/statistics.scm | 25 +-
gnu/packages/syndication.scm | 7 +-
gnu/packages/terminals.scm | 5 +-
gnu/packages/text-editors.scm | 3 +-
gnu/packages/textutils.scm | 25 +
gnu/packages/time.scm | 4 +-
gnu/packages/version-control.scm | 4 +-
gnu/packages/video.scm | 22 +-
gnu/packages/web.scm | 27 +-
gnu/packages/wget.scm | 4 +-
gnu/packages/wm.scm | 92 +++-
gnu/packages/xiph.scm | 4 +-
gnu/packages/xml.scm | 5 +-
gnu/packages/xorg.scm | 15 +-
gnu/packages/zwave.scm | 9 +
gnu/services/admin.scm | 3 +-
gnu/services/desktop.scm | 1 +
gnu/services/mail.scm | 8 +-
gnu/services/mcron.scm | 1 -
gnu/services/networking.scm | 104 ++++
gnu/system/linux-container.scm | 29 +-
gnu/system/vm.scm | 5 +
gnu/tests/mail.scm | 6 +-
guix/build/haskell-build-system.scm | 14 +-
guix/derivations.scm | 9 +-
guix/grafts.scm | 67 ++-
guix/import/cabal.scm | 7 +-
guix/import/hackage.scm | 62 ++-
guix/licenses.scm | 6 +
guix/scripts/build.scm | 5 +-
guix/utils.scm | 6 +-
tests/derivations.scm | 15 +-
tests/hackage.scm | 97 +++-
tests/utils.scm | 6 +
106 files changed, 4399 insertions(+), 1337 deletions(-)
diff --cc gnu/local.mk
index 2a6908d,649d901..3be9c9d
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -690,8 -691,8 +690,9 @@@ dist_patch_DATA =
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
%D%/packages/patches/beets-python-3.7-fix.patch \
%D%/packages/patches/beignet-correct-file-names.patch \
- %D%/packages/patches/binutils-boot-2.20.1a.patch \
+ %D%/packages/patches/benchmark-unbundle-googletest.patch \
%D%/packages/patches/biber-fix-encoding-write.patch \
++ %D%/packages/patches/binutils-boot-2.20.1a.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/blender-2.79-newer-ffmpeg.patch \
%D%/packages/patches/blender-2.79-python-3.7-fix.patch \
@@@ -937,8 -936,6 +942,7 @@@
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/idris-test-no-node.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
- %D%/packages/patches/inkscape-poppler-compat3.patch \
+ %D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
diff --cc gnu/packages/glib.scm
index b2d4bf5,ab9ed0b..d93a928
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@@ -82,7 -79,8 +82,8 @@@
(define dbus
(package
(name "dbus")
- (version "1.12.12")
+ (version "1.12.14")
+ (replacement dbus/fixed)
(source (origin
(method url-fetch)
(uri (string-append
diff --cc gnu/packages/mpd.scm
index 668045c,7d46870..654d1e4
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@@ -100,10 -100,20 +100,10 @@@ interfacing MPD in the C, C++ & Objecti
"/mpd-" version ".tar.xz"))
(sha256
(base32
- "0ghda8g9q0bi6nrvl6n756d8f45spqpblkh77mnb4k9gmiv57qir"))))
+ "0fx9n6qmyb4ls17j7kl58i1ivg9wfx9zm9wyfnwzw7lcwdl56sqk"))))
(build-system meson-build-system)
(arguments
- `(#:configure-flags '("-Ddocumentation=true") ; the default is 'false'...
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'expand-C++-include-path
- ;; Make <gcc>/include/c++/ext/string_conversions.h find <stdlib.h>.
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((path "CPLUS_INCLUDE_PATH")
- (gcc (assoc-ref inputs "gcc"))
- (c++ (string-append gcc "/include/c++")))
- (setenv path (string-append c++ ":" (getenv path)))
- #t))))))
+ `(#:configure-flags '("-Ddocumentation=true"))) ;the default is
'false'...
(inputs `(("ao" ,ao)
("alsa-lib" ,alsa-lib)
("avahi" ,avahi)
diff --cc gnu/packages/time.scm
index d13f14b,9bbfe07..65f42cc
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@@ -96,10 -96,10 +96,10 @@@ to a file."
(source
(origin
(method url-fetch)
- (uri (pypi-uri "pytz" version ".tar.gz"))
+ (uri (pypi-uri "pytz" version))
(sha256
(base32
- "0k1pqnq3c4gvcspjxf3fschdjn71fk89i4wz801rxqh7f145xw6m"))))
+ "0hg1r2c41gnmljdsdmdgy6kb1zkfmxsf49imd96g8znp4cyxsiyp"))))
(build-system python-build-system)
(home-page "http://pythonhosted.org/pytz";)
(synopsis "Python timezone library")