diff options
| author | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/java-compression.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/java-compression.scm')
| -rw-r--r-- | gnu/packages/java-compression.scm | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 5f653bcc94..033b55c988 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Marius Bakke <[email protected]> ;;; Copyright © 2018 Mark H Weaver <[email protected]> ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <[email protected]> +;;; Copyright © 2021 Efraim Flashner <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -289,24 +290,19 @@ It can be used as a replacement for the Apache @code{CBZip2InputStream} / (define-public java-xz (package (name "java-xz") - (version "1.6") + (version "1.9") (source (origin - (method url-fetch) + (method url-fetch/zipbomb) (uri (string-append "https://tukaani.org/xz/xz-java-" version ".zip")) (sha256 (base32 - "1z3p1ri1gvl07inxn0agx44ck8n7wrzfmvkz8nbq3njn8r9wba8x")))) + "007d9f83277qn70swz9inqhyf0qxq6ygajpq5rqg0xgsyh1sdndi")))) (build-system ant-build-system) (arguments `(#:tests? #f; no tests + #:jdk ,openjdk9 #:phases (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - ;; Our build system enters the first directory in the archive, but - ;; the package is not contained in a subdirectory - (chdir "..") - #t)) (add-before 'install 'generate-pom (lambda _ (copy-file "maven/pom_template.xml" "pom.xml") |