From ca0fe294d65aff8bd1b11d0c81e968870c0f1084 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Mar 2020 03:58:46 +0100 Subject: gnu: java-snappy: Update to 1.1.7.3. * gnu/packages/java-compression.scm (java-snappy): Update to 1.1.7.3. --- gnu/packages/java-compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/java-compression.scm') diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 3102c70d88..1c246f6a72 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017, 2018 Julien Lepiller ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Mark H Weaver -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,7 +35,7 @@ (define-public java-snappy (package (name "java-snappy") - (version "1.1.7.2") + (version "1.1.7.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/xerial/snappy-java/archive/" @@ -43,7 +43,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1p557vdv006ysgxbpp83krmq0066k46108vyiyka69w8i4i8rbbm")))) + "0v7mrc62v2wyr5l3c5xx11rn0k5bcl1l05cwr79xyw7zqr8k71qh")))) (build-system ant-build-system) (arguments `(#:jar-name "snappy.jar" -- cgit 1.4.1 From 0308944ab06a103791c853743c88280a2abc114f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 12 Mar 2020 04:54:32 +0100 Subject: gnu: java-snappy: Don't use unstable tarball. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/java-compression.scm (java-snappy)[source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Add ‘make-git-checkout-writable’ phase. --- gnu/packages/java-compression.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'gnu/packages/java-compression.scm') diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 1c246f6a72..3a9082641c 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -25,6 +25,7 @@ #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system ant) #:use-module (gnu packages) #:use-module (gnu packages compression) @@ -36,20 +37,25 @@ (package (name "java-snappy") (version "1.1.7.3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/xerial/snappy-java/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0v7mrc62v2wyr5l3c5xx11rn0k5bcl1l05cwr79xyw7zqr8k71qh")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xerial/snappy-java") + (commit version))) + (sha256 + (base32 "07c145w1kv8g7dbwpy5xss142il7zr0qq78p2ih76azgl97n5cba")) + (file-name (git-file-name name version)))) (build-system ant-build-system) (arguments `(#:jar-name "snappy.jar" #:source-dir "src/main/java" #:phases (modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) (add-before 'build 'remove-binaries (lambda _ (delete-file "lib/org/xerial/snappy/OSInfo.class") -- cgit 1.4.1 From e2528a3cc1819d3fe24880c5cfec74f075d5f820 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Mar 2020 02:45:00 +0100 Subject: gnu: java-snappy@1.0: Don't use unstable tarball. * gnu/packages/java-compression.scm (java-snappy-1)[name]: Restate. [source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/java-compression.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gnu/packages/java-compression.scm') diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 3a9082641c..2dd65da305 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -131,14 +131,17 @@ compressor/decompressor.") (define-public java-snappy-1 (package (inherit java-snappy) + (name "java-snappy") (version "1.0.3-rc3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/xerial/snappy-java/archive/" - "snappy-java-" version ".tar.gz")) - (sha256 - (base32 - "08hsxlqidiqck0q57fshwyv3ynyxy18vmhrai9fyc8mz17m7gsa3")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/xerial/snappy-java")) + (commit (string-append "snappy-java-" version)))) + (sha256 + (base32 "0gbg3xmhniyh5p6w5zqj16fr15fa8j4raswd8pj00l4ixf5qa6m4")) + (file-name (git-file-name name version)))) (arguments `(#:jar-name "snappy.jar" #:source-dir "src/main/java" -- cgit 1.4.1 From 287e3d312440a103e8ca1e14b5b09a0ce0124e5e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 13 Mar 2020 03:18:23 +0100 Subject: gnu: java-iq80-snappy: Don't use unstable tarball. * gnu/packages/java-compression.scm (java-iq80-snappy)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/java-compression.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages/java-compression.scm') diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 2dd65da305..536e1e6530 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -193,13 +193,15 @@ compressor/decompressor.") (package (name "java-iq80-snappy") (version "0.4") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dain/snappy/archive/snappy-" - version ".tar.gz")) - (sha256 - (base32 - "0rb3zhci7w9wzd65lfnk7p3ip0n6gb58a9qpx8n7r0231gahyamf")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dain/snappy") + (commit (string-append "snappy-" version)))) + (sha256 + (base32 "1mswh207065rdzbxk6rxaqlxhbg1ngxa0vjc20knsn31kqbq1bcz")) + (file-name (git-file-name name version)))) (build-system ant-build-system) (arguments `(#:jar-name "iq80-snappy.jar" -- cgit 1.4.1