[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
89/104: gnu: java-xz: Remove duplicate definition.
From: |
guix-commits |
Subject: |
89/104: gnu: java-xz: Remove duplicate definition. |
Date: |
Sun, 17 May 2020 11:36:50 -0400 (EDT) |
nckx pushed a commit to branch core-updates
in repository guix.
commit 619c1d160b2d26e48bfaaf35259754aaffbcc166
Author: Julien Lepiller <address@hidden>
AuthorDate: Sun May 17 01:48:28 2020 +0200
gnu: java-xz: Remove duplicate definition.
* gnu/packages/java.scm (java-xz): Remove duplicate variable.
(java-plexus-archiver)[inputs]: Use java-xz.
* gnu/packages/java-compression.scm (java-tukaani-xz): Rename to
java-xz.
---
gnu/packages/java-compression.scm | 4 ++--
gnu/packages/java.scm | 30 +-----------------------------
2 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/java-compression.scm
b/gnu/packages/java-compression.scm
index 536e1e6..b1d3ae7 100644
--- a/gnu/packages/java-compression.scm
+++ b/gnu/packages/java-compression.scm
@@ -282,9 +282,9 @@ It can be used as a replacement for the Apache
@code{CBZip2InputStream} /
@code{CBZip2OutputStream} classes.")
(license license:expat)))
-(define-public java-tukaani-xz
+(define-public java-xz
(package
- (name "java-tukaani-xz")
+ (name "java-xz")
(version "1.6")
(source (origin
(method url-fetch)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index fc1f7d1..a465924 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3403,34 +3403,6 @@ is implemented.")
license:mpl2.0
license:lgpl2.1+))))
-(define-public java-xz
- (package
- (name "java-xz")
- (version "1.6")
- (source (origin
- (method url-fetch)
- (uri (string-append "http://tukaani.org/xz/xz-java-" version ".zip"))
- (sha256
- (base32
- "1z3p1ri1gvl07inxn0agx44ck8n7wrzfmvkz8nbq3njn8r9wba8x"))))
- (build-system ant-build-system)
- (arguments
- `(#:tests? #f ; There are no tests to run.
- #:jar-name ,(string-append "xz-" version ".jar")
- #:phases
- (modify-phases %standard-phases
- ;; The unpack phase enters the "maven" directory by accident.
- (add-after 'unpack 'chdir
- (lambda _ (chdir "..") #t)))))
- (native-inputs
- `(("unzip" ,unzip)))
- (home-page "https://tukaani.org/xz/java.html")
- (synopsis "Implementation of XZ data compression in pure Java")
- (description "This library aims to be a complete implementation of XZ data
-compression in pure Java. Single-threaded streamed compression and
-decompression and random access decompression have been fully implemented.")
- (license license:public-domain)))
-
;; java-hamcrest-core uses qdox version 1.12. We package this version instead
;; of the latest release.
(define-public java-qdox-1.12
@@ -3957,7 +3929,7 @@ reusing it in maven.")
("junit" ,java-junit)
("classworld" ,java-plexus-classworlds)
("xbean" ,java-geronimo-xbean-reflect)
- ("xz" ,java-tukaani-xz)
+ ("xz" ,java-xz)
("guava" ,java-guava)))
(home-page "https://github.com/codehaus-plexus/plexus-archiver")
(synopsis "Archiver component of the Plexus project")
- 78/104: gnu: multipath-tools: Enable tests., (continued)
- 78/104: gnu: multipath-tools: Enable tests., guix-commits, 2020/05/17
- 81/104: gnu: drumkv1: Update to 0.9.14., guix-commits, 2020/05/17
- 83/104: gnu: padthv1: Update to 0.9.14., guix-commits, 2020/05/17
- 88/104: gnu: julius: Remove unused bundled libraries., guix-commits, 2020/05/17
- 79/104: gnu: guile-hall: Update to 0.3.1., guix-commits, 2020/05/17
- 82/104: gnu: samplv1: Update to 0.9.14., guix-commits, 2020/05/17
- 92/104: gnu: alpine: Support cross-gcc'ing., guix-commits, 2020/05/17
- 93/104: gnu: soundconverter: Update to 3.0.2., guix-commits, 2020/05/17
- 84/104: gnu: supertux: Update to 0.6.2., guix-commits, 2020/05/17
- 86/104: gnu: mumble: End phase with #t., guix-commits, 2020/05/17
- 89/104: gnu: java-xz: Remove duplicate definition.,
guix-commits <=
- 90/104: gnu: spiped: Update to 1.6.1., guix-commits, 2020/05/17
- 85/104: gnu: java-jmapviewer: Return #t from all phases., guix-commits, 2020/05/17
- 91/104: gnu: alpine: Update to 2.22., guix-commits, 2020/05/17
- 101/104: gnu: cups: Update to 2.3.3 [fixes CVE-2020-3898 & CVE-2019-8842]., guix-commits, 2020/05/17
- 103/104: gnu: cups, cups-minimal: Ungraft 2.3.3., guix-commits, 2020/05/17
- 104/104: gnu: cups-filters: Update to 1.27.4., guix-commits, 2020/05/17
- 87/104: gnu: julius: Update to 1.4.0., guix-commits, 2020/05/17
- 96/104: gnu: racket: Update to 7.7., guix-commits, 2020/05/17
- 102/104: etc: Install mount unit only if it exists., guix-commits, 2020/05/17
- 80/104: gnu: synthv1: Update to 0.9.14., guix-commits, 2020/05/17