treewide: move to by-name part 2

+13 -52
+4 -4
pkgs/applications/misc/freemind/default.nix pkgs/by-name/fr/freemind/package.nix
··· 3 3 stdenv, 4 4 fetchurl, 5 5 ant, 6 - jdk, 7 - jre, 6 + jdk8, 7 + jre8, 8 8 makeWrapper, 9 9 stripJavaArchivesHook, 10 10 }: ··· 20 20 21 21 nativeBuildInputs = [ 22 22 ant 23 - jdk 23 + jdk8 24 24 makeWrapper 25 25 stripJavaArchivesHook 26 26 ]; ··· 58 58 59 59 postFixup = '' 60 60 makeWrapper $out/share/freemind/freemind.sh $out/bin/freemind \ 61 - --set JAVA_HOME ${jre} 61 + --set JAVA_HOME ${jre8} 62 62 ''; 63 63 64 64 meta = {
pkgs/applications/science/logic/cvc5/default.nix pkgs/by-name/cv/cvc5/package.nix
+2 -2
pkgs/by-name/we/webcord-vencord/package.nix
··· 1 1 { 2 2 # allow overriding electron 3 - electron, 3 + electron_36, 4 4 webcord, 5 5 replaceVars, 6 6 lib, ··· 8 8 }: 9 9 10 10 # nixpkgs-update: no auto update 11 - (webcord.override { inherit electron; }).overrideAttrs (old: { 11 + (webcord.override { inherit electron_36; }).overrideAttrs (old: { 12 12 pname = "webcord-vencord"; 13 13 14 14 patches = (old.patches or [ ]) ++ [
+2 -2
pkgs/by-name/we/webcord/package.nix
··· 5 5 copyDesktopItems, 6 6 python3, 7 7 xdg-utils, 8 - electron, 8 + electron_36, 9 9 makeDesktopItem, 10 10 }: 11 11 ··· 55 55 install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png 56 56 57 57 # Add xdg-utils to path via suffix, per PR #181171 58 - makeWrapper '${lib.getExe electron}' $out/bin/webcord \ 58 + makeWrapper '${lib.getExe electron_36}' $out/bin/webcord \ 59 59 --suffix PATH : "${binPath}" \ 60 60 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ 61 61 --add-flags $out/lib/node_modules/webcord/
pkgs/development/libraries/lief/default.nix pkgs/by-name/li/lief/package.nix
+3 -3
pkgs/development/tools/analysis/jdepend/default.nix pkgs/by-name/jd/jdepend/package.nix
··· 3 3 stdenv, 4 4 fetchFromGitHub, 5 5 ant, 6 - jdk, 6 + jdk8, 7 7 makeWrapper, 8 8 stripJavaArchivesHook, 9 9 }: ··· 21 21 22 22 nativeBuildInputs = [ 23 23 ant 24 - jdk 24 + jdk8 25 25 makeWrapper 26 26 stripJavaArchivesHook 27 27 ]; ··· 37 37 38 38 install -Dm644 dist/jdepend-*.jar -t $out/share/jdepend 39 39 40 - makeWrapper ${jdk.jre}/bin/java $out/bin/jdepend \ 40 + makeWrapper ${jdk8.jre}/bin/java $out/bin/jdepend \ 41 41 --add-flags "-classpath $out/share/jdepend/jdepend-*.jar" 42 42 43 43 for type in "swingui" "textui" "xmlui"; do
+2 -2
pkgs/development/tools/analysis/pmd/default.nix pkgs/by-name/pm/pmd/package.nix
··· 4 4 fetchurl, 5 5 unzip, 6 6 makeWrapper, 7 - openjdk, 7 + jdk8, 8 8 }: 9 9 10 10 stdenv.mkDerivation rec { ··· 31 31 install -Dm644 lib/*.jar -t $out/lib/pmd 32 32 33 33 wrapProgram $out/libexec/pmd \ 34 - --prefix PATH : ${openjdk.jre}/bin \ 34 + --prefix PATH : ${jdk8.jre}/bin \ 35 35 --set LIB_DIR $out/lib/pmd 36 36 37 37 for app in pmd cpd cpdgui designer bgastviewer designerold ast-dump; do
pkgs/development/tools/build-managers/rake/Gemfile pkgs/by-name/ra/rake/Gemfile
pkgs/development/tools/build-managers/rake/Gemfile.lock pkgs/by-name/ra/rake/Gemfile.lock
pkgs/development/tools/build-managers/rake/default.nix pkgs/by-name/ra/rake/package.nix
pkgs/development/tools/build-managers/rake/gemset.nix pkgs/by-name/ra/rake/gemset.nix
pkgs/development/tools/jazzy/Gemfile pkgs/by-name/ja/jazzy/Gemfile
pkgs/development/tools/jazzy/Gemfile.lock pkgs/by-name/ja/jazzy/Gemfile.lock
pkgs/development/tools/jazzy/default.nix pkgs/by-name/ja/jazzy/package.nix
pkgs/development/tools/jazzy/gemset.nix pkgs/by-name/ja/jazzy/gemset.nix
pkgs/development/tools/sqlint/Gemfile pkgs/by-name/sq/sqlint/Gemfile
pkgs/development/tools/sqlint/Gemfile.lock pkgs/by-name/sq/sqlint/Gemfile.lock
pkgs/development/tools/sqlint/default.nix pkgs/by-name/sq/sqlint/package.nix
pkgs/development/tools/sqlint/gemset.nix pkgs/by-name/sq/sqlint/gemset.nix
pkgs/servers/computing/torque/default.nix pkgs/by-name/to/torque/package.nix
pkgs/servers/irc/solanum/default.nix pkgs/by-name/so/solanum/package.nix
pkgs/servers/irc/solanum/dont-create-logdir.patch pkgs/by-name/so/solanum/dont-create-logdir.patch
pkgs/servers/roapi/http.nix pkgs/by-name/ro/roapi-http/package.nix
pkgs/servers/sickbeard/patches/override-python-version-check.patch pkgs/by-name/si/sickgear/patches/override-python-version-check.patch
pkgs/servers/sickbeard/sickgear.nix pkgs/by-name/si/sickgear/package.nix
pkgs/tools/misc/t/Gemfile pkgs/by-name/t/t/Gemfile
pkgs/tools/misc/t/Gemfile.lock pkgs/by-name/t/t/Gemfile.lock
pkgs/tools/misc/t/default.nix pkgs/by-name/t/t/package.nix
pkgs/tools/misc/t/gemset.nix pkgs/by-name/t/t/gemset.nix
pkgs/tools/package-management/nix-pin/default.nix pkgs/by-name/ni/nix-pin/package.nix
-39
pkgs/top-level/all-packages.nix
··· 2271 2271 2272 2272 lexicon = with python3Packages; toPythonApplication dns-lexicon; 2273 2273 2274 - lief = callPackage ../development/libraries/lief { }; 2275 - 2276 2274 # Less secure variant of lowdown for use inside Nix builds. 2277 2275 lowdown-unsandboxed = lowdown.override { 2278 2276 enableDarwinSandbox = false; ··· 2425 2423 mcelog = callPackage ../os-specific/linux/mcelog { 2426 2424 util-linux = util-linuxMinimal; 2427 2425 }; 2428 - 2429 - sqlint = callPackage ../development/tools/sqlint { }; 2430 2426 2431 2427 apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { }; 2432 2428 ··· 3366 3362 usePulseaudio = true; 3367 3363 }; 3368 3364 3369 - jazzy = callPackage ../development/tools/jazzy { }; 3370 - 3371 3365 jc = with python3Packages; toPythonApplication jc; 3372 3366 3373 3367 jello = with python3Packages; toPythonApplication jello; ··· 4355 4349 4356 4350 stm32loader = with python3Packages; toPythonApplication stm32loader; 4357 4351 4358 - solanum = callPackage ../servers/irc/solanum { }; 4359 - 4360 4352 solc-select = with python3Packages; toPythonApplication solc-select; 4361 4353 4362 4354 splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot; ··· 4407 4399 }; 4408 4400 4409 4401 systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { }; 4410 - 4411 - t = callPackage ../tools/misc/t { }; 4412 4402 4413 4403 tartube = callPackage ../applications/video/tartube { }; 4414 4404 ··· 7226 7216 7227 7217 gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; 7228 7218 7229 - pmd = callPackage ../development/tools/analysis/pmd { 7230 - openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 7231 - }; 7232 - 7233 - jdepend = callPackage ../development/tools/analysis/jdepend { 7234 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 7235 - }; 7236 - 7237 7219 flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; 7238 7220 flex = callPackage ../development/tools/parsing/flex { }; 7239 7221 ··· 10661 10643 erlang = erlang_27; 10662 10644 elixir = elixir_1_17.override { inherit erlang; }; 10663 10645 }; 10664 - 10665 - rake = callPackage ../development/tools/build-managers/rake { }; 10666 10646 10667 10647 rethinkdb = callPackage ../servers/nosql/rethinkdb { 10668 10648 stdenv = clangStdenv; ··· 10715 10695 # see also openssl, which has/had this same trick 10716 10696 }; 10717 10697 10718 - sickgear = callPackage ../servers/sickbeard/sickgear.nix { }; 10719 - 10720 10698 spacecookie = haskell.lib.compose.justStaticExecutables haskellPackages.spacecookie; 10721 10699 10722 10700 inherit (callPackages ../servers/http/tomcat { }) ··· 10726 10704 ; 10727 10705 10728 10706 tomcat = tomcat11; 10729 - 10730 - torque = callPackage ../servers/computing/torque { }; 10731 10707 10732 10708 virtualenv = with python3Packages; toPythonApplication virtualenv; 10733 10709 ··· 11579 11555 protobuf = protobuf_21; # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178 11580 11556 }; 11581 11557 11582 - roapi-http = callPackage ../servers/roapi/http.nix { }; 11583 - 11584 11558 shaderc = callPackage ../development/compilers/shaderc { 11585 11559 inherit (darwin) autoSignDarwinBinariesHook; 11586 11560 }; ··· 12280 12254 }; 12281 12255 }; 12282 12256 12283 - freemind = callPackage ../applications/misc/freemind { 12284 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 12285 - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 12286 - }; 12287 - 12288 12257 inherit 12289 12258 ({ 12290 12259 freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; ··· 14128 14097 }; 14129 14098 14130 14099 webcamoid = qt6Packages.callPackage ../applications/video/webcamoid { }; 14131 - 14132 - webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_36; }; 14133 - 14134 - webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_36; }; 14135 14100 14136 14101 webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs { 14137 14102 stdenv = if stdenv.cc.isClang then gccStdenv else stdenv; ··· 15418 15383 stdenv = gccStdenv; 15419 15384 }; 15420 15385 15421 - cvc5 = callPackage ../applications/science/logic/cvc5 { }; 15422 - 15423 15386 ekrhyper = callPackage ../applications/science/logic/ekrhyper { 15424 15387 ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml; 15425 15388 }; ··· 16006 15969 nix-index = callPackage ../tools/package-management/nix-index/wrapper.nix { }; 16007 15970 16008 15971 nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter); 16009 - 16010 - nix-pin = callPackage ../tools/package-management/nix-pin { }; 16011 15972 16012 15973 nix-prefetch-github = with python3Packages; toPythonApplication nix-prefetch-github; 16013 15974