nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 10:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

JDK updates and removals (#344544)

Browse Source
This commit is contained in:
Thiago Kenji Okada
2024-09-27 14:55:59 +01:00
committed by GitHub
parent 6401f1172e d19c7e8b16
commit 371963edfc
26 changed files with 498 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/by-name/je/jextract/package.nix
View File

@@ -3,7 +3,7 @@
, fetchFromGitHub
, makeBinaryWrapper
, gradle
, jdk22
, jdk23
, llvmPackages
}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
gradleFlags = [
"-Pllvm_home=${llvmPackages.libclang.lib}"
"-Pjdk22_home=${jdk22}"
"-Pjdk22_home=${jdk23}"
];
doCheck = true;
@@ -46,8 +46,10 @@ stdenv.mkDerivation {
description = "Tool which mechanically generates Java bindings from a native library headers";
mainProgram = "jextract";
homepage = "https://github.com/openjdk/jextract";
platforms = jdk22.meta.platforms;
platforms = jdk23.meta.platforms;
license = licenses.gpl2Only;
maintainers = with maintainers; [ jlesquembre sharzy ];
# Not yet updated for JDK 23
broken = true;
};
}

8
pkgs/by-name/mo/moneydance/package.nix
View File

@@ -1,9 +1,7 @@
{ lib, stdenv, fetchzip, makeWrapper, openjdk22, openjfx22, jvmFlags ? [ ] }:
{ lib, stdenv, fetchzip, makeWrapper, openjdk23, jvmFlags ? [ ] }:
let
openjfx = openjfx22;
jdk = openjdk22.override {
jdk = openjdk23.override {
enableJavaFX = true;
inherit openjfx;
};
in
stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk openjfx ];
buildInputs = [ jdk ];
# Note the double escaping in the call to makeWrapper. The escapeShellArgs
# call quotes each element of the flags list as a word[1] and returns a

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

@@ -11,8 +11,8 @@
let
major = "11";
minor = "0";
update = "23";
build = "9";
update = "24";
build = "8";
# 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-6y6wge8ZuSKBpb5QNihvAlD4Pv/0d3AQCPOkxUm/sJk=";
hash = "sha256-H/VmT6NYbbZBba7Js8xk+epVZ2kLfvlwTNgg5SQ4ljA=";
};
nativeBuildInputs = [ pkg-config autoconf unzip ];

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

@@ -11,8 +11,8 @@
let
version = {
feature = "17";
interim = ".0.11";
build = "9";
interim = ".0.12";
build = "7";
};
# 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-aO4iSc9MklW/4q9U86WEfiiWnlq6iZSbxzq2fbsqd0A=";
hash = "sha256-9UB1H3gd+b4wWxOMgsdDPgX/IGWNORKk1gMsSjYoZMw=";
};
nativeBuildInputs = [ pkg-config autoconf unzip ];

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

@@ -14,8 +14,8 @@
let
version = {
feature = "21";
interim = ".0.3";
build = "9";
interim = ".0.4";
build = "7";
};
# when building a headless jdk, also bootstrap it with a headless jdk
@@ -29,7 +29,7 @@ let
owner = "openjdk";
repo = "jdk${version.feature}u";
rev = "jdk-${version.feature}${version.interim}+${version.build}";
hash = "sha256-zRN16lrc5gtDlTVIQJRRx103w/VbRkatCLeEc9AXWPE=";
hash = "sha256-+xpQtQ1IQ7btVWnENT9XS5A/2VP101/+XR3BMo8BqYI=";
};
nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ];

20
pkgs/development/compilers/openjdk/22.nix → pkgs/development/compilers/openjdk/23.nix
View File

@@ -30,7 +30,7 @@
, libXcursor
, libXrandr
, fontconfig
, openjdk22-bootstrap
, openjdk23-bootstrap
, ensureNewerSourcesForZipFilesHook
, setJavaClassPath
# TODO(@sternenseemann): gtk3 fails to evaluate in pkgsCross.ghcjs.buildPackages
@@ -51,13 +51,13 @@ let
# $FEATURE.$INTERIM.$UPDATE.$PATCH
# See
# https://openjdk.org/jeps/223
# https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/lang/Runtime.Version.html
featureVersion = "22";
# https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/Runtime.Version.html
featureVersion = "23";
info = builtins.getAttr featureVersion (lib.importJSON ./info.json);
version = info.version;
# when building a headless jdk, also bootstrap it with a headless jdk
openjdk-bootstrap = openjdk22-bootstrap.override { gtkSupport = !headless; };
openjdk-bootstrap = openjdk23-bootstrap.override { gtkSupport = !headless; };
in
stdenv.mkDerivation (finalAttrs: {
@@ -108,19 +108,9 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
./fix-java-home-jdk21.patch
./read-truststore-from-env-jdk10.patch
./currency-date-range-jdk10.patch
./increase-javadoc-heap-jdk13.patch
./ignore-LegalNoticeFilePlugin-jdk18.patch
# -Wformat etc. are stricter in newer gccs, per
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
# so grab the work-around from
# https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
(fetchurl {
url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
})
# Fix build for gnumake-4.4.1:
# https://github.com/openjdk/jdk/pull/12992
(fetchpatch {
@@ -274,7 +264,7 @@ stdenv.mkDerivation (finalAttrs: {
${finalAttrs.finalPackage}/bin/java \
-cp ${java-json} \
${./JavaUpdater.java} \
22 pkgs/development/compilers/openjdk/info.json
${featureVersion} pkgs/development/compilers/openjdk/info.json
'';
home = "${finalAttrs.finalPackage}/lib/openjdk";

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 = "412";
update = "422";
build = "ga";
# when building a headless jdk, also bootstrap it with a headless jdk
@@ -34,7 +34,7 @@ let
owner = "openjdk";
repo = "jdk8u";
rev = "jdk${version}";
sha256 = "sha256-o+H5n5p6JG1giJj9OADgMbQPaoKMzLMFquKH536SHhM=";
hash = "sha256-uMo1DIkji+FPTbFRwURXybkLE5xv+teSClWP9RfAvfo=";
};
outputs = [ "out" "jre" ];

40
pkgs/development/compilers/openjdk/bootstrap.nix
View File

@@ -1,40 +0,0 @@
{ stdenv
, runCommand, fetchurl, zlib
, version
}:
assert stdenv.hostPlatform.libc == "glibc";
let
fetchboot = version: arch: sha256: fetchurl {
name = "openjdk${version}-bootstrap-${arch}-linux.tar.xz";
url = "http://tarballs.nixos.org/openjdk/2018-03-31/${version}/${arch}-linux.tar.xz";
inherit sha256;
};
src = if stdenv.hostPlatform.system == "x86_64-linux" then
(if version == "10" then fetchboot "10" "x86_64" "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2"
else if version == "8" then fetchboot "8" "x86_64" "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks"
else throw "No bootstrap jdk for version ${version}")
else if stdenv.hostPlatform.system == "i686-linux" then
(if version == "10" then fetchboot "10" "i686" "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7"
else if version == "8" then fetchboot "8" "i686" "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9"
else throw "No bootstrap for version")
else throw "No bootstrap jdk for system ${stdenv.hostPlatform.system}";
bootstrap = runCommand "openjdk-bootstrap" {
passthru.home = "${bootstrap}/lib/openjdk";
} ''
tar xvf ${src}
mv openjdk-bootstrap $out
LIBDIRS="$(find $out -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':')"
find "$out" -type f -print0 | while IFS= read -r -d "" elf; do
isELF "$elf" || continue
patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true
patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${zlib}/lib:$LIBDIRS" "$elf" || true
done
'';
in bootstrap

13
pkgs/development/compilers/openjdk/info.json
View File

@@ -1,12 +1,7 @@
{
"22": {
"version": "22.0.2-ga",
"repo": "jdk22u",
"hash": "sha256-Zo1LOumkt9zTaPqbDcRL8lVJMqVle0QqzThtIz0JRNo="
},
"21": {
"version": "21.0.3-ga",
"repo": "jdk21u",
"hash": "sha256-zRN16lrc5gtDlTVIQJRRx103w/VbRkatCLeEc9AXWPE="
"23": {
"version": "23-ga",
"repo": "jdk23u",
"hash": "sha256-lcLnWAiskWindOqWmOWiIHiYKXGSJZK4d20k19QZfrE="
}
}

31
pkgs/development/compilers/openjdk/make-bootstrap.nix
View File

@@ -1,31 +0,0 @@
{ runCommand, openjdk, nukeReferences }:
runCommand "${openjdk.name}-bootstrap.tar.xz" {} ''
mkdir -pv openjdk-bootstrap/lib
# Do a deep copy of the openjdk
cp -vrL ${openjdk.home} openjdk-bootstrap/lib
# Includes are needed for building the native jvm
cp -vrL ${openjdk}/include openjdk-bootstrap
# The binaries are actually stored in the openjdk lib
ln -sv lib/openjdk/bin openjdk-bootstrap/bin
find . -name libjli.so
(cd openjdk-bootstrap/lib; find . -name libjli.so -exec ln -sfv {} libjli.so \;)
chmod -R +w openjdk-bootstrap
# Remove components we don't need
find openjdk-bootstrap -name \*.diz -exec rm {} \;
find openjdk-bootstrap -name \*.ttf -exec rm {} \;
find openjdk-bootstrap -name \*.gif -exec rm {} \;
find openjdk-bootstrap -name src.zip -exec rm {} \;
rm -rf openjdk-bootstrap/lib/openjdk/jre/bin
# Remove all of the references to the native nix store
find openjdk-bootstrap -print0 | xargs -0 ${nukeReferences}/bin/nuke-refs
# Create the output tarball
tar cv openjdk-bootstrap | xz > $out
''

18
pkgs/development/compilers/openjdk/openjfx/22/default.nix → pkgs/development/compilers/openjdk/openjfx/23/default.nix
View File

@@ -4,7 +4,7 @@
, fetchFromGitHub
, fetchpatch2
, writeText
, openjdk21_headless
, openjdk23_headless
, gradle
, pkg-config
, perl
@@ -25,11 +25,11 @@
let
pname = "openjfx-modular-sdk";
major = "22";
update = ".0.2";
major = "23";
update = "";
build = "-ga";
repover = "${major}${update}${build}";
jdk = openjdk21_headless;
jdk = openjdk23_headless;
in stdenv.mkDerivation {
inherit pname;
@@ -37,17 +37,17 @@ in stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "openjdk";
repo = "jfx22u";
repo = "jfx23u";
rev = repover;
hash = "sha256-7Q9nZ2p3KfQPt1A2ULwk64OU/5/ghEkcsf9ECD6Ln2g=";
hash = "sha256-a/ev91Rq7D3z9O56ZZQCgvvbfj5GBt5Lonow2NH3s/E=";
};
patches = [
# 8338701: Provide media support for libavcodec version 61
# <https://github.com/openjdk/jfx/pull/1552>
# <https://github.com/openjdk/jfx23u/pull/18>
(fetchpatch2 {
url = "https://github.com/openjdk/jfx/commit/6115b396bacf62f39dcaa93c7c0adcd60b428b8c.patch?full_index=1";
hash = "sha256-6EES4qsumFgXePZSDEetJC1Li65zquz3UjwRbq/6YJM=";
url = "https://github.com/openjdk/jfx23u/commit/aba60fda1c82f00e8e685107592305c403a31287.patch?full_index=1";
hash = "sha256-+aRhTwi4VQthAq1SH1jxPl0mTosNMKoTY52jm+jiKso=";
})
];

0
pkgs/development/compilers/openjdk/openjfx/22/deps.json → pkgs/development/compilers/openjdk/openjfx/23/deps.json generated
View File

2
pkgs/development/compilers/temurin-bin/generate-sources.py
View File

@@ -6,7 +6,7 @@ import re
import requests
import sys
feature_versions = (8, 11, 17, 21, 22)
feature_versions = (8, 11, 17, 21, 23)
oses = ("mac", "linux", "alpine-linux")
types = ("jre", "jdk")
impls = ("hotspot",)

4
pkgs/development/compilers/temurin-bin/jdk-darwin.nix
View File

@@ -19,6 +19,6 @@ in
jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; };
jre-21 = common { sourcePerArch = sources.jre.openjdk21; };
jdk-22 = common { sourcePerArch = sources.jdk.openjdk22; };
jre-22 = common { sourcePerArch = sources.jre.openjdk22; };
jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; };
jre-23 = common { sourcePerArch = sources.jre.openjdk23; };
}

4
pkgs/development/compilers/temurin-bin/jdk-linux.nix
View File

@@ -20,6 +20,6 @@ in
jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; };
jre-21 = common { sourcePerArch = sources.jre.openjdk21; };
jdk-22 = common { sourcePerArch = sources.jdk.openjdk22; };
jre-22 = common { sourcePerArch = sources.jre.openjdk22; };
jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; };
jre-23 = common { sourcePerArch = sources.jre.openjdk23; };
}

1030
pkgs/development/compilers/temurin-bin/sources.json
View File

File diff suppressed because it is too large Load Diff

32
pkgs/development/compilers/zulu/11.nix
View File

@@ -8,35 +8,35 @@ callPackage ./common.nix ({
# Note that the latest build may differ by platform
dists = {
x86_64-linux = {
zuluVersion = "11.70.15";
jdkVersion = "11.0.22";
zuluVersion = "11.74.15";
jdkVersion = "11.0.24";
hash =
if enableJavaFX then "sha256-FxTHgng7/oDY3n3qy8j1ztbpBQeoGcEBJbEXqaE4Zr4="
else "sha256-V41ZRrJtkle3joKhwoID5bvWkN5I4gFjmbEnTD7no8U=";
if enableJavaFX then "sha256-eP2BCD77uRmukd48+pDlIlhos9RjL9VYx8tpQdq2uNo="
else "sha256-p6rA5pqZv2Sho+yW8IFJrAaaW72q766SLuOnRl/ZGLM=";
};
aarch64-linux = {
zuluVersion = "11.70.15";
jdkVersion = "11.0.22";
zuluVersion = "11.74.15";
jdkVersion = "11.0.24";
hash =
if enableJavaFX then throw "JavaFX is not available for aarch64-linux"
else "sha256-u6XWMXAArUhMMb6j3KFOhkIxpVYR1oYLF0Wde7/tI0k=";
if enableJavaFX then "sha256-nAUjPk9gktO0UJk7gAKygq+ztSJY5wk+EoG1LgJidJ8="
else "sha256-T0c+YwfEZcA3iJmBriyzxBM2SECcczG25XVApIlgM+E=";
};
x86_64-darwin = {
zuluVersion = "11.70.15";
jdkVersion = "11.0.22";
zuluVersion = "11.74.15";
jdkVersion = "11.0.24";
hash =
if enableJavaFX then "sha256-JkJZwk+D28wHWqwUoLo7WW5ypwTrT5biSoP+70YI3eQ="
else "sha256-ca/ttkPe2tbcm1ruguDgPsxKWbEdKcICsKCDXaup9N4=";
if enableJavaFX then "sha256-hanQw2FWbqsmGR1WixbM0BNWGeXmS2vt9tbaaEY7D1c="
else "sha256-CH6pVui0PInHMt+AJOE0T2hrAmEcLFRJvmR4KZuanaw=";
};
aarch64-darwin = {
zuluVersion = "11.70.15";
jdkVersion = "11.0.22";
zuluVersion = "11.74.15";
jdkVersion = "11.0.24";
hash =
if enableJavaFX then "sha256-bAgH4lCxPvvFOeif5gI2aoLt1aC4EXPzb2YmiS9bQsU="
else "sha256-PWQOF+P9djZarjAJaE3I0tuI1E4H/9584VN04BMzmvM=";
if enableJavaFX then "sha256-WbzpfPgoT3CTazKBnI1Fg+q+YQP6MwCWkon6VOeLZsA="
else "sha256-+KxFgHbBDxN1O3NCAzqqBztxXveYAjrPFVuoFL/2dRQ=";
};
};
} // builtins.removeAttrs args [ "callPackage" ])

32
pkgs/development/compilers/zulu/17.nix
View File

@@ -8,35 +8,35 @@ callPackage ./common.nix ({
# Note that the latest build may differ by platform
dists = {
x86_64-linux = {
zuluVersion = "17.48.15";
jdkVersion = "17.0.10";
zuluVersion = "17.52.17";
jdkVersion = "17.0.12";
hash =
if enableJavaFX then "sha256-YvuD/n84+DARPm+38TxIUB727SIhASFo+WX9+PtJqyw="
else "sha256-VyhNob2G1Tq/WCKT0g0Y//f+JD2hWgj6QU9idfvUj+I=";
if enableJavaFX then "sha256-qKpkvk7/IEnlOJoy7An0AVGUXWkWeuuiQzqKKE/+Ec4="
else "sha256-JCRcjQzkkV2G5wsoi13psbTHjxCtuw5rqT4pEAOarRk=";
};
aarch64-linux = {
zuluVersion = "17.48.15";
jdkVersion = "17.0.10";
zuluVersion = "17.52.17";
jdkVersion = "17.0.12";
hash =
if enableJavaFX then throw "JavaFX is not available for aarch64-linux"
else "sha256-9OZl8ruaLvjdpg42fC3IM5mC/9lmshCppNfUuz/Sf8E=";
if enableJavaFX then "sha256-mpTM/43oyDsOnoZM8AW1Z7EFTznnPAnYoC+T6csc8Fw="
else "sha256-uIz2D5WjqySy5lobuvWp3kFTGsBKhXzT56QgCGyXwSY=";
};
x86_64-darwin = {
zuluVersion = "17.48.15";
jdkVersion = "17.0.10";
zuluVersion = "17.52.17";
jdkVersion = "17.0.12";
hash =
if enableJavaFX then "sha256-VOIcFtjQiYsA4AiP1TCa0Q76Ew5FdeJCICwsYGU+Dnw="
else "sha256-huSKGvOnrEUAiE2MJbdHWtF2saeLGaQkZllXzDo8o+g=";
if enableJavaFX then "sha256-jb1oPmRzlYUMONovdsHowlC44X3/PFZ8KilxSsR924U="
else "sha256-8VlGFUhCn3NE2A42xi69KzZqu0RoGOV1ZYj8oaqCnTc=";
};
aarch64-darwin = {
zuluVersion = "17.48.15";
jdkVersion = "17.0.10";
zuluVersion = "17.52.17";
jdkVersion = "17.0.12";
hash =
if enableJavaFX then "sha256-fxBDhHMeL5IP4eRw9ykXrRRh7Nl9DnvDB1YLaQwFHLg="
else "sha256-kuEiHSkb4WFtPB3m0A968LPZw7Wl0sKquhbzDF8vQS8=";
if enableJavaFX then "sha256-rEILTKTpX8DEoOGhlrhbxpcCyF2+QrjW92h0ox9ezp0="
else "sha256-RZ3hNQQFE+spTT9lFHLjmkolSkpHDg2Hvro6xi7uNww=";
};
};
} // builtins.removeAttrs args [ "callPackage" ])

32
pkgs/development/compilers/zulu/21.nix
View File

@@ -8,35 +8,35 @@ callPackage ./common.nix ({
# Note that the latest build may differ by platform
dists = {
x86_64-linux = {
zuluVersion = "21.32.17";
jdkVersion = "21.0.2";
zuluVersion = "21.36.17";
jdkVersion = "21.0.4";
hash =
if enableJavaFX then "sha256-CEM2lMjyZLWS1tBcS1tBTUxBwAyzW3vrpRWFVVSFVGY="
else "sha256-Wtcw++5rtJv/8QvznoQ5LnKNiRA9NHSn5d7w/RNLMAo=";
if enableJavaFX then "sha256-Q2bdM0/a2t5aBRCIzXBlhXamf8N7wdSUsK5VhaU9DcY="
else "sha256-MY0MLtPIdvt+oslSlFzc997PtSZMpRrs4VnmNaxT1UQ=";
};
aarch64-linux = {
zuluVersion = "21.32.17";
jdkVersion = "21.0.2";
zuluVersion = "21.36.17";
jdkVersion = "21.0.4";
hash =
if enableJavaFX then throw "JavaFX is not available for aarch64-linux"
else "sha256-zn3xr11EqfRVYXxLiJFEP74+Syacd32Lgu1m93Fnz+A=";
if enableJavaFX then "sha256-BzNEcDrQo5yOWnEsJxw9JfXYdZGN6/wxnTDB0qC1i/0="
else "sha256-2jwtfbM2cLz2ZTJEGut/M9zw0ifI2v5841zuZ/aCnEw=";
};
x86_64-darwin = {
zuluVersion = "21.32.17";
jdkVersion = "21.0.2";
zuluVersion = "21.36.17";
jdkVersion = "21.0.4";
hash =
if enableJavaFX then "sha256-CbEKa9Z/ItFqVM4BqsWXyRf5ejQZXPK8OqkULr9Cpqk="
else "sha256-Otj+KI61fZdcJ4auRToDaqRuR6sqw9gVOOuuKlTTwCU=";
if enableJavaFX then "sha256-H3gM2XCCcuUxlAEzX6IO7Cp6NtH85PYHlH54k5XvNAc="
else "sha256-XOdaaiR8cCm3TEynz29g/SstaM4eiVb7RI0phDFrX+o=";
};
aarch64-darwin = {
zuluVersion = "21.32.17";
jdkVersion = "21.0.2";
zuluVersion = "21.36.17";
jdkVersion = "21.0.4";
hash =
if enableJavaFX then "sha256-PK+cafgQsnK6acuQxun4IUiyYHQJsBfUawwfGV8OCfQ="
else "sha256-6CYFFt6LYGYUIqcl8d8sNu+Ij2+zU5NWawDnMl2z0E4=";
if enableJavaFX then "sha256-lLAb8MABo95A5WcayBLNvsBSdVFptnO4EmhX2gjo6r8="
else "sha256-vCdQ+BoWbMbpwwroqrpU8lOoyOydjPwEpVX+IHEse/8=";
};
};
} // builtins.removeAttrs args [ "callPackage" ])

42
pkgs/development/compilers/zulu/22.nix
View File

@@ -1,42 +0,0 @@
{ callPackage
, enableJavaFX ? false
, ...
}@args:
callPackage ./common.nix ({
# Details from https://www.azul.com/downloads/?version=java-22-lts&package=jdk
# Note that the latest build may differ by platform
dists = {
x86_64-linux = {
zuluVersion = "22.28.91";
jdkVersion = "22.0.0";
hash =
if enableJavaFX then "sha256-+qUrZ+GlspSP3RLTAbgEtFm0B0fzX/VD1WUl6mk2c/0="
else "sha256-HvMiODsz+puu1xtxG2RRXH/PWCk91PGNZ7UcOd9orqQ=";
};
aarch64-linux = {
zuluVersion = "22.28.91";
jdkVersion = "22.0.0";
hash =
if enableJavaFX then throw "JavaFX is not available for aarch64-linux"
else "sha256-3RLNNEbMk5wAZsQmbQj/jpx9iTL/yr9N3wL4t7m6c+s=";
};
x86_64-darwin = {
zuluVersion = "22.28.91";
jdkVersion = "22.0.0";
hash =
if enableJavaFX then "sha256-QkFwbc2YFEWb5rddhH4a+zmtsrXxUBSuS8yg9qUb728="
else "sha256-Y6PSNQjHRXukwux2sVbvpTIqT+Cg+KeG1C0iSEwyKZw=";
};
aarch64-darwin = {
zuluVersion = "22.28.91";
jdkVersion = "22.0.0";
hash =
if enableJavaFX then "sha256-256UP6MtUReQYqCKVt0ThN9BVDyKLAMXQTdpcDB9t24="
else "sha256-o0VkWB4+PzBmNNWy+FZlyjTgukBTe6owfydb3YNfEE0=";
};
};
} // builtins.removeAttrs args [ "callPackage" ])

42
pkgs/development/compilers/zulu/23.nix Normal file
View File

@@ -0,0 +1,42 @@
{ callPackage
, enableJavaFX ? false
, ...
}@args:
callPackage ./common.nix ({
# Details from https://www.azul.com/downloads/?version=java-23-lts&package=jdk
# Note that the latest build may differ by platform
dists = {
x86_64-linux = {
zuluVersion = "23.28.85";
jdkVersion = "23.0.0";
hash =
if enableJavaFX then "sha256-HEQ0lxHsoyHG+ZWIlWsbkqMf/rauARafzWoiElRwekA="
else "sha256-a1YPqBMaWkoruNFoSckLyx00LCOZNsowlSn2L3XCDJA=";
};
aarch64-linux = {
zuluVersion = "23.28.85";
jdkVersion = "23.0.0";
hash =
if enableJavaFX then throw "JavaFX is not available for aarch64-linux"
else "sha256-/i+ch7BMAwMQ1C4e3shp9BHuQ67vVXfmIK1YKs7L24M=";
};
x86_64-darwin = {
zuluVersion = "23.28.85";
jdkVersion = "23.0.0";
hash =
if enableJavaFX then "sha256-1/YmLWA/men8jMjnhkZVMf2irf6Tc/5x7UECxqKJcL4="
else "sha256-rEr8M3KF9Z95gV8sHqi5lQD2RJjtssZx8Q8goy6danw=";
};
aarch64-darwin = {
zuluVersion = "23.28.85";
jdkVersion = "23.0.0";
hash =
if enableJavaFX then "sha256-TumPJoHmvklMlcpF4PFY/Arcdc5fkX5z0xeIuNFxluQ="
else "sha256-gFvfJL0RQgIOATLTMdfa+fStUCrdHYC3rxy0j5eNVDc=";
};
};
} // builtins.removeAttrs args [ "callPackage" ])

32
pkgs/development/compilers/zulu/8.nix
View File

@@ -8,35 +8,35 @@ callPackage ./common.nix ({
# Note that the latest build may differ by platform
dists = {
x86_64-linux = {
zuluVersion = "8.76.0.17";
jdkVersion = "8.0.402";
zuluVersion = "8.80.0.17";
jdkVersion = "8.0.422";
hash =
if enableJavaFX then "sha256-29aDAu8WVYQFSpMUFq4gG64BBz/ei/VDMg72xrpB9w4="
else "sha256-34DI6O7T8iqDHsX63S3xk+BKDu8IHRRWNvtxpsnUJEk=";
if enableJavaFX then "sha256-Ls2sHCtP9htBIDwq5fNDRA3/bGN0bzaMp6nNkjU1zx8="
else "sha256-YNxnNOFvTc0S3jt4F3UREi2196W7wSBmwieNJl7qamo=";
};
aarch64-linux = {
zuluVersion = "8.74.0.17";
jdkVersion = "8.0.392";
zuluVersion = "8.80.0.17";
jdkVersion = "8.0.422";
hash =
if enableJavaFX then throw "JavaFX is not available for aarch64-linux"
else "sha256-xESdKEmfkiE657X/xclwsJR5M+P72BpWErtAcYMcK0Y=";
if enableJavaFX then "sha256-aVBleFrj4OpUJh82rM8XQGy9SzGqjaeOBo20nAbtpJo="
else "sha256-C5ebWtKAyKexOuEf4yM1y5tQZ2ICxREObwvMrcz5TXE=";
};
x86_64-darwin = {
zuluVersion = "8.76.0.17";
jdkVersion = "8.0.402";
zuluVersion = "8.80.0.17";
jdkVersion = "8.0.422";
hash =
if enableJavaFX then "sha256-oqFpKeWwfiXr3oX78LGvAyDGAAS2GON2gAm6fHGH7Ow="
else "sha256-edZqDEsydQCDEwC1ZCDF/MjWVTnuQNWcKR2k/RjaIEI=";
if enableJavaFX then "sha256-7NB0OH194nZdpIGyX8gLxJzjJdi2UIxmGsGI5M0yqJ4="
else "sha256-vyB1Fepnpwsi9KjwFjEF+YbiCgmqZcirZu0zmRAp8PA=";
};
aarch64-darwin = {
zuluVersion = "8.76.0.17";
jdkVersion = "8.0.402";
zuluVersion = "8.80.0.17";
jdkVersion = "8.0.422";
hash =
if enableJavaFX then "sha256-UCWRXCz4v381IWzWPDYzwJwbhsmZOYxKPLGJBQGjPmc="
else "sha256-0VPlOuNB39gDnU+pK0DGTSUjTHTtYoxaRg3YD2LyLXg=";
if enableJavaFX then "sha256-JuQkY923tizx5HQo4WC3YCk75a4qHJYNRFKpZ8XES58="
else "sha256-Q/hU2ICVwmJehrXmACm4/X48ULTqM6WSc55JDVgkBvM=";
};
};
} // builtins.removeAttrs args [ "callPackage" ])

2
pkgs/tools/security/cryptomator/default.nix
View File

@@ -96,5 +96,7 @@ maven.buildMavenPackage rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ bachp ];
platforms = [ "x86_64-linux" ];
# Uses abandoned JEP 430 string template preview, removed in JDK 23
broken = true;
};
}

7
pkgs/top-level/aliases.nix
View File

@@ -1169,8 +1169,13 @@ mapAliases {
openjdk20_headless = openjdk20; # Added 2024-08-01
jdk20 = openjdk20; # Added 2024-08-01
jdk20_headless = openjdk20; # Added 2024-08-01
openjdk22 = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
openjdk22_headless = openjdk22; # Added 2024-09-24
jdk22 = openjdk22; # Added 2024-09-24
jdk22_headless = openjdk22; # Added 2024-09-24
openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01
openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01
openjfx22 = throw "OpenJFX 22 was removed as it has reached its end of life"; # Added 2024-09-24
openjpeg_2 = openjpeg; # Added 2021-01-25
openlens = throw "Lens Closed its source code, package obsolete/stale - consider lens as replacement"; # Added 2024-09-04
openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29
@@ -1546,6 +1551,8 @@ mapAliases {
temurin-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01
temurin-jre-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01
temurin-bin-16 = throw "Temurin 16 has been removed as it has reached its end of life"; # Added 2024-08-01
temurin-jre-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24
temurin-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24
tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08
tepl = libgedit-tepl; # Added 2024-04-29
testVersion = testers.testVersion; # Added 2022-04-20

26
pkgs/top-level/all-packages.nix
View File

@@ -14375,8 +14375,8 @@ with pkgs;
### DEVELOPMENT / COMPILERS
temurin-bin-22 = javaPackages.compiler.temurin-bin.jdk-22;
temurin-jre-bin-22 = javaPackages.compiler.temurin-bin.jre-22;
temurin-bin-23 = javaPackages.compiler.temurin-bin.jdk-23;
temurin-jre-bin-23 = javaPackages.compiler.temurin-bin.jre-23;
temurin-bin-21 = javaPackages.compiler.temurin-bin.jdk-21;
temurin-jre-bin-21 = javaPackages.compiler.temurin-bin.jre-21;
@@ -14386,11 +14386,12 @@ with pkgs;
temurin-bin-11 = javaPackages.compiler.temurin-bin.jdk-11;
temurin-jre-bin-11 = javaPackages.compiler.temurin-bin.jre-11;
temurin-bin-8 = javaPackages.compiler.temurin-bin.jdk-8;
temurin-jre-bin-8 = javaPackages.compiler.temurin-bin.jre-8;
temurin-bin = temurin-bin-22;
temurin-jre-bin = temurin-jre-bin-22;
temurin-bin = temurin-bin-21;
temurin-jre-bin = temurin-jre-bin-21;
semeru-bin-21 = javaPackages.compiler.semeru-bin.jdk-21;
semeru-jre-bin-21 = javaPackages.compiler.semeru-bin.jre-21;
@@ -15184,7 +15185,7 @@ with pkgs;
hugs = callPackage ../development/interpreters/hugs { };
inherit (javaPackages) openjfx11 openjfx17 openjfx21 openjfx22;
inherit (javaPackages) openjfx11 openjfx17 openjfx21 openjfx23;
openjfx = openjfx17;
openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
@@ -15212,10 +15213,10 @@ with pkgs;
jdk21 = openjdk21;
jdk21_headless = openjdk21_headless;
openjdk22 = javaPackages.compiler.openjdk22;
openjdk22_headless = javaPackages.compiler.openjdk22.headless;
jdk22 = openjdk22;
jdk22_headless = openjdk22_headless;
openjdk23 = javaPackages.compiler.openjdk23;
openjdk23_headless = javaPackages.compiler.openjdk23.headless;
jdk23 = openjdk23;
jdk23_headless = openjdk23_headless;
/* default JDK */
jdk = jdk21;
@@ -16120,6 +16121,7 @@ with pkgs;
zulu11 = callPackage ../development/compilers/zulu/11.nix { };
zulu17 = callPackage ../development/compilers/zulu/17.nix { };
zulu21 = callPackage ../development/compilers/zulu/21.nix { };
zulu23 = callPackage ../development/compilers/zulu/23.nix { };
zulu = zulu21;
### DEVELOPMENT / INTERPRETERS
@@ -25727,7 +25729,7 @@ with pkgs;
criu = callPackage ../os-specific/linux/criu { };
cryptomator = callPackage ../tools/security/cryptomator {
jdk = jdk22.override { enableJavaFX = true; };
jdk = jdk23.override { enableJavaFX = true; };
};
cryptsetup = callPackage ../os-specific/linux/cryptsetup { };
@@ -30547,9 +30549,9 @@ with pkgs;
};
jabref = callPackage ../applications/office/jabref {
jdk = jdk.override {
jdk = jdk21.override {
enableJavaFX = true;
openjfx = openjfx22.override { withWebKit = true; };
openjfx = openjfx23.override { withWebKit = true; };
};
};

14
pkgs/top-level/java-packages.nix
View File

@@ -6,10 +6,10 @@ let
openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11 { };
openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17 { };
openjfx21 = callPackage ../development/compilers/openjdk/openjfx/21 { };
openjfx22 = callPackage ../development/compilers/openjdk/openjfx/22 { };
openjfx23 = callPackage ../development/compilers/openjdk/openjfx/23 { };
in {
inherit openjfx11 openjfx17 openjfx21 openjfx22;
inherit openjfx11 openjfx17 openjfx21 openjfx23;
compiler = let
mkOpenjdk = path-linux: path-darwin: args:
@@ -62,12 +62,12 @@ in {
openjfx = openjfx21;
};
openjdk22 = mkOpenjdk
../development/compilers/openjdk/22.nix
../development/compilers/zulu/22.nix
openjdk23 = mkOpenjdk
../development/compilers/openjdk/23.nix
../development/compilers/zulu/23.nix
{
openjdk22-bootstrap = temurin-bin.jdk-22;
openjfx = openjfx22;
openjdk23-bootstrap = temurin-bin.jdk-23;
openjfx = openjfx23;
};
temurin-bin = recurseIntoAttrs (callPackage (