Corretto{11,17,21}: update to latest release & build with Gradle8 (#459071)

Author: thiagokokada

pkgs/development/compilers/corretto/11.nix

@@ -1,6 +1,6 @@
 {
   fetchFromGitHub,
-  gradle_7,
+  gradle_8,
   jdk11,
   lib,
   stdenv,
@@ -19,20 +19,25 @@ let
       testers
       ;
     jdk = jdk11;
-    gradle = gradle_7;
+    gradle = gradle_8;
     extraConfig = [
       # jdk11 is built with --disable-warnings-as-errors (see openjdk/11.nix)
       # because of several compile errors. We need to include this parameter for
       # Corretto, too.
       "--disable-warnings-as-errors"
     ];
-    version = "11.0.26.4.1";
+    version = "11.0.29.7.1";
     src = fetchFromGitHub {
       owner = "corretto";
       repo = "corretto-11";
       rev = version;
-      hash = "sha256-buJlSvmyOVeMwaP9oDcHhG+Sabr1exf0nRUt4O7MaIY=";
+      hash = "sha256-/VlV8tAo1deOZ5Trc4VlLNtpjWx352qUGZmfVbj7HuU=";
     };
   };
 in
-corretto
+corretto.overrideAttrs (oldAttrs: {
+  patches = (oldAttrs.patches or [ ]) ++ [
+    ./corretto11-gradle8.patch
+  ];
+
+})

pkgs/development/compilers/corretto/17.nix

@@ -1,7 +1,7 @@
 {
   fetchFromGitHub,
   fetchurl,
-  gradle_7,
+  gradle_8,
   jdk17,
   lib,
   stdenv,
@@ -20,13 +20,13 @@ let
       testers
       ;
     jdk = jdk17;
-    gradle = gradle_7;
-    version = "17.0.14.7.1";
+    gradle = gradle_8;
+    version = "17.0.17.10.1";
     src = fetchFromGitHub {
       owner = "corretto";
       repo = "corretto-17";
       rev = version;
-      hash = "sha256-ohQrguEJ8QvTaNjyQxKFujGhXNxCQTGkLILurzD7cy0=";
+      hash = "sha256-Z8+g5jXjcWNTYU9Xvze7scu348okMauGMhSZwX1sS9w=";
     };
   };
 in
@@ -35,9 +35,11 @@ corretto.overrideAttrs (
     # Corretto17 has incorporated this patch already so it fails to apply.
     # We thus skip it here.
     # See https://github.com/corretto/corretto-17/pull/158
-    patches = lib.remove (fetchurl {
-      url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c";
-      sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
-    }) (prev.patches or [ ]);
+    patches =
+      lib.remove (fetchurl {
+        url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c";
+        sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
+      }) (prev.patches or [ ])
+      ++ [ ./corretto17-gradle8.patch ];
   }
 )

pkgs/development/compilers/corretto/21.nix

@@ -1,7 +1,6 @@
 {
-  corretto21,
   fetchFromGitHub,
-  gradle_7,
+  gradle_8,
   jdk21,
   lib,
   stdenv,
@@ -20,14 +19,19 @@ let
       testers
       ;
     jdk = jdk21;
-    gradle = gradle_7;
-    version = "21.0.6.7.1";
+    gradle = gradle_8;
+    version = "21.0.9.11.1";
     src = fetchFromGitHub {
       owner = "corretto";
       repo = "corretto-21";
       rev = version;
-      hash = "sha256-kF7Quf8bU5scfunmwfEYLkje/jEJOx7CFnBIUWCovzI=";
+      hash = "sha256-d62rXVgVlOM3M18c8GioFtMi/GhmCEMLQwy/EWAJW7I=";
     };
   };
 in
-corretto
+corretto.overrideAttrs (oldAttrs: {
+  patches = (oldAttrs.patches or [ ]) ++ [
+    ./corretto21-gradle8.patch
+  ];
+
+})