summaryrefslogtreecommitdiff
path: root/gnu/packages/java.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-08-19 15:24:59 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-08-19 15:24:59 +0200
commita7bc1588e6b8ad4a890d9cc884016f36f92f2e7d (patch)
tree284cc0af9edb74bfafad70b5a6fac9ad8b07b532 /gnu/packages/java.scm
parent8a502c3b60fdd5d8ee0b08e1c9d4c0d7fedc2fda (diff)
parentdf570bf271536399993b39e7ea2ea0452bb6cde4 (diff)
downloadguix-patches-a7bc1588e6b8ad4a890d9cc884016f36f92f2e7d.tar
guix-patches-a7bc1588e6b8ad4a890d9cc884016f36f92f2e7d.tar.gz
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/java.scm')
-rw-r--r--gnu/packages/java.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0ff92c763d..d2f4c9d05b 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1672,7 +1672,7 @@ new Date();"))
'("jdk" "openjdk-src" "corba-drop" "jaxp-drop" "jaxws-drop"
"jdk-drop" "langtools-drop" "hotspot-drop")))))))
-(define-public icedtea icedtea-7)
+(define-public icedtea icedtea-8)
(define-public ant/java8
@@ -3679,7 +3679,8 @@ on the XPP3 API (XML Pull Parser).")))
"115l5pqblirdkmzi32dxx7gbcm4jy0s14y5wircr6h8jdr9aix00"))))
(build-system ant-build-system)
(propagated-inputs
- `(("java-aqute-bndlib" ,java-aqute-bndlib)))
+ `(("java-aqute-bndlib" ,java-aqute-bndlib)
+ ("java-aqute-libg" ,java-aqute-libg)))
(arguments
`(#:build-target "compile"
;; The tests require an old version of Janino, which no longer compiles