Merge branch 'master' into staging

diff --cc gnu/local.mk
Simple merge

diff --cc gnu/packages/crates-io.scm
Simple merge

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

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

diff --cc gnu/packages/kde-frameworks.scm
index bec8ff1,61cbf19..87c9884
--- 1/gnu/packages/kde-frameworks.scm
--- 2/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@@ -578,11 -583,12 +578,11 @@@ propagate their changes to their respec
                      name "-" version ".tar.xz"))
                (sha256
                 (base32
-                 "1n5mzj02si8allg907l6vn77c2i95qdgfvn48gsqgalwlyd4q6nj"))))
+                 "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52"))))
      (build-system cmake-build-system)
      (native-inputs
 -     (list extra-cmake-modules qttools-5 shared-mime-info
 +     (list extra-cmake-modules qttools-5 shared-mime-info))
             ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam
 -           xorg-server-for-tests)) ; for the tests
      (inputs
       (list qtbase-5))
      (arguments

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

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

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

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

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

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