Unverified Commit f99f3942 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #314567 from NixOS/backport-313925-to-release-24.05 

[Backport release-24.05] openjdk11, openjfx11, corretto11: update
parents cc5ae9c1 b02f4c33

pkgs/development/compilers/corretto/11.nix

+4 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
}:



let

  corretto = import ./mk-corretto.nix {

  corretto = import ./mk-corretto.nix rec {

    inherit lib stdenv rsync runCommand testers;

    jdk = jdk11;

    gradle = gradle_7;
@@ -20,12 +20,12 @@ let 
      # Corretto, too.

      "--disable-warnings-as-errors"

    ];

    version = "11.0.20.9.1";

    version = "11.0.23.9.1";

    src = fetchFromGitHub {

      owner = "corretto";

      repo = "corretto-11";

      rev = "b880bdc8397ec3dd6b7cd4b837ce846c9e902783";

      sha256 = "sha256-IomJHQn0ZgqsBZ5BrRqVrEOhTq7wjLiIKMQlz53JxsU=";

      rev = version;

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

    };

  };

in

pkgs/development/compilers/openjdk/11.nix

+3 −3
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
let

  major = "11";

  minor = "0";

  update = "19";

  build = "7";

  update = "23";

  build = "9";



  # when building a headless jdk, also bootstrap it with a headless jdk

  openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; };
@@ -25,7 +25,7 @@ let 
      owner = "openjdk";

      repo = "jdk${major}u";

      rev = "jdk-${version}";

      sha256 = "sha256-mp8toB1dWcwOtMqNFd7UwRg8pLJckovqD/LD5p9zUoA=";

      sha256 = "sha256-6y6wge8ZuSKBpb5QNihvAlD4Pv/0d3AQCPOkxUm/sJk=";

    };



    nativeBuildInputs = [ pkg-config autoconf unzip ];

pkgs/development/compilers/openjdk/openjfx/11.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


let

  major = "11";

  update = ".0.18";

  update = ".0.20";

  build = "1";

  repover = "${major}${update}+${build}";

  gradle_ = (gradle_7.override {
@@ -31,7 +31,7 @@ let 
      owner = "openjdk";

      repo = "jfx${major}u";

      rev = repover;

      sha256 = "sha256-46DjIzcBHkmp5vnhYnLu78CG72bIBRM4A6mgk2OLOko=";

      sha256 = "sha256-BbBP2DiPZTSn1SBYMCgyiNdF9GD+NqR6YjeVNOQHHn4=";

    };



    buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ];