corretto{11,17,21}: {11.0.24.8.1,17.0.12.7.1,21.0.4.7.1} -> {11.0.25.…

…9.1,17.0.13.11.1,21.0.5.11.1} (cherry picked from commit 71936fc from PR #356982)
NixOS · Jan 6, 2025 · 83042f6 · 83042f6
1 parent ae59c80
commit 83042f6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix
@@ -26,12 +26,12 @@ let
       # Corretto, too.
       "--disable-warnings-as-errors"
     ];
-    version = "11.0.24.8.1";
+    version = "11.0.25.9.1";
     src = fetchFromGitHub {
       owner = "corretto";
       repo = "corretto-11";
       rev = version;
-      sha256 = "sha256-MD/ipEulQCEgfqqa0QQrD6x6GQwirQfb8OT2UBDLYEE=";
+      hash = "sha256-ewGGj4BHmwoPdULeT3PSI0Fo9T3cFbTO7cZXhzuKISY=";
     };
   };
 in

diff --git a/pkgs/development/compilers/corretto/17.nix b/pkgs/development/compilers/corretto/17.nix
@@ -21,12 +21,12 @@ let
       ;
     jdk = jdk17;
     gradle = gradle_7;
-    version = "17.0.12.7.1";
+    version = "17.0.13.11.1";
     src = fetchFromGitHub {
       owner = "corretto";
       repo = "corretto-17";
       rev = version;
-      sha256 = "sha256-aRn1hqaqNsBkp2jHHkwMKc8cNiBM+TYVm3tVMPJJ1YE=";
+      hash = "sha256-2jMre5aI02uDFjSgToTyVNriyb4EuZ01lKsNi822o5Q=";
     };
   };
 in

diff --git a/pkgs/development/compilers/corretto/21.nix b/pkgs/development/compilers/corretto/21.nix
@@ -21,12 +21,12 @@ let
       ;
     jdk = jdk21;
     gradle = gradle_7;
-    version = "21.0.4.7.1";
+    version = "21.0.5.11.1";
     src = fetchFromGitHub {
       owner = "corretto";
       repo = "corretto-21";
       rev = version;
-      sha256 = "sha256-EQqktd2Uz9PhkCaqvbuzmONcSiRppQ40tpLB3mqu2wo=";
+      hash = "sha256-Df2Pq2aPrTxD4FeqG12apE/USfQULmMGsDsgXrmCINc=";
     };
   };
 in

diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix
@@ -117,14 +117,11 @@ jdk.overrideAttrs (
     # Some of the OpenJDK derivation set their `pos` by hand. We need to
     # overwrite this in order to point to Corretto, not OpenJDK.
     pos = __curPos;
-    meta =
-      with lib;
-      oldAttrs.meta
-      // {
-        homepage = "https://aws.amazon.com/corretto";
-        license = licenses.gpl2Only;
-        description = "Amazon's distribution of OpenJDK";
-        maintainers = with maintainers; [ rollf ];
-      };
+    meta = oldAttrs.meta // {
+      homepage = "https://aws.amazon.com/corretto";
+      license = lib.licenses.gpl2Only;
+      description = "Amazon's distribution of OpenJDK";
+      maintainers = with lib.maintainers; [ rollf ];
+    };
   }
 )