Skip to content

treewide(java-users): clean callPackage overrides, by-name some #443954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jopejoe1 merged 1 commit into from
Sep 27, 2025
Merged

treewide(java-users): clean callPackage overrides, by-name some #443954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...lers/adoptopenjdk-icedtea-web/default.nix → ...e/ad/adoptopenjdk-icedtea-web/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
cargo,
rustc,
autoreconfHook,
jdk,
jdk8,
glib,
firefox-unwrapped,
zip,
Expand All @@ -14,7 +14,9 @@
bash,
bc,
}:

let
jdk = jdk8;
in
stdenv.mkDerivation rec {
pname = "adoptopenjdk-icedtea-web";

Expand Down
0 ...-cargo-work-with-nix-build-on-linux.patch → ...-cargo-work-with-nix-build-on-linux.patch
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...velopment/compilers/ballerina/default.nix → pkgs/by-name/ba/ballerina/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
6 changes: 3 additions & 3 deletions ...plications/networking/davmail/default.nix → pkgs/by-name/da/davmail/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 4 additions & 2 deletions ...ement/disnix/DisnixWebService/default.nix → pkgs/by-name/di/DisnixWebService/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
0 ...s/elasticmq-server-bin/elasticmq-test.nix → ...l/elasticmq-server-bin/elasticmq-test.nix
View file
Open in desktop
File renamed without changes.
9 changes: 6 additions & 3 deletions .../servers/elasticmq-server-bin/default.nix → ...-name/el/elasticmq-server-bin/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 2 additions & 1 deletion pkgs/by-name/en/envoy/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
cmake,
gn,
go,
jdk,
openjdk11_headless,
ninja,
patchelf,
python312,
Expand Down Expand Up @@ -56,6 +56,7 @@ let
.${stdenv.system} or (throw "unsupported system ${stdenv.system}");

python3 = python312;
jdk = openjdk11_headless;

in
buildBazelPackage rec {
Expand Down
8 changes: 6 additions & 2 deletions ...cations/misc/ganttproject-bin/default.nix → pkgs/by-name/ga/ganttproject-bin/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
10 changes: 8 additions & 2 deletions ...pplications/editors/greenfoot/default.nix → pkgs/by-name/gr/greenfoot/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
6 changes: 4 additions & 2 deletions ...ications/misc/gremlin-console/default.nix → pkgs/by-name/gr/gremlin-console/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
lib,
stdenv,
makeWrapper,
openjdk,
openjdk11,
}:

let
openjdk = openjdk11;
in
stdenv.mkDerivation rec {
pname = "gremlin-console";
version = "3.7.4";
Expand Down
5 changes: 4 additions & 1 deletion ...lications/misc/gremlin-server/default.nix → pkgs/by-name/gr/gremlin-server/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
lib,
stdenv,
makeWrapper,
openjdk,
openjdk11,
}:
let
openjdk = openjdk11;
in
stdenv.mkDerivation rec {
pname = "gremlin-server";
version = "3.7.0";
Expand Down
0 pkgs/applications/office/jabref/deps.json → pkgs/by-name/ja/jabref/deps.json
View file
Open in desktop
File renamed without changes.
7 changes: 6 additions & 1 deletion pkgs/applications/office/jabref/default.nix → pkgs/by-name/ja/jabref/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...up-0.11b_beta20160615-build-xml-git.patch → ...up-0.11b_beta20160615-build-xml-git.patch
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions ...evelopment/libraries/java/cup/default.nix → pkgs/by-name/ja/javaCup/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
11 changes: 8 additions & 3 deletions ...elopment/tools/parsing/javacc/default.nix → pkgs/by-name/ja/javacc/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
0 .../xml/jing-trang/no-git-during-build.patch → ...e/ji/jing-trang/no-git-during-build.patch
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions pkgs/tools/text/xml/jing-trang/default.nix → pkgs/by-name/ji/jing-trang/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 2 additions & 1 deletion ...elopment/tools/java/jprofiler/default.nix → pkgs/by-name/jp/jprofiler/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
makeDesktopItem,
copyDesktopItems,
_7zz,
jdk,
jdk11,
}:

let
jdk = jdk11;
pname = "jprofiler";
version = "14.0.5";
nameApp = "JProfiler";
Expand Down
6 changes: 4 additions & 2 deletions ...ations/misc/keystore-explorer/default.nix → .../by-name/ke/keystore-explorer/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
6 changes: 4 additions & 2 deletions ...ibraries/java/libmatthew-java/default.nix → pkgs/by-name/li/libmatthew_java/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
10 changes: 7 additions & 3 deletions ...s/games/minecraft/mcaselector/default.nix → pkgs/by-name/mc/mcaselector/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
wrapGAppsHook3,
jre,
}:

let
jre' = jre.override {
enableJavaFX = true;
};
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "mcaselector";
version = "2.5.3";
Expand All @@ -20,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
dontBuild = true;

nativeBuildInputs = [
jre
jre'
makeWrapper
wrapGAppsHook3
];
Expand All @@ -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[@]}
'';
Expand Down
0 ...working/openapi-generator-cli/example.nix → ...name/op/openapi-generator-cli/example.nix
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...working/openapi-generator-cli/default.nix → ...name/op/openapi-generator-cli/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 2 additions & 1 deletion ...tions/science/misc/openrefine/default.nix → pkgs/by-name/op/openrefine/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
fetchFromGitHub,
buildNpmPackage,
curl,
jdk,
jdk17,
jq,
makeWrapper,
maven,
}:

let
jdk = jdk17;
version = "3.9.5";
src = fetchFromGitHub {
owner = "openrefine";
Expand Down
0 ...cations/science/misc/openrefine/update.sh → pkgs/by-name/op/openrefine/update.sh
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions pkgs/applications/misc/pattypan/default.nix → pkgs/by-name/pa/pattypan/package.nix
View file
Open in desktop
Copy link
Member

@fee1-dead fee1-dead Sep 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait, nevermind. Was this change required in the first place?

Copy link
Member Author

@tomodachi94 tomodachi94 Sep 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit confused. This PR's aim is to reduce technical debt through cleanup. Could you be a bit more specific?

The migration to by-name, among other benefits like reducing the size of all-packages.nix, also allows non-committer maintainers to merge r-ryantm's version updates using NixOS-merge-bot without needing a committer to merge it.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
copyDesktopItems,
stripJavaArchivesHook,
}:

let
jdk' = jdk.override { enableJavaFX = true; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "pattypan";
version = "22.03";
Expand Down Expand Up @@ -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"
'';
Expand Down
0 ...s/processing/disable-revision-check.patch → ...r/processing/disable-revision-check.patch
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...lications/graphics/processing/default.nix → pkgs/by-name/pr/processing/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
ant,
unzip,
makeWrapper,
jdk,
jdk17,
jogl,
rsync,
ffmpeg,
Expand All @@ -16,6 +16,7 @@
libGL,
}:
let
jdk = jdk17;
buildNumber = "1295";
vaqua = fetchurl {
name = "VAqua9.jar";
Expand Down
Loading
Loading