Merge branch 'master' into staging

diff --cc gnu/local.mk
Simple merge

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

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

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

diff --cc gnu/packages/freedesktop.scm
index b9a2b4e,e822f39..950961e
--- 1/gnu/packages/freedesktop.scm
--- 2/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -357,22 -357,26 +357,25 @@@ manager for the current system."
      (build-system python-build-system)
      (arguments
       '(#:phases
 -       (alist-replace
 -        'check
 -        (lambda* (#:key inputs #:allow-other-keys)
 -          (setenv "XDG_DATA_DIRS"
 -                  (string-append (assoc-ref inputs "shared-mime-info")
 -                                 "/share/"))
 -          (substitute* "test/test-icon.py"
 -            (("/usr/share/icons/hicolor/index.theme")
 -             (string-append (assoc-ref inputs "hicolor-icon-theme")
 -                            "/share/icons/hicolor/index.theme"))
 -            ;; FIXME: This test fails because the theme contains the unknown
 -            ;; key "Scale".
 -            (("theme.validate\\(\\)") "#"))
 +       (modify-phases %standard-phases
 +         (replace 'check
 +           (lambda* (#:key inputs #:allow-other-keys)
 +             (setenv "XDG_DATA_DIRS"
 +                     (string-append (assoc-ref inputs "shared-mime-info")
 +                                    "/share/"))
 +             (substitute* "test/test-icon.py"
 +               (("/usr/share/icons/hicolor/index.theme")
 +                (string-append (assoc-ref inputs "hicolor-icon-theme")
-                                "/share/icons/hicolor/index.theme")))
++                               "/share/icons/hicolor/index.theme"))
++               ;; FIXME: This test fails because the theme contains the unknown
++               ;; key "Scale".
++               (("theme.validate\\(\\)") "#"))
  
 -          ;; One test fails with:
 -          ;; AssertionError: 'x-apple-ios-png' != 'png'
 -          (substitute* "test/test-mime.py"
 -            (("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#"))
 -          (zero? (system* "nosetests" "-v")))
 -        %standard-phases)))
 +             ;; One test fails with:
 +             ;; AssertionError: 'x-apple-ios-png' != 'png'
 +             (substitute* "test/test-mime.py"
 +               (("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#"))
 +             (zero? (system* "nosetests" "-v")))))))
      (native-inputs
       `(("shared-mime-info" ,shared-mime-info) ;for tests
         ("hicolor-icon-theme" ,hicolor-icon-theme) ;for tests

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

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

diff --cc gnu/packages/machine-learning.scm
Simple merge

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

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

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

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

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