From 147d02e310b472fcf1c1498d7d6bebb1acdbd6e7 Mon Sep 17 00:00:00 2001 From: liberodark Date: Fri, 1 Aug 2025 14:41:22 +0200 Subject: [PATCH] treewide: move to by-name part 2 --- .../cv/cvc5/package.nix} | 0 .../fr/freemind/package.nix} | 8 ++-- .../tools => by-name/ja}/jazzy/Gemfile | 0 .../tools => by-name/ja}/jazzy/Gemfile.lock | 0 .../tools => by-name/ja}/jazzy/gemset.nix | 0 .../ja/jazzy/package.nix} | 0 .../jd/jdepend/package.nix} | 6 +-- .../li/lief/package.nix} | 0 .../ni/nix-pin/package.nix} | 0 .../pm/pmd/package.nix} | 4 +- .../ra}/rake/Gemfile | 0 .../ra}/rake/Gemfile.lock | 0 .../ra}/rake/gemset.nix | 0 .../ra/rake/package.nix} | 0 .../ro/roapi-http/package.nix} | 0 .../si/sickgear/package.nix} | 0 .../override-python-version-check.patch | 0 .../so}/solanum/dont-create-logdir.patch | 0 .../so/solanum/package.nix} | 0 .../tools => by-name/sq}/sqlint/Gemfile | 0 .../tools => by-name/sq}/sqlint/Gemfile.lock | 0 .../tools => by-name/sq}/sqlint/gemset.nix | 0 .../sq/sqlint/package.nix} | 0 pkgs/{tools/misc => by-name/t}/t/Gemfile | 0 pkgs/{tools/misc => by-name/t}/t/Gemfile.lock | 0 pkgs/{tools/misc => by-name/t}/t/gemset.nix | 0 .../t/default.nix => by-name/t/t/package.nix} | 0 .../to/torque/package.nix} | 0 pkgs/by-name/we/webcord-vencord/package.nix | 4 +- pkgs/by-name/we/webcord/package.nix | 4 +- pkgs/top-level/all-packages.nix | 39 ------------------- 31 files changed, 13 insertions(+), 52 deletions(-) rename pkgs/{applications/science/logic/cvc5/default.nix => by-name/cv/cvc5/package.nix} (100%) rename pkgs/{applications/misc/freemind/default.nix => by-name/fr/freemind/package.nix} (96%) rename pkgs/{development/tools => by-name/ja}/jazzy/Gemfile (100%) rename pkgs/{development/tools => by-name/ja}/jazzy/Gemfile.lock (100%) rename pkgs/{development/tools => by-name/ja}/jazzy/gemset.nix (100%) rename pkgs/{development/tools/jazzy/default.nix => by-name/ja/jazzy/package.nix} (100%) rename pkgs/{development/tools/analysis/jdepend/default.nix => by-name/jd/jdepend/package.nix} (94%) rename pkgs/{development/libraries/lief/default.nix => by-name/li/lief/package.nix} (100%) rename pkgs/{tools/package-management/nix-pin/default.nix => by-name/ni/nix-pin/package.nix} (100%) rename pkgs/{development/tools/analysis/pmd/default.nix => by-name/pm/pmd/package.nix} (95%) rename pkgs/{development/tools/build-managers => by-name/ra}/rake/Gemfile (100%) rename pkgs/{development/tools/build-managers => by-name/ra}/rake/Gemfile.lock (100%) rename pkgs/{development/tools/build-managers => by-name/ra}/rake/gemset.nix (100%) rename pkgs/{development/tools/build-managers/rake/default.nix => by-name/ra/rake/package.nix} (100%) rename pkgs/{servers/roapi/http.nix => by-name/ro/roapi-http/package.nix} (100%) rename pkgs/{servers/sickbeard/sickgear.nix => by-name/si/sickgear/package.nix} (100%) rename pkgs/{servers/sickbeard => by-name/si/sickgear}/patches/override-python-version-check.patch (100%) rename pkgs/{servers/irc => by-name/so}/solanum/dont-create-logdir.patch (100%) rename pkgs/{servers/irc/solanum/default.nix => by-name/so/solanum/package.nix} (100%) rename pkgs/{development/tools => by-name/sq}/sqlint/Gemfile (100%) rename pkgs/{development/tools => by-name/sq}/sqlint/Gemfile.lock (100%) rename pkgs/{development/tools => by-name/sq}/sqlint/gemset.nix (100%) rename pkgs/{development/tools/sqlint/default.nix => by-name/sq/sqlint/package.nix} (100%) rename pkgs/{tools/misc => by-name/t}/t/Gemfile (100%) rename pkgs/{tools/misc => by-name/t}/t/Gemfile.lock (100%) rename pkgs/{tools/misc => by-name/t}/t/gemset.nix (100%) rename pkgs/{tools/misc/t/default.nix => by-name/t/t/package.nix} (100%) rename pkgs/{servers/computing/torque/default.nix => by-name/to/torque/package.nix} (100%) diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/by-name/cv/cvc5/package.nix similarity index 100% rename from pkgs/applications/science/logic/cvc5/default.nix rename to pkgs/by-name/cv/cvc5/package.nix diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/by-name/fr/freemind/package.nix similarity index 96% rename from pkgs/applications/misc/freemind/default.nix rename to pkgs/by-name/fr/freemind/package.nix index 5e5d205c8ae9..f19484e10bfa 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/by-name/fr/freemind/package.nix @@ -3,8 +3,8 @@ stdenv, fetchurl, ant, - jdk, - jre, + jdk8, + jre8, makeWrapper, stripJavaArchivesHook, }: @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ ant - jdk + jdk8 makeWrapper stripJavaArchivesHook ]; @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' makeWrapper $out/share/freemind/freemind.sh $out/bin/freemind \ - --set JAVA_HOME ${jre} + --set JAVA_HOME ${jre8} ''; meta = { diff --git a/pkgs/development/tools/jazzy/Gemfile b/pkgs/by-name/ja/jazzy/Gemfile similarity index 100% rename from pkgs/development/tools/jazzy/Gemfile rename to pkgs/by-name/ja/jazzy/Gemfile diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/by-name/ja/jazzy/Gemfile.lock similarity index 100% rename from pkgs/development/tools/jazzy/Gemfile.lock rename to pkgs/by-name/ja/jazzy/Gemfile.lock diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/by-name/ja/jazzy/gemset.nix similarity index 100% rename from pkgs/development/tools/jazzy/gemset.nix rename to pkgs/by-name/ja/jazzy/gemset.nix diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/by-name/ja/jazzy/package.nix similarity index 100% rename from pkgs/development/tools/jazzy/default.nix rename to pkgs/by-name/ja/jazzy/package.nix diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/by-name/jd/jdepend/package.nix similarity index 94% rename from pkgs/development/tools/analysis/jdepend/default.nix rename to pkgs/by-name/jd/jdepend/package.nix index 6ba10c6611c7..135c7e0a7501 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/by-name/jd/jdepend/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, ant, - jdk, + jdk8, makeWrapper, stripJavaArchivesHook, }: @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ ant - jdk + jdk8 makeWrapper stripJavaArchivesHook ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 dist/jdepend-*.jar -t $out/share/jdepend - makeWrapper ${jdk.jre}/bin/java $out/bin/jdepend \ + makeWrapper ${jdk8.jre}/bin/java $out/bin/jdepend \ --add-flags "-classpath $out/share/jdepend/jdepend-*.jar" for type in "swingui" "textui" "xmlui"; do diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/by-name/li/lief/package.nix similarity index 100% rename from pkgs/development/libraries/lief/default.nix rename to pkgs/by-name/li/lief/package.nix diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/by-name/ni/nix-pin/package.nix similarity index 100% rename from pkgs/tools/package-management/nix-pin/default.nix rename to pkgs/by-name/ni/nix-pin/package.nix diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/by-name/pm/pmd/package.nix similarity index 95% rename from pkgs/development/tools/analysis/pmd/default.nix rename to pkgs/by-name/pm/pmd/package.nix index 567699b6b3c6..2be5fdf1012a 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/by-name/pm/pmd/package.nix @@ -4,7 +4,7 @@ fetchurl, unzip, makeWrapper, - openjdk, + jdk8, }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { install -Dm644 lib/*.jar -t $out/lib/pmd wrapProgram $out/libexec/pmd \ - --prefix PATH : ${openjdk.jre}/bin \ + --prefix PATH : ${jdk8.jre}/bin \ --set LIB_DIR $out/lib/pmd for app in pmd cpd cpdgui designer bgastviewer designerold ast-dump; do diff --git a/pkgs/development/tools/build-managers/rake/Gemfile b/pkgs/by-name/ra/rake/Gemfile similarity index 100% rename from pkgs/development/tools/build-managers/rake/Gemfile rename to pkgs/by-name/ra/rake/Gemfile diff --git a/pkgs/development/tools/build-managers/rake/Gemfile.lock b/pkgs/by-name/ra/rake/Gemfile.lock similarity index 100% rename from pkgs/development/tools/build-managers/rake/Gemfile.lock rename to pkgs/by-name/ra/rake/Gemfile.lock diff --git a/pkgs/development/tools/build-managers/rake/gemset.nix b/pkgs/by-name/ra/rake/gemset.nix similarity index 100% rename from pkgs/development/tools/build-managers/rake/gemset.nix rename to pkgs/by-name/ra/rake/gemset.nix diff --git a/pkgs/development/tools/build-managers/rake/default.nix b/pkgs/by-name/ra/rake/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/rake/default.nix rename to pkgs/by-name/ra/rake/package.nix diff --git a/pkgs/servers/roapi/http.nix b/pkgs/by-name/ro/roapi-http/package.nix similarity index 100% rename from pkgs/servers/roapi/http.nix rename to pkgs/by-name/ro/roapi-http/package.nix diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/by-name/si/sickgear/package.nix similarity index 100% rename from pkgs/servers/sickbeard/sickgear.nix rename to pkgs/by-name/si/sickgear/package.nix diff --git a/pkgs/servers/sickbeard/patches/override-python-version-check.patch b/pkgs/by-name/si/sickgear/patches/override-python-version-check.patch similarity index 100% rename from pkgs/servers/sickbeard/patches/override-python-version-check.patch rename to pkgs/by-name/si/sickgear/patches/override-python-version-check.patch diff --git a/pkgs/servers/irc/solanum/dont-create-logdir.patch b/pkgs/by-name/so/solanum/dont-create-logdir.patch similarity index 100% rename from pkgs/servers/irc/solanum/dont-create-logdir.patch rename to pkgs/by-name/so/solanum/dont-create-logdir.patch diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/by-name/so/solanum/package.nix similarity index 100% rename from pkgs/servers/irc/solanum/default.nix rename to pkgs/by-name/so/solanum/package.nix diff --git a/pkgs/development/tools/sqlint/Gemfile b/pkgs/by-name/sq/sqlint/Gemfile similarity index 100% rename from pkgs/development/tools/sqlint/Gemfile rename to pkgs/by-name/sq/sqlint/Gemfile diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/by-name/sq/sqlint/Gemfile.lock similarity index 100% rename from pkgs/development/tools/sqlint/Gemfile.lock rename to pkgs/by-name/sq/sqlint/Gemfile.lock diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/by-name/sq/sqlint/gemset.nix similarity index 100% rename from pkgs/development/tools/sqlint/gemset.nix rename to pkgs/by-name/sq/sqlint/gemset.nix diff --git a/pkgs/development/tools/sqlint/default.nix b/pkgs/by-name/sq/sqlint/package.nix similarity index 100% rename from pkgs/development/tools/sqlint/default.nix rename to pkgs/by-name/sq/sqlint/package.nix diff --git a/pkgs/tools/misc/t/Gemfile b/pkgs/by-name/t/t/Gemfile similarity index 100% rename from pkgs/tools/misc/t/Gemfile rename to pkgs/by-name/t/t/Gemfile diff --git a/pkgs/tools/misc/t/Gemfile.lock b/pkgs/by-name/t/t/Gemfile.lock similarity index 100% rename from pkgs/tools/misc/t/Gemfile.lock rename to pkgs/by-name/t/t/Gemfile.lock diff --git a/pkgs/tools/misc/t/gemset.nix b/pkgs/by-name/t/t/gemset.nix similarity index 100% rename from pkgs/tools/misc/t/gemset.nix rename to pkgs/by-name/t/t/gemset.nix diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/by-name/t/t/package.nix similarity index 100% rename from pkgs/tools/misc/t/default.nix rename to pkgs/by-name/t/t/package.nix diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/by-name/to/torque/package.nix similarity index 100% rename from pkgs/servers/computing/torque/default.nix rename to pkgs/by-name/to/torque/package.nix diff --git a/pkgs/by-name/we/webcord-vencord/package.nix b/pkgs/by-name/we/webcord-vencord/package.nix index de047eb43990..ceb69cc66988 100644 --- a/pkgs/by-name/we/webcord-vencord/package.nix +++ b/pkgs/by-name/we/webcord-vencord/package.nix @@ -1,6 +1,6 @@ { # allow overriding electron - electron, + electron_36, webcord, replaceVars, lib, @@ -8,7 +8,7 @@ }: # nixpkgs-update: no auto update -(webcord.override { inherit electron; }).overrideAttrs (old: { +(webcord.override { inherit electron_36; }).overrideAttrs (old: { pname = "webcord-vencord"; patches = (old.patches or [ ]) ++ [ diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index 244def175a97..ae2a230af021 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -5,7 +5,7 @@ copyDesktopItems, python3, xdg-utils, - electron, + electron_36, makeDesktopItem, }: @@ -55,7 +55,7 @@ buildNpmPackage rec { install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png # Add xdg-utils to path via suffix, per PR #181171 - makeWrapper '${lib.getExe electron}' $out/bin/webcord \ + makeWrapper '${lib.getExe electron_36}' $out/bin/webcord \ --suffix PATH : "${binPath}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags $out/lib/node_modules/webcord/ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15b7b79653f4..5db14169b48d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2271,8 +2271,6 @@ with pkgs; lexicon = with python3Packages; toPythonApplication dns-lexicon; - lief = callPackage ../development/libraries/lief { }; - # Less secure variant of lowdown for use inside Nix builds. lowdown-unsandboxed = lowdown.override { enableDarwinSandbox = false; @@ -2426,8 +2424,6 @@ with pkgs; util-linux = util-linuxMinimal; }; - sqlint = callPackage ../development/tools/sqlint { }; - apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { }; asciidoc = callPackage ../tools/typesetting/asciidoc { @@ -3366,8 +3362,6 @@ with pkgs; usePulseaudio = true; }; - jazzy = callPackage ../development/tools/jazzy { }; - jc = with python3Packages; toPythonApplication jc; jello = with python3Packages; toPythonApplication jello; @@ -4355,8 +4349,6 @@ with pkgs; stm32loader = with python3Packages; toPythonApplication stm32loader; - solanum = callPackage ../servers/irc/solanum { }; - solc-select = with python3Packages; toPythonApplication solc-select; splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot; @@ -4408,8 +4400,6 @@ with pkgs; systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { }; - t = callPackage ../tools/misc/t { }; - tartube = callPackage ../applications/video/tartube { }; tartube-yt-dlp = callPackage ../applications/video/tartube { @@ -7226,14 +7216,6 @@ with pkgs; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; - pmd = callPackage ../development/tools/analysis/pmd { - openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - - jdepend = callPackage ../development/tools/analysis/jdepend { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; flex = callPackage ../development/tools/parsing/flex { }; @@ -10662,8 +10644,6 @@ with pkgs; elixir = elixir_1_17.override { inherit erlang; }; }; - rake = callPackage ../development/tools/build-managers/rake { }; - rethinkdb = callPackage ../servers/nosql/rethinkdb { stdenv = clangStdenv; libtool = cctools; @@ -10715,8 +10695,6 @@ with pkgs; # see also openssl, which has/had this same trick }; - sickgear = callPackage ../servers/sickbeard/sickgear.nix { }; - spacecookie = haskell.lib.compose.justStaticExecutables haskellPackages.spacecookie; inherit (callPackages ../servers/http/tomcat { }) @@ -10727,8 +10705,6 @@ with pkgs; tomcat = tomcat11; - torque = callPackage ../servers/computing/torque { }; - virtualenv = with python3Packages; toPythonApplication virtualenv; virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; @@ -11579,8 +11555,6 @@ with pkgs; protobuf = protobuf_21; # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178 }; - roapi-http = callPackage ../servers/roapi/http.nix { }; - shaderc = callPackage ../development/compilers/shaderc { inherit (darwin) autoSignDarwinBinariesHook; }; @@ -12280,11 +12254,6 @@ with pkgs; }; }; - freemind = callPackage ../applications/misc/freemind { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - inherit ({ freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; @@ -14129,10 +14098,6 @@ with pkgs; webcamoid = qt6Packages.callPackage ../applications/video/webcamoid { }; - webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_36; }; - - webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_36; }; - webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs { stdenv = if stdenv.cc.isClang then gccStdenv else stdenv; }; @@ -15418,8 +15383,6 @@ with pkgs; stdenv = gccStdenv; }; - cvc5 = callPackage ../applications/science/logic/cvc5 { }; - ekrhyper = callPackage ../applications/science/logic/ekrhyper { ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml; }; @@ -16007,8 +15970,6 @@ with pkgs; nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter); - nix-pin = callPackage ../tools/package-management/nix-pin { }; - nix-prefetch-github = with python3Packages; toPythonApplication nix-prefetch-github; inherit (callPackages ../tools/package-management/nix-prefetch-scripts { })