[bug#60020] [PATCH 0/8] Update openjdk.

[bug#60020] [PATCH 0/8] Update openjdk.

[Greg Hogan]

These look to be the latest updates to openjdk11+.

The openjdk build process creates thousands of defunct bash processes,
necessitating the increase in maximum number of tasks.

Greg Hogan (8):
  Increase "TasksMax" in 'guix-daemon.service'.
  gnu: openjdk11: Update to 11.0.17.
  gnu: openjdk13: Update to 13.0.13.
  gnu: openjdk15: Update to 15.0.9.
  gnu: openjdk16: Update to 16.0.2.
  gnu: openjdk17: Update to 17.0.5.
  gnu: openjdk18: Update to 18.0.2.
  gnu: openjdk: Update to 19.

 etc/guix-daemon.service.in |  2 +-
 gnu/packages/java.scm      | 44 +++++++++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 14 deletions(-)

-- 
2.38.1

[bug#60020] [PATCH 1/8] Increase "TasksMax" in 'guix-daemon.service'.

[Greg Hogan]

* etc/guix-daemon.service.in (TasksMax): Increase to 16384.
---
 etc/guix-daemon.service.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/guix-daemon.service.in b/etc/guix-daemon.service.in
index 9dbc3b5678..25e895235f 100644
--- a/etc/guix-daemon.service.in
+++ b/etc/guix-daemon.service.in
@@ -22,7 +22,7 @@ Restart=always
 # See <https://lists.gnu.org/archive/html/guix-devel/2016-04/msg00608.html>.
 # Some package builds (for example, go@1.8.1) may require even more than
 # 1024 tasks.
-TasksMax=8192
+TasksMax=16384
 
 [Install]
 WantedBy=multi-user.target
-- 
2.38.1

[bug#60020] [PATCH 2/8] gnu: openjdk11: Update to 11.0.17.

[Greg Hogan]

* gnu/packages/java.scm (openjdk11): Update to 11.0.17.
[native-inputs]: Add bash.
---
 gnu/packages/java.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index f80406cab9..d4dfd4be39 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1761,7 +1761,7 @@ (define-public openjdk10
 (define-public openjdk11
   (package
     (name "openjdk")
-    (version "11.0.15")
+    (version "11.0.17")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://openjdk-sources.osci.io/openjdk11/openjdk-"
@@ -1769,7 +1769,7 @@ (define-public openjdk11
               (file-name (string-append name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0di91nnms2iq1svgq72r5y17am17r4vh2lq43k0bkcwpc84d6nd8"))
+                "1prvqy0ysz0999wrhsrbz6vrknpqfihl9l74l16ph93g89dqi5ia"))
               (modules '((guix build utils)))
               (snippet
                '(for-each delete-file (find-files "." ".*.(bin|exe|jar)$")))))
@@ -2019,6 +2019,7 @@ (define-public openjdk11
            libxtst))
     (native-inputs
      (list autoconf
+           bash
            openjdk10
            `(,openjdk10 "jdk")
            gnu-make-4.2
-- 
2.38.1

[bug#60020] [PATCH 3/8] gnu: openjdk13: Update to 13.0.13.

[Greg Hogan]

* gnu/packages/java.scm (openjdk13): Update to 13.0.13.
---
 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 d4dfd4be39..d19c10062b 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2101,8 +2101,8 @@ (define-public openjdk12
                   "#! java BlacklistedCertsConverter SHA-256\n"))))))))))
 
 (define-public openjdk13
-  (make-openjdk openjdk12 "13.0.7"
-                "0wrrr0d7lz1v8qqm752mn4gz5l2vpl2kmx4ac3ysvk4mljc924hp"))
+  (make-openjdk openjdk12 "13.0.13"
+                "0pxf4dlig61k0pg7amg4mi919hzam7nzwckry01avgq1wj8ambji"))
 
 (define-public openjdk14
   (make-openjdk
-- 
2.38.1

[bug#60020] [PATCH 4/8] gnu: openjdk15: Update to 15.0.9.

[Greg Hogan]

* gnu/packages/java.scm (openjdk15): Update to 15.0.9.
---
 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 d19c10062b..9a0ed07ed3 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2120,8 +2120,8 @@ (define-public openjdk14
 
 (define-public openjdk15
   (make-openjdk
-   openjdk14 "15.0.3"
-   "168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i"
+   openjdk14 "15.0.9"
+   "1k3x06fv89l84ysjsyw8s89q8blghq85m6xjzv373x6297ln8n7a"
    (source (origin
              (inherit (package-source base))
              (modules '())
-- 
2.38.1

[bug#60020] [PATCH 5/8] gnu: openjdk16: Update to 16.0.2.

[Greg Hogan]

* gnu/packages/java.scm (openjdk16): Update to 16.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 9a0ed07ed3..0c57dca114 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2138,8 +2138,8 @@ (define-public openjdk15
       (append `(,openjdk14 "jdk"))))))
 
 (define-public openjdk16
-  (make-openjdk openjdk15 "16.0.1"
-                "1ggddsbsar4dj2fycfqqqagqil7prhb30afvq6933rz7pa9apm2f"))
+  (make-openjdk openjdk15 "16.0.2"
+                "0587px2qbz07g3xi4a3ya6m630p72dvkxcn0bj1813pxnwvcgigz"))
 
 (define-public openjdk17
   (make-openjdk
-- 
2.38.1

[bug#60020] [PATCH 6/8] gnu: openjdk17: Update to 17.0.5.

[Greg Hogan]

* gnu/packages/java.scm (openjdk17): Update to 17.0.5.
---
 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 0c57dca114..2dbcdce44f 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2143,8 +2143,8 @@ (define-public openjdk16
 
 (define-public openjdk17
   (make-openjdk
-   openjdk16 "17.0.3"
-   "0slmd6ww947gxpp4yr2wmr5z975bg86qh7zqfp2radf2q77ql65b"
+   openjdk16 "17.0.5"
+   "1asnysg6kxdkrmb88y6qihdr12ljsyxv0mg6hlcs7cwxgsdlqkfs"
    (arguments
     (substitute-keyword-arguments (package-arguments openjdk16)
       ((#:phases phases)
-- 
2.38.1

[bug#60020] [PATCH 7/8] gnu: openjdk18: Update to 18.0.2.

[Greg Hogan]

* gnu/packages/java.scm (openjdk18): Update to 18.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 2dbcdce44f..afd8c60f55 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2156,8 +2156,8 @@ (define-public openjdk17
                  (("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))))))))
 
 (define-public openjdk18
-  (make-openjdk openjdk17 "18"
-                "1bv6bdhkmwvn10l0xy8yi9xibds640hs5zsvx0jp7wrxa3qw4qy8"))
+  (make-openjdk openjdk17 "18.0.2"
+                "1yimfdkwpinhg5cf1mcrzk9xvjwnray3cx762kypb9jcwbranjwx"))
 
 ;;; Convenience alias to point to the latest version of OpenJDK.
 (define-public openjdk openjdk18)
-- 
2.38.1

[bug#60020] [PATCH 8/8] gnu: openjdk: Update to 19.

[Greg Hogan]

* gnu/packages/java.scm (openjdk): Update to 19.
(openjdk19): New variable.
---
 gnu/packages/java.scm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index afd8c60f55..05a1b8996a 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2159,8 +2159,25 @@ (define-public openjdk18
   (make-openjdk openjdk17 "18.0.2"
                 "1yimfdkwpinhg5cf1mcrzk9xvjwnray3cx762kypb9jcwbranjwx"))
 
+(define-public openjdk19
+  (make-openjdk openjdk18 "19.0.1"
+                "0kyalb391znw6idmfn3dsx6c2mal1hl63f0bwa4mlnsxfl380bi1"
+   (arguments
+    (substitute-keyword-arguments (package-arguments openjdk18)
+      ((#:phases phases)
+       #~(modify-phases #$phases
+           (replace 'fix-java-shebangs
+             (lambda _
+               ;; Update file path.
+               (substitute* "src/java.base/share/data/blockedcertsconverter/blocked.certs.pem"
+                 (("^#!.*") "#! java BlockedCertsConverter SHA-256\n"))))
+           (add-before 'configure 'define-java-environment-variables
+             (lambda* (#:key inputs #:allow-other-keys)
+               ;; Fix for "valid range 1980-01-01T00:00:02Z to 2099-12-31T23:59:59Z".
+               (setenv "SOURCE_DATE_EPOCH" "1234567890")))))))))
+
 ;;; Convenience alias to point to the latest version of OpenJDK.
-(define-public openjdk openjdk18)
+(define-public openjdk openjdk19)
 
 (define-public icedtea icedtea-8)
 
-- 
2.38.1

[bug#60020] [PATCH 0/8] Update openjdk.

[Maxim Cournoyer]

Hello,

Greg Hogan <code@greghogan.com> writes:

> These look to be the latest updates to openjdk11+.
>
> The openjdk build process creates thousands of defunct bash processes,
> necessitating the increase in maximum number of tasks.
>
> Greg Hogan (8):
>   Increase "TasksMax" in 'guix-daemon.service'.

This doesn't appear to have been merged yet.  Is it still neeeded?

>   gnu: openjdk11: Update to 11.0.17.
>   gnu: openjdk13: Update to 13.0.13.
>   gnu: openjdk15: Update to 15.0.9.
>   gnu: openjdk16: Update to 16.0.2.
>   gnu: openjdk17: Update to 17.0.5.
>   gnu: openjdk18: Update to 18.0.2.
>   gnu: openjdk: Update to 19.

These appear to have been merged already.  Feel free to close if there's
nothing left to do here.

-- 
Thanks,
Maxim

[bug#60020] [PATCH 0/8] Update openjdk.

[Greg Hogan]

On Mon, Jan 16, 2023 at 12:59 PM Maxim Cournoyer
<maxim.cournoyer@gmail.com> wrote:
>
> Hello,
>
> Greg Hogan <code@greghogan.com> writes:
>
> > These look to be the latest updates to openjdk11+.
> >
> > The openjdk build process creates thousands of defunct bash processes,
> > necessitating the increase in maximum number of tasks.
> >
> > Greg Hogan (8):
> >   Increase "TasksMax" in 'guix-daemon.service'.
>
> This doesn't appear to have been merged yet.  Is it still needed?

Yes. Do we know what TasksMax is set to on the build farms?

> >   gnu: openjdk11: Update to 11.0.17.
> >   gnu: openjdk13: Update to 13.0.13.
> >   gnu: openjdk15: Update to 15.0.9.
> >   gnu: openjdk16: Update to 16.0.2.
> >   gnu: openjdk17: Update to 17.0.5.
> >   gnu: openjdk18: Update to 18.0.2.
> >   gnu: openjdk: Update to 19.
>
> These appear to have been merged already.  Feel free to close if there's
> nothing left to do here.

Everything except openjdk@19 was merged, so I don't know if that was
an editorial decision by the committer because version 19 was so new
(19.0.1 has since been released). I would close this ticket except for
waiting to confirm and accept the increase to TasksMax.

> --
> Thanks,
> Maxim

[bug#60020] [PATCH 0/8] Update openjdk.

[Maxim Cournoyer]

+CC Efram

Hi Greg,

Greg Hogan <code@greghogan.com> writes:

> On Mon, Jan 16, 2023 at 12:59 PM Maxim Cournoyer
> <maxim.cournoyer@gmail.com> wrote:
>>
>> Hello,
>>
>> Greg Hogan <code@greghogan.com> writes:
>>
>> > These look to be the latest updates to openjdk11+.
>> >
>> > The openjdk build process creates thousands of defunct bash processes,
>> > necessitating the increase in maximum number of tasks.
>> >
>> > Greg Hogan (8):
>> >   Increase "TasksMax" in 'guix-daemon.service'.
>>
>> This doesn't appear to have been merged yet.  Is it still needed?
>
> Yes. Do we know what TasksMax is set to on the build farms?
>
>> >   gnu: openjdk11: Update to 11.0.17.
>> >   gnu: openjdk13: Update to 13.0.13.
>> >   gnu: openjdk15: Update to 15.0.9.
>> >   gnu: openjdk16: Update to 16.0.2.
>> >   gnu: openjdk17: Update to 17.0.5.
>> >   gnu: openjdk18: Update to 18.0.2.
>> >   gnu: openjdk: Update to 19.
>>
>> These appear to have been merged already.  Feel free to close if there's
>> nothing left to do here.
>
> Everything except openjdk@19 was merged, so I don't know if that was
> an editorial decision by the committer because version 19 was so new
> (19.0.1 has since been released).

Efraim, was this an oversight or you were waiting to upload the new
release?

> I would close this ticket except for
> waiting to confirm and accept the increase to TasksMax.

OK; there doesn't seem to be anything particular on the build farm, per
(sysadmin services) in the guix-maintenance repository:

--8<---------------cut here---------------start------------->8---
(define* (guix-daemon-config #:key (max-jobs 5) (cores 4)
                             (build-accounts-to-max-jobs-ratio 4)
                             (authorized-keys '()))
  (guix-configuration
   (substitute-urls '())
   (authorized-keys authorized-keys)

   ;; We don't want to let builds get stuck for too long, but we still want
   ;; to allow building, say, Guile 2.2 on armhf-linux, which takes < 3h on
   ;; an OverDrive 1000.
   (max-silent-time 3600)
   (timeout (* 6 3600))

   (log-compression 'gzip)               ;be friendly to 'guix publish' users

   (build-accounts (* build-accounts-to-max-jobs-ratio max-jobs))
   (extra-options (list "--max-jobs" (number->string max-jobs)
                        "--cores" (number->string cores)
                        "--gc-keep-outputs" "--gc-keep-derivations"))))
--8<---------------cut here---------------end--------------->8---

And it uses the guix-daemon from the latest Guix package in Guix, so it
doesn't seem to be needed there?

-- 
Thanks,
Maxim

[bug#60020] [PATCH 0/8] Update openjdk.

[Efraim Flashner]

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

On Tue, Jan 17, 2023 at 02:38:28PM -0500, Maxim Cournoyer wrote:
> +CC Efram
> 
> Hi Greg,
> 
> Greg Hogan <code@greghogan.com> writes:
> 
> > On Mon, Jan 16, 2023 at 12:59 PM Maxim Cournoyer
> > <maxim.cournoyer@gmail.com> wrote:
> >>
> >> Hello,
> >>
> >> Greg Hogan <code@greghogan.com> writes:
> >>
> >> > These look to be the latest updates to openjdk11+.
> >> >
> >> > The openjdk build process creates thousands of defunct bash processes,
> >> > necessitating the increase in maximum number of tasks.
> >> >
> >> > Greg Hogan (8):
> >> >   Increase "TasksMax" in 'guix-daemon.service'.
> >>
> >> This doesn't appear to have been merged yet.  Is it still needed?
> >
> > Yes. Do we know what TasksMax is set to on the build farms?
> >
> >> >   gnu: openjdk11: Update to 11.0.17.
> >> >   gnu: openjdk13: Update to 13.0.13.
> >> >   gnu: openjdk15: Update to 15.0.9.
> >> >   gnu: openjdk16: Update to 16.0.2.
> >> >   gnu: openjdk17: Update to 17.0.5.
> >> >   gnu: openjdk18: Update to 18.0.2.
> >> >   gnu: openjdk: Update to 19.
> >>
> >> These appear to have been merged already.  Feel free to close if there's
> >> nothing left to do here.
> >
> > Everything except openjdk@19 was merged, so I don't know if that was
> > an editorial decision by the committer because version 19 was so new
> > (19.0.1 has since been released).
> 
> Efraim, was this an oversight or you were waiting to upload the new
> release?

I meant to come back to this one. I wasn't able to build version 19
locally and I guess I forgot to say anything :/


> > I would close this ticket except for
> > waiting to confirm and accept the increase to TasksMax.
> 
> OK; there doesn't seem to be anything particular on the build farm, per
> (sysadmin services) in the guix-maintenance repository:
> 
> --8<---------------cut here---------------start------------->8---
> (define* (guix-daemon-config #:key (max-jobs 5) (cores 4)
>                              (build-accounts-to-max-jobs-ratio 4)
>                              (authorized-keys '()))
>   (guix-configuration
>    (substitute-urls '())
>    (authorized-keys authorized-keys)
> 
>    ;; We don't want to let builds get stuck for too long, but we still want
>    ;; to allow building, say, Guile 2.2 on armhf-linux, which takes < 3h on
>    ;; an OverDrive 1000.
>    (max-silent-time 3600)
>    (timeout (* 6 3600))
> 
>    (log-compression 'gzip)               ;be friendly to 'guix publish' users
> 
>    (build-accounts (* build-accounts-to-max-jobs-ratio max-jobs))
>    (extra-options (list "--max-jobs" (number->string max-jobs)
>                         "--cores" (number->string cores)
>                         "--gc-keep-outputs" "--gc-keep-derivations"))))
> --8<---------------cut here---------------end--------------->8---
> 
> And it uses the guix-daemon from the latest Guix package in Guix, so it
> doesn't seem to be needed there?
> 
> -- 
> Thanks,
> Maxim

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

bug#60020: [PATCH 0/8] Update openjdk.

[Greg Hogan]

On Wed, Jan 18, 2023 at 4:40 AM Efraim Flashner <efraim@flashner.co.il> wrote:
>
> I meant to come back to this one. I wasn't able to build version 19
> locally and I guess I forgot to say anything :/

I see that this was committed and built successfully on ci. Since
TasksMax only appears to be affecting my foreign distro build
environment (with thousands of zombie bash processes) this ticket is
complete and I am closing. Thanks Maxim and Efraim!

Greg

[bug#60020] [PATCH 0/8] Update openjdk.

[Maxim Cournoyer]

Hi,

Greg Hogan <code@greghogan.com> writes:

> On Wed, Jan 18, 2023 at 4:40 AM Efraim Flashner <efraim@flashner.co.il> wrote:
>>
>> I meant to come back to this one. I wasn't able to build version 19
>> locally and I guess I forgot to say anything :/
>
> I see that this was committed and built successfully on ci. Since
> TasksMax only appears to be affecting my foreign distro build
> environment (with thousands of zombie bash processes) this ticket is
> complete and I am closing. Thanks Maxim and Efraim!

The zombie processes could be resolved by fixing #30948.

-- 
Thanks,
Maxim