From cd2ccdd6aa3789f3ed0a3298a117f1254850378b Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Wed, 9 Apr 2025 12:39:06 +0200 Subject: [PATCH 1/4] zulu24: init at 24.0.0 --- pkgs/development/compilers/zulu/24.nix | 58 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/compilers/zulu/24.nix diff --git a/pkgs/development/compilers/zulu/24.nix b/pkgs/development/compilers/zulu/24.nix new file mode 100644 index 000000000000..28e876e4ca0b --- /dev/null +++ b/pkgs/development/compilers/zulu/24.nix @@ -0,0 +1,58 @@ +{ + callPackage, + enableJavaFX ? false, + ... +}@args: + +let + # For 24 JDK FX is newer than regular JDK? + zuluVersion = if enableJavaFX then "24.28.85" else "24.28.83"; +in +callPackage ./common.nix ( + { + # Details from https://www.azul.com/downloads/?version=java-24&package=jdk + # Note that the latest build may differ by platform + dists = { + x86_64-linux = { + inherit zuluVersion; + jdkVersion = "24.0.0"; + hash = + if enableJavaFX then + "sha256-y8jiE5yECh96pHYZFM0Q/JTiVcm5a0PONYJDLYydCT0=" + else + "sha256-Kf6gF8A8ZFIhujEgjlENeuSPVzW6QWnVZcRst35/ZvI="; + }; + + aarch64-linux = { + inherit zuluVersion; + jdkVersion = "24.0.0"; + hash = + if enableJavaFX then + "sha256-H6YD8uhk9rTpd+3/S1+7QVzpCi6jykWKyu7RPxMx/sI=" + else + "sha256-6J7szd/ax9xCMNA9efw9Bhgv/VwQFXz5glWIoj+UYIc="; + }; + + x86_64-darwin = { + inherit zuluVersion; + jdkVersion = "24.0.0"; + hash = + if enableJavaFX then + "sha256-lMdbPkUdXyNcye8uMxGIhZTErrTI0P0SnqMS+8+Rjqg=" + else + "sha256-e7KJtJ9+mFFSdKCj68thfTXguWH5zXaSSb9phzXf/lQ="; + }; + + aarch64-darwin = { + inherit zuluVersion; + jdkVersion = "24.0.0"; + hash = + if enableJavaFX then + "sha256-oR2x0vphBGgh3KkEkLAcmtIMNONny9/b32z9jLR98X0=" + else + "sha256-7yXLOJCK0RZ8V1vsexOGxGR9NAwi/pCl95BlO8E8nGU="; + }; + }; + } + // builtins.removeAttrs args [ "callPackage" ] +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d35d3f0b7e8..f1fc48cfecc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6597,6 +6597,7 @@ with pkgs; zulu17 = callPackage ../development/compilers/zulu/17.nix { }; zulu21 = callPackage ../development/compilers/zulu/21.nix { }; zulu23 = callPackage ../development/compilers/zulu/23.nix { }; + zulu24 = callPackage ../development/compilers/zulu/24.nix { }; zulu = zulu21; ### DEVELOPMENT / INTERPRETERS From 71dd692741a1c8d6c7d3a1da83c6c7d2be73c459 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 1 May 2025 11:24:20 +0200 Subject: [PATCH 2/4] openjdk24: init at 24+36 --- .../24/patches/fix-java-home-jdk24.patch | 13 ++++++++ .../read-truststore-from-env-jdk24.patch | 30 +++++++++++++++++++ .../compilers/openjdk/24/source.json | 6 ++++ .../development/compilers/openjdk/generic.nix | 28 +++++++++++++---- pkgs/top-level/all-packages.nix | 5 ++++ pkgs/top-level/java-packages.nix | 1 + 6 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/compilers/openjdk/24/patches/fix-java-home-jdk24.patch create mode 100644 pkgs/development/compilers/openjdk/24/patches/read-truststore-from-env-jdk24.patch create mode 100644 pkgs/development/compilers/openjdk/24/source.json diff --git a/pkgs/development/compilers/openjdk/24/patches/fix-java-home-jdk24.patch b/pkgs/development/compilers/openjdk/24/patches/fix-java-home-jdk24.patch new file mode 100644 index 000000000000..8196ffba753c --- /dev/null +++ b/pkgs/development/compilers/openjdk/24/patches/fix-java-home-jdk24.patch @@ -0,0 +1,13 @@ +--- a/src/hotspot/os/linux/os_linux.cpp 2025-04-08 14:43:06.765198522 +0200 ++++ b/src/hotspot/os/linux/os_linux.cpp 2025-04-08 14:43:27.890301990 +0200 +@@ -2758,9 +2758,7 @@ + assert(ret, "cannot locate libjvm"); + char *rp = nullptr; + if (ret && dli_fname[0] != '\0') { +- rp = os::realpath(dli_fname, buf, buflen); +- } +- if (rp == nullptr) { ++ snprintf(buf, buflen, "%s", dli_fname); + return; + } + diff --git a/pkgs/development/compilers/openjdk/24/patches/read-truststore-from-env-jdk24.patch b/pkgs/development/compilers/openjdk/24/patches/read-truststore-from-env-jdk24.patch new file mode 100644 index 000000000000..7ca74359c529 --- /dev/null +++ b/pkgs/development/compilers/openjdk/24/patches/read-truststore-from-env-jdk24.patch @@ -0,0 +1,30 @@ +--- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400 ++++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-07-05 20:45:57.491295030 -0400 +@@ -71,6 +71,7 @@ + * + * The preference of the default trusted KeyStore is: + * javax.net.ssl.trustStore ++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE + * jssecacerts + * cacerts + */ +@@ -125,7 +126,8 @@ + static TrustStoreDescriptor run() { + // Get the system properties for trust store. + String storePropName = System.getProperty( +- "javax.net.ssl.trustStore", jsseDefaultStore); ++ "javax.net.ssl.trustStore", ++ System.getenv("JAVAX_NET_SSL_TRUSTSTORE")); + String storePropType = System.getProperty( + "javax.net.ssl.trustStoreType", + KeyStore.getDefaultType()); +@@ -137,6 +139,9 @@ + String temporaryName = ""; + File temporaryFile = null; + long temporaryTime = 0L; ++ if (storePropName == null) { ++ storePropName = jsseDefaultStore; ++ } + if (!"NONE".equals(storePropName)) { + String[] fileNames = + new String[] {storePropName, defaultStore}; diff --git a/pkgs/development/compilers/openjdk/24/source.json b/pkgs/development/compilers/openjdk/24/source.json new file mode 100644 index 000000000000..7bc62f8b38bf --- /dev/null +++ b/pkgs/development/compilers/openjdk/24/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-ogWq6oLyZzzvxGTqEEoPMXdtfbobUyXcC5bXXxBxfuo=", + "owner": "openjdk", + "repo": "jdk24u", + "rev": "refs/tags/jdk-24+36" +} diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index 21395f979b6d..a7e8791bc408 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -13,6 +13,7 @@ lndir, unzip, ensureNewerSourcesForZipFilesHook, + pandoc, cpio, file, @@ -76,6 +77,7 @@ temurin-bin-17, temurin-bin-21, temurin-bin-23, + temurin-bin-24, jdk-bootstrap ? { "8" = temurin-bin-8.__spliced.buildBuild or temurin-bin-8; @@ -83,6 +85,7 @@ "17" = temurin-bin-17.__spliced.buildBuild or temurin-bin-17; "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21; "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23; + "24" = temurin-bin-24.__spliced.buildBuild or temurin-bin-24; } .${featureVersion}, }: @@ -98,6 +101,7 @@ let atLeast17 = lib.versionAtLeast featureVersion "17"; atLeast21 = lib.versionAtLeast featureVersion "21"; atLeast23 = lib.versionAtLeast featureVersion "23"; + atLeast24 = lib.versionAtLeast featureVersion "24"; tagPrefix = if atLeast11 then "jdk-" else "jdk"; version = lib.removePrefix "refs/tags/${tagPrefix}" source.src.rev; @@ -143,7 +147,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ( - if atLeast21 then + if atLeast24 then + ./24/patches/fix-java-home-jdk24.patch + else if atLeast21 then ./21/patches/fix-java-home-jdk21.patch else if atLeast11 then ./11/patches/fix-java-home-jdk10.patch @@ -151,7 +157,9 @@ stdenv.mkDerivation (finalAttrs: { ./8/patches/fix-java-home-jdk8.patch ) ( - if atLeast11 then + if atLeast24 then + ./24/patches/read-truststore-from-env-jdk24.patch + else if atLeast11 then ./11/patches/read-truststore-from-env-jdk10.patch else ./8/patches/read-truststore-from-env-jdk8.patch @@ -254,6 +262,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals atLeast21 [ ensureNewerSourcesForZipFilesHook + ] + ++ lib.optionals atLeast24 [ + pandoc ]; buildInputs = @@ -475,10 +486,15 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = atLeast23; - ${if atLeast17 then "postPatch" else null} = '' - chmod +x configure - patchShebangs --build configure - ''; + ${if atLeast17 then "postPatch" else null} = + '' + chmod +x configure + patchShebangs --build configure + '' + + lib.optionalString atLeast24 '' + chmod +x make/scripts/*.{template,sh,pl} + patchShebangs --build make/scripts + ''; ${if !atLeast17 then "preConfigure" else null} = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1fc48cfecc9..442faa5fe99d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6061,6 +6061,11 @@ with pkgs; jdk23 = openjdk23; jdk23_headless = openjdk23_headless; + openjdk24 = javaPackages.compiler.openjdk24; + openjdk24_headless = javaPackages.compiler.openjdk24.headless; + jdk24 = openjdk24; + jdk24_headless = openjdk24_headless; + # default JDK jdk = jdk21; jdk_headless = jdk21_headless; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index a08cb4a55c7a..770a29df445e 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -49,6 +49,7 @@ with pkgs; openjdk17 = mkOpenjdk "17"; openjdk21 = mkOpenjdk "21"; openjdk23 = mkOpenjdk "23"; + openjdk24 = mkOpenjdk "24"; # Legacy aliases openjdk8-bootstrap = temurin-bin.jdk-8; From 62ae237a56f8f4fb98d81ec366e199a1c876ac83 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Wed, 9 Apr 2025 19:42:39 +0200 Subject: [PATCH 3/4] openjfx24: init at 24+29 --- pkgs/by-name/op/openjfx/24/deps.json | 158 ++++++++++++++++++ pkgs/by-name/op/openjfx/24/source.json | 6 + pkgs/by-name/op/openjfx/package.nix | 2 + .../development/compilers/openjdk/generic.nix | 2 + pkgs/top-level/all-packages.nix | 1 + 5 files changed, 169 insertions(+) create mode 100644 pkgs/by-name/op/openjfx/24/deps.json create mode 100644 pkgs/by-name/op/openjfx/24/source.json diff --git a/pkgs/by-name/op/openjfx/24/deps.json b/pkgs/by-name/op/openjfx/24/deps.json new file mode 100644 index 000000000000..f70206d4a9f7 --- /dev/null +++ b/pkgs/by-name/op/openjfx/24/deps.json @@ -0,0 +1,158 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355": { + "jar": "sha256-Q048o4oWnZ9Y33AxXiSxbxEeayfbWOf1HoxtoLS4SIs=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-74-2/icu4c-74_2-data-bin-l": { + "zip": "sha256-Ks2xuYIigECWPRg7LdnTISUsYT4PTbIT1LvBBBfN5Wk=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.11.3": { + "module": "sha256-S/D1PO6nx5D9+9JNujyeBM3FGGQnnuv8V6qkc+vKA4A=", + "pom": "sha256-8T3y5Mrx/rzlZ2Z+fDeBAaAzHVPRMk1uLf467Psfd3Q=" + }, + "org/junit/jupiter#junit-jupiter-api/5.11.3": { + "jar": "sha256-XYFHpg9JRTlz4lDtaHAbf/BVlk/iRi/Cyx7B1tRIibo=", + "module": "sha256-zC4yvwDuZDSpoZ3P2fJ6z2ZaPdYy03fkdhgNies+8n0=", + "pom": "sha256-8Zr+CSOwGTXEDy5+ltZgN+IAi3AXkXzHBRM4N3hJYY4=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.11.3": { + "jar": "sha256-5iQgyZ98DVmiFZou9j5hh36cgL1yLAPKi/O9zqBQpYk=", + "module": "sha256-s3w9vEFSbrpeVMz/ROxUf0hVYstDyj0J2p+n2hmjBl4=", + "pom": "sha256-eJ43jTfEndhlTWbjrTreQY5YhK5vSHI5Ad0758nsngM=" + }, + "org/junit/jupiter#junit-jupiter-params/5.11.3": { + "jar": "sha256-D3mOvsdExOZgX9TyBy9BqOmJ4tRp4h21qmfPeZwLUew=", + "module": "sha256-sLUYC9HX9NFhsKCF+7JP2hbNcKfQX2Ni4asuSS0cq+w=", + "pom": "sha256-zOw0JKBxSUTGd7lP1QP9DByiQ84VxAFg1gzmKKr6Nf8=" + }, + "org/junit/jupiter#junit-jupiter/5.11.3": { + "jar": "sha256-rHV47+0WI2fD3cAGM44H1FcVEP2YZmQuqT1bnk7S9mU=", + "module": "sha256-a5pr3dlKOPEmUmh67HyBJisZkf6+vEjKmP6rxWOhKwE=", + "pom": "sha256-y+nzhaChO2/tjGxu0fFtxgWpJlfzslsZaDjHPZdoSAY=" + }, + "org/junit/platform#junit-platform-commons/1.11.3": { + "jar": "sha256-viYpZLC2tI3pd8YdT5Md+M9h6A51DMPzoKOc3SHBAIw=", + "module": "sha256-l531zqTESC/fxZCK3ItGq2q/ADbpmk0CzBjAdDyLggc=", + "pom": "sha256-gW69MkSncNkV2cHUDTtGUf40j0L4m3y369De4gnFIEA=" + }, + "org/junit/platform#junit-platform-engine/1.11.3": { + "jar": "sha256-AEP3L2EWZHNdqNyaMIvxLs0iNrBTOTUcR0HttNj6sNo=", + "module": "sha256-K5UnTIxw3eS9vEmQnxxY61qSLlQcXdO+qpx68rv6Qaw=", + "pom": "sha256-/ibcXakRuUtowSsiQSV6IIE1u7m4yRzBoTQzqAp6eR4=" + }, + "org/junit/platform#junit-platform-launcher/1.11.3": { + "jar": "sha256-tHJ0WSAbABG+sHQr2AdCGh/IQmsRYZMDHth4JbwtTwQ=", + "module": "sha256-cqqtIKPLIsFMA9WYDgJZZ1KmWe3EaylHH35c/yJWbow=", + "pom": "sha256-ElFDZ7k84oUOXa4jt8PWSjZuVMuLgjf5FNiD/Z26G/o=" + }, + "org/junit/vintage#junit-vintage-engine/5.11.3": { + "jar": "sha256-1YAiQZvHaz309Hmis1mdleJEZM1o+3wiZ/GhqHEhXEc=", + "module": "sha256-/ruKwpJtQhhJUQhtKDFqn0AfjEoUMhW4QleXCHEGBoQ=", + "pom": "sha256-Js5pMwDkTPg5mu0wujw7kBA6inM8/wH5DfCMDyvs2CA=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/by-name/op/openjfx/24/source.json b/pkgs/by-name/op/openjfx/24/source.json new file mode 100644 index 000000000000..d9f8d4ef2aaf --- /dev/null +++ b/pkgs/by-name/op/openjfx/24/source.json @@ -0,0 +1,6 @@ +{ + "hash": "sha256-pXQCzNcucQAYv0Da1uE5xG6pGqxQXrTDzvFqrn7H92M=", + "owner": "openjdk", + "repo": "jfx24u", + "rev": "refs/tags/24+29" +} diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix index 08cd2edbec5c..aef6b92888fc 100644 --- a/pkgs/by-name/op/openjfx/package.nix +++ b/pkgs/by-name/op/openjfx/package.nix @@ -36,11 +36,13 @@ jdk17_headless, jdk21_headless, jdk23_headless, + jdk24_headless, jdk-bootstrap ? { "17" = jdk17_headless; "21" = jdk21_headless; "23" = jdk23_headless; + "24" = jdk24_headless; } .${featureVersion}, }: diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index a7e8791bc408..2ec03b2d5df5 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -59,11 +59,13 @@ openjfx17, openjfx21, openjfx23, + openjfx24, openjfx_jdk ? { "17" = openjfx17; "21" = openjfx21; "23" = openjfx23; + "24" = openjfx24; } .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"), diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 442faa5fe99d..d38f873a5919 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6030,6 +6030,7 @@ with pkgs; openjfx17 = openjfx; openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; }; openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; }; + openjfx24 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "24"; }; openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap; openjdk8 = javaPackages.compiler.openjdk8; From e527d18630173a7c54af821b2fe9ed315bd938e0 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Mon, 5 May 2025 11:40:34 +0200 Subject: [PATCH 4/4] openjfx24: manually add org.eclipse.swt.gtk.linux.aarch64 dependency --- pkgs/by-name/op/openjfx/24/deps.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/op/openjfx/24/deps.json b/pkgs/by-name/op/openjfx/24/deps.json index f70206d4a9f7..55263fae58fe 100644 --- a/pkgs/by-name/op/openjfx/24/deps.json +++ b/pkgs/by-name/op/openjfx/24/deps.json @@ -4,6 +4,9 @@ "https://download.eclipse.org": { "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355": { "jar": "sha256-Q048o4oWnZ9Y33AxXiSxbxEeayfbWOf1HoxtoLS4SIs=" + }, + "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355": { + "jar": "sha256-j98ySq5bTxFHbDJKzWMZP+kfUqekWU1jYUJNDyNg9js=" } }, "https://github.com": {