Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/cups.scm
	gnu/packages/python-web.scm
	gnu/packages/web.scm
	guix/build/maven/pom.scm

diff --cc doc/guix.texi
Simple merge

diff --cc gnu/local.mk
index a78d255,fb6c25d..65f35a1
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -934,7 -929,9 +934,8 @@@ dist_patch_DATA =                                          
    %D%/packages/patches/crda-optional-gcrypt.patch             \
    %D%/packages/patches/clucene-contribs-lib.patch               \
    %D%/packages/patches/cube-nocheck.patch                     \
+   %D%/packages/patches/cups-CVE-2020-10001.patch              \
    %D%/packages/patches/curl-use-ssl-cert-env.patch            \
 -  %D%/packages/patches/curl-7.76-use-ssl-cert-env.patch       \
    %D%/packages/patches/curl-7.77-tls-priority-string.patch    \
    %D%/packages/patches/cursynth-wave-rand.patch                       \
    %D%/packages/patches/cvs-CVE-2017-12836.patch               \

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

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/game-development.scm
Simple merge

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

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

diff --cc gnu/packages/java.scm
index bf5da82,64df5a2..f7840f6
--- 1/gnu/packages/java.scm
--- 2/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@@ -42,9 -42,9 +42,10 @@@
    #:use-module (guix svn-download)
    #:use-module ((guix build utils) #:select (alist-replace))
    #:use-module (guix utils)
 +  #:use-module (guix gexp)
    #:use-module (guix build-system ant)
    #:use-module (guix build-system gnu)
+   #:use-module (guix build-system maven)
    #:use-module (guix build-system trivial)
    #:use-module (gnu packages)
    #:use-module (gnu packages attr)

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

diff --cc gnu/packages/lua.scm
index ad36ef1,0ecc912..73dfa0b
--- 1/gnu/packages/lua.scm
--- 2/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@@ -1124,10 -1121,11 +1121,10 @@@ shell command executions."
              (file-name (git-file-name name version))
              (sha256
               (base32
-               "124fj73722c03znwdyqp1i0jygwv3s11f6s1j9rzym513qrf7fnd"))))
+               "1999bgrh52124a5g4qizav3x257ff2brjr855srpm1jv1nxzbygv"))))
     (build-system meson-build-system)
     (arguments
 -    `(#:meson ,meson-0.55
 -      ;; Tests are disabled for now due to an issue that affecs guix:
 +    `(;; Tests are disabled for now due to an issue that affecs guix:
        ;; <https://gitlab.com/emilua/emilua/-/issues/22>
        #:configure-flags
        (list "-Denable_http=true"

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

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

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

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

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

diff --cc gnu/packages/python-web.scm
index 2397854,d0a4ee9..e4d1326
--- 1/gnu/packages/python-web.scm
--- 2/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@@ -477,6 -486,13 +477,8 @@@ emit information from within their appl
                          ;; to avoid a dependency on 'git'.
                          (delete-file
                           "test/unit/module/maintenance/test_update_documentation.py")
 -                        (setenv "PYTHONPATH"
 -                                (string-append "./build/lib:"
 -                                               (getenv "PYTHONPATH")))
 -                        (setenv "PATH" (string-append out "/bin:"
 -                                                      (getenv "PATH")))
+                         (delete-file
+                          "test/unit/module/maintenance/test_update_resource_specs.py")
                          (invoke "python" "-m" "unittest" "discover"
                                  "-s" "test")))))))
      (native-inputs

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

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

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

diff --cc gnu/packages/text-editors.scm
Simple merge

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

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

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

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

diff --cc gnu/packages/web.scm
index 0ecc12e,896125a..47f2063
--- 1/gnu/packages/web.scm
--- 2/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -6587,31 -6588,27 +6587,26 @@@ Instagram and YouTube."
         (file-name (git-file-name name version))
         (sha256
          (base32
-          "03ihjmc4bqxxqv71bb43r2f23sx0xnbq1k2fsg9fw05qa5s9x187"))))
+          "1j97dc9a4yhpscwadhv5dxp7036pnrxiaky18l8ddr3pvxdjvkxs"))))
      (build-system python-build-system)
      (inputs
-      `(("python2-dnspython" ,python2-dnspython-1.16)
-        ("python2-pyxdg" ,python2-pyxdg)
-        ("python2-requests" ,python2-requests)))
+      `(("python-beautifulsoup4" ,python-beautifulsoup4)
+        ("python-dnspython" ,python-dnspython)
+        ("python-pyxdg" ,python-pyxdg)
+        ("python-requests" ,python-requests)))
      (native-inputs
       `(("gettext" ,gettext-minimal)
-        ("python2-pytest" ,python2-pytest)
-        ("python2-miniboa" ,python2-miniboa)
-        ("python2-parameterized" ,python2-parameterized)))
+        ("python-pytest" ,python-pytest)
+        ("python-miniboa" ,python-miniboa)
+        ("python-parameterized" ,python-parameterized)))
      (arguments
-      `(#:python ,python-2
-        #:phases
+      `(#:phases
         (modify-phases %standard-phases
           (replace 'check
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((out (assoc-ref outputs "out")))
-                ;; Remove this directory to avoid it being used when running
-                ;; the tests
-                (delete-file-recursively "linkcheck")
 -           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
++           (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
 -               (add-installed-pythonpath inputs outputs)
                 (invoke "py.test" "tests")))))))
-     (home-page "https://linkcheck.github.io/linkchecker")
+     (home-page "https://linkchecker.github.io/linkchecker/")
      (synopsis "Check websites for broken links")
      (description "LinkChecker is a website validator.  It checks for broken
  links in websites.  It is recursive and multithreaded providing output in

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

diff --cc guix/build/maven/pom.scm
index dd61f65,9e35e47..193a76b
--- 1/guix/build/maven/pom.scm
--- 2/guix/build/maven/pom.scm
+++ b/guix/build/maven/pom.scm
@@@ -242,8 -291,9 +291,9 @@@ this repository contains.
  
  (define* (fix-pom-dependencies pom-file inputs
                                 #:key with-plugins? with-build-dependencies?
-                                      (excludes '()) (local-packages '()))
+                                      with-modules? (excludes '())
+                                      (local-packages '()))
 -  "Open @var{pom-file}, and override its content, rewritting its dependencies
 +  "Open @var{pom-file}, and override its content, rewriting its dependencies
  to set their version to the latest version available in the @var{inputs}.
  
  @var{#:with-plugins?} controls whether plugins are also overridden.