Merge branch 'master' into staging

diff --cc gnu/local.mk
index 47963b6,dad664c..cde94f4
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1224,8 -1224,9 +1226,10 @@@ dist_patch_DATA =                                              
    %D%/packages/patches/xinetd-fix-fd-leak.patch                       \
    %D%/packages/patches/xinetd-CVE-2013-4342.patch             \
    %D%/packages/patches/xmodmap-asprintf.patch                         \
-   %D%/packages/patches/zathura-plugindir-environment-variable.patch
 +  %D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \
+   %D%/packages/patches/zathura-plugindir-environment-variable.patch   \
+   %D%/packages/patches/zstd-fix-stdin-list-without-tty.patch  \
+   %D%/packages/patches/zstd-fix-stdin-list-test.patch
  
  MISC_DISTRO_FILES =                           \
    %D%/packages/ld-wrapper.in

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

diff --cc gnu/packages/java.scm
index 0f6a778,2b72c98..8d4a292
--- 1/gnu/packages/java.scm
--- 2/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@@ -718,32 -668,37 +718,35 @@@ machine."))
         (modify-phases %standard-phases
           (replace 'unpack
             (lambda* (#:key source inputs #:allow-other-keys)
 -             (and (zero? (system* "tar" "xvf" source))
 -                  (begin
 -                    (chdir (string-append "icedtea6-" ,version))
 -                    (mkdir "openjdk")
 -                    (copy-recursively (assoc-ref inputs "openjdk-src") "openjdk")
 -                    ;; The convenient OpenJDK source bundle is no longer
 -                    ;; available for download, so we have to take the sources
 -                    ;; from the Mercurial repositories and change the Makefile
 -                    ;; to avoid tests for the OpenJDK zip archive.
 -                    (with-directory-excursion "openjdk"
 -                      (for-each (lambda (part)
 -                                  (mkdir part)
 -                                  (copy-recursively
 -                                   (assoc-ref inputs
 -                                              (string-append part "-src"))
 -                                   part))
 -                                '("jdk" "corba"
 -                                  "langtools" "jaxp" "jaxws")))
 -                    (with-directory-excursion "openjdk"
 -                      (invoke "tar" "xvf" (assoc-ref inputs "hotspot-src"))
 -                      (rename-file "hg-checkout" "hotspot"))
 -                    (substitute* "Makefile.in"
 -                      (("echo \"ERROR: No up-to-date OpenJDK zip available\"; exit -1;")
 -                       "echo \"trust me\";")
 -                      ;; The contents of the bootstrap directory must be
 -                      ;; writeable but when copying from the store they are
 -                      ;; not.
 -                      (("mkdir -p lib/rt" line)
 -                       (string-append line "; chmod -R u+w $(BOOT_DIR)")))
 -                    (zero? (system* "chmod" "-R" "u+w" "openjdk"))
 -                    #t))))
 +             (invoke "tar" "xvf" source)
 +             (chdir (string-append "icedtea6-" ,version))
 +             (mkdir "openjdk")
 +             (copy-recursively (assoc-ref inputs "openjdk-src") "openjdk")
 +             ;; The convenient OpenJDK source bundle is no longer
 +             ;; available for download, so we have to take the sources
 +             ;; from the Mercurial repositories and change the Makefile
 +             ;; to avoid tests for the OpenJDK zip archive.
 +             (with-directory-excursion "openjdk"
 +               (for-each (lambda (part)
 +                           (mkdir part)
 +                           (copy-recursively
 +                            (assoc-ref inputs
 +                                       (string-append part "-src"))
 +                            part))
-                          '("jdk" "hotspot" "corba"
++                         '("jdk" "corba"
 +                           "langtools" "jaxp" "jaxws")))
++             (with-directory-excursion "openjdk"
++               (invoke "tar" "xvf" (assoc-ref inputs "hotspot-src"))
++               (rename-file "hg-checkout" "hotspot"))
 +             (substitute* "Makefile.in"
 +               (("echo \"ERROR: No up-to-date OpenJDK zip available\"; exit -1;")
 +                "echo \"trust me\";")
 +               ;; The contents of the bootstrap directory must be
 +               ;; writeable but when copying from the store they are
 +               ;; not.
 +               (("mkdir -p lib/rt" line)
 +                (string-append line "; chmod -R u+w $(BOOT_DIR)")))
 +             (invoke "chmod" "-R" "u+w" "openjdk")))
           (add-after 'unpack 'use-classpath
             (lambda* (#:key inputs #:allow-other-keys)
               (let ((jvmlib (assoc-ref inputs "classpath"))

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

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

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

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