Commit cea4885f authored by Rolf Schröder's avatar Rolf Schröder
Browse files

corretto{11,17,21}: {11.0.23.9.1,17.0.11.9.1,21.0.3.9.1} -> {11.0.24.8.1,17.0.12.7.1,21.0.4.7.1}

parent 7b067a12

pkgs/development/compilers/corretto/11.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ let 
      # Corretto, too.

      "--disable-warnings-as-errors"

    ];

    version = "11.0.23.9.1";

    version = "11.0.24.8.1";

    src = fetchFromGitHub {

      owner = "corretto";

      repo = "corretto-11";

      rev = version;

      sha256 = "sha256-qSx0kgXTgvsvBaEqgy7Jrp/c1Imoi5/IOqEWoLenJYI=";

      sha256 = "sha256-MD/ipEulQCEgfqqa0QQrD6x6GQwirQfb8OT2UBDLYEE=";

    };

  };

in

pkgs/development/compilers/corretto/17.nix

+5 −3
Original line number Diff line number Diff line
@@ -14,17 +14,19 @@ let 
    inherit lib stdenv rsync runCommand testers;

    jdk = jdk17;

    gradle = gradle_7;

    version = "17.0.11.9.1";

    version = "17.0.12.7.1";

    src = fetchFromGitHub {

      owner = "corretto";

      repo = "corretto-17";

      rev = version;

      sha256 = "sha256-LxZSFILFfyh8oBiYEnuBQ0Og2i713qdK2jIiCBnrlj0=";

      sha256 = "sha256-aRn1hqaqNsBkp2jHHkwMKc8cNiBM+TYVm3tVMPJJ1YE=";

    };

  };

in

corretto.overrideAttrs (final: prev: {

  # HACK: Removes the FixNullPtrCast patch, as it fails to apply. Need to figure out what causes it to fail to apply.

  # 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";

pkgs/development/compilers/corretto/21.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ let 
    inherit lib stdenv rsync runCommand testers;

    jdk = jdk21;

    gradle = gradle_7;

    version = "21.0.3.9.1";

    version = "21.0.4.7.1";

    src = fetchFromGitHub {

      owner = "corretto";

      repo = "corretto-21";

      rev = version;

      sha256 = "sha256-V8UDyukDCQVTWUg4IpSKoY0qnnQ5fePbm3rxcw06Vr0=";

      sha256 = "sha256-EQqktd2Uz9PhkCaqvbuzmONcSiRppQ40tpLB3mqu2wo=";

    };

  };

in