diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/by-name/ad/adoptopenjdk-icedtea-web/package.nix similarity index 98% rename from pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix rename to pkgs/by-name/ad/adoptopenjdk-icedtea-web/package.nix index 0db3e41bafac2..967a38d5c0065 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/by-name/ad/adoptopenjdk-icedtea-web/package.nix @@ -5,7 +5,7 @@ cargo, rustc, autoreconfHook, - jdk, + jdk8, glib, firefox-unwrapped, zip, @@ -14,7 +14,9 @@ bash, bc, }: - +let + jdk = jdk8; +in stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch b/pkgs/by-name/ad/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch similarity index 100% rename from pkgs/development/compilers/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch rename to pkgs/by-name/ad/adoptopenjdk-icedtea-web/patches/0001-make-cargo-work-with-nix-build-on-linux.patch diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/by-name/ba/ballerina/package.nix similarity index 96% rename from pkgs/development/compilers/ballerina/default.nix rename to pkgs/by-name/ba/ballerina/package.nix index 9fa4dcbfdd23b..e0c32c3092964 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/by-name/ba/ballerina/package.nix @@ -6,11 +6,12 @@ makeWrapper, fetchzip, stdenv, - openjdk, + openjdk17_headless, }: let version = "2201.10.3"; codeName = "swan-lake"; + openjdk = openjdk17_headless; in stdenv.mkDerivation { pname = "ballerina"; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/by-name/da/davmail/package.nix similarity index 93% rename from pkgs/applications/networking/davmail/default.nix rename to pkgs/by-name/da/davmail/package.nix index 9f19363d74fd5..c4f3f442cdaa3 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/by-name/da/davmail/package.nix @@ -7,18 +7,18 @@ glib, gtk2, gtk3, - jre, + jdk11, libXtst, coreutils, gnugrep, - zulu, + zulu11, preferGtk3 ? true, preferZulu ? true, }: let rev = 3627; - jre' = if preferZulu then zulu else jre; + jre' = (if preferZulu then zulu11 else jdk11).override { enableJavaFX = true; }; gtk' = if preferGtk3 then gtk3 else gtk2; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/by-name/di/DisnixWebService/package.nix similarity index 98% rename from pkgs/tools/package-management/disnix/DisnixWebService/default.nix rename to pkgs/by-name/di/DisnixWebService/package.nix index 5826280a22f6e..1a3c64f652c4d 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/by-name/di/DisnixWebService/package.nix @@ -4,12 +4,14 @@ fetchFromGitHub, fetchpatch, ant, - jdk, + jdk8, xmlstarlet, axis2, dbus_java, }: - +let + jdk = jdk8; +in stdenv.mkDerivation (finalAttrs: { pname = "DisnixWebService"; version = "0.10.1"; diff --git a/pkgs/servers/elasticmq-server-bin/elasticmq-test.nix b/pkgs/by-name/el/elasticmq-server-bin/elasticmq-test.nix similarity index 100% rename from pkgs/servers/elasticmq-server-bin/elasticmq-test.nix rename to pkgs/by-name/el/elasticmq-server-bin/elasticmq-test.nix diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/by-name/el/elasticmq-server-bin/package.nix similarity index 89% rename from pkgs/servers/elasticmq-server-bin/default.nix rename to pkgs/by-name/el/elasticmq-server-bin/package.nix index a02eb7068a473..6b1d2860f4bca 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/by-name/el/elasticmq-server-bin/package.nix @@ -2,14 +2,17 @@ lib, stdenv, fetchurl, - jdk, - jre, + jdk8, + jre8, makeBinaryWrapper, runCommand, python3Packages, writeText, }: - +let + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 +in stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; version = "1.6.14"; diff --git a/pkgs/by-name/en/envoy/package.nix b/pkgs/by-name/en/envoy/package.nix index 131fff6aaf71e..a455b4620a372 100644 --- a/pkgs/by-name/en/envoy/package.nix +++ b/pkgs/by-name/en/envoy/package.nix @@ -13,7 +13,7 @@ cmake, gn, go, - jdk, + openjdk11_headless, ninja, patchelf, python312, @@ -56,6 +56,7 @@ let .${stdenv.system} or (throw "unsupported system ${stdenv.system}"); python3 = python312; + jdk = openjdk11_headless; in buildBazelPackage rec { diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/by-name/ga/ganttproject-bin/package.nix similarity index 95% rename from pkgs/applications/misc/ganttproject-bin/default.nix rename to pkgs/by-name/ga/ganttproject-bin/package.nix index 0065eac9c8d58..ab7fbcac624e9 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/by-name/ga/ganttproject-bin/package.nix @@ -4,9 +4,13 @@ fetchzip, makeDesktopItem, makeWrapper, - jre, + openjdk17, }: - +let + jre = openjdk17.override { + enableJavaFX = true; + }; +in stdenv.mkDerivation rec { pname = "ganttproject-bin"; version = "3.3.3316"; diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/by-name/gr/greenfoot/package.nix similarity index 91% rename from pkgs/applications/editors/greenfoot/default.nix rename to pkgs/by-name/gr/greenfoot/package.nix index b2830b4b09d15..5ce999a958d1a 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/by-name/gr/greenfoot/package.nix @@ -2,12 +2,18 @@ lib, stdenv, fetchurl, - openjdk, + openjdk21, + openjfx21, glib, dpkg, wrapGAppsHook3, }: - +let + openjdk = openjdk21.override { + enableJavaFX = true; + openjfx_jdk = openjfx21.override { withWebKit = true; }; + }; +in stdenv.mkDerivation rec { pname = "greenfoot"; version = "3.9.0"; diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/by-name/gr/gremlin-console/package.nix similarity index 95% rename from pkgs/applications/misc/gremlin-console/default.nix rename to pkgs/by-name/gr/gremlin-console/package.nix index c2c0334a68584..8903b65b6dd92 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/by-name/gr/gremlin-console/package.nix @@ -3,9 +3,11 @@ lib, stdenv, makeWrapper, - openjdk, + openjdk11, }: - +let + openjdk = openjdk11; +in stdenv.mkDerivation rec { pname = "gremlin-console"; version = "3.7.4"; diff --git a/pkgs/applications/misc/gremlin-server/default.nix b/pkgs/by-name/gr/gremlin-server/package.nix similarity index 96% rename from pkgs/applications/misc/gremlin-server/default.nix rename to pkgs/by-name/gr/gremlin-server/package.nix index 9bf2199291510..559470f5dd9c5 100644 --- a/pkgs/applications/misc/gremlin-server/default.nix +++ b/pkgs/by-name/gr/gremlin-server/package.nix @@ -3,8 +3,11 @@ lib, stdenv, makeWrapper, - openjdk, + openjdk11, }: +let + openjdk = openjdk11; +in stdenv.mkDerivation rec { pname = "gremlin-server"; version = "3.7.0"; diff --git a/pkgs/applications/office/jabref/deps.json b/pkgs/by-name/ja/jabref/deps.json similarity index 100% rename from pkgs/applications/office/jabref/deps.json rename to pkgs/by-name/ja/jabref/deps.json diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/by-name/ja/jabref/package.nix similarity index 97% rename from pkgs/applications/office/jabref/default.nix rename to pkgs/by-name/ja/jabref/package.nix index f5c58890e6d0d..e94423ed57d15 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/by-name/ja/jabref/package.nix @@ -8,11 +8,16 @@ unzip, xdg-utils, gtk3, - jdk, + jdk21, + openjfx23, gradle_8, python3, }: let + jdk = jdk21.override { + enableJavaFX = true; + openjfx_jdk = openjfx23; + }; # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." gradle = gradle_8; in diff --git a/pkgs/development/libraries/java/cup/javacup-0.11b_beta20160615-build-xml-git.patch b/pkgs/by-name/ja/javaCup/javacup-0.11b_beta20160615-build-xml-git.patch similarity index 100% rename from pkgs/development/libraries/java/cup/javacup-0.11b_beta20160615-build-xml-git.patch rename to pkgs/by-name/ja/javaCup/javacup-0.11b_beta20160615-build-xml-git.patch diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/by-name/ja/javaCup/package.nix similarity index 92% rename from pkgs/development/libraries/java/cup/default.nix rename to pkgs/by-name/ja/javaCup/package.nix index 219bbd5908c57..c91666c67808a 100644 --- a/pkgs/development/libraries/java/cup/default.nix +++ b/pkgs/by-name/ja/javaCup/package.nix @@ -3,11 +3,13 @@ stdenv, fetchurl, ant, - jdk, + jdk8, makeWrapper, stripJavaArchivesHook, }: - +let + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 +in stdenv.mkDerivation (finalAttrs: { pname = "java-cup"; version = "11b-20160615"; diff --git a/pkgs/development/tools/parsing/javacc/default.nix b/pkgs/by-name/ja/javacc/package.nix similarity index 84% rename from pkgs/development/tools/parsing/javacc/default.nix rename to pkgs/by-name/ja/javacc/package.nix index a157134569884..9f6f03089afae 100644 --- a/pkgs/development/tools/parsing/javacc/default.nix +++ b/pkgs/by-name/ja/javacc/package.nix @@ -3,12 +3,17 @@ stdenv, fetchFromGitHub, ant, - jdk, - jre, + jdk8, + jre8, makeWrapper, stripJavaArchivesHook, }: - +let + # Upstream doesn't support anything newer than Java 8. + # https://github.com/javacc/javacc/blob/c708628423b71ce8bc3b70143fa5b6a2b7362b3a/README.md#building-javacc-from-source + jdk = jdk8; + jre = jre8; +in stdenv.mkDerivation (finalAttrs: { pname = "javacc"; version = "7.0.13"; diff --git a/pkgs/tools/text/xml/jing-trang/no-git-during-build.patch b/pkgs/by-name/ji/jing-trang/no-git-during-build.patch similarity index 100% rename from pkgs/tools/text/xml/jing-trang/no-git-during-build.patch rename to pkgs/by-name/ji/jing-trang/no-git-during-build.patch diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/by-name/ji/jing-trang/package.nix similarity index 91% rename from pkgs/tools/text/xml/jing-trang/default.nix rename to pkgs/by-name/ji/jing-trang/package.nix index 4dafa9980a31d..d30d0438c4ea6 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/by-name/ji/jing-trang/package.nix @@ -3,11 +3,13 @@ stdenv, fetchFromGitHub, jre_headless, - jdk_headless, + jdk8_headless, ant, saxon, }: - +let + jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 +in stdenv.mkDerivation rec { pname = "jing-trang"; version = "20181222"; diff --git a/pkgs/development/tools/java/jprofiler/default.nix b/pkgs/by-name/jp/jprofiler/package.nix similarity index 99% rename from pkgs/development/tools/java/jprofiler/default.nix rename to pkgs/by-name/jp/jprofiler/package.nix index 753dfddeb2b08..3e380282639aa 100644 --- a/pkgs/development/tools/java/jprofiler/default.nix +++ b/pkgs/by-name/jp/jprofiler/package.nix @@ -6,10 +6,11 @@ makeDesktopItem, copyDesktopItems, _7zz, - jdk, + jdk11, }: let + jdk = jdk11; pname = "jprofiler"; version = "14.0.5"; nameApp = "JProfiler"; diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/by-name/ke/keystore-explorer/package.nix similarity index 98% rename from pkgs/applications/misc/keystore-explorer/default.nix rename to pkgs/by-name/ke/keystore-explorer/package.nix index 7aa4aa62910fe..6739ab2d1b0ef 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/by-name/ke/keystore-explorer/package.nix @@ -2,12 +2,14 @@ fetchzip, lib, stdenv, - jdk, + jdk11, runtimeShell, glib, wrapGAppsHook3, }: - +let + jdk = jdk11; +in stdenv.mkDerivation rec { version = "5.6.0"; pname = "keystore-explorer"; diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/by-name/li/libmatthew_java/package.nix similarity index 85% rename from pkgs/development/libraries/java/libmatthew-java/default.nix rename to pkgs/by-name/li/libmatthew_java/package.nix index 60bc1231f5ff0..83d7fdc2ea26b 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/by-name/li/libmatthew_java/package.nix @@ -2,9 +2,11 @@ lib, stdenv, fetchurl, - jdk, + jdk8, }: - +let + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 +in stdenv.mkDerivation rec { pname = "libmatthew-java"; version = "0.8"; diff --git a/pkgs/tools/games/minecraft/mcaselector/default.nix b/pkgs/by-name/mc/mcaselector/package.nix similarity index 90% rename from pkgs/tools/games/minecraft/mcaselector/default.nix rename to pkgs/by-name/mc/mcaselector/package.nix index ffe52140b83d6..9336f0c26d22e 100644 --- a/pkgs/tools/games/minecraft/mcaselector/default.nix +++ b/pkgs/by-name/mc/mcaselector/package.nix @@ -6,7 +6,11 @@ wrapGAppsHook3, jre, }: - +let + jre' = jre.override { + enableJavaFX = true; + }; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "mcaselector"; version = "2.5.3"; @@ -20,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontBuild = true; nativeBuildInputs = [ - jre + jre' makeWrapper wrapGAppsHook3 ]; @@ -37,7 +41,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; preFixup = '' - makeWrapper ${jre}/bin/java $out/bin/mcaselector \ + makeWrapper ${jre'}/bin/java $out/bin/mcaselector \ --add-flags "-jar $out/lib/mcaselector/mcaselector.jar" \ ''${gappsWrapperArgs[@]} ''; diff --git a/pkgs/tools/networking/openapi-generator-cli/example.nix b/pkgs/by-name/op/openapi-generator-cli/example.nix similarity index 100% rename from pkgs/tools/networking/openapi-generator-cli/example.nix rename to pkgs/by-name/op/openapi-generator-cli/example.nix diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/by-name/op/openapi-generator-cli/package.nix similarity index 97% rename from pkgs/tools/networking/openapi-generator-cli/default.nix rename to pkgs/by-name/op/openapi-generator-cli/package.nix index 21981d09e4353..87968f9980ef1 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/by-name/op/openapi-generator-cli/package.nix @@ -3,11 +3,12 @@ lib, stdenv, fetchurl, - jre, + jre_headless, makeWrapper, }: let + jre = jre_headless; this = stdenv.mkDerivation (finalAttrs: { version = "7.15.0"; pname = "openapi-generator-cli"; diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/by-name/op/openrefine/package.nix similarity index 99% rename from pkgs/applications/science/misc/openrefine/default.nix rename to pkgs/by-name/op/openrefine/package.nix index 22852f99116c7..d9ea9e4270e1f 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/by-name/op/openrefine/package.nix @@ -4,13 +4,14 @@ fetchFromGitHub, buildNpmPackage, curl, - jdk, + jdk17, jq, makeWrapper, maven, }: let + jdk = jdk17; version = "3.9.5"; src = fetchFromGitHub { owner = "openrefine"; diff --git a/pkgs/applications/science/misc/openrefine/update.sh b/pkgs/by-name/op/openrefine/update.sh similarity index 100% rename from pkgs/applications/science/misc/openrefine/update.sh rename to pkgs/by-name/op/openrefine/update.sh diff --git a/pkgs/applications/misc/pattypan/default.nix b/pkgs/by-name/pa/pattypan/package.nix similarity index 94% rename from pkgs/applications/misc/pattypan/default.nix rename to pkgs/by-name/pa/pattypan/package.nix index a02c8ae92f531..7145f56a9289a 100644 --- a/pkgs/applications/misc/pattypan/default.nix +++ b/pkgs/by-name/pa/pattypan/package.nix @@ -10,7 +10,9 @@ copyDesktopItems, stripJavaArchivesHook, }: - +let + jdk' = jdk.override { enableJavaFX = true; }; +in stdenv.mkDerivation (finalAttrs: { pname = "pattypan"; version = "22.03"; @@ -50,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { # gappsWrapperArgs is set in preFixup postFixup = '' - makeWrapper ${jdk}/bin/java $out/bin/pattypan \ + makeWrapper ${jdk'}/bin/java $out/bin/pattypan \ ''${gappsWrapperArgs[@]} \ --add-flags "-jar $out/share/pattypan/pattypan.jar" ''; diff --git a/pkgs/applications/graphics/processing/disable-revision-check.patch b/pkgs/by-name/pr/processing/disable-revision-check.patch similarity index 100% rename from pkgs/applications/graphics/processing/disable-revision-check.patch rename to pkgs/by-name/pr/processing/disable-revision-check.patch diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/by-name/pr/processing/package.nix similarity index 99% rename from pkgs/applications/graphics/processing/default.nix rename to pkgs/by-name/pr/processing/package.nix index 65e28fec764a1..7f595dc48c563 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/by-name/pr/processing/package.nix @@ -6,7 +6,7 @@ ant, unzip, makeWrapper, - jdk, + jdk17, jogl, rsync, ffmpeg, @@ -16,6 +16,7 @@ libGL, }: let + jdk = jdk17; buildNumber = "1295"; vaqua = fetchurl { name = "VAqua9.jar"; diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/by-name/sc/scalafix/package.nix similarity index 94% rename from pkgs/development/tools/scalafix/default.nix rename to pkgs/by-name/sc/scalafix/package.nix index 94abffd961201..9aa101f331dee 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/by-name/sc/scalafix/package.nix @@ -1,13 +1,16 @@ { lib, stdenv, - jre, + jre8, coursier, makeWrapper, installShellFiles, setJavaClassPath, testers, }: +let + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 +in stdenv.mkDerivation (finalAttrs: { pname = "scalafix"; version = "0.12.0"; diff --git a/pkgs/tools/games/slipstream/default.nix b/pkgs/by-name/sl/slipstream/package.nix similarity index 98% rename from pkgs/tools/games/slipstream/default.nix rename to pkgs/by-name/sl/slipstream/package.nix index 8269072876f38..2911890df5aa6 100644 --- a/pkgs/tools/games/slipstream/default.nix +++ b/pkgs/by-name/sl/slipstream/package.nix @@ -3,9 +3,11 @@ fetchFromGitHub, makeWrapper, maven, - jdk, + jdk8, }: - +let + jdk = jdk8; +in maven.buildMavenPackage rec { pname = "slipstream"; version = "1.9.1"; diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/by-name/so/soapui/package.nix similarity index 100% rename from pkgs/applications/networking/soapui/default.nix rename to pkgs/by-name/so/soapui/package.nix diff --git a/pkgs/applications/science/biology/trimmomatic/default.nix b/pkgs/by-name/tr/trimmomatic/package.nix similarity index 89% rename from pkgs/applications/science/biology/trimmomatic/default.nix rename to pkgs/by-name/tr/trimmomatic/package.nix index 1c22b3ec7fb3a..c3285d2be4bd7 100644 --- a/pkgs/applications/science/biology/trimmomatic/default.nix +++ b/pkgs/by-name/tr/trimmomatic/package.nix @@ -3,12 +3,22 @@ stdenv, fetchFromGitHub, ant, - jdk, - jre, + jdk21_headless, + jre_minimal, makeWrapper, stripJavaArchivesHook, }: - +let + jdk = jdk21_headless; + # Reduce closure size + jre = jre_minimal.override { + modules = [ + "java.base" + "java.logging" + ]; + jdk = jdk21_headless; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "trimmomatic"; version = "0.39"; diff --git a/pkgs/by-name/xm/xmloscopy/package.nix b/pkgs/by-name/xm/xmloscopy/package.nix index faab84dc3cefe..e0df62513ddda 100644 --- a/pkgs/by-name/xm/xmloscopy/package.nix +++ b/pkgs/by-name/xm/xmloscopy/package.nix @@ -9,7 +9,7 @@ coreutils, libxml2, libxslt, - jing, + jing-trang, findutils, gnugrep, gnused, @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { coreutils libxml2 libxslt - jing + jing-trang findutils gnugrep gnused diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix index 6b92b70900ca8..b19d6e752f6d7 100644 --- a/pkgs/by-name/yo/yourkit-java/package.nix +++ b/pkgs/by-name/yo/yourkit-java/package.nix @@ -5,9 +5,11 @@ copyDesktopItems, imagemagick, makeDesktopItem, - jre, + jdk21, }: let + jre = jdk21; + vPath = v: lib.elemAt (lib.splitString "-" v) 0; version = "2025.3-b154"; diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index bc00e173ac242..a030be518b7c7 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -4,12 +4,16 @@ writeShellScriptBin, fetchurl, ant, - jdk, + openjdk17, makeWrapper, stripJavaArchivesHook, }: let + # https://armedbear.common-lisp.dev/ lists OpenJDK 17 as the highest + # supported JDK. + jdk = openjdk17; + fakeHostname = writeShellScriptBin "hostname" '' echo nix-builder.localdomain ''; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 438331140b41f..7a0bdcf588600 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -4,12 +4,15 @@ bashNonInteractive, fetchurl, installShellFiles, - jdk, + jdk21, rlwrap, makeWrapper, writeScript, }: - +let + # set this to an LTS version of java + jdk = jdk21; +in stdenv.mkDerivation (finalAttrs: { pname = "clojure"; version = "1.12.2.1565"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9d490d8f84d4b..18910e64a63c1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1219,6 +1219,7 @@ mapAliases { jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10 + jing = jing-trang; # Added 2025-09-18 jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2024-08-07 jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3288901eccc5f..b8e7b032c6578 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1091,12 +1091,6 @@ with pkgs; makehuman = libsForQt5.callPackage ../applications/misc/makehuman { }; - mcaselector = callPackage ../tools/games/minecraft/mcaselector { - jre = jre.override { - enableJavaFX = true; - }; - }; - mkosi = callPackage ../tools/virtualization/mkosi { }; mkosi-full = mkosi.override { withQemu = true; }; @@ -1126,10 +1120,6 @@ with pkgs; shaperglot = with python3Packages; toPythonApplication shaperglot; - slipstream = callPackage ../tools/games/slipstream { - jdk = jdk8; - }; - supermin = callPackage ../tools/virtualization/supermin { ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; @@ -1699,14 +1689,6 @@ with pkgs; guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { }; - gremlin-console = callPackage ../applications/misc/gremlin-console { - openjdk = openjdk11; - }; - - gremlin-server = callPackage ../applications/misc/gremlin-server { - openjdk = openjdk11; - }; - hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; hwi = with python3Packages; toPythonApplication hwi; @@ -3232,11 +3214,6 @@ with pkgs; jello = with python3Packages; toPythonApplication jello; - jing = res.jing-trang; - jing-trang = callPackage ../tools/text/xml/jing-trang { - jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - jl = haskellPackages.jl; joplin = nodePackages.joplin; @@ -3284,10 +3261,6 @@ with pkgs; keybase-gui = callPackage ../tools/security/keybase/gui.nix { }; - keystore-explorer = callPackage ../applications/misc/keystore-explorer { - jdk = jdk11; - }; - kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { }; krunvm = callPackage ../applications/virtualization/krunvm { @@ -3729,10 +3702,6 @@ with pkgs; onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; }; - openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { - jre = pkgs.jre_headless; - }; - ophcrack-cli = ophcrack.override { enableGui = false; }; open-interpreter = with python3Packages; toPythonApplication open-interpreter; @@ -3752,8 +3721,6 @@ with pkgs; privsepPath = "/var/empty"; }; - openrefine = callPackage ../applications/science/misc/openrefine { jdk = jdk17; }; - openrgb-with-all-plugins = openrgb.withPlugins [ openrgb-plugin-effects openrgb-plugin-hardwaresync @@ -4147,10 +4114,6 @@ with pkgs; pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux; }; - soapui = callPackage ../applications/networking/soapui { - jdk = jdk11; - }; - specup = haskellPackages.specup.bin; spglib = callPackage ../development/libraries/spglib { @@ -4587,18 +4550,10 @@ with pkgs; adaptivecppWithCuda = adaptivecpp.override { cudaSupport = true; }; adaptivecppWithRocm = adaptivecpp.override { rocmSupport = true; }; - adoptopenjdk-icedtea-web = callPackage ../development/compilers/adoptopenjdk-icedtea-web { - jdk = jdk8; - }; - armips = callPackage ../by-name/ar/armips/package.nix { stdenv = clangStdenv; }; - ballerina = callPackage ../development/compilers/ballerina { - openjdk = openjdk17_headless; - }; - binaryen = callPackage ../development/compilers/binaryen { nodejs = nodejs-slim; inherit (python3Packages) filecheck; @@ -5612,9 +5567,6 @@ with pkgs; coursier = coursier.override { jre = jdk8; }; }; - scalafix = callPackage ../development/tools/scalafix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; # smlnjBootstrap should be redundant, now that smlnj works on Darwin natively smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { }; smlnj = callPackage ../development/compilers/smlnj { }; @@ -5860,10 +5812,7 @@ with pkgs; xeus-cling ; - clojure = callPackage ../development/interpreters/clojure { - # set this to an LTS version of java - jdk = jdk21; - }; + clojure = callPackage ../development/interpreters/clojure { }; clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; @@ -5954,11 +5903,6 @@ with pkgs; jpm = callPackage ../development/interpreters/janet/jpm.nix { }; - davmail = callPackage ../applications/networking/davmail { - jre = jdk11.override { enableJavaFX = true; }; - zulu = zulu11.override { enableJavaFX = true; }; - }; - lambda-lisp-blc = lambda-lisp; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; @@ -6839,13 +6783,6 @@ with pkgs; inochi-session ; - javacc = callPackage ../development/tools/parsing/javacc { - # Upstream doesn't support anything newer than Java 8. - # https://github.com/javacc/javacc/blob/c708628423b71ce8bc3b70143fa5b6a2b7362b3a/README.md#building-javacc-from-source - jdk = jdk8; - jre = jre8; - }; - jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder; kustomize = callPackage ../development/tools/kustomize { }; @@ -7142,10 +7079,6 @@ with pkgs; gdbHostCpuOnly = gdb.override { hostCpuOnly = true; }; - jprofiler = callPackage ../development/tools/java/jprofiler { - jdk = jdk11; - }; - valgrind-light = (valgrind.override { gdb = null; }).overrideAttrs (oldAttrs: { meta = oldAttrs.meta // { description = "${oldAttrs.meta.description} (without GDB)"; @@ -7181,10 +7114,6 @@ with pkgs; xxdiff-tip = xxdiff; - yourkit-java = callPackage ../by-name/yo/yourkit-java/package.nix { - jre = jdk21; - }; - yq = python3.pkgs.toPythonApplication python3.pkgs.yq; mypy = with python3Packages; toPythonApplication mypy; @@ -8167,10 +8096,6 @@ with pkgs; malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { }; - libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - inherit ({ libmicrohttpd_0_9_77 = callPackage ../development/libraries/libmicrohttpd/0.9.77.nix { }; @@ -9176,10 +9101,6 @@ with pkgs; ### DEVELOPMENT / LIBRARIES / JAVA - javaCup = callPackage ../development/libraries/java/cup { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - saxonb = saxonb_8_8; saxon-he = saxon_12-he; @@ -9252,11 +9173,7 @@ with pkgs; # Armed Bear Common Lisp abcl = wrapLisp { - pkg = callPackage ../development/compilers/abcl { - # https://armedbear.common-lisp.dev/ lists OpenJDK 17 as the highest - # supported JDK. - jdk = openjdk17; - }; + pkg = callPackage ../development/compilers/abcl { }; faslExt = "abcl"; }; @@ -9576,10 +9493,6 @@ with pkgs; dodgy = with python3Packages; toPythonApplication dodgy; - envoy = callPackage ../by-name/en/envoy/package.nix { - jdk = openjdk11_headless; - }; - etcd = etcd_3_5; etcd_3_4 = callPackage ../servers/etcd/3_4 { }; etcd_3_5 = callPackage ../servers/etcd/3_5 { }; @@ -9589,11 +9502,6 @@ with pkgs; withExtraLuaPackages = _: [ ]; }; - elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - felix = callPackage ../servers/felix { }; felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { }; @@ -11352,13 +11260,6 @@ with pkgs; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; - greenfoot = callPackage ../applications/editors/greenfoot { - openjdk = openjdk21.override { - enableJavaFX = true; - openjfx_jdk = openjfx21.override { withWebKit = true; }; - }; - }; - input-leap = qt6Packages.callPackage ../applications/misc/input-leap { avahi = avahi.override { withLibdnssdCompat = true; }; }; @@ -11398,12 +11299,6 @@ with pkgs; fvwm = fvwm2; - ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { - jre = openjdk17.override { - enableJavaFX = true; - }; - }; - gaucheBootstrap = callPackage ../development/interpreters/gauche/boot.nix { }; gauche = callPackage ../development/interpreters/gauche { }; @@ -11663,10 +11558,6 @@ with pkgs; molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; - pattypan = callPackage ../applications/misc/pattypan { - jdk = jdk.override { enableJavaFX = true; }; - }; - gphoto2 = callPackage ../applications/misc/gphoto2 { }; gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { }; @@ -11947,13 +11838,6 @@ with pkgs; subproject = "reader"; }; - jabref = callPackage ../applications/office/jabref { - jdk = jdk21.override { - enableJavaFX = true; - openjfx_jdk = openjfx23; - }; - }; - jackmix = libsForQt5.callPackage ../applications/audio/jackmix { }; jackmix_jack1 = jackmix.override { jack = jack1; }; @@ -12564,10 +12448,6 @@ with pkgs; imlib2 = imlib2Full; }; - processing = callPackage ../applications/graphics/processing { - jdk = jdk17; - }; - # perhaps there are better apps for this task? It's how I had configured my previous system. # And I don't want to rewrite all rules profanity = callPackage ../applications/networking/instant-messengers/profanity ( @@ -14281,18 +14161,6 @@ with pkgs; raxml-mpi = raxml.override { useMpi = true; }; - trimmomatic = callPackage ../applications/science/biology/trimmomatic { - jdk = pkgs.jdk21_headless; - # Reduce closure size - jre = pkgs.jre_minimal.override { - modules = [ - "java.base" - "java.logging" - ]; - jdk = pkgs.jdk21_headless; - }; - }; - ### SCIENCE/MACHINE LEARNING streamlit = with python3Packages; toPythonApplication streamlit; @@ -15010,10 +14878,6 @@ with pkgs; } ); - DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { - jdk = jdk8; - }; - lice = python3Packages.callPackage ../tools/misc/lice { }; mysql-workbench = callPackage ../by-name/my/mysql-workbench/package.nix (