From b29954509f42f05f8764554d259f5a8cdd4ccc6d Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Mon, 13 Mar 2023 22:26:24 +0100 Subject: gnu: openjdk9: Build from hg. * gnu/packages/java.scm (openjdk9)[source]: Use HG-DOWNLOAD. [homepage]: Update. This fixes for OpenJDK 9. --- gnu/packages/java.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 388e9d127fc..a5e60b7c716 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -852,18 +852,17 @@ new Date();")) (name "openjdk") (version "9.181") (source (origin - (method url-fetch) - (uri "https://hg.openjdk.java.net/jdk/jdk/archive/3cc80be736f2.tar.bz2") - (file-name (string-append name "-" version ".tar.bz2")) + (method hg-fetch) + (uri (hg-reference (url "https://hg.openjdk.org/jdk/jdk") + (changeset "jdk-9+181"))) + (file-name (hg-file-name name version)) + (modules '((guix build utils))) + (snippet `(begin + (for-each delete-file + (find-files "." ".*.(bin|exe|jar)$")))) (sha256 (base32 - "01ihmyf7k5z17wbr7xig7y40l9f01d5zjgkcmawn1102hw5kchpq")) - (modules '((guix build utils))) - (snippet - `(begin - (for-each delete-file - (find-files "." ".*.(bin|exe|jar)$")) - #t)))) + "1v92nzdqx07c35x945awzir4yk0fk22vky6fpp8mq9js930sxsz0")))) (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) (arguments @@ -1024,7 +1023,7 @@ new Date();")) ("unzip" ,unzip) ("which" ,which) ("zip" ,zip))) - (home-page "https://openjdk.java.net/projects/jdk9/") + (home-page "https://openjdk.org/projects/jdk9/") (synopsis "Java development kit") (description "This package provides the Java development kit OpenJDK.") -- cgit v1.3 From 7636c49b45adb9870cf416c64bde032ec858a820 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Mon, 13 Mar 2023 23:16:26 +0100 Subject: gnu: openjdk10: Build from hg. * gnu/packages/java.scm (openjdk10)[source]: Use HG-DOWNLOAD. This fixes for OpenJDK 10. --- gnu/packages/java.scm | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a5e60b7c716..7cf4a4fb4be 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1035,19 +1035,17 @@ new Date();")) (name "openjdk") (version "10.46") (source (origin - (method url-fetch) - (uri "http://hg.openjdk.java.net/jdk/jdk/archive/6fa770f9f8ab.tar.bz2") - (file-name (string-append name "-" version ".tar.bz2")) + (method hg-fetch) + (uri (hg-reference (url "https://hg.openjdk.org/jdk/jdk") + (changeset "jdk-10+46"))) + (file-name (hg-file-name name version)) + (modules '((guix build utils))) + (snippet `(begin + (for-each delete-file + (find-files "." ".*.(bin|exe|jar)$")))) (sha256 (base32 - "0zywq2203b4hx4jms9vbwvjcj1d3k2v3qpx4s33729fkpmid97r4")) - (patches (search-patches - "openjdk-10-idlj-reproducibility.patch")) - (modules '((guix build utils))) - (snippet - `(begin - (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) - #t)))) + "0i47ar8lxzjrkkiwbzybfxs473390h4jq9ahm3xqdvy5zpchxy3y")))) (arguments (substitute-keyword-arguments (package-arguments openjdk9) ((#:phases phases) -- cgit v1.3