Merge branch 'master' into core-updates

diff --cc gnu/local.mk
Simple merge

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

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

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

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

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

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

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

diff --cc gnu/packages/guile.scm
index 39d1ebe,1d33066..83cb75d
--- 1/gnu/packages/guile.scm
--- 2/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -285,10 -287,39 +285,10 @@@ without requiring the source code to b
                    (max-silent-time . 36000))))) ;10 hours (needed on ARM
                                                  ;  when heavily loaded)
  
 -(define-public guile-2.2.2
 -  ;; Keep it so that, when 'guix' runs on 2.2.2, 'guix pull' compiles objects
 -  ;; with 2.2.2, thereby avoiding the ABI incompatibility issues described in
 -  ;; <https://bugs.gnu.org/29570>.
 -  (package
 -    (inherit guile-2.2)
 -    (version "2.2.2")
 -    (source (origin
 -              (inherit (package-source guile-2.2))
 -              (uri (string-append "mirror://gnu/guile/guile-" version
 -                                  ".tar.xz"))
 -              (sha256
 -               (base32
 -                "1azm25zcmxif0skxfrp11d2wc89nrzpjaann9yxdw6pvjxhs948w"))))))
 -
 -(define-public guile-2.2.4
 -  ;; This version contains important bug fixes, in particular wrt. to crashes
 -  ;; of multi-threaded code as used by 'guix pull' and grafting.
 -  (package
 -    (inherit guile-2.2)
 -    (version "2.2.4")
 -    (source (origin
 -              (inherit (package-source guile-2.2))
 -              (uri (string-append "mirror://gnu/guile/guile-" version
 -                                  ".tar.xz"))
 -              (sha256
 -               (base32
 -                "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r"))))))
 -
  (define-public guile-next
    ;; This is the upcoming Guile 3.0, with JIT support.
-   (let ((commit "a74b4a45fab1a78e34954bce5f031e8a9765f827")
-         (revision "0"))
+   (let ((commit "6f3357b0df64c4be17e72079864c09a542f1c779")
+         (revision "1"))
      (package
        (inherit guile-2.2)
        (name "guile-next")

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

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

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

diff --cc gnu/packages/package-management.scm
Simple merge

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

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

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

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

diff --cc guix/build/haskell-build-system.scm
index 5a72d22,be4f5b5..72714a2
--- 1/guix/build/haskell-build-system.scm
--- 2/guix/build/haskell-build-system.scm
+++ b/guix/build/haskell-build-system.scm
@@@ -262,12 -262,23 +263,23 @@@ given Haskell package.
  
  (define* (haddock #:key outputs haddock? haddock-flags #:allow-other-keys)
    "Run the test suite of a given Haskell package."
 -  (if haddock?
 -      (run-setuphs "haddock" haddock-flags)
 -      #t))
 +  (when haddock?
 +    (run-setuphs "haddock" haddock-flags))
 +  #t)
  
+ (define* (patch-cabal-file #:key cabal-revision #:allow-other-keys)
+   (when cabal-revision
+     ;; Cabal requires there to be a single file with the suffix ".cabal".
+     (match (scandir "." (cut string-suffix? ".cabal" <>))
+       ((original)
+        (format #t "replacing ~s with ~s~%" original cabal-revision)
+        (copy-file cabal-revision original))
+       (_ (error "Could not find a Cabal file to patch."))))
+   #t)
+ 
  (define %standard-phases
    (modify-phases gnu:%standard-phases
+     (add-after 'unpack 'patch-cabal-file patch-cabal-file)
      (delete 'bootstrap)
      (add-before 'configure 'setup-compiler setup-compiler)
      (add-before 'install 'haddock haddock)

diff --cc tests/gexp.scm
Simple merge