Merge branch 'master' into core-updates

diff --cc Makefile.am
Simple merge

diff --cc doc/guix.texi
Simple merge

diff --cc gnu/local.mk
index d62dd6a,9dac7ea..ad88955
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -946,9 -945,9 +947,10 @@@ dist_patch_DATA =                                         
    %D%/packages/patches/desmume-gcc7-fixes.patch                       \
    %D%/packages/patches/dfu-programmer-fix-libusb.patch                \
    %D%/packages/patches/diffutils-gets-undeclared.patch                \
+   %D%/packages/patches/disarchive-cross-compilation.patch     \
    %D%/packages/patches/dkimproxy-add-ipv6-support.patch               \
    %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch    \
 +  %D%/packages/patches/docbook-xsl-support-old-url.patch      \
    %D%/packages/patches/doc++-include-directives.patch         \
    %D%/packages/patches/doc++-segfault-fix.patch                       \
    %D%/packages/patches/docker-fix-tests.patch                 \
@@@ -1245,8 -1272,10 +1248,9 @@@
    %D%/packages/patches/java-xerces-xjavac_taskdef.patch       \
    %D%/packages/patches/jfsutils-add-sysmacros.patch           \
    %D%/packages/patches/jfsutils-include-systypes.patch                \
 -  %D%/packages/patches/jsoncpp-fix-inverted-case.patch                \
    %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch    \
    %D%/packages/patches/kdbusaddons-kinit-file-name.patch      \
+   %D%/packages/patches/libblockdev-glib-compat.patch          \
    %D%/packages/patches/libffi-3.3-powerpc-fixes.patch         \
    %D%/packages/patches/libffi-float128-powerpc64le.patch      \
    %D%/packages/patches/libvirt-add-install-prefix.patch       \
@@@ -1386,8 -1417,10 +1391,9 @@@
    %D%/packages/patches/mcrypt-CVE-2012-4527.patch                     \
    %D%/packages/patches/libmemcached-build-with-gcc7.patch     \
    %D%/packages/patches/libmhash-hmac-fix-uaf.patch            \
+   %D%/packages/patches/mercurial-hg-extension-path.patch       \
    %D%/packages/patches/mesa-skip-tests.patch                  \
    %D%/packages/patches/mescc-tools-boot.patch                 \
 -  %D%/packages/patches/meson-for-build-rpath.patch            \
    %D%/packages/patches/metabat-fix-compilation.patch          \
    %D%/packages/patches/mhash-keygen-test-segfault.patch               \
    %D%/packages/patches/mingw-w64-6.0.0-gcc.patch              \

diff --cc gnu/packages/admin.scm
index 60a624f,001c6db..531686f
--- 1/gnu/packages/admin.scm
--- 2/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@@ -1,8 -1,8 +1,8 @@@
  ;;; GNU Guix --- Functional package management for GNU
 -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
  ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
  ;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
- ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020 Eric Bavier <bavier@posteo.net>
+ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020, 2021 Eric Bavier <bavier@posteo.net>
  ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
  ;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
  ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>

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

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

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

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

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

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

diff --cc gnu/packages/databases.scm
index 3a9c8c7,d18fb89..bc508aa
--- 1/gnu/packages/databases.scm
--- 2/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -1029,7 -1035,8 +1029,8 @@@ and high-availability (HA)."
  (define-public postgresql-13
    (package
      (name "postgresql")
 -    (version "13.1")
+     (replacement postgresql-13.3)
 +    (version "13.2")
      (source (origin
                (method url-fetch)
                (uri (string-append "https://ftp.postgresql.org/pub/source/v"

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

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

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

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

diff --cc gnu/packages/game-development.scm
Simple merge

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

diff --cc gnu/packages/gcc.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/guile-xyz.scm
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/rust.scm
index 636420e,56e6e72..2d29c2a
--- 1/gnu/packages/rust.scm
--- 2/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@@ -845,8 -1464,15 +845,18 @@@ safety and thread safety guarantees."
    (rust-bootstrapped-package rust-1.50 "1.51.0"
      "0ixqkqglv3isxbvl4ldr4byrkx692wghsz3fasy1pn5kr2prnsvs"))
  
 -;; TODO(staging): Bump this variable to the latest packaged rust.
 -(define-public rust rust-1.45)
+ (define-public rust-1.52
+   (let ((base-rust
+          (rust-bootstrapped-package rust-1.51 "1.52.1"
+            "165zs3xzp9dravybwslqs1qhn35agp6wacmzpymqg3qfdni26vrs")))
+     (package
+       (inherit base-rust)
+       (inputs
+         (alist-replace "llvm" (list llvm-12)
+                        (package-inputs base-rust))))))
+ 
 +;;; Note: Only the latest versions of Rust are supported and tested.  The
 +;;; intermediate rusts are built for bootstrapping purposes and should not
 +;;; be relied upon.  This is to ease maintenance and reduce the time
 +;;; required to build the full Rust bootstrap chain.
 +(define-public rust rust-1.49)

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

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

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

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

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

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

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

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

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

diff --cc gnu/system/vm.scm
Simple merge