diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/by-name/as/asn2quickder/package.nix similarity index 100% rename from pkgs/development/tools/asn2quickder/default.nix rename to pkgs/by-name/as/asn2quickder/package.nix diff --git a/pkgs/applications/misc/bitwarden-menu/default.nix b/pkgs/by-name/bi/bitwarden-menu/package.nix similarity index 100% rename from pkgs/applications/misc/bitwarden-menu/default.nix rename to pkgs/by-name/bi/bitwarden-menu/package.nix diff --git a/pkgs/applications/misc/bluetooth_battery/default.nix b/pkgs/by-name/bl/bluetooth_battery/package.nix similarity index 100% rename from pkgs/applications/misc/bluetooth_battery/default.nix rename to pkgs/by-name/bl/bluetooth_battery/package.nix diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/by-name/cm/cm-rgb/package.nix similarity index 100% rename from pkgs/tools/system/cm-rgb/default.nix rename to pkgs/by-name/cm/cm-rgb/package.nix diff --git a/pkgs/os-specific/linux/cpupower-gui/default.nix b/pkgs/by-name/cp/cpupower-gui/package.nix similarity index 100% rename from pkgs/os-specific/linux/cpupower-gui/default.nix rename to pkgs/by-name/cp/cpupower-gui/package.nix diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/by-name/cv/cve-bin-tool/package.nix similarity index 100% rename from pkgs/tools/security/cve-bin-tool/default.nix rename to pkgs/by-name/cv/cve-bin-tool/package.nix diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/by-name/dr/droopy/package.nix similarity index 100% rename from pkgs/applications/networking/droopy/default.nix rename to pkgs/by-name/dr/droopy/package.nix diff --git a/pkgs/development/tools/enochecker-test/default.nix b/pkgs/by-name/en/enochecker-test/package.nix similarity index 100% rename from pkgs/development/tools/enochecker-test/default.nix rename to pkgs/by-name/en/enochecker-test/package.nix diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/by-name/gd/gdbgui/package.nix similarity index 100% rename from pkgs/development/tools/misc/gdbgui/default.nix rename to pkgs/by-name/gd/gdbgui/package.nix diff --git a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix b/pkgs/by-name/hy/hyprshade/package.nix similarity index 100% rename from pkgs/applications/window-managers/hyprwm/hyprshade/default.nix rename to pkgs/by-name/hy/hyprshade/package.nix diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/by-name/in/input-remapper/package.nix similarity index 100% rename from pkgs/tools/inputmethods/input-remapper/default.nix rename to pkgs/by-name/in/input-remapper/package.nix diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/by-name/je/jellyfin-mpv-shim/package.nix similarity index 100% rename from pkgs/applications/video/jellyfin-mpv-shim/default.nix rename to pkgs/by-name/je/jellyfin-mpv-shim/package.nix diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/by-name/ma/matrix-commander/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/matrix-commander/default.nix rename to pkgs/by-name/ma/matrix-commander/package.nix diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/by-name/ma/mavproxy/package.nix similarity index 100% rename from pkgs/applications/science/robotics/mavproxy/default.nix rename to pkgs/by-name/ma/mavproxy/package.nix diff --git a/pkgs/tools/networking/namespaced-openvpn/default.nix b/pkgs/by-name/na/namespaced-openvpn/package.nix similarity index 100% rename from pkgs/tools/networking/namespaced-openvpn/default.nix rename to pkgs/by-name/na/namespaced-openvpn/package.nix diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/by-name/ni/nitrokey-app2/package.nix similarity index 100% rename from pkgs/tools/security/nitrokey-app2/default.nix rename to pkgs/by-name/ni/nitrokey-app2/package.nix diff --git a/pkgs/tools/misc/online-judge-template-generator/default.nix b/pkgs/by-name/on/online-judge-template-generator/package.nix similarity index 100% rename from pkgs/tools/misc/online-judge-template-generator/default.nix rename to pkgs/by-name/on/online-judge-template-generator/package.nix diff --git a/pkgs/tools/misc/pandoc-acro/default.nix b/pkgs/by-name/pa/pandoc-acro/package.nix similarity index 100% rename from pkgs/tools/misc/pandoc-acro/default.nix rename to pkgs/by-name/pa/pandoc-acro/package.nix diff --git a/pkgs/tools/misc/pandoc-drawio-filter/default.nix b/pkgs/by-name/pa/pandoc-drawio-filter/package.nix similarity index 100% rename from pkgs/tools/misc/pandoc-drawio-filter/default.nix rename to pkgs/by-name/pa/pandoc-drawio-filter/package.nix diff --git a/pkgs/tools/misc/pandoc-eqnos/default.nix b/pkgs/by-name/pa/pandoc-eqnos/package.nix similarity index 100% rename from pkgs/tools/misc/pandoc-eqnos/default.nix rename to pkgs/by-name/pa/pandoc-eqnos/package.nix diff --git a/pkgs/tools/misc/pandoc-fignos/default.nix b/pkgs/by-name/pa/pandoc-fignos/package.nix similarity index 100% rename from pkgs/tools/misc/pandoc-fignos/default.nix rename to pkgs/by-name/pa/pandoc-fignos/package.nix diff --git a/pkgs/tools/misc/pandoc-imagine/default.nix b/pkgs/by-name/pa/pandoc-imagine/package.nix similarity index 100% rename from pkgs/tools/misc/pandoc-imagine/default.nix rename to pkgs/by-name/pa/pandoc-imagine/package.nix diff --git a/pkgs/tools/misc/pandoc-include/default.nix b/pkgs/by-name/pa/pandoc-include/package.nix similarity index 100% rename from pkgs/tools/misc/pandoc-include/default.nix rename to pkgs/by-name/pa/pandoc-include/package.nix diff --git a/pkgs/tools/misc/pandoc-plantuml-filter/default.nix b/pkgs/by-name/pa/pandoc-plantuml-filter/package.nix similarity index 100% rename from pkgs/tools/misc/pandoc-plantuml-filter/default.nix rename to pkgs/by-name/pa/pandoc-plantuml-filter/package.nix diff --git a/pkgs/tools/misc/pandoc-secnos/default.nix b/pkgs/by-name/pa/pandoc-secnos/package.nix similarity index 100% rename from pkgs/tools/misc/pandoc-secnos/default.nix rename to pkgs/by-name/pa/pandoc-secnos/package.nix diff --git a/pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch b/pkgs/by-name/pa/pandoc-secnos/patch/fix-manifest.patch similarity index 100% rename from pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch rename to pkgs/by-name/pa/pandoc-secnos/patch/fix-manifest.patch diff --git a/pkgs/tools/misc/pandoc-tablenos/default.nix b/pkgs/by-name/pa/pandoc-tablenos/package.nix similarity index 100% rename from pkgs/tools/misc/pandoc-tablenos/default.nix rename to pkgs/by-name/pa/pandoc-tablenos/package.nix diff --git a/pkgs/tools/security/pass2csv/default.nix b/pkgs/by-name/pa/pass2csv/package.nix similarity index 100% rename from pkgs/tools/security/pass2csv/default.nix rename to pkgs/by-name/pa/pass2csv/package.nix diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/by-name/pd/pdd/package.nix similarity index 100% rename from pkgs/tools/misc/pdd/default.nix rename to pkgs/by-name/pd/pdd/package.nix diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/by-name/pl/plex-mpv-shim/package.nix similarity index 100% rename from pkgs/applications/video/plex-mpv-shim/default.nix rename to pkgs/by-name/pl/plex-mpv-shim/package.nix diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/by-name/re/remarkable-mouse/package.nix similarity index 100% rename from pkgs/applications/misc/remarkable/remarkable-mouse/default.nix rename to pkgs/by-name/re/remarkable-mouse/package.nix diff --git a/pkgs/tools/misc/remote-exec/default.nix b/pkgs/by-name/re/remote-exec/package.nix similarity index 100% rename from pkgs/tools/misc/remote-exec/default.nix rename to pkgs/by-name/re/remote-exec/package.nix diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/by-name/s3/s3cmd/package.nix similarity index 100% rename from pkgs/tools/networking/s3cmd/default.nix rename to pkgs/by-name/s3/s3cmd/package.nix diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/by-name/su/sumorobot-manager/package.nix similarity index 100% rename from pkgs/applications/science/robotics/sumorobot-manager/default.nix rename to pkgs/by-name/su/sumorobot-manager/package.nix diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/by-name/te/termpdfpy/package.nix similarity index 100% rename from pkgs/applications/misc/termpdf.py/default.nix rename to pkgs/by-name/te/termpdfpy/package.nix diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/by-name/vi/vimwiki-markdown/package.nix similarity index 100% rename from pkgs/tools/misc/vimwiki-markdown/default.nix rename to pkgs/by-name/vi/vimwiki-markdown/package.nix diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/by-name/vp/vpn-slice/package.nix similarity index 100% rename from pkgs/tools/networking/vpn-slice/default.nix rename to pkgs/by-name/vp/vpn-slice/package.nix diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/by-name/ya/yakut/package.nix similarity index 100% rename from pkgs/development/tools/misc/yakut/default.nix rename to pkgs/by-name/ya/yakut/package.nix diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/by-name/yo/yokadi/package.nix similarity index 100% rename from pkgs/applications/misc/yokadi/default.nix rename to pkgs/by-name/yo/yokadi/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cb689540262..9320a56ea5d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -407,8 +407,6 @@ with pkgs; dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { }; - enochecker-test = callPackage ../development/tools/enochecker-test { }; - inherit (gridlock) nyarr; lshw-gui = lshw.override { withGUI = true; }; @@ -1417,8 +1415,6 @@ with pkgs; bitwarden-directory-connector ; - bitwarden-menu = callPackage ../applications/misc/bitwarden-menu { }; - blocksat-cli = with python3Packages; toPythonApplication blocksat-cli; bucklespring-x11 = callPackage ../by-name/bu/bucklespring-libinput/package.nix { legacy = true; }; @@ -1725,16 +1721,12 @@ with pkgs; cairo = cairo.override { xcbSupport = true; }; }; - hyprshade = callPackage ../applications/window-managers/hyprwm/hyprshade { }; - hyprlandPlugins = recurseIntoAttrs ( callPackage ../applications/window-managers/hyprwm/hyprland-plugins { } ); intensity-normalization = with python3Packages; toPythonApplication intensity-normalization; - jellyfin-mpv-shim = callPackage ../applications/video/jellyfin-mpv-shim { }; - klaus = with python3Packages; toPythonApplication klaus; klipper = callPackage ../servers/klipper { }; @@ -1802,8 +1794,6 @@ with pkgs; ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf; - online-judge-template-generator = callPackage ../tools/misc/online-judge-template-generator { }; - online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools; inherit (ocamlPackages) patdiff; @@ -1812,8 +1802,6 @@ with pkgs; pixcat = with python3Packages; toPythonApplication pixcat; - remarkable-mouse = callPackage ../applications/misc/remarkable/remarkable-mouse { }; - ropgadget = with python3Packages; toPythonApplication ropgadget; scour = with python3Packages; toPythonApplication scour; @@ -1972,8 +1960,6 @@ with pkgs; blacken-docs = with python3Packages; toPythonApplication blacken-docs; - bluetooth_battery = callPackage ../applications/misc/bluetooth_battery { }; - cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert; clickhouse-lts = callPackage ../by-name/cl/clickhouse/lts.nix { }; @@ -2047,8 +2033,6 @@ with pkgs; ngtcp2 = ngtcp2-gnutls; }; - cve-bin-tool = callPackage ../tools/security/cve-bin-tool { }; - dconf2nix = callPackage ../development/tools/haskell/dconf2nix { }; inherit (callPackages ../applications/networking/p2p/deluge { }) @@ -2400,8 +2384,6 @@ with pkgs; infisical = callPackage ../development/tools/infisical { }; - input-remapper = callPackage ../tools/inputmethods/input-remapper { }; - internetarchive = with python3Packages; toPythonApplication internetarchive; iocextract = with python3Packages; toPythonApplication iocextract; @@ -2759,21 +2741,6 @@ with pkgs; nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher; - pandoc-acro = callPackage ../tools/misc/pandoc-acro { }; - - pandoc-imagine = callPackage ../tools/misc/pandoc-imagine { }; - - pandoc-include = callPackage ../tools/misc/pandoc-include { }; - - pandoc-drawio-filter = callPackage ../tools/misc/pandoc-drawio-filter { }; - - pandoc-plantuml-filter = callPackage ../tools/misc/pandoc-plantuml-filter { }; - - pandoc-eqnos = callPackage ../tools/misc/pandoc-eqnos { }; - pandoc-fignos = callPackage ../tools/misc/pandoc-fignos { }; - pandoc-secnos = callPackage ../tools/misc/pandoc-secnos { }; - pandoc-tablenos = callPackage ../tools/misc/pandoc-tablenos { }; - pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { }; nsjail = callPackage ../tools/security/nsjail { @@ -2842,8 +2809,6 @@ with pkgs; inherit (llvmPackages) stdenv; }; - namespaced-openvpn = callPackage ../tools/networking/namespaced-openvpn { }; - update-dotdee = with python3Packages; toPythonApplication update-dotdee; update-nix-fetchgit = haskell.lib.compose.justStaticExecutables haskellPackages.update-nix-fetchgit; @@ -2901,8 +2866,6 @@ with pkgs; polkitSupport = true; }; - pdd = callPackage ../tools/misc/pdd { }; - pdfminer = with python3Packages; toPythonApplication pdfminer-six; pdfium-binaries-v8 = pdfium-binaries.override { withV8 = true; }; @@ -3009,8 +2972,6 @@ with pkgs; recoll-nox = recoll.override { withGui = false; }; - remote-exec = callPackage ../tools/misc/remote-exec { }; - reptor = with python3.pkgs; toPythonApplication reptor; inherit (callPackage ../development/misc/resholve { }) @@ -3035,8 +2996,6 @@ with pkgs; ruby-lsp = rubyPackages.ruby-lsp; - s3cmd = callPackage ../tools/networking/s3cmd { }; - s3-credentials = with python3Packages; toPythonApplication s3-credentials; safety-cli = with python3.pkgs; toPythonApplication safety; @@ -3085,8 +3044,6 @@ with pkgs; strip-nondeterminism = perlPackages.strip-nondeterminism; - sumorobot-manager = callPackage ../applications/science/robotics/sumorobot-manager { }; - sslscan = callPackage ../tools/security/sslscan { openssl = openssl.override { withZlib = true; }; }; @@ -3175,13 +3132,9 @@ with pkgs; vimpager = callPackage ../tools/misc/vimpager { }; vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { }; - vimwiki-markdown = callPackage ../tools/misc/vimwiki-markdown { }; - voxtype-vulkan = callPackage ../by-name/vo/voxtype/package.nix { vulkanSupport = true; }; voxtype-onnx = callPackage ../by-name/vo/voxtype/package.nix { onnxSupport = true; }; - vpn-slice = callPackage ../tools/networking/vpn-slice { }; - openconnectPackages = callPackage ../tools/networking/openconnect { }; inherit (openconnectPackages) openconnect openconnect_openssl; @@ -5009,8 +4962,6 @@ with pkgs; ansible-builder = with python3Packages; toPythonApplication ansible-builder; - yakut = callPackage ../development/tools/misc/yakut { }; - ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS inherit (callPackages ../development/tools/language-servers/nixd { }) nixf nixt nixd; @@ -5041,8 +4992,6 @@ with pkgs; apacheKafka = apacheKafka_4_2; - asn2quickder = callPackage ../development/tools/asn2quickder { }; - libastyle = astyle.override { asLibrary = true; }; aws-adfs = with python3Packages; toPythonApplication aws-adfs; @@ -5393,8 +5342,6 @@ with pkgs; haskellPackages.callPackage ../tools/misc/fffuu { } ); - gdbgui = callPackage ../development/tools/misc/gdbgui { }; - flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; flex = callPackage ../development/tools/parsing/flex { }; @@ -5454,8 +5401,6 @@ with pkgs; maven3 = maven; inherit (maven) buildMaven; - mavproxy = callPackage ../applications/science/robotics/mavproxy { }; - python-matter-server = with python3Packages; toPythonApplication ( @@ -8006,8 +7951,6 @@ with pkgs; }; busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { }; - cm-rgb = callPackage ../tools/system/cm-rgb { }; - conky = callPackage ../os-specific/linux/conky ( { lua = lua5_4; @@ -8016,8 +7959,6 @@ with pkgs; // config.conky or { } ); - cpupower-gui = callPackage ../os-specific/linux/cpupower-gui { }; - # Darwin package set # # Even though this is a set of packages not single package, use `callPackage` @@ -8813,8 +8754,6 @@ with pkgs; drawterm-wayland = callPackage ../by-name/dr/drawterm/package.nix { withWayland = true; }; - droopy = callPackage ../applications/networking/droopy { }; - evilwm = callPackage ../applications/window-managers/evilwm { patches = config.evilwm.patches or [ ]; }; @@ -9130,8 +9069,6 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - pass2csv = callPackage ../tools/security/pass2csv { }; - pinboard = with python3Packages; toPythonApplication pinboard; pinboard-notes-backup = haskell.lib.compose.justStaticExecutables haskellPackages.pinboard-notes-backup; @@ -9320,8 +9257,6 @@ with pkgs; shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { }; }; - matrix-commander = callPackage ../applications/networking/instant-messengers/matrix-commander { }; - mediaelch-qt5 = callPackage ../by-name/me/mediaelch/package.nix { qtVersion = 5; }; mediaelch-qt6 = mediaelch; @@ -9515,8 +9450,6 @@ with pkgs; inherit (pidginPackages) pidgin; - plex-mpv-shim = callPackage ../applications/video/plex-mpv-shim { }; - # 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 ( @@ -10119,8 +10052,6 @@ with pkgs; ydiff = with python3.pkgs; toPythonApplication ydiff; - yokadi = callPackage ../applications/misc/yokadi { }; - your-editor = callPackage ../applications/editors/your-editor { stdenv = gccStdenv; }; youtube-dl = with python3Packages; toPythonApplication youtube-dl; @@ -11264,8 +11195,6 @@ with pkgs; hasktags = haskellPackages.hasktags; }; - termpdfpy = callPackage ../applications/misc/termpdf.py { }; - inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform terraform_1 @@ -11376,8 +11305,6 @@ with pkgs; torcs-without-data = callPackage ../by-name/to/torcs/without-data.nix { }; - nitrokey-app2 = callPackage ../tools/security/nitrokey-app2 { }; - hy = with python3Packages; toPythonApplication hy; ghc-standalone-archive =