From 1c8ba10a0b39613907a21ef208e7d36b274325a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 15:31:58 +0100 Subject: gnu: java-jsch: Update to 0.1.55. * gnu/packages/java.scm (java-jsch): Update to 0.1.55. --- gnu/packages/java.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a314dc9953e..f1aab42be85 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017, 2018 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018 Alex Vong -;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Gábor Boskovits ;;; Copyright © 2018 Chris Marusich ;;; Copyright © 2018 Efraim Flashner @@ -5236,18 +5236,18 @@ fundamental protocol access, not higher-level abstractions.") (define-public java-jsch (package (name "java-jsch") - (version "0.1.54") + (version "0.1.55") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/jsch/jsch/" version "/jsch-" version ".zip")) (sha256 (base32 - "029rdddyq1mh3ghryh3ki99kba1xkf1d1swjv2vi6lk6zzjy2wdb")))) + "1lxyjwvmwa723wcf3bqn816hkvc03vz4xhbsi7bvfhrz2rpgcfq6")))) (build-system ant-build-system) (arguments `(#:build-target "dist" - #:tests? #f ; no tests included + #:tests? #f ; no tests included #:phases (modify-phases %standard-phases (replace 'install (install-jars "dist"))))) -- cgit v1.3 From 6b66e47052e859e3b36899e5b0a19e2adebde32f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 15:52:10 +0100 Subject: gnu: javacc: Update to 7.0.4. * gnu/packages/java.scm (javacc): Update to 7.0.4. --- gnu/packages/java.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f1aab42be85..8a695102e1c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2267,7 +2267,7 @@ debugging, etc.") (define-public javacc (package (inherit javacc-4) - (version "7.0.3") + (version "7.0.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/javacc/javacc/" @@ -2275,14 +2275,14 @@ debugging, etc.") (file-name (string-append "javacc-" version ".tar.gz")) (sha256 (base32 - "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf")) + "0z7p9irwarc3avlcdyv9bd3zz57m1aawj8dr95wgxzg5z8fki8m6")) (modules '((guix build utils))) - ;; delete bundled jars + ;; Delete bundled jars. (snippet '(begin (for-each delete-file-recursively '("bootstrap" "lib")) #t)))) (arguments - `(#:make-flags ; bootstrap from javacc-4 + `(#:make-flags ; bootstrap from javacc-4 (list (string-append "-Dbootstrap-jar=" (assoc-ref %build-inputs "javacc") "/share/java/javacc.jar")) -- cgit v1.3 From ebf8048d1493b734e188cf5a1557002c961de319 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Feb 2019 15:56:20 +0100 Subject: gnu: javacc: Don't use unstable tarball. * gnu/packages/java.scm (javacc)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/java.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 8a695102e1c..97475690095 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2268,19 +2268,20 @@ debugging, etc.") (package (inherit javacc-4) (version "7.0.4") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/javacc/javacc/" - "archive/" version ".tar.gz")) - (file-name (string-append "javacc-" version ".tar.gz")) - (sha256 - (base32 - "0z7p9irwarc3avlcdyv9bd3zz57m1aawj8dr95wgxzg5z8fki8m6")) - (modules '((guix build utils))) - ;; Delete bundled jars. - (snippet '(begin (for-each delete-file-recursively - '("bootstrap" "lib")) - #t)))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/javacc/javacc.git") + (commit version))) + (file-name (git-file-name "javacc" version)) + (sha256 + (base32 "18kkak3gda93gr25jrgy6q00g0jr8i24ri2wk4kybz1v234fxx9i")) + (modules '((guix build utils))) + ;; Delete bundled jars. + (snippet '(begin (for-each delete-file-recursively + '("bootstrap" "lib")) + #t)))) (arguments `(#:make-flags ; bootstrap from javacc-4 (list (string-append "-Dbootstrap-jar=" -- cgit v1.3