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/check.scm
Simple merge

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

diff --cc gnu/packages/gl.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 0333c25,6d8ab71..39d1ebe
--- 1/gnu/packages/guile.scm
--- 2/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -285,8 -287,75 +285,46 @@@ 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
-   (deprecated-package "guile-next" guile-2.2))
+   ;; This is the upcoming Guile 3.0, with JIT support.
+   (let ((commit "a74b4a45fab1a78e34954bce5f031e8a9765f827")
+         (revision "0"))
+     (package
+       (inherit guile-2.2)
+       (name "guile-next")
+       (version (git-version "2.99" revision commit))
+       (source (origin
+                 (method git-fetch)
+                 (uri (git-reference
+                       (url "https://git.savannah.gnu.org/git/guile.git")
+                       (commit commit)))
+                 (sha256
+                  (base32
+                   "0kq6mabv7j4gdlwmpz3iaddv98sc7awkl2358sg8j50sg10yw8nx"))
+                 (file-name (git-file-name name version))))
+       (native-inputs
+        `(("autoconf", autoconf)
+          ("automake" ,automake)
+          ("libtool" ,libtool)
+          ("gettext" ,gnu-gettext)
+          ("texinfo" ,texinfo)
+          ("flex" ,flex)
+          ,@(package-native-inputs guile-2.2)))
+       (arguments
+        (substitute-keyword-arguments (package-arguments guile-2.2)
+          ((#:phases phases '%standard-phases)
+           ;; XXX: The default 'bootstrap' phase tries to execute the
+           ;; ./bootstrap directory.
+           `(modify-phases ,phases
+              (replace 'bootstrap
+                (lambda _
+                  (patch-shebang "build-aux/git-version-gen")
+                  (invoke "autoreconf" "-vfi")))
+              (add-before 'check 'skip-version-test
+                (lambda _
+                  ;; Remove this test that's bound to fail.
+                  (delete-file "test-suite/tests/version.test")
+                  #t)))))))))
  
  (define (make-guile-readline guile)
    (package

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

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

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

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

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

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

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

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

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

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

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