From 2407527507991db6e4afa5868b91519e1c9c5aa0 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 12 Jun 2021 19:51:57 +0100 Subject: gnu: openjdk13: Update to 13.0.7. * gnu/packages/java.scm (openjdk13): Update to 13.0.7. [source]: Switch to https://github.com/openjdk/jdk13u. --- gnu/packages/java.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a167aafc38f..830e5b62b0a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2021 Vincent Legoll ;;; Copyright © 2021 Mike Gerwitz +;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -2428,14 +2429,16 @@ new Date();")) (package (inherit openjdk12) (name "openjdk") - (version "13.0") + (version "13.0.7") (source (origin - (method url-fetch) - (uri "http://hg.openjdk.java.net/jdk/jdk13/archive/9c250a7600e1.tar.bz2") - (file-name (string-append name "-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/openjdk/jdk13u") + (commit (string-append "jdk-" version "-ga")))) + (file-name (git-file-name name version)) (sha256 (base32 - "0v0ljvx5dyzp96dw4z4ksw3pvasil7783mgnmd1wk9gads5ab8iq")) + "0wrrr0d7lz1v8qqm752mn4gz5l2vpl2kmx4ac3ysvk4mljc924hp")) (modules '((guix build utils))) (snippet `(begin -- cgit v1.3 From c2834544e3872261a55910eb1f6e619939a53bf9 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 12 Jun 2021 19:54:10 +0100 Subject: gnu: openjdk14: Update to 14.0.2. * gnu/packages/java.scm (openjdk14): Update to 14.0.2. [source]: Switch to https://github.com/openjdk/jdk14u. --- gnu/packages/java.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 830e5b62b0a..09360d6b6fc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2473,14 +2473,16 @@ new Date();")) (package (inherit openjdk13) (name "openjdk") - (version "14.0") + (version "14.0.2") (source (origin - (method url-fetch) - (uri "http://hg.openjdk.java.net/jdk/jdk14/archive/bc54620a3848.tar.bz2") - (file-name (string-append name "-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/openjdk/jdk14u") + (commit (string-append "jdk-" version "-ga")))) + (file-name (git-file-name name version)) (sha256 (base32 - "0z485pk7r1xpw8004g4nrwrzj17sabgx8yfdbxwfvzkjp8qyajch")) + "07k9bsbxwyf2z2n50z96nvhsdai916mxdxcr5lm44jz7f6xrwfq6")) (modules '((guix build utils))) (snippet `(begin -- cgit v1.3 From 994235d956bc34dfcac17d7af230d3f581bdc3f8 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 12 Jun 2021 19:25:17 +0100 Subject: gnu: Add openjdk15. * gnu/packages/java.scm (openjdk15): New variable. --- gnu/packages/java.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 09360d6b6fc..af3e83be006 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2517,6 +2517,29 @@ new Date();")) ("zip" ,zip))) (home-page "https://openjdk.java.net/projects/jdk/14"))) +(define-public openjdk15 + (package + (inherit openjdk14) + (name "openjdk") + (version "15.0.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openjdk/jdk15u") + (commit (string-append "jdk-" version "-ga")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i")))) + (native-inputs + `(("autoconf" ,autoconf) + ("openjdk14:jdk" ,openjdk14 "jdk") + ("pkg-config" ,pkg-config) + ("unzip" ,unzip) + ("which" ,which) + ("zip" ,zip))) + (home-page "https://openjdk.java.net/projects/jdk/15"))) + (define-public icedtea icedtea-8) -- cgit v1.3 From afd4924d6a64c01a1d5138954b9f22c9bd4f4690 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 12 Jun 2021 19:26:06 +0100 Subject: gnu: Add openjdk16. * gnu/packages/java.scm (openjdk16): New variable. --- gnu/packages/java.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index af3e83be006..471cc5e906a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2540,6 +2540,44 @@ new Date();")) ("zip" ,zip))) (home-page "https://openjdk.java.net/projects/jdk/15"))) +(define-public openjdk16 + (package + (inherit openjdk15) + (name "openjdk") + (version "16.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openjdk/jdk16u") + (commit (string-append "jdk-" version "-ga")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ggddsbsar4dj2fycfqqqagqil7prhb30afvq6933rz7pa9apm2f")))) + (native-inputs + `(("autoconf" ,autoconf) + ("openjdk15:jdk" ,openjdk15 "jdk") + ("pkg-config" ,pkg-config) + ("unzip" ,unzip) + ("which" ,which) + ("zip" ,zip))) + (arguments + (substitute-keyword-arguments (package-arguments openjdk15) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'make-templates-writable + (lambda _ + ;; The build system copies a few .template files from the + ;; source directory into the build directory and then modifies + ;; them in-place. So these files have to be writable. + (for-each + (lambda (file) + (invoke "chmod" "u+w" file)) + (find-files "src/java.base/share/classes/jdk/internal/misc/" + "\\.template$")) + #t)))))) + (home-page "https://openjdk.java.net/projects/jdk/16"))) + (define-public icedtea icedtea-8) -- cgit v1.3