treewide(java-users): clean callPackage overrides, by-name some (#443954)
This commit is contained in:
jopejoe1
+4
-2
@@ -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";
|
||||
|
||||
+2
-1
@@ -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";
|
||||
+3
-3
@@ -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 {
|
||||
+4
-2
@@ -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";
|
||||
+6
-3
@@ -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";
|
||||
@@ -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 {
|
||||
|
||||
+6
-2
@@ -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";
|
||||
+8
-2
@@ -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";
|
||||
+4
-2
@@ -3,9 +3,11 @@
|
||||
lib,
|
||||
stdenv,
|
||||
makeWrapper,
|
||||
openjdk,
|
||||
openjdk11,
|
||||
}:
|
||||
|
||||
let
|
||||
openjdk = openjdk11;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gremlin-console";
|
||||
version = "3.7.4";
|
||||
+4
-1
@@ -3,8 +3,11 @@
|
||||
lib,
|
||||
stdenv,
|
||||
makeWrapper,
|
||||
openjdk,
|
||||
openjdk11,
|
||||
}:
|
||||
let
|
||||
openjdk = openjdk11;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gremlin-server";
|
||||
version = "3.7.0";
|
||||
@@ -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
|
||||
+4
-2
@@ -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";
|
||||
+8
-3
@@ -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";
|
||||
@@ -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";
|
||||
+2
-1
@@ -6,10 +6,11 @@
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
_7zz,
|
||||
jdk,
|
||||
jdk11,
|
||||
}:
|
||||
|
||||
let
|
||||
jdk = jdk11;
|
||||
pname = "jprofiler";
|
||||
version = "14.0.5";
|
||||
nameApp = "JProfiler";
|
||||
+4
-2
@@ -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";
|
||||
+4
-2
@@ -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";
|
||||
+7
-3
@@ -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[@]}
|
||||
'';
|
||||
+2
-1
@@ -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";
|
||||
+2
-1
@@ -4,13 +4,14 @@
|
||||
fetchFromGitHub,
|
||||
buildNpmPackage,
|
||||
curl,
|
||||
jdk,
|
||||
jdk17,
|
||||
jq,
|
||||
makeWrapper,
|
||||
maven,
|
||||
}:
|
||||
|
||||
let
|
||||
jdk = jdk17;
|
||||
version = "3.9.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openrefine";
|
||||
@@ -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"
|
||||
'';
|
||||
+2
-1
@@ -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";
|
||||
@@ -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";
|
||||
@@ -3,9 +3,11 @@
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
maven,
|
||||
jdk,
|
||||
jdk8,
|
||||
}:
|
||||
|
||||
let
|
||||
jdk = jdk8;
|
||||
in
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "slipstream";
|
||||
version = "1.9.1";
|
||||
+13
-3
@@ -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";
|
||||
@@ -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
|
||||
|
||||
@@ -5,9 +5,11 @@
|
||||
copyDesktopItems,
|
||||
imagemagick,
|
||||
makeDesktopItem,
|
||||
jre,
|
||||
jdk21,
|
||||
}:
|
||||
let
|
||||
jre = jdk21;
|
||||
|
||||
vPath = v: lib.elemAt (lib.splitString "-" v) 0;
|
||||
|
||||
version = "2025.3-b154";
|
||||
|
||||
@@ -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
|
||||
'';
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -1218,6 +1218,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
|
||||
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
@@ -1695,14 +1685,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;
|
||||
@@ -3228,11 +3210,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;
|
||||
@@ -3280,10 +3257,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 {
|
||||
@@ -3722,10 +3695,6 @@ with pkgs;
|
||||
|
||||
onlykey = callPackage ../tools/security/onlykey { };
|
||||
|
||||
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;
|
||||
@@ -3745,8 +3714,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
|
||||
@@ -4140,10 +4107,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 {
|
||||
@@ -4582,18 +4545,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;
|
||||
@@ -5608,9 +5563,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 { };
|
||||
@@ -5856,10 +5808,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 { };
|
||||
|
||||
@@ -5950,11 +5899,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 { };
|
||||
@@ -6835,13 +6779,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 { };
|
||||
@@ -7138,10 +7075,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)";
|
||||
@@ -7177,10 +7110,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;
|
||||
@@ -8162,10 +8091,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 { };
|
||||
@@ -9171,10 +9096,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;
|
||||
|
||||
@@ -9247,11 +9168,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";
|
||||
};
|
||||
|
||||
@@ -9571,10 +9488,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 { };
|
||||
@@ -9584,11 +9497,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 { };
|
||||
@@ -11347,13 +11255,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; };
|
||||
};
|
||||
@@ -11393,12 +11294,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 { };
|
||||
@@ -11658,10 +11553,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 { };
|
||||
@@ -11940,13 +11831,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; };
|
||||
|
||||
@@ -12555,10 +12439,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 (
|
||||
@@ -14270,18 +14150,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;
|
||||
@@ -14999,10 +14867,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 (
|
||||
|
||||
Reference in New Issue
Block a user