From 33aa65e0eee0e42b0610aab1f6a1086e51eb9fe1 Mon Sep 17 00:00:00 2001
From: Gábor Boskovits <boskovits@gmail.com>
Date: Sun, 15 Jul 2018 22:07:26 +0200
Subject: gnu: icedtea: Make icedtea-8 the default jdk.
* gnu/packages/java.scm (icedtea): Point to icedtea-8.
---
gnu/packages/java.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 8d4a29267a..8e0a0bfbf8 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1672,7 +1672,7 @@ (define-public icedtea-8
'("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
--
cgit v1.2.3
From 9d2160171c32f9f2c5a95618d58e0d7627b6d0a2 Mon Sep 17 00:00:00 2001
From: Gábor Boskovits <boskovits@gmail.com>
Date: Wed, 18 Jul 2018 07:53:20 +0200
Subject: gnu: java-asm: Add missing propagated-input.
* gnu/packages/java.scm (java-asm)[propagated-inputs]: Add java-aqute-libg.
---
gnu/packages/java.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'gnu/packages/java.scm')
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 8e0a0bfbf8..f73eaeacb6 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3643,7 +3643,8 @@ (define-public java-asm
"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
--
cgit v1.2.3