Merge branch 'staging' into core-updates

diff --cc doc/guix.texi
Simple merge

diff --cc gnu/local.mk
index 2a6908d,649d901..3be9c9d
--- 1/gnu/local.mk
--- 2/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/check.scm
Simple merge

diff --cc gnu/packages/databases.scm
Simple merge

diff --cc gnu/packages/games.scm
Simple merge

diff --cc gnu/packages/glib.scm
index b2d4bf5,ab9ed0b..d93a928
--- 1/gnu/packages/glib.scm
--- 2/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/gnome.scm
Simple merge

diff --cc gnu/packages/gnupg.scm
Simple merge

diff --cc gnu/packages/guile.scm
Simple merge

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/machine-learning.scm
Simple merge

diff --cc gnu/packages/maths.scm
Simple merge

diff --cc gnu/packages/mpd.scm
index 668045c,7d46870..654d1e4
--- 1/gnu/packages/mpd.scm
--- 2/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/pdf.scm
Simple merge

diff --cc gnu/packages/perl.scm
Simple merge

diff --cc gnu/packages/python-web.scm
Simple merge

diff --cc gnu/packages/python-xyz.scm
Simple merge

diff --cc gnu/packages/python.scm
Simple merge

diff --cc gnu/packages/rust.scm
Simple merge

diff --cc gnu/packages/time.scm
index d13f14b,9bbfe07..65f42cc
--- 1/gnu/packages/time.scm
--- 2/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")

diff --cc gnu/packages/version-control.scm
Simple merge

diff --cc gnu/packages/video.scm
Simple merge

diff --cc gnu/packages/web.scm
Simple merge

diff --cc gnu/packages/xml.scm
Simple merge

diff --cc gnu/packages/xorg.scm
Simple merge

diff --cc tests/derivations.scm
Simple merge