diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/by-name/al/alembic/package.nix similarity index 100% rename from pkgs/development/libraries/alembic/default.nix rename to pkgs/by-name/al/alembic/package.nix diff --git a/pkgs/development/libraries/arrayfire/no-assets.patch b/pkgs/by-name/ar/arrayfire/no-assets.patch similarity index 100% rename from pkgs/development/libraries/arrayfire/no-assets.patch rename to pkgs/by-name/ar/arrayfire/no-assets.patch diff --git a/pkgs/development/libraries/arrayfire/no-download.patch b/pkgs/by-name/ar/arrayfire/no-download.patch similarity index 100% rename from pkgs/development/libraries/arrayfire/no-download.patch rename to pkgs/by-name/ar/arrayfire/no-download.patch diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/by-name/ar/arrayfire/package.nix similarity index 100% rename from pkgs/development/libraries/arrayfire/default.nix rename to pkgs/by-name/ar/arrayfire/package.nix diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/by-name/ca/cardpeek/package.nix similarity index 100% rename from pkgs/applications/misc/cardpeek/default.nix rename to pkgs/by-name/ca/cardpeek/package.nix diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/by-name/ca/cargo-vet/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-vet/default.nix rename to pkgs/by-name/ca/cargo-vet/package.nix diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/by-name/ca/catcli/package.nix similarity index 100% rename from pkgs/tools/filesystems/catcli/default.nix rename to pkgs/by-name/ca/catcli/package.nix diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/by-name/cl/cloudflared/package.nix similarity index 100% rename from pkgs/applications/networking/cloudflared/default.nix rename to pkgs/by-name/cl/cloudflared/package.nix diff --git a/pkgs/applications/networking/cloudflared/tests.nix b/pkgs/by-name/cl/cloudflared/tests.nix similarity index 100% rename from pkgs/applications/networking/cloudflared/tests.nix rename to pkgs/by-name/cl/cloudflared/tests.nix diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/by-name/da/databricks-sql-cli/package.nix similarity index 100% rename from pkgs/applications/misc/databricks-sql-cli/default.nix rename to pkgs/by-name/da/databricks-sql-cli/package.nix diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/by-name/de/devpi-client/package.nix similarity index 100% rename from pkgs/development/tools/devpi-client/default.nix rename to pkgs/by-name/de/devpi-client/package.nix diff --git a/pkgs/applications/audio/easyabc/hardcoded-paths.patch b/pkgs/by-name/ea/easyabc/hardcoded-paths.patch similarity index 100% rename from pkgs/applications/audio/easyabc/hardcoded-paths.patch rename to pkgs/by-name/ea/easyabc/hardcoded-paths.patch diff --git a/pkgs/applications/audio/easyabc/default.nix b/pkgs/by-name/ea/easyabc/package.nix similarity index 100% rename from pkgs/applications/audio/easyabc/default.nix rename to pkgs/by-name/ea/easyabc/package.nix diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/by-name/ec/ecryptfs/package.nix similarity index 100% rename from pkgs/tools/security/ecryptfs/default.nix rename to pkgs/by-name/ec/ecryptfs/package.nix diff --git a/pkgs/applications/version-management/gitmux/default.nix b/pkgs/by-name/gi/gitmux/package.nix similarity index 100% rename from pkgs/applications/version-management/gitmux/default.nix rename to pkgs/by-name/gi/gitmux/package.nix diff --git a/pkgs/games/gshogi/default.nix b/pkgs/by-name/gs/gshogi/package.nix similarity index 100% rename from pkgs/games/gshogi/default.nix rename to pkgs/by-name/gs/gshogi/package.nix diff --git a/pkgs/applications/misc/html5validator/default.nix b/pkgs/by-name/ht/html5validator/package.nix similarity index 100% rename from pkgs/applications/misc/html5validator/default.nix rename to pkgs/by-name/ht/html5validator/package.nix diff --git a/pkgs/development/libraries/libepoxy/libgl-path.patch b/pkgs/by-name/li/libepoxy/libgl-path.patch similarity index 100% rename from pkgs/development/libraries/libepoxy/libgl-path.patch rename to pkgs/by-name/li/libepoxy/libgl-path.patch diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/by-name/li/libepoxy/package.nix similarity index 100% rename from pkgs/development/libraries/libepoxy/default.nix rename to pkgs/by-name/li/libepoxy/package.nix diff --git a/pkgs/applications/display-managers/ly/deps.nix b/pkgs/by-name/ly/ly/deps.nix similarity index 100% rename from pkgs/applications/display-managers/ly/deps.nix rename to pkgs/by-name/ly/ly/deps.nix diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/by-name/ly/ly/package.nix similarity index 100% rename from pkgs/applications/display-managers/ly/default.nix rename to pkgs/by-name/ly/ly/package.nix diff --git a/pkgs/tools/games/mymcplus/default.nix b/pkgs/by-name/my/mymcplus/package.nix similarity index 100% rename from pkgs/tools/games/mymcplus/default.nix rename to pkgs/by-name/my/mymcplus/package.nix diff --git a/pkgs/applications/science/misc/nextinspace/default.nix b/pkgs/by-name/ne/nextinspace/package.nix similarity index 100% rename from pkgs/applications/science/misc/nextinspace/default.nix rename to pkgs/by-name/ne/nextinspace/package.nix diff --git a/pkgs/applications/misc/nimbo/default.nix b/pkgs/by-name/ni/nimbo/package.nix similarity index 100% rename from pkgs/applications/misc/nimbo/default.nix rename to pkgs/by-name/ni/nimbo/package.nix diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/by-name/op/opentimestamps-client/package.nix similarity index 100% rename from pkgs/tools/misc/opentimestamps-client/default.nix rename to pkgs/by-name/op/opentimestamps-client/package.nix diff --git a/pkgs/tools/networking/pingu/default.nix b/pkgs/by-name/pi/pingu/package.nix similarity index 100% rename from pkgs/tools/networking/pingu/default.nix rename to pkgs/by-name/pi/pingu/package.nix diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/by-name/py/pysolfc/package.nix similarity index 100% rename from pkgs/games/pysolfc/default.nix rename to pkgs/by-name/py/pysolfc/package.nix diff --git a/pkgs/games/pysolfc/pysolfc-datadir.patch b/pkgs/by-name/py/pysolfc/pysolfc-datadir.patch similarity index 100% rename from pkgs/games/pysolfc/pysolfc-datadir.patch rename to pkgs/by-name/py/pysolfc/pysolfc-datadir.patch diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/by-name/sn/snagboot/package.nix similarity index 100% rename from pkgs/applications/misc/snagboot/default.nix rename to pkgs/by-name/sn/snagboot/package.nix diff --git a/pkgs/development/tools/tarmac/default.nix b/pkgs/by-name/ta/tarmac/package.nix similarity index 100% rename from pkgs/development/tools/tarmac/default.nix rename to pkgs/by-name/ta/tarmac/package.nix diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/by-name/tf/tftui/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/tftui/default.nix rename to pkgs/by-name/tf/tftui/package.nix diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/by-name/tu/tunefish/package.nix similarity index 100% rename from pkgs/applications/audio/tunefish/default.nix rename to pkgs/by-name/tu/tunefish/package.nix diff --git a/pkgs/applications/networking/twtxt/default.nix b/pkgs/by-name/tw/twtxt/package.nix similarity index 100% rename from pkgs/applications/networking/twtxt/default.nix rename to pkgs/by-name/tw/twtxt/package.nix diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/by-name/ub/ubidump/package.nix similarity index 100% rename from pkgs/tools/filesystems/ubidump/default.nix rename to pkgs/by-name/ub/ubidump/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6be7b7913055..07e582472069 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -357,8 +357,6 @@ with pkgs; copilot-language-server-fhs = copilot-language-server.fhs; - databricks-sql-cli = callPackage ../applications/misc/databricks-sql-cli { }; - deck = callPackage ../by-name/de/deck/package.nix { buildGoModule = buildGo123Module; }; @@ -399,8 +397,6 @@ with pkgs; inherit (gridlock) nyarr; - html5validator = callPackage ../applications/misc/html5validator { }; - inspec = callPackage ../tools/misc/inspec { }; lshw-gui = lshw.override { withGUI = true; }; @@ -1170,8 +1166,6 @@ with pkgs; mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { }; - mymcplus = callPackage ../tools/games/mymcplus { }; - networkd-notify = python3Packages.callPackage ../tools/networking/networkd-notify { systemd = pkgs.systemd; }; @@ -1201,8 +1195,6 @@ with pkgs; shaperglot = with python3Packages; toPythonApplication shaperglot; - snagboot = callPackage ../applications/misc/snagboot { }; - slipstream = callPackage ../tools/games/slipstream { jdk = jdk8; }; @@ -1387,8 +1379,6 @@ with pkgs; pythonPackages = python3Packages; }; - gitmux = callPackage ../applications/version-management/gitmux { }; - gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { }; lucky-commit = callPackage ../applications/version-management/lucky-commit { @@ -1848,8 +1838,6 @@ with pkgs; certipy = with python3Packages; toPythonApplication certipy-ad; - catcli = callPackage ../tools/filesystems/catcli { }; - chipsec = callPackage ../tools/security/chipsec { kernel = null; withDriver = false; @@ -2205,8 +2193,6 @@ with pkgs; catch2_3 = callPackage ../development/libraries/catch2/3.nix { }; - cardpeek = callPackage ../applications/misc/cardpeek { }; - ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests }; @@ -2228,8 +2214,6 @@ with pkgs; cloud-init = callPackage ../tools/virtualization/cloud-init { inherit systemd; }; - cloudflared = callPackage ../applications/networking/cloudflared { }; - clingo = callPackage ../applications/science/logic/potassco/clingo.nix { }; clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { }; @@ -2350,8 +2334,6 @@ with pkgs; enableSSH = true; }; - easyabc = callPackage ../applications/audio/easyabc { }; - easyaudiosync = qt6Packages.callPackage ../applications/audio/easyaudiosync { }; easycrypt = callPackage ../applications/science/logic/easycrypt { @@ -3235,8 +3217,6 @@ with pkgs; dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { }; - ecryptfs = callPackage ../tools/security/ecryptfs { }; - eid-mw = callPackage ../tools/security/eid-mw { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -4827,8 +4807,6 @@ with pkgs; pinentry_mac = callPackage ../tools/security/pinentry/mac.nix { }; - pingu = callPackage ../tools/networking/pingu { }; - pinnwand = callPackage ../servers/pinnwand { }; piping-server-rust = callPackage ../servers/piping-server-rust { @@ -5424,12 +5402,8 @@ with pkgs; python3Packages.callPackage ../applications/misc/twitch-chat-downloader { }; - twtxt = callPackage ../applications/networking/twtxt { }; - twurl = callPackage ../tools/misc/twurl { }; - ubidump = callPackage ../tools/filesystems/ubidump { }; - ubpm = libsForQt5.callPackage ../applications/misc/ubpm { }; uftraceFull = uftrace.override { @@ -5922,8 +5896,6 @@ with pkgs; llvmPackages = crystal.llvmPackages; }; - devpi-client = callPackage ../development/tools/devpi-client { }; - devpi-server = python3Packages.callPackage ../development/tools/devpi-server { }; dprint-plugins = recurseIntoAttrs (callPackage ../by-name/dp/dprint/plugins { }); @@ -6996,7 +6968,6 @@ with pkgs; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; - cargo-vet = callPackage ../development/tools/rust/cargo-vet { }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { inherit (darwin.apple_sdk.frameworks) Foundation Cocoa; }; @@ -8524,8 +8495,6 @@ with pkgs; ) haskellPackages.haskell-ci; - nimbo = callPackage ../applications/misc/nimbo { }; - nixbang = callPackage ../development/tools/misc/nixbang { pythonPackages = python3Packages; }; @@ -8751,8 +8720,6 @@ with pkgs; stdenv = gccStdenv; }; - tarmac = callPackage ../development/tools/tarmac { }; - teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; @@ -8924,8 +8891,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) PCSC; }; - arrayfire = callPackage ../development/libraries/arrayfire { }; - asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; asio = callPackage ../development/libraries/asio { }; @@ -9172,8 +9137,6 @@ with pkgs; }; enchant = enchant2; - libepoxy = callPackage ../development/libraries/libepoxy { }; - factorPackages-0_99 = callPackage ./factor-packages.nix { factor-unwrapped = callPackage ../development/compilers/factor-lang/0.99.nix { }; }; @@ -13672,8 +13635,6 @@ with pkgs; airwave = libsForQt5.callPackage ../applications/audio/airwave { }; - alembic = callPackage ../development/libraries/alembic { }; - amarok = libsForQt5.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility @@ -15585,8 +15546,6 @@ with pkgs; openscad = libsForQt5.callPackage ../applications/graphics/openscad { }; - opentimestamps-client = callPackage ../tools/misc/opentimestamps-client { }; - opentoonz = libsForQt5.callPackage ../applications/graphics/opentoonz { }; opentx = libsForQt5.callPackage ../applications/misc/opentx { }; @@ -16019,8 +15978,6 @@ with pkgs; inherit (xfce) xfce4-dev-tools; }; - ly = callPackage ../applications/display-managers/ly { }; - curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; curaengine = callPackage ../applications/misc/curaengine { @@ -16315,8 +16272,6 @@ with pkgs; trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; - tunefish = callPackage ../applications/audio/tunefish { }; - tuxclocker = libsForQt5.callPackage ../applications/misc/tuxclocker { tuxclocker-plugins = tuxclocker-plugins-with-unfree; }; @@ -17231,8 +17186,6 @@ with pkgs; gscrabble = python3Packages.callPackage ../games/gscrabble { }; - gshogi = callPackage ../games/gshogi { }; - qtads = qt5.callPackage ../games/qtads { }; ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; }; @@ -17406,8 +17359,6 @@ with pkgs; protobuf = protobuf_21; }; - pysolfc = callPackage ../games/pysolfc { }; - quake3wrapper = callPackage ../games/quake3/wrapper { }; quake3demo = quake3wrapper { @@ -18382,8 +18333,6 @@ with pkgs; inherit (ocaml-ng.ocamlPackages_4_14) ocaml; }; - nextinspace = callPackage ../applications/science/misc/nextinspace { }; - ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; }; rink = callPackage ../applications/science/misc/rink { @@ -18983,8 +18932,6 @@ with pkgs; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { }; - tftui = callPackage ../applications/networking/cluster/tftui { }; - trufflehog = callPackage ../tools/security/trufflehog { buildGoModule = buildGo123Module; };