Merge branch 'staging' into core-updates

diff --cc doc/guix.texi
Simple merge

diff --cc gnu/local.mk
index e6830f0,7da2e1f..47996dc
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -665,10 -669,8 +668,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/biber-fix-encoding-write.patch         \
    %D%/packages/patches/binutils-loongson-workaround.patch     \
-   %D%/packages/patches/blast+-fix-makefile.patch              \
    %D%/packages/patches/boost-fix-icu-build.patch              \
    %D%/packages/patches/byobu-writable-status.patch            \
    %D%/packages/patches/calibre-no-updates-dialog.patch                \

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

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

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

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

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

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

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

diff --cc gnu/packages/mpd.scm
index 56ffe17,bb386f5..3b21378
--- 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
-                 "1ix52vfa8k8my4xyr8b0phg8605b2xchyzyva908m08vpzm14w94"))))
+                 "1y8fbch4xp96i4mz6czivnwvaf7g8pnfix5d0pbybnkv7bmz1a9f"))))
      (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/perl.scm
Simple merge

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

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

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

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

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

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

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

diff --cc guix/scripts/pack.scm
Simple merge