dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #313927 from wegank/openjdk-bump-split-4

Browse Source 
openjdk17, openjfx17, corretto17: update
This commit is contained in:
Thiago Kenji Okada 2024-05-26 16:00:23 +01:00 committed by GitHub
commit bf40cc63d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/compilers/corretto/17.nix
View File

@ -1,4 +1,5 @@
{ fetchFromGitHub
, fetchurl
, gradle_7
, jdk17
, lib
@ -9,17 +10,25 @@
}:
let
corretto = import ./mk-corretto.nix {
corretto = import ./mk-corretto.nix rec {
inherit lib stdenv rsync runCommand testers;
jdk = jdk17;
gradle = gradle_7;
version = "17.0.8.8.1";
version = "17.0.11.9.1";
src = fetchFromGitHub {
owner = "corretto";
repo = "corretto-17";
rev = "9a3cc984f76cb5f90598bdb43215bad20e0f7319";
sha256 = "sha256-/VuB3ocD5VvDqCU7BoTG+fQ0aKvK1TejegRYmswInqQ=";
rev = version;
sha256 = "sha256-LxZSFILFfyh8oBiYEnuBQ0Og2i713qdK2jIiCBnrlj0=";
};
};
in
corretto
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.
patches = lib.remove
(fetchurl {
url = "https://git.alpinelinux.org/aports/plain/community/openjdk17/FixNullPtrCast.patch?id=41e78a067953e0b13d062d632bae6c4f8028d91c";
sha256 = "sha256-LzmSew51+DyqqGyyMw2fbXeBluCiCYsS1nCjt9hX6zo=";
})
prev.patches;
})

6
pkgs/development/compilers/openjdk/17.nix
View File

@ -11,8 +11,8 @@
let
version = {
feature = "17";
interim = ".0.7";
build = "7";
interim = ".0.11";
build = "9";
};
# when building a headless jdk, also bootstrap it with a headless jdk
@ -26,7 +26,7 @@ let
owner = "openjdk";
repo = "jdk${version.feature}u";
rev = "jdk-${version.feature}${version.interim}+${version.build}";
sha256 = "sha256-S6QOB4Tbi+K1yjvvywTfvwFI2eX8AiqIx5c3zfxcskc=";
sha256 = "sha256-aO4iSc9MklW/4q9U86WEfiiWnlq6iZSbxzq2fbsqd0A=";
};
nativeBuildInputs = [ pkg-config autoconf unzip ];

6
pkgs/development/compilers/openjdk/openjfx/17.nix
View File

@ -7,8 +7,8 @@
let
major = "17";
update = ".0.6";
build = "+3";
update = ".0.11";
build = "-ga";
repover = "${major}${update}${build}";
gradle_ = (gradle_7.override {
java = openjdk17_headless;
@ -31,7 +31,7 @@ let
owner = "openjdk";
repo = "jfx${major}u";
rev = repover;
sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw=";
sha256 = "sha256-WV8NHlYlt7buGbirLSorLnS2TnyBD17zUquFfwSL3xE=";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ];