From 58c3a4f5969977402d83452f70d10289e0cd7305 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 15 Dec 2019 12:31:35 +0100 Subject: gnu: java-svg-salamander: Return #t from snippet. * gnu/packages/java.scm (java-svg-salamander)[origin]: Return #t from snippet. --- gnu/packages/java.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index cc63ccf19ad..6550463fa56 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1,3 +1,4 @@ + ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari @@ -11680,7 +11681,9 @@ IPTC, XMP, ICC and more formats.") "1zv3kjdkf6iqf02x6ln76254y634j2ji448y706a65lsbfjmmicf")) (modules '((guix build utils))) (snippet - `(for-each delete-file (find-files "." ".*.jar"))) + '(begin + (for-each delete-file (find-files "." ".*.jar")) + #t)) (patches (search-patches "java-svg-salamander-Fix-non-det.patch")))) (build-system ant-build-system) -- cgit v1.3 From 514001e9cee0cc65a887de09cb7588987648322c Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Sat, 14 Dec 2019 22:18:44 +1100 Subject: gnu: abcl: Update to 1.6.0. * gnu/packages/java.scm (abcl): Update to 1.6.0. Signed-off-by: Efraim Flashner --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 6550463fa56..d0e3fd8d33f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11479,7 +11479,7 @@ network protocols, and core version control algorithms.") (define-public abcl (package (name "abcl") - (version "1.5.0") + (version "1.6.0") (source (origin (method url-fetch) @@ -11487,7 +11487,7 @@ network protocols, and core version control algorithms.") version "/abcl-src-" version ".tar.gz")) (sha256 (base32 - "1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj")) + "0hvbcsffr8n2xwdixc8wyw1bfl9fxn2gyy0c4nma7j9zbn0wwgw9")) (patches (search-patches "abcl-fix-build-xml.patch")))) -- cgit v1.3 From 4176300804a50d0a1a118ff2ff8b33118dc5b0a1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Dec 2019 09:06:14 +0200 Subject: gnu: icedtea@2: Fix missing match catch-all. * gnu/packages/java.scm (icedtea@2)[arguments]: In custom 'install-libjvm phase add catch-all case to 'match'. --- gnu/packages/java.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d0e3fd8d33f..c4cbcbdc1bd 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1430,7 +1430,14 @@ bootstrapping purposes.") ("armhf-linux" "/lib/arm") ("aarch64-linux" - "/lib/aarch64"))))) + "/lib/aarch64") + ;; We need a catch-all, dropping + ;; '-linux' works in most cases. + (_ + (string-append + "/lib/" + (string-drop-right + (%current-system) 6))))))) (symlink (string-append lib-path "/server/libjvm.so") (string-append lib-path "/libjvm.so"))) #t)) -- cgit v1.3