[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
Marius Bakke |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Sun, 8 Jul 2018 18:08:46 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 873325b0307a709be6f305472a5bfb9e07437aaa
Merge: 68ee10d 6a8299d
Author: Marius Bakke <address@hidden>
Date: Sun Jul 8 23:58:22 2018 +0200
Merge branch 'master' into staging
Makefile.am | 2 -
NEWS | 1066 ++-
doc/contributing.texi | 4 +-
doc/guix.texi | 83 +-
doc/htmlxref.cnf | 6 +-
etc/completion/bash/guix | 12 +
gnu/build/vm.scm | 8 +-
gnu/local.mk | 8 +-
gnu/packages/admin.scm | 8 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/astronomy.scm | 6 +-
gnu/packages/aux-files/linux-libre/4.1-i686.conf | 8316 --------------------
gnu/packages/aux-files/linux-libre/4.1-x86_64.conf | 8116 -------------------
gnu/packages/bioconductor.scm | 129 +-
gnu/packages/bioinformatics.scm | 99 +-
gnu/packages/cluster.scm | 4 +-
gnu/packages/compression.scm | 8 +-
gnu/packages/cran.scm | 159 +-
gnu/packages/crypto.scm | 29 +
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/disk.scm | 4 +-
gnu/packages/emacs.scm | 157 +-
gnu/packages/emulators.scm | 26 +-
gnu/packages/engineering.scm | 18 +-
gnu/packages/finance.scm | 124 +-
gnu/packages/fontutils.scm | 21 +-
gnu/packages/fpga.scm | 8 +-
gnu/packages/freedesktop.scm | 7 +-
gnu/packages/ftp.scm | 41 +-
gnu/packages/game-development.scm | 6 +-
gnu/packages/games.scm | 69 +-
gnu/packages/gimp.scm | 12 +-
gnu/packages/gnome.scm | 8 +-
gnu/packages/golang.scm | 47 +
gnu/packages/graphics.scm | 41 +-
gnu/packages/graphviz.scm | 4 +-
gnu/packages/guile.scm | 69 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/java.scm | 49 +-
gnu/packages/linux.scm | 22 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/maven.scm | 142 +-
gnu/packages/messaging.scm | 4 +-
gnu/packages/music.scm | 4 +-
gnu/packages/opencl.scm | 62 +-
gnu/packages/package-management.scm | 8 +-
...icedtea-6-hotspot-gcc-segfault-workaround.patch | 42 +
...icedtea-7-hotspot-gcc-segfault-workaround.patch | 45 +
...-0.25.1-mtime-0.patch => libgit2-mtime-0.patch} | 0
.../patches/zstd-fix-stdin-list-test.patch | 30 +
.../patches/zstd-fix-stdin-list-without-tty.patch | 67 +
gnu/packages/python-crypto.scm | 71 +-
gnu/packages/python.scm | 20 +
gnu/packages/re2c.scm | 4 +-
gnu/packages/textutils.scm | 66 +
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 5 +-
gnu/packages/vulkan.scm | 66 +-
gnu/packages/web.scm | 5 +
gnu/packages/xorg.scm | 69 +-
gnu/services/base.scm | 9 +-
gnu/system/examples/bare-bones.tmpl | 5 +-
gnu/system/examples/desktop.tmpl | 8 +-
gnu/system/shadow.scm | 4 +-
gnu/tests/base.scm | 17 +
guix/build/syscalls.scm | 17 +
guix/import/elpa.scm | 4 +-
guix/profiles.scm | 30 +-
guix/scripts/container.scm | 3 +-
guix/scripts/import.scm | 3 +-
guix/scripts/pack.scm | 1 +
guix/scripts/size.scm | 11 +-
guix/scripts/substitute.scm | 3 +-
guix/scripts/system.scm | 14 +-
guix/scripts/weather.scm | 3 +-
guix/self.scm | 14 +-
guix/store.scm | 10 +
guix/store/database.scm | 4 +-
guix/store/deduplication.scm | 39 +-
guix/ui.scm | 16 +-
guix/utils.scm | 28 +-
po/guix/fr.po | 4 +-
tests/guix-pack.sh | 5 +
tests/store-deduplication.scm | 4 +
tests/syscalls.scm | 13 +
85 files changed, 2896 insertions(+), 16901 deletions(-)
diff --cc gnu/local.mk
index 47963b6,dad664c..cde94f4
--- a/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-pdf-mupdf-link-to-jpeg-libraries.patch \
- %D%/packages/patches/zathura-plugindir-environment-variable.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/java.scm
index 0f6a778,2b72c98..8d4a292
--- a/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"))