Merge branch 'master' into staging

diff --cc gnu/local.mk
index abb4c7a,39b8e00..eb37450
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1249,9 -1271,8 +1271,7 @@@ dist_patch_DATA =                                               
    %D%/packages/patches/python-unittest2-remove-argparse.patch \
    %D%/packages/patches/python-waitress-fix-tests.patch                \
    %D%/packages/patches/qemu-glibc-2.27.patch                  \
-   %D%/packages/patches/qemu-CVE-2018-16872.patch              \
-   %D%/packages/patches/qemu-CVE-2019-6778.patch               \
    %D%/packages/patches/qt4-ldflags.patch                      \
 -  %D%/packages/patches/qtbase-old-kernel.patch                        \
    %D%/packages/patches/qtbase-use-TZDIR.patch                 \
    %D%/packages/patches/qtscript-disable-tests.patch           \
    %D%/packages/patches/quagga-reproducible-build.patch          \

diff --cc gnu/packages/freedesktop.scm
index ed3b2db,8a302ba..457d650
--- 1/gnu/packages/freedesktop.scm
--- 2/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -159,10 -159,15 +159,15 @@@ freedesktop.org project."
                                    "libinput-" version ".tar.xz"))
                (sha256
                 (base32
 -                "07a0w7rak7rvnh6g4j0akwjxwinxfszc1xi9mrx12fv82k3mgsyk"))))
 +                "0rzw2kx06ywc19lwf147f474xav7w83h28k0afy822wjz0j5rf3w"))))
      (build-system meson-build-system)
      (arguments
-      `(#:configure-flags '("-Ddocumentation=false")))
+      `(#:configure-flags '("-Ddocumentation=false")
+ 
+        ;; XXX: Using 'debug' or 'debugoptimized' pulls in an additional test that
+        ;; hangs, and the comments around it suggests that we should be using this
+        ;; Meson target anyway.
+        #:build-type "release"))
      (native-inputs
       `(("check" ,check)
         ("pkg-config" ,pkg-config)))

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

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

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

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

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

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

diff --cc guix/build/cargo-build-system.scm
Simple merge