nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-15 01:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #214285 from thiagokokada/bump-openjdk

Browse Source 
openjdk{8,11,17},openjfx{11,17,19}: bumps
This commit is contained in:
Thiago Kenji Okada 2023-02-03 21:00:20 +00:00 committed by GitHub
commit 0bfb9df52b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,8 @@
let
major = "11";
minor = "0";
update = "17";
build = "8";
update = "18";
build = "10";
openjdk = stdenv.mkDerivation rec {
pname = "openjdk" + lib.optionalString headless "-headless";
@ -22,7 +22,7 @@ let
owner = "openjdk";
repo = "jdk${major}u";
rev = "jdk-${version}";
sha256 = "sha256-kvgLYqQZPqyuigVyzbDHc3TMff0clvzM8IdzYLYcxPU=";
sha256 = "sha256-QGOpMIrWwOtIcUY/CLbTRDvcVTG2xioZu46v+n+IIQ4=";
};
nativeBuildInputs = [ pkg-config autoconf unzip ];

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

@ -11,8 +11,8 @@
let
version = {
feature = "17";
interim = ".0.5";
build = "8";
interim = ".0.6";
build = "10";
};
openjdk = stdenv.mkDerivation {
@ -23,7 +23,7 @@ let
owner = "openjdk";
repo = "jdk${version.feature}u";
rev = "jdk-${version.feature}${version.interim}+${version.build}";
sha256 = "sha256-2k1Mm36ds6MZheZVsLvXkoqQG4zYeIRWzbP1aZ72Vqs=";
sha256 = "sha256-zPpINi++3Ct0PCwlwlfhceh/ploMkclw+MgeI9dULdc=";
};
nativeBuildInputs = [ pkg-config autoconf unzip ];

10
pkgs/development/compilers/openjdk/19.nix
View File

@ -14,8 +14,8 @@
let
version = {
feature = "19";
interim = ".0.1";
build = "10";
interim = ".0.2";
build = "7";
};
openjdk = stdenv.mkDerivation {
@ -26,7 +26,7 @@ let
owner = "openjdk";
repo = "jdk${version.feature}u";
rev = "jdk-${version.feature}${version.interim}+${version.build}";
hash = "sha256-IS6ABnVdW1qJ4gu4YSgMVFXBTNdtWFdbNNz+kMaiyk8=";
hash = "sha256-pBEHmBtIgG4Czou4C/zpBBYZEDImvXiLoA5CjOzpeyI=";
};
nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];
@ -57,8 +57,8 @@ let
# Patch borrowed from Alpine to fix build errors with musl libc and recent gcc.
# This is applied anywhere to prevent patchrot.
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/testing/openjdk19/FixNullPtrCast.patch?id=b93d1fc37fcf106144958d957bb97c7db67bd41f";
hash = "sha256-cnpeYcVoRYjuDgrl2x27frv6KUAnu1+1MVPehPZy/Cg=";
url = "https://git.alpinelinux.org/aports/plain/testing/openjdk19/FixNullPtrCast.patch?id=93dc07f97ff716b647c5f57c6224901ea06da560";
hash = "sha256-H4X3Yip5bCpXMH7MSu9BgXIOYRVUBMZPZW8EvZSWI5k=";
})
] ++ lib.optionals (!headless && enableGnome2) [
./swing-use-gtk-jdk13.patch

4
pkgs/development/compilers/openjdk/8.nix
View File

@ -20,7 +20,7 @@ let
powerpc64le-linux = "ppc64le";
}.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}");
update = "352";
update = "362";
build = "ga";
openjdk8 = stdenv.mkDerivation rec {
@ -31,7 +31,7 @@ let
owner = "openjdk";
repo = "jdk8u";
rev = "jdk${version}";
sha256 = "sha256-xDiiALDjStD9IPhbBr997rm/v2Q/WdS10cILBCmdJIQ=";
sha256 = "sha256-C5dQwfIIpIrLeO3JWERyFCQHUSgG8gARuc3qXAeLkJ4=";
};
outputs = [ "out" "jre" ];

4
pkgs/development/compilers/openjdk/openjfx/11.nix
View File

@ -4,7 +4,7 @@
let
major = "11";
update = ".0.17";
update = ".0.18";
build = "1";
repover = "${major}${update}+${build}";
gradle_ = (gradle_7.override {
@ -28,7 +28,7 @@ let
owner = "openjdk";
repo = "jfx${major}u";
rev = repover;
sha256 = "sha256-uKb6k+tIFdwy1BYiHWeGmKNz82X4CZjFlGYqLDpSFY0=";
sha256 = "sha256-46DjIzcBHkmp5vnhYnLu78CG72bIBRM4A6mgk2OLOko=";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ];

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

@ -4,8 +4,8 @@
let
major = "17";
update = ".0.5";
build = "+1";
update = ".0.6";
build = "+3";
repover = "${major}${update}${build}";
gradle_ = (gradle_7.override {
java = openjdk17_headless;
@ -18,7 +18,7 @@ let
owner = "openjdk";
repo = "jfx${major}u";
rev = repover;
sha256 = "sha256-jzLOlWuhkUS0/4+nXtjd1/IYbAHHnJrusFRTh7aPt8U=";
sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw=";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ];

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

@ -4,8 +4,8 @@
let
major = "19";
update = "";
build = "+11";
update = ".0.2.1";
build = "+1";
repover = "${major}${update}${build}";
gradle_ = (gradle_7.override {
# note: gradle does not yet support running on 19
@ -19,7 +19,7 @@ let
owner = "openjdk";
repo = "jfx";
rev = repover;
hash = "sha256-UXTaXtJ8py83V7IQK9wACIEWDAMRUaYNgH9e/Aeyuzc=";
hash = "sha256-A08GhCGpzWlUG1+f6mcjvkJmMNaOReacQKPEmNpUvLs=";
};
patches = [