diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index 6196350c32c8..f40ef90c6cf3 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -78,7 +78,6 @@ temurin-bin-11, temurin-bin-17, temurin-bin-21, - temurin-bin-23, temurin-bin-25, jdk-bootstrap ? { @@ -86,7 +85,6 @@ "11" = temurin-bin-11.__spliced.buildBuild or temurin-bin-11; "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; "25" = temurin-bin-25.__spliced.buildBuild or temurin-bin-25; } .${featureVersion}, diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index d2f840632a89..0ebf923b1078 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, 25) +feature_versions = (8, 11, 17, 21, 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 6a97a46675dc..037f0811f3f0 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix @@ -19,9 +19,6 @@ in jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; - jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; - jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; - 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 2ec2e35a80fc..9e40a4722ce3 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix @@ -24,9 +24,6 @@ in jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; }; jre-21 = common { sourcePerArch = sources.jre.openjdk21; }; - jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; }; - jre-23 = common { sourcePerArch = sources.jre.openjdk23; }; - 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 ba71e263bef1..88b3850ba249 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -38,22 +38,6 @@ "version": "21.0.8" } }, - "openjdk23": { - "aarch64": { - "build": "7", - "sha256": "b55c5c881a2fed17ec5a59feaa33d9263703b399d1bfae3a5eaed3f140aa4570", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "2c05c6dfea23a83fdbfaf5b03cc3cfd8d998c8069e930e0e585a39d4a99f3d99", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -118,22 +102,6 @@ "version": "21.0.8" } }, - "openjdk23": { - "aarch64": { - "build": "7", - "sha256": "248a2ffb3abcb0cee7841ce648af7af415c96ee88cba4f8bf676c0115d38de5e", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "4513750bd10cc6c38f0c19d335dac7dcc112bba64e52010f81ba29e7a71e2a76", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_alpine-linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -266,34 +234,6 @@ "version": "21.0.8" } }, - "openjdk23": { - "aarch64": { - "build": "7", - "sha256": "fb43ae1202402842559cb6223886ec1663b90ffbec48479abbcb92c92c9012eb", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "packageType": "jdk", - "powerpc64le": { - "build": "7", - "sha256": "548fd82af4eb0802fe20b0b61a4664a69c7f03cd963540908f30dbf73636dafe", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "riscv64": { - "build": "7", - "sha256": "1e102e1e6653f8810ef6c275b0d38ea7036abd4a8709f0f916b339f65e76bb56", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "870ac8c05c6fe563e7a3878a47d0234b83c050e83651d2c47e8b822ec74512dd", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -460,34 +400,6 @@ "version": "21.0.8" } }, - "openjdk23": { - "aarch64": { - "build": "7", - "sha256": "b2a8a287ebd2d2a1d5d32eb6b79768cf2b5e02f1b4d6d4791297feb8636b9e2f", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "packageType": "jre", - "powerpc64le": { - "build": "7", - "sha256": "a21355923fdcdcc49fcf6359f2763f49f001bd4caeb970f7313f18aeaa61b588", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_ppc64le_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "riscv64": { - "build": "7", - "sha256": "c2c8f8add6af6518cfc565ec0a7410e031301b91f2d8bd594303d7f04680da4e", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_riscv64_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "1a16c654e67a72dadfa632969a457404ad1cc30c6375857fdcb393e0592ce3ba", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_linux_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -602,22 +514,6 @@ "version": "21.0.8" } }, - "openjdk23": { - "aarch64": { - "build": "7", - "sha256": "749993e751f085c7ae713140066a90800075e4aeedfac50a5ed0c5457131c5a0", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_mac_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "packageType": "jdk", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "97fca2e90668351f248f149d4e96e16875094eba6716a8dd1dcf163be9e19085", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_mac_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", @@ -694,22 +590,6 @@ "version": "21.0.8" } }, - "openjdk23": { - "aarch64": { - "build": "7", - "sha256": "56b86d4f5745ba44894310c3417755e4b4aaa62d4a17a5cb4dab6200c14c56fe", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_mac_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - }, - "packageType": "jre", - "vmType": "hotspot", - "x86_64": { - "build": "7", - "sha256": "2c5b81ce3234d6bef0ec352734aa2de19c0950020c55a1cbfc21ae5fda7690b8", - "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_mac_hotspot_23.0.2_7.tar.gz", - "version": "23.0.2" - } - }, "openjdk25": { "aarch64": { "build": "36", diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8e4071c5bcc9..f0a4542964c8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1468,7 +1468,9 @@ mapAliases { teamspeak_client = throw "'teamspeak_client' has been renamed to/replaced by 'teamspeak3'"; # Converted to throw 2025-10-27 tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10 temporalite = throw "'temporalite' has been removed as it is obsolete and unmaintained, please use 'temporal-cli' instead (with `temporal server start-dev`)"; # Added 2025-06-26 + temurin-bin-23 = throw "Temurin 23 has been removed as it has reached its end of life"; # Added 2025-11-04 temurin-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04 + temurin-jre-bin-23 = throw "Temurin 23 has been removed as it has reached its end of life"; # Added 2025-11-04 temurin-jre-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04 tepl = throw "'tepl' has been renamed to/replaced by 'libgedit-tepl'"; # Converted to throw 2025-10-27 terminus-nerdfont = throw "'terminus-nerdfont' has been renamed to/replaced by 'nerd-fonts.terminess-ttf'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fde10b631cc0..4d26dfce6ce5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4322,9 +4322,6 @@ with pkgs; temurin-bin-25 = javaPackages.compiler.temurin-bin.jdk-25; temurin-jre-bin-25 = javaPackages.compiler.temurin-bin.jre-25; - 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;