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} (#356982)
This commit is contained in:
commit
5ad0153b37
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user