[bug#69754] [PATCH 0/8] Update Java and fix build.

[bug#69754] [PATCH 0/8] Update Java and fix build.

[Greg Hogan]

Fix the broken openjdk@12 source build and update release versions.

Greg Hogan (8):
  gnu: openjdk11: Update to 11.0.22.
  gnu: openjdk12: Update source hash.
  gnu: openjdk13: Update to 13.0.14.
  gnu: openjdk15: Update to 15.0.10.
  gnu: openjdk17: Update to 17.0.10.
  gnu: openjdk18: Update to 18.0.2.1.
  gnu: openjdk20: Update to 20.0.2.
  gnu: openjdk21: Update to 21.0.2.

 gnu/packages/java.scm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)


base-commit: 447e9c96259e8fa15a828de9b2dd3400e2ffafe6
-- 
2.44.0

[bug#69754] [PATCH 1/8] gnu: openjdk11: Update to 11.0.22.

[Greg Hogan]

* gnu/packages/java.scm (openjdk11): Update to 11.0.22.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 151fc8aa89..a115c134ba 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1217,7 +1217,7 @@ (define-public openjdk10
 (define-public openjdk11
   (package
     (name "openjdk")
-    (version "11.0.17")
+    (version "11.0.22")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://openjdk-sources.osci.io/openjdk11/openjdk-"
@@ -1225,7 +1225,7 @@ (define-public openjdk11
               (file-name (string-append name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1prvqy0ysz0999wrhsrbz6vrknpqfihl9l74l16ph93g89dqi5ia"))
+                "18ca4syp9xlrqjgyjkb1sp9835riy6aym5xs81r8byrz6jlb2473"))
               (modules '((guix build utils)))
               (snippet
                '(for-each delete-file (find-files "." "\\.(bin|exe|jar)$")))
-- 
2.44.0

[bug#69754] [PATCH 2/8] gnu: openjdk12: Update source hash.

[Greg Hogan]

$ ./pre-inst-env guix build openjdk@12
The following derivations will be built:
  /gnu/store/l92r8cm2kmmv795ipn046yvxik7w355m-openjdk-12.33.drv
  /gnu/store/hwaj99ak2v98m2b1ssmg31s93lddq8ql-openjdk-12.33.tar.xz.drv
  /gnu/store/jnyzzcx42vvcdqv6j7fwz01ksw58s3ch-openjdk-12.33.tar.bz2.drv

building /gnu/store/jnyzzcx42vvcdqv6j7fwz01ksw58s3ch-openjdk-12.33.tar.bz2.drv...
\sha256 hash mismatch for /gnu/store/0g6yyyvhpx7b3scm2h079z72fv1740za-openjdk-12.33.tar.bz2:
  expected hash: 0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2
  actual hash:   0pi2gwib3j2imi4l623iaywrmvfh9rqzh82lj2gxqbrmg55swvjf
hash mismatch for store item '/gnu/store/0g6yyyvhpx7b3scm2h079z72fv1740za-openjdk-12.33.tar.bz2'
build of /gnu/store/jnyzzcx42vvcdqv6j7fwz01ksw58s3ch-openjdk-12.33.tar.bz2.drv failed
View build log at '/var/log/guix/drvs/jn/yzzcx42vvcdqv6j7fwz01ksw58s3ch-openjdk-12.33.tar.bz2.drv.gz'.
cannot build derivation `/gnu/store/hwaj99ak2v98m2b1ssmg31s93lddq8ql-openjdk-12.33.tar.xz.drv': 1 dependencies couldn't be built
cannot build derivation `/gnu/store/l92r8cm2kmmv795ipn046yvxik7w355m-openjdk-12.33.drv': 1 dependencies couldn't be built
guix build: error: build of `/gnu/store/l92r8cm2kmmv795ipn046yvxik7w355m-openjdk-12.33.drv' failed

* gnu/packages/java.scm (openjdk12): Update source hash.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a115c134ba..e6eb21d866 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1534,7 +1534,7 @@ (define-syntax make-openjdk
 
 (define-public openjdk12
   (make-openjdk
-   openjdk11 "12.33" "0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2"
+   openjdk11 "12.33" "0pi2gwib3j2imi4l623iaywrmvfh9rqzh82lj2gxqbrmg55swvjf"
    (source
     (origin
       (method url-fetch)
@@ -1542,7 +1542,7 @@ (define-public openjdk12
       (file-name (string-append name "-" version ".tar.bz2"))
       (sha256
        (base32
-        "0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2"))
+        "0pi2gwib3j2imi4l623iaywrmvfh9rqzh82lj2gxqbrmg55swvjf"))
       (modules '((guix build utils)))
       (snippet
        '(for-each delete-file (find-files "." "\\.(bin|exe|jar)$")))
-- 
2.44.0

[bug#69754] [PATCH 2/8] gnu: openjdk12: Update source hash.

[Ludovic Courtès]

Hi,

Greg Hogan <code@greghogan.com> skribis:

> $ ./pre-inst-env guix build openjdk@12
> The following derivations will be built:
>   /gnu/store/l92r8cm2kmmv795ipn046yvxik7w355m-openjdk-12.33.drv
>   /gnu/store/hwaj99ak2v98m2b1ssmg31s93lddq8ql-openjdk-12.33.tar.xz.drv
>   /gnu/store/jnyzzcx42vvcdqv6j7fwz01ksw58s3ch-openjdk-12.33.tar.bz2.drv
>
> building /gnu/store/jnyzzcx42vvcdqv6j7fwz01ksw58s3ch-openjdk-12.33.tar.bz2.drv...
> \sha256 hash mismatch for /gnu/store/0g6yyyvhpx7b3scm2h079z72fv1740za-openjdk-12.33.tar.bz2:
>   expected hash: 0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2
>   actual hash:   0pi2gwib3j2imi4l623iaywrmvfh9rqzh82lj2gxqbrmg55swvjf

Out of curiosity, I checked the archival status of the original tarball
and it’s apparently all good:

--8<---------------cut here---------------start------------->8---
$ guix describe
Generation 295  Mar 10 2024 23:35:32    (current)
  guix c783639
    repository URL: https://git.savannah.gnu.org/git/guix.git
    branch: master
    commit: c7836393be4d134861d652b2fcf09cf4e68275ca
$ guix package -A openjdk |grep 12
openjdk 12.33   out,jdk,doc     gnu/packages/java.scm:1536:2
openjdk 11.0.17 out,jdk,doc     gnu/packages/java.scm:1218:2
$ guix lint -c archival openjdk
$ echo $?
0
--8<---------------cut here---------------end--------------->8---

(Still a good thing to update it, though!)

Ludo’.

[bug#69754] [PATCH 2/8] gnu: openjdk12: Update source hash.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 3762 bytes --]


Greg Hogan <code@greghogan.com> writes:

> $ ./pre-inst-env guix build openjdk@12
> The following derivations will be built:
>   /gnu/store/l92r8cm2kmmv795ipn046yvxik7w355m-openjdk-12.33.drv
>   /gnu/store/hwaj99ak2v98m2b1ssmg31s93lddq8ql-openjdk-12.33.tar.xz.drv
>   /gnu/store/jnyzzcx42vvcdqv6j7fwz01ksw58s3ch-openjdk-12.33.tar.bz2.drv
>
> building /gnu/store/jnyzzcx42vvcdqv6j7fwz01ksw58s3ch-openjdk-12.33.tar.bz2.drv...
> \sha256 hash mismatch for /gnu/store/0g6yyyvhpx7b3scm2h079z72fv1740za-openjdk-12.33.tar.bz2:
>   expected hash: 0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2
>   actual hash:   0pi2gwib3j2imi4l623iaywrmvfh9rqzh82lj2gxqbrmg55swvjf
> hash mismatch for store item '/gnu/store/0g6yyyvhpx7b3scm2h079z72fv1740za-openjdk-12.33.tar.bz2'
> build of /gnu/store/jnyzzcx42vvcdqv6j7fwz01ksw58s3ch-openjdk-12.33.tar.bz2.drv failed
> View build log at '/var/log/guix/drvs/jn/yzzcx42vvcdqv6j7fwz01ksw58s3ch-openjdk-12.33.tar.bz2.drv.gz'.
> cannot build derivation `/gnu/store/hwaj99ak2v98m2b1ssmg31s93lddq8ql-openjdk-12.33.tar.xz.drv': 1 dependencies couldn't be built
> cannot build derivation `/gnu/store/l92r8cm2kmmv795ipn046yvxik7w355m-openjdk-12.33.drv': 1 dependencies couldn't be built
> guix build: error: build of `/gnu/store/l92r8cm2kmmv795ipn046yvxik7w355m-openjdk-12.33.drv' failed
>
> * gnu/packages/java.scm (openjdk12): Update source hash.
> ---
>  gnu/packages/java.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

I asked diffoscope what's up with this change, some mercurial metadata
by the looks of it.

→ diffoscope /gnu/store/qqqpxqg51gz1diwjz067mk1hxxmkyz9a-openjdk-12.33.tar.xz /gnu/store/17482xhyh2blaxk2nyfpkrfjrzd3dlxz-openjdk-12.33.tar.xz
--- /gnu/store/qqqpxqg51gz1diwjz067mk1hxxmkyz9a-openjdk-12.33.tar.xz
+++ /gnu/store/17482xhyh2blaxk2nyfpkrfjrzd3dlxz-openjdk-12.33.tar.xz
│   --- qqqpxqg51gz1diwjz067mk1hxxmkyz9a-openjdk-12.33.tar
├── +++ 17482xhyh2blaxk2nyfpkrfjrzd3dlxz-openjdk-12.33.tar
│ ├── file list
│ │ @@ -1,10 +1,10 @@
│ │  drwxr-xr-x   0 root         (0) root         (0)        0 1970-01-01 00:00:01.000000 jdk-0276cba45aac/
│ │  -rw-r--r--   0 root         (0) root         (0)      196 1970-01-01 00:00:01.000000 jdk-0276cba45aac/.gitignore
│ │ --rw-r--r--   0 root         (0) root         (0)      173 1970-01-01 00:00:01.000000 jdk-0276cba45aac/.hg_archival.txt
│ │ +-rw-r--r--   0 root         (0) root         (0)      198 1970-01-01 00:00:01.000000 jdk-0276cba45aac/.hg_archival.txt
│ │  -rw-r--r--   0 root         (0) root         (0)      211 1970-01-01 00:00:01.000000 jdk-0276cba45aac/.hgignore
│ │  -rw-r--r--   0 root         (0) root         (0)    27133 1970-01-01 00:00:01.000000 jdk-0276cba45aac/.hgtags
│ │  drwxr-xr-x   0 root         (0) root         (0)        0 1970-01-01 00:00:01.000000 jdk-0276cba45aac/.jcheck/
│ │  -rw-r--r--   0 root         (0) root         (0)       23 1970-01-01 00:00:01.000000 jdk-0276cba45aac/.jcheck/conf
│ │  -rw-r--r--   0 root         (0) root         (0)     2114 1970-01-01 00:00:01.000000 jdk-0276cba45aac/ADDITIONAL_LICENSE_INFO
│ │  -rw-r--r--   0 root         (0) root         (0)     1522 1970-01-01 00:00:01.000000 jdk-0276cba45aac/ASSEMBLY_EXCEPTION
│ │  -rw-r--r--   0 root         (0) root         (0)    19274 1970-01-01 00:00:01.000000 jdk-0276cba45aac/LICENSE
│ ├── jdk-0276cba45aac/.hg_archival.txt
│ │ @@ -1,6 +1,7 @@
│ │  repo: fd16c54261b32be1aaedd863b7e856801b7f8543
│ │  node: 0276cba45aacb1fcb5a09d8c681fcdfef86c401b
│ │  branch: default
│ │  latesttag: jdk-12+33
│ │  latesttag: jdk-12-ga
│ │  latesttagdistance: 1
│ │ +changessincelatesttag: 1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#69754] [PATCH 3/8] gnu: openjdk13: Update to 13.0.14.

[Greg Hogan]

* gnu/packages/java.scm (openjdk13): Update to 13.0.14.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index e6eb21d866..f629fe7800 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1573,8 +1573,8 @@ (define-public openjdk12
                   "#! java BlacklistedCertsConverter SHA-256\n"))))))))))
 
 (define-public openjdk13
-  (make-openjdk openjdk12 "13.0.13"
-                "0pxf4dlig61k0pg7amg4mi919hzam7nzwckry01avgq1wj8ambji"
+  (make-openjdk openjdk12 "13.0.14"
+                "1v92i5rhahqkjw8mz09c9qasnxqc67ygy0y266kdmm534z0da755"
   (source (origin
             (inherit (package-source base))
             (patches '())))))
-- 
2.44.0

[bug#69754] [PATCH 4/8] gnu: openjdk15: Update to 15.0.10.

[Greg Hogan]

* gnu/packages/java.scm (openjdk15): Update to 15.0.10.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index f629fe7800..66c103fd15 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1596,8 +1596,8 @@ (define-public openjdk14
 
 (define-public openjdk15
   (make-openjdk
-   openjdk14 "15.0.9"
-   "1k3x06fv89l84ysjsyw8s89q8blghq85m6xjzv373x6297ln8n7a"
+   openjdk14 "15.0.10"
+   "0hdllv348bws6m992bh73jik18x0sv0k2m9l817b3zb7q802sp7x"
    (source (origin
              (inherit (package-source base))
              (modules '())
-- 
2.44.0

[bug#69754] [PATCH 5/8] gnu: openjdk17: Update to 17.0.10.

[Greg Hogan]

* gnu/packages/java.scm (openjdk17): Update to 17.0.10.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 66c103fd15..7c47c88829 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1623,8 +1623,8 @@ (define-public openjdk16
 
 (define-public openjdk17
   (make-openjdk
-   openjdk16 "17.0.5"
-   "1asnysg6kxdkrmb88y6qihdr12ljsyxv0mg6hlcs7cwxgsdlqkfs"
+   openjdk16 "17.0.10"
+   "1bq1rqnipz6wdr05s20gm8nlpb3328ljxckzvc5ag0gf7fzlhn5f"
    (source (origin
              (inherit (package-source base))
              (patches (search-patches "openjdk-15-xcursor-no-dynamic.patch"))))
-- 
2.44.0

[bug#69754] [PATCH 6/8] gnu: openjdk18: Update to 18.0.2.1.

[Greg Hogan]

* gnu/packages/java.scm (openjdk18): Update to 18.0.2.1.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7c47c88829..528288a300 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1639,8 +1639,8 @@ (define-public openjdk17
                  (("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))))))))
 
 (define-public openjdk18
-  (make-openjdk openjdk17 "18.0.2"
-                "1yimfdkwpinhg5cf1mcrzk9xvjwnray3cx762kypb9jcwbranjwx"))
+  (make-openjdk openjdk17 "18.0.2.1"
+                "0zxanjzz4p3psqahlidh55vx1ldanq70c2ygk3gcfn9a94vnr9rg"))
 
 (define-public openjdk19
   (make-openjdk openjdk18 "19.0.2"
-- 
2.44.0

[bug#69754] [PATCH 7/8] gnu: openjdk20: Update to 20.0.2.

[Greg Hogan]

* gnu/packages/java.scm (openjdk20): Update to 20.0.2.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 528288a300..c94612bdc6 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1660,8 +1660,8 @@ (define-public openjdk19
                (setenv "SOURCE_DATE_EPOCH" "1234567890")))))))))
 
 (define-public openjdk20
-  (make-openjdk openjdk19 "20"
-                "0pk5lpwijfv9qv7vwpsq2xfklbnqdfs6xbdhc5aamrpar4xi4ykx"))
+  (make-openjdk openjdk19 "20.0.2"
+                "1af1v2c3d8x4c6shzl6cv9qwq7a4hn5map5pjh9vjcky0hkzd489"))
 
 (define-public openjdk21
   (make-openjdk openjdk20 "21"
-- 
2.44.0

[bug#69754] [PATCH 8/8] gnu: openjdk21: Update to 21.0.2.

[Greg Hogan]

* gnu/packages/java.scm (openjdk21): Update to 21.0.2.
---
 gnu/packages/java.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c94612bdc6..613742007a 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1664,8 +1664,8 @@ (define-public openjdk20
                 "1af1v2c3d8x4c6shzl6cv9qwq7a4hn5map5pjh9vjcky0hkzd489"))
 
 (define-public openjdk21
-  (make-openjdk openjdk20 "21"
-                "06wjfwrkqykjdkis2s1nh91cy8vwincnmc699cxvyk3fc12jf3vw"
+  (make-openjdk openjdk20 "21.0.2"
+                "0d1g3wnzr5whjpq8gvxq0h7kd7lxd3xgc6bh3kg8vzz096asn0kj"
    (source (origin
              (inherit (package-source base))
              (patches (search-patches "openjdk-21-fix-rpath.patch"
-- 
2.44.0

bug#69754: [PATCH 0/8] Update Java and fix build.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 719 bytes --]


Greg Hogan <code@greghogan.com> writes:

> Fix the broken openjdk@12 source build and update release versions.
>
> Greg Hogan (8):
>   gnu: openjdk11: Update to 11.0.22.
>   gnu: openjdk12: Update source hash.
>   gnu: openjdk13: Update to 13.0.14.
>   gnu: openjdk15: Update to 15.0.10.
>   gnu: openjdk17: Update to 17.0.10.
>   gnu: openjdk18: Update to 18.0.2.1.
>   gnu: openjdk20: Update to 20.0.2.
>   gnu: openjdk21: Update to 21.0.2.
>
>  gnu/packages/java.scm | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
>
>
> base-commit: 447e9c96259e8fa15a828de9b2dd3400e2ffafe6

Thanks! I've pushed these patches to master as
b5bd0d3a7ea932710bc7a39733b00fb644f3425a.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]