Merge branch 'master' into staging

diff --cc gnu/local.mk
Simple merge

diff --cc gnu/packages/build-tools.scm
index 6a759f2,73eacf7..b1534e0
--- 1/gnu/packages/build-tools.scm
--- 2/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@@ -79,18 -79,9 +79,18 @@@ makes a few sacrifices to acquire fast 
                                    version ".tar.gz"))
                (sha256
                 (base32
 -                "06r8limj38mv884s5riiz6lpzw37cvhbf9jd0smzcbi7fwmv3yah"))))
 +                "1r3wlimllakrswx2rb4mbdk1iricqk6myvdvib6dkyx362yanm9l"))))
      (build-system python-build-system)
-     (inputs `(("ninja", ninja)))
 +    (arguments
 +     `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH
 +       ;; patch in meson-for-build, and patching many hard-coded file system
 +       ;; locations in "run_unittests.py".
 +       #:tests? #f
 +       #:phases (modify-phases %standard-phases
 +                  ;; Meson calls the various executables in out/bin through the
 +                  ;; Python interpreter, so we cannot use the shell wrapper.
 +                  (delete 'wrap))))
+     (inputs `(("ninja" ,ninja)))
      (propagated-inputs `(("python" ,python)))
      (home-page "https://mesonbuild.com/")
      (synopsis "Build system designed to be fast and user-friendly")

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

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

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

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

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

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

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

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

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

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

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

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

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

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