Merge branch 'master' into staging

diff --cc gnu/local.mk
Simple merge

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

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

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

diff --cc gnu/packages/gnome.scm
index cd31dbb,a489137..0fa8141
--- 1/gnu/packages/gnome.scm
--- 2/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -5063,8 -4940,24 +5063,24 @@@ window manager."
                                    name "-" version ".tar.xz"))
                (sha256
                 (base32
 -                "1l8p1ghknmkmjpnpl7jr53j66qbzpikickzbmrz0aczyhq6pdy29"))))
 +                "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47"))))
+     (outputs '("out" "lib"))
      (build-system glib-or-gtk-build-system)
+     (arguments
+      `(#:configure-flags
+        (list (string-append "--libdir=" (assoc-ref %outputs "out") "/lib"))
+        #:phases
+        (modify-phases %standard-phases
+          (add-before 'configure 'patch-libgoa-output
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((lib (assoc-ref outputs "lib")))
+                (substitute* '("src/goa/Makefile.in" "src/goa/goa-1.0.pc.in")
+                  (("@prefix@") lib)
+                  (("@exec_prefix@") lib)
+                  (("@libdir@") (string-append lib "/lib"))
+                  (("@includedir@") (string-append lib "/include"))
+                  (("@datadir@") (string-append lib "/share")))
+                #t))))))
      (native-inputs
       `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
         ("gobject-introspection" ,gobject-introspection)
@@@ -5100,7 -4993,8 +5116,8 @@@ Exchange, Last.fm, IMAP/SMTP, Jabber, S
                                    name "-" version ".tar.xz"))
                (sha256
                 (base32
 -                "12b9lfgwd57rzn9394xrbvl9ym5aqldpz9v7c9a421dsv8dgq13b"))))
 +                "11sq795115vrcgxl9svscm6wg8isjj784c3d84qzb6z47zq92zj3"))))
+     (outputs '("out" "libedataserverui"))
      (build-system cmake-build-system)
      (arguments
       '(;; XXX FIXME: 11/85 tests are failing.
@@@ -6560,11 -6423,9 +6610,12 @@@ desktop.  It supports world clock, sto
         ("pkg-config" ,pkg-config)))
      (inputs
       `(("evolution-data-server" ,evolution-data-server)
-        ("gnome-online-accounts" ,gnome-online-accounts)
+        ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
         ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
 -       ("libedataserverui" ,evolution-data-server "libedataserverui")))
 +       ("libdazzle" ,libdazzle)
++       ("libedataserverui" ,evolution-data-server "libedataserverui")
 +       ("libgweather" ,libgweather)
 +       ("geoclue" ,geoclue)))
      (home-page "https://wiki.gnome.org/Apps/Calendar")
      (synopsis "GNOME's calendar application")
      (description

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

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

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

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

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

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

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

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

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

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

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