Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openjdk11, openjfx11, corretto11: update #313925

Merged
merged 3 commits into from
May 25, 2024
Merged

openjdk11, openjfx11, corretto11: update #313925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd875d9
openjdk: 11.0.19+7 -> 11.0.23+9
Infinidoge Feb 4, 2024
6c26092
openjfx: 11.0.18+1 -> 11.0.20+1
Infinidoge Feb 4, 2024
9710ec0
corretto: 11.0.20.9.1 -> 11.0.23.9.1
Infinidoge Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/development/compilers/corretto/11.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/compilers/openjdk/11.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand All @@ -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 ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/compilers/openjdk/openjfx/11.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

let
major = "11";
update = ".0.18";
update = ".0.20";
build = "1";
repover = "${major}${update}+${build}";
gradle_ = (gradle_7.override {
Expand All @@ -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 ];
Expand Down