gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

corretto{11,17,21}: {11.0.25.9.1,17.0.13.11.1,21.0.5.11.1} -> {11.0.2… (#392159)

Browse Source
This commit is contained in:
Thiago Kenji Okada
2025-04-11 09:33:25 +01:00
committed by GitHub
parent c76d239f14 c666c5613a
commit e23d8243c3
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/corretto/11.nix
+2 -2
View File
@@ -26,12 +26,12 @@ let
# Corretto, too.
"--disable-warnings-as-errors"
];
version = "11.0.25.9.1";
version = "11.0.26.4.1";
src = fetchFromGitHub {
owner = "corretto";
repo = "corretto-11";
rev = version;
hash = "sha256-ewGGj4BHmwoPdULeT3PSI0Fo9T3cFbTO7cZXhzuKISY=";
hash = "sha256-buJlSvmyOVeMwaP9oDcHhG+Sabr1exf0nRUt4O7MaIY=";
};
};
in
pkgs/development/compilers/corretto/17.nix
+2 -2
View File
@@ -21,12 +21,12 @@ let
;
jdk = jdk17;
gradle = gradle_7;
version = "17.0.13.11.1";
version = "17.0.14.7.1";
src = fetchFromGitHub {
owner = "corretto";
repo = "corretto-17";
rev = version;
hash = "sha256-2jMre5aI02uDFjSgToTyVNriyb4EuZ01lKsNi822o5Q=";
hash = "sha256-ohQrguEJ8QvTaNjyQxKFujGhXNxCQTGkLILurzD7cy0=";
};
};
in
pkgs/development/compilers/corretto/21.nix
+2 -2
View File
@@ -21,12 +21,12 @@ let
;
jdk = jdk21;
gradle = gradle_7;
version = "21.0.5.11.1";
version = "21.0.6.7.1";
src = fetchFromGitHub {
owner = "corretto";
repo = "corretto-21";
rev = version;
hash = "sha256-Df2Pq2aPrTxD4FeqG12apE/USfQULmMGsDsgXrmCINc=";
hash = "sha256-kF7Quf8bU5scfunmwfEYLkje/jEJOx7CFnBIUWCovzI=";
};
};
in
pkgs/development/compilers/corretto/mk-corretto.nix
+4 -3
View File
@@ -18,12 +18,13 @@
# builds. However, Corretto uses `gradle` as build tool (which in turn will
# invoke `make`). The configure/build phases are adapted as needed.
let
pname = "corretto";
in
# The version scheme is different between OpenJDK & Corretto.
# See https://github.com/corretto/corretto-17/blob/release-17.0.8.8.1/build.gradle#L40
# "major.minor.security.build.revision"
let
majorVersion = builtins.head (lib.strings.splitString "." version); # same as "featureVersion" for OpenJDK
pname = "corretto${majorVersion}";
in
jdk.overrideAttrs (
finalAttrs: oldAttrs: {
inherit pname version src;