diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index 9a4e75dcb4fc..a60c80ee3903 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -6,7 +6,7 @@ import re import requests import sys -feature_versions = (8, 11, 17, 21, 23, 24) +feature_versions = (8, 11, 17, 21, 23, 24, 25) oses = ("mac", "linux", "alpine-linux") types = ("jre", "jdk") impls = ("hotspot",) diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix index e9509c847fa6..4677a640e2c8 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -24,4 +24,7 @@ in jdk-24 = common { sourcePerArch = sources.jdk.openjdk24; }; jre-24 = common { sourcePerArch = sources.jre.openjdk24; }; + + jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; }; + jre-25 = common { sourcePerArch = sources.jre.openjdk25; }; } diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix index f66f3f6c705a..ec2c1168fe68 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -29,4 +29,7 @@ in jdk-24 = common { sourcePerArch = sources.jdk.openjdk24; }; jre-24 = common { sourcePerArch = sources.jre.openjdk24; }; + + jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; }; + jre-25 = common { sourcePerArch = sources.jre.openjdk25; }; } diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index d1db6a2b711c..22c2e903f3e0 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -70,6 +70,22 @@ "version": "24.0.1" } }, + "openjdk25": { + "aarch64": { + "build": "36", + "sha256": "1f18ba69ca7d674724307a66928a9b80049748b4276c629450935543db2cdfb1", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_aarch64_alpine-linux_hotspot_25_36.tar.gz", + "version": "25.0.0" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "637e47474d411ed86134f413af7d5fef4180ddb0bf556347b7e74a88cf8904c8", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_x64_alpine-linux_hotspot_25_36.tar.gz", + "version": "25.0.0" + } + }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", @@ -150,6 +166,22 @@ "version": "24.0.1" } }, + "openjdk25": { + "aarch64": { + "build": "36", + "sha256": "e88496ca31d2e0a0cdeeba385ab4ea668bbb53a03018f30c8933e97f4f9fda47", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_aarch64_alpine-linux_hotspot_25_36.tar.gz", + "version": "25.0.0" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "aa5160aa130f0f0b4379fc62a0d5198c065815224e01318272864e56f260de34", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_x64_alpine-linux_hotspot_25_36.tar.gz", + "version": "25.0.0" + } + }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", @@ -322,6 +354,34 @@ "version": "24.0.1" } }, + "openjdk25": { + "aarch64": { + "build": "36", + "sha256": "95716d04bdfc8b10c94f4448ea8d57a3ba872d98b53c752e4c6b48f1c95bc582", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_aarch64_linux_hotspot_25_36.tar.gz", + "version": "25.0.0" + }, + "packageType": "jdk", + "powerpc64le": { + "build": "36", + "sha256": "b060bb12b3a192a0599f03ebb9495492f78c48cb61e291e336a8b00e7798ffb0", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_ppc64le_linux_hotspot_25_36.tar.gz", + "version": "25.0.0" + }, + "riscv64": { + "build": "36", + "sha256": "3fc35759502b620f010a9cd2b3da8454f8a49a156ceaebb00de1fd8335682d40", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_riscv64_linux_hotspot_25_36.tar.gz", + "version": "25.0.0" + }, + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "ee04de95ab9da7287d40bd2173076ecc2a6dd662f007bedfc6eb0380c0ef90e8", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_x64_linux_hotspot_25_36.tar.gz", + "version": "25.0.0" + } + }, "openjdk8": { "aarch64": { "build": "9", @@ -516,6 +576,34 @@ "version": "24.0.1" } }, + "openjdk25": { + "aarch64": { + "build": "36", + "sha256": "939a1517971985363b2b57b8c6008f4bd48b91f565366d6eb3bae3aa503a05e2", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_aarch64_linux_hotspot_25_36.tar.gz", + "version": "25.0.0" + }, + "packageType": "jre", + "powerpc64le": { + "build": "36", + "sha256": "f593d6c435f6498cfbdb1ca07d7b1fa33829b159abb31b992b6234c324794dad", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_ppc64le_linux_hotspot_25_36.tar.gz", + "version": "25.0.0" + }, + "riscv64": { + "build": "36", + "sha256": "3ec1d5906104fb273821a5865235b673fcd2b55674c5aee68d15b429fdc7837c", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_riscv64_linux_hotspot_25_36.tar.gz", + "version": "25.0.0" + }, + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "5e3de13a1487ecc90f8b0cddc83a6cd4e053b4cd48ddcfe5d1f19178e6089fba", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_x64_linux_hotspot_25_36.tar.gz", + "version": "25.0.0" + } + }, "openjdk8": { "aarch64": { "build": "9", @@ -634,6 +722,22 @@ "version": "24.0.1" } }, + "openjdk25": { + "aarch64": { + "build": "36", + "sha256": "6630ea0f19db61843a8fa84a84b2c71cd120c4155bb5a0e42a74593b0d70fee4", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_aarch64_mac_hotspot_25_36.tar.gz", + "version": "25.0.0" + }, + "packageType": "jdk", + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "9eca779ae00a5e2e06744ed096be91ec52c2f545d8d9495e5b57fa2892bcca20", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_x64_mac_hotspot_25_36.tar.gz", + "version": "25.0.0" + } + }, "openjdk8": { "packageType": "jdk", "vmType": "hotspot", @@ -726,6 +830,22 @@ "version": "24.0.1" } }, + "openjdk25": { + "aarch64": { + "build": "36", + "sha256": "82e29c997cb50d8c011e689e25fc85c1a63958d12623ca94a58de08d1be14902", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_aarch64_mac_hotspot_25_36.tar.gz", + "version": "25.0.0" + }, + "packageType": "jre", + "vmType": "hotspot", + "x86_64": { + "build": "36", + "sha256": "70843c642a998d627aa3731535493fcb2ac94dac8ad5b24516fd89ebec094c4d", + "url": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jre_x64_mac_hotspot_25_36.tar.gz", + "version": "25.0.0" + } + }, "openjdk8": { "packageType": "jre", "vmType": "hotspot", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43851adceefb..cf92b29fefa1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4547,6 +4547,8 @@ with pkgs; powerline = with python3Packages; toPythonApplication powerline; ### DEVELOPMENT / COMPILERS + temurin-bin-25 = javaPackages.compiler.temurin-bin.jdk-25; + temurin-jre-bin-25 = javaPackages.compiler.temurin-bin.jre-25; temurin-bin-24 = javaPackages.compiler.temurin-bin.jdk-24; temurin-jre-bin-24 = javaPackages.compiler.temurin-bin.jre-24;