diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-12-18 23:07:40 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-18 23:07:40 +0100 |
| commit | 7ba6d70e4528201151195e1ed2175ee4828bdb2f (patch) | |
| tree | 3a95b7f107763f959c31187d394d3fabbf1501c5 /gnu/packages/java.scm | |
| parent | 94c7f70faa0ba0409099b423df6534718d7518cc (diff) | |
| parent | 6afea7489b76c8db58d4f389fdbedc7c2b8992bd (diff) | |
| download | guix-7ba6d70e4528201151195e1ed2175ee4828bdb2f.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index cc63ccf19a..d0e3fd8d33 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 <rekado@elephly.net> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> @@ -11478,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) @@ -11486,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")))) @@ -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) |