treewide: move to by-name part 2

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 = {

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

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

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 [ ]) ++ [

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/

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 { })