diff options
author | Artturi <Artturin@artturin.com> | 2024-04-27 03:36:59 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-27 03:36:59 +0300 |
commit | 28668355dffa775109ab2735dd1ff45b4598886e (patch) | |
tree | 8e39e3e55daaaa3fd41d45a317d39cb922e5dbe4 | |
parent | cfd1fc8087b5c2fe6559b1ed19bd51ace30c7e17 (diff) | |
parent | 0cd0fe654e62316e039ce93603109235dbfd0832 (diff) |
Merge pull request #306922 from rollf/corretto21
corretto21: init at 21.0.3.9.1
-rw-r--r-- | pkgs/development/compilers/corretto/11.nix | 19 | ||||
-rw-r--r-- | pkgs/development/compilers/corretto/21.nix | 26 | ||||
-rw-r--r-- | pkgs/development/compilers/corretto/mk-corretto.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/java-packages.nix | 1 |
5 files changed, 39 insertions, 14 deletions
diff --git a/pkgs/development/compilers/corretto/11.nix b/pkgs/development/compilers/corretto/11.nix index 9e61e133f4cf..06de7a7bbdf8 100644 --- a/pkgs/development/compilers/corretto/11.nix +++ b/pkgs/development/compilers/corretto/11.nix @@ -14,6 +14,12 @@ let inherit lib stdenv rsync runCommand testers; jdk = jdk11; gradle = gradle_7; + 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.20.9.1"; src = fetchFromGitHub { owner = "corretto"; @@ -23,15 +29,4 @@ let }; }; in -corretto.overrideAttrs (oldAttrs: { - # 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. Since the build is invoked via `gradle` build.gradle has to - # be adapted. - postPatch = oldAttrs.postPatch + '' - for file in $(find installers -name "build.gradle"); do - substituteInPlace $file --replace "command += archSpecificFlags" "command += archSpecificFlags + ['--disable-warnings-as-errors']" - done - ''; - -}) +corretto diff --git a/pkgs/development/compilers/corretto/21.nix b/pkgs/development/compilers/corretto/21.nix new file mode 100644 index 000000000000..fed3aa05f7a0 --- /dev/null +++ b/pkgs/development/compilers/corretto/21.nix @@ -0,0 +1,26 @@ +{ corretto21 +, fetchFromGitHub +, gradle_7 +, jdk21 +, lib +, stdenv +, rsync +, runCommand +, testers +}: + +let + corretto = import ./mk-corretto.nix { + inherit lib stdenv rsync runCommand testers; + jdk = jdk21; + gradle = gradle_7; + version = "21.0.3.9.1"; + src = fetchFromGitHub { + owner = "corretto"; + repo = "corretto-21"; + rev = "97b366227b4dc8f5a89bbedea88b0b18c9e21886"; + sha256 = "sha256-V8UDyukDCQVTWUg4IpSKoY0qnnQ5fePbm3rxcw06Vr0="; + }; + }; +in +corretto diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index adc6a86d98e2..c26614e47641 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -4,6 +4,7 @@ , lib , stdenv , gradle +, extraConfig ? [ ] , rsync , runCommand , testers @@ -38,7 +39,7 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: { # `/usr/bin/rsync` is invoked to copy the source tree. We don't have that. for file in $(find installers -name "build.gradle"); do - substituteInPlace $file --replace "workingDir '/usr/bin'" "workingDir '.'" + substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" done ''; @@ -51,12 +52,13 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: { if stdenv.isDarwin then ":installers:mac:tar:packageBuildResults" else ":installers:linux:universal:tar:packageBuildResults"; + extra_config = builtins.concatStringsSep " " extraConfig; in '' runHook preBuild # Corretto's actual built is triggered via `gradle`. - gradle --console=plain --no-daemon ${task} + gradle -Pcorretto.extra_config="${extra_config}" --console=plain --no-daemon ${task} # Prepare for the installPhase so that it looks like if a normal # OpenJDK had been built. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0545cc91c986..6d228524c591 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15470,6 +15470,7 @@ with pkgs; corretto11 = javaPackages.compiler.corretto11; corretto17 = javaPackages.compiler.corretto17; corretto19 = javaPackages.compiler.corretto19; + corretto21 = javaPackages.compiler.corretto21; cotton = callPackage ../development/tools/cotton { inherit (darwin.apple_sdk.frameworks) CoreServices; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 1028c2f62bae..2d59c358863b 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -99,6 +99,7 @@ in { corretto11 = callPackage ../development/compilers/corretto/11.nix { }; corretto17 = callPackage ../development/compilers/corretto/17.nix { }; corretto19 = callPackage ../development/compilers/corretto/19.nix { }; + corretto21 = callPackage ../development/compilers/corretto/21.nix { }; openjdk8-bootstrap = mkBootstrap adoptopenjdk-8 ../development/compilers/openjdk/bootstrap.nix |