diff --git a/pkgs/data/fonts/0xproto/default.nix b/pkgs/by-name/_0/_0xproto/package.nix
similarity index 100%
rename from pkgs/data/fonts/0xproto/default.nix
rename to pkgs/by-name/_0/_0xproto/package.nix
diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/by-name/_2/_2048-in-terminal/package.nix
similarity index 100%
rename from pkgs/games/2048-in-terminal/default.nix
rename to pkgs/by-name/_2/_2048-in-terminal/package.nix
diff --git a/pkgs/games/20kly/default.nix b/pkgs/by-name/_2/_20kly/package.nix
similarity index 100%
rename from pkgs/games/20kly/default.nix
rename to pkgs/by-name/_2/_20kly/package.nix
diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/by-name/_3/_3270font/package.nix
similarity index 100%
rename from pkgs/data/fonts/3270font/default.nix
rename to pkgs/by-name/_3/_3270font/package.nix
diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/by-name/_3/_3mux/package.nix
similarity index 100%
rename from pkgs/tools/misc/3mux/default.nix
rename to pkgs/by-name/_3/_3mux/package.nix
diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/by-name/_3/_3proxy/package.nix
similarity index 100%
rename from pkgs/applications/networking/3proxy/default.nix
rename to pkgs/by-name/_3/_3proxy/package.nix
diff --git a/pkgs/servers/web-apps/5etools/default.nix b/pkgs/by-name/_5/_5etools/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/5etools/default.nix
rename to pkgs/by-name/_5/_5etools/package.nix
diff --git a/pkgs/tools/networking/6tunnel/default.nix b/pkgs/by-name/_6/_6tunnel/package.nix
similarity index 100%
rename from pkgs/tools/networking/6tunnel/default.nix
rename to pkgs/by-name/_6/_6tunnel/package.nix
diff --git a/pkgs/games/7kaa/default.nix b/pkgs/by-name/_7/_7kaa/package.nix
similarity index 100%
rename from pkgs/games/7kaa/default.nix
rename to pkgs/by-name/_7/_7kaa/package.nix
diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/by-name/_9/_915resolution/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/915resolution/default.nix
rename to pkgs/by-name/_9/_915resolution/package.nix
diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/by-name/_9/_9pfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/9pfs/default.nix
rename to pkgs/by-name/_9/_9pfs/package.nix
diff --git a/pkgs/os-specific/linux/9ptls/default.nix b/pkgs/by-name/_9/_9ptls/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/9ptls/default.nix
rename to pkgs/by-name/_9/_9ptls/package.nix
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/by-name/a2/a2jmidid/package.nix
similarity index 100%
rename from pkgs/applications/audio/a2jmidid/default.nix
rename to pkgs/by-name/a2/a2jmidid/package.nix
diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/by-name/a2/a2ps/package.nix
similarity index 100%
rename from pkgs/tools/text/a2ps/default.nix
rename to pkgs/by-name/a2/a2ps/package.nix
diff --git a/pkgs/tools/misc/aaa/default.nix b/pkgs/by-name/aa/aaa/package.nix
similarity index 100%
rename from pkgs/tools/misc/aaa/default.nix
rename to pkgs/by-name/aa/aaa/package.nix
diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/by-name/aa/aacgain/package.nix
similarity index 100%
rename from pkgs/applications/audio/aacgain/default.nix
rename to pkgs/by-name/aa/aacgain/package.nix
diff --git a/pkgs/development/libraries/aalib/clang.patch b/pkgs/by-name/aa/aalib/clang.patch
similarity index 100%
rename from pkgs/development/libraries/aalib/clang.patch
rename to pkgs/by-name/aa/aalib/clang.patch
diff --git a/pkgs/development/libraries/aalib/darwin.patch b/pkgs/by-name/aa/aalib/darwin.patch
similarity index 100%
rename from pkgs/development/libraries/aalib/darwin.patch
rename to pkgs/by-name/aa/aalib/darwin.patch
diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/by-name/aa/aalib/package.nix
similarity index 100%
rename from pkgs/development/libraries/aalib/default.nix
rename to pkgs/by-name/aa/aalib/package.nix
diff --git a/pkgs/development/tools/aapt/default.nix b/pkgs/by-name/aa/aapt/package.nix
similarity index 100%
rename from pkgs/development/tools/aapt/default.nix
rename to pkgs/by-name/aa/aapt/package.nix
diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/by-name/aa/aardvark-dns/package.nix
similarity index 100%
rename from pkgs/tools/networking/aardvark-dns/default.nix
rename to pkgs/by-name/aa/aardvark-dns/package.nix
diff --git a/pkgs/applications/audio/aaxtomp3/default.nix b/pkgs/by-name/aa/aaxtomp3/package.nix
similarity index 100%
rename from pkgs/applications/audio/aaxtomp3/default.nix
rename to pkgs/by-name/aa/aaxtomp3/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/pkgs/by-name/ab/abaddon/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/abaddon/default.nix
rename to pkgs/by-name/ab/abaddon/package.nix
diff --git a/pkgs/games/abbaye-des-morts/default.nix b/pkgs/by-name/ab/abbaye-des-morts/package.nix
similarity index 100%
rename from pkgs/games/abbaye-des-morts/default.nix
rename to pkgs/by-name/ab/abbaye-des-morts/package.nix
diff --git a/pkgs/tools/text/abbreviate/default.nix b/pkgs/by-name/ab/abbreviate/package.nix
similarity index 100%
rename from pkgs/tools/text/abbreviate/default.nix
rename to pkgs/by-name/ab/abbreviate/package.nix
diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/by-name/ab/abc-verifier/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/abc/default.nix
rename to pkgs/by-name/ab/abc-verifier/package.nix
diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/by-name/ab/abcm2ps/package.nix
similarity index 100%
rename from pkgs/tools/audio/abcm2ps/default.nix
rename to pkgs/by-name/ab/abcm2ps/package.nix
diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/by-name/ab/abduco/package.nix
similarity index 100%
rename from pkgs/tools/misc/abduco/default.nix
rename to pkgs/by-name/ab/abduco/package.nix
diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/by-name/ab/abi-compliance-checker/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/abi-compliance-checker/default.nix
rename to pkgs/by-name/ab/abi-compliance-checker/package.nix
diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/by-name/ab/abi-dumper/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/abi-dumper/default.nix
rename to pkgs/by-name/ab/abi-dumper/package.nix
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/by-name/ab/abiword/package.nix
similarity index 100%
rename from pkgs/applications/office/abiword/default.nix
rename to pkgs/by-name/ab/abiword/package.nix
diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/by-name/ab/abook/package.nix
similarity index 100%
rename from pkgs/applications/misc/abook/default.nix
rename to pkgs/by-name/ab/abook/package.nix
diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/by-name/ab/abootimg/package.nix
similarity index 100%
rename from pkgs/development/mobile/abootimg/default.nix
rename to pkgs/by-name/ab/abootimg/package.nix
diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/by-name/ab/abuild/package.nix
similarity index 100%
rename from pkgs/development/tools/abuild/default.nix
rename to pkgs/by-name/ab/abuild/package.nix
diff --git a/pkgs/games/abuse/abuse.sh b/pkgs/by-name/ab/abuse/abuse.sh
similarity index 100%
rename from pkgs/games/abuse/abuse.sh
rename to pkgs/by-name/ab/abuse/abuse.sh
diff --git a/pkgs/games/abuse/default.nix b/pkgs/by-name/ab/abuse/package.nix
similarity index 100%
rename from pkgs/games/abuse/default.nix
rename to pkgs/by-name/ab/abuse/package.nix
diff --git a/pkgs/applications/science/computer-architecture/accelergy/default.nix b/pkgs/by-name/ac/accelergy/package.nix
similarity index 100%
rename from pkgs/applications/science/computer-architecture/accelergy/default.nix
rename to pkgs/by-name/ac/accelergy/package.nix
diff --git a/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch b/pkgs/by-name/ac/accountsservice/Disable-methods-that-change-files-in-etc.patch
similarity index 100%
rename from pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch
rename to pkgs/by-name/ac/accountsservice/Disable-methods-that-change-files-in-etc.patch
diff --git a/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch b/pkgs/by-name/ac/accountsservice/drop-prefix-check-extensions.patch
similarity index 100%
rename from pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch
rename to pkgs/by-name/ac/accountsservice/drop-prefix-check-extensions.patch
diff --git a/pkgs/development/libraries/accountsservice/fix-paths.patch b/pkgs/by-name/ac/accountsservice/fix-paths.patch
similarity index 100%
rename from pkgs/development/libraries/accountsservice/fix-paths.patch
rename to pkgs/by-name/ac/accountsservice/fix-paths.patch
diff --git a/pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch b/pkgs/by-name/ac/accountsservice/get-dm-type-from-config.patch
similarity index 100%
rename from pkgs/development/libraries/accountsservice/get-dm-type-from-config.patch
rename to pkgs/by-name/ac/accountsservice/get-dm-type-from-config.patch
diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/by-name/ac/accountsservice/no-create-dirs.patch
similarity index 100%
rename from pkgs/development/libraries/accountsservice/no-create-dirs.patch
rename to pkgs/by-name/ac/accountsservice/no-create-dirs.patch
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/by-name/ac/accountsservice/package.nix
similarity index 100%
rename from pkgs/development/libraries/accountsservice/default.nix
rename to pkgs/by-name/ac/accountsservice/package.nix
diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/by-name/ac/acct/package.nix
similarity index 100%
rename from pkgs/tools/system/acct/default.nix
rename to pkgs/by-name/ac/acct/package.nix
diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/by-name/ac/accuraterip-checksum/package.nix
similarity index 100%
rename from pkgs/tools/audio/accuraterip-checksum/default.nix
rename to pkgs/by-name/ac/accuraterip-checksum/package.nix
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/by-name/ac/ace/package.nix
similarity index 100%
rename from pkgs/development/libraries/ace/default.nix
rename to pkgs/by-name/ac/ace/package.nix
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/by-name/ac/acgtk/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/acgtk/default.nix
rename to pkgs/by-name/ac/acgtk/package.nix
diff --git a/pkgs/tools/security/acltoolkit/default.nix b/pkgs/by-name/ac/acltoolkit/package.nix
similarity index 100%
rename from pkgs/tools/security/acltoolkit/default.nix
rename to pkgs/by-name/ac/acltoolkit/package.nix
diff --git a/pkgs/tools/admin/acme-sh/default.nix b/pkgs/by-name/ac/acme-sh/package.nix
similarity index 100%
rename from pkgs/tools/admin/acme-sh/default.nix
rename to pkgs/by-name/ac/acme-sh/package.nix
diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/by-name/ac/acme/package.nix
similarity index 100%
rename from pkgs/development/compilers/acme/default.nix
rename to pkgs/by-name/ac/acme/package.nix
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/by-name/ac/acpi/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/acpi/default.nix
rename to pkgs/by-name/ac/acpi/package.nix
diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/by-name/ac/acpid/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/acpid/default.nix
rename to pkgs/by-name/ac/acpid/package.nix
diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/by-name/ac/acpilight/package.nix
similarity index 100%
rename from pkgs/misc/acpilight/default.nix
rename to pkgs/by-name/ac/acpilight/package.nix
diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/by-name/ac/acpitool/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/acpitool/default.nix
rename to pkgs/by-name/ac/acpitool/package.nix
diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/by-name/ac/acsccid/package.nix
similarity index 100%
rename from pkgs/tools/security/acsccid/default.nix
rename to pkgs/by-name/ac/acsccid/package.nix
diff --git a/pkgs/applications/misc/activate-linux/default.nix b/pkgs/by-name/ac/activate-linux/package.nix
similarity index 100%
rename from pkgs/applications/misc/activate-linux/default.nix
rename to pkgs/by-name/ac/activate-linux/package.nix
diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/by-name/ac/actkbd/package.nix
similarity index 100%
rename from pkgs/tools/system/actkbd/default.nix
rename to pkgs/by-name/ac/actkbd/package.nix
diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/by-name/ad/adafruit-ampy/package.nix
similarity index 100%
rename from pkgs/tools/misc/adafruit-ampy/default.nix
rename to pkgs/by-name/ad/adafruit-ampy/package.nix
diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/by-name/ad/adapta-backgrounds/package.nix
similarity index 100%
rename from pkgs/data/misc/adapta-backgrounds/default.nix
rename to pkgs/by-name/ad/adapta-backgrounds/package.nix
diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/by-name/ad/adapta-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/adapta/default.nix
rename to pkgs/by-name/ad/adapta-gtk-theme/package.nix
diff --git a/pkgs/data/themes/adapta-kde/default.nix b/pkgs/by-name/ad/adapta-kde-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/adapta-kde/default.nix
rename to pkgs/by-name/ad/adapta-kde-theme/package.nix
diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/by-name/ad/adbfs-rootless/package.nix
similarity index 100%
rename from pkgs/development/mobile/adbfs-rootless/default.nix
rename to pkgs/by-name/ad/adbfs-rootless/package.nix
diff --git a/pkgs/build-support/add-driver-runpath/default.nix b/pkgs/by-name/ad/addDriverRunpath/package.nix
similarity index 100%
rename from pkgs/build-support/add-driver-runpath/default.nix
rename to pkgs/by-name/ad/addDriverRunpath/package.nix
diff --git a/pkgs/build-support/add-driver-runpath/setup-hook.sh b/pkgs/by-name/ad/addDriverRunpath/setup-hook.sh
similarity index 100%
rename from pkgs/build-support/add-driver-runpath/setup-hook.sh
rename to pkgs/by-name/ad/addDriverRunpath/setup-hook.sh
diff --git a/pkgs/tools/misc/addic7ed-cli/default.nix b/pkgs/by-name/ad/addic7ed-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/addic7ed-cli/default.nix
rename to pkgs/by-name/ad/addic7ed-cli/package.nix
diff --git a/pkgs/tools/misc/addlicense/default.nix b/pkgs/by-name/ad/addlicense/package.nix
similarity index 100%
rename from pkgs/tools/misc/addlicense/default.nix
rename to pkgs/by-name/ad/addlicense/package.nix
diff --git a/pkgs/data/themes/adementary/default.nix b/pkgs/by-name/ad/adementary-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/adementary/default.nix
rename to pkgs/by-name/ad/adementary-theme/package.nix
diff --git a/pkgs/tools/security/adenum/default.nix b/pkgs/by-name/ad/adenum/package.nix
similarity index 100%
rename from pkgs/tools/security/adenum/default.nix
rename to pkgs/by-name/ad/adenum/package.nix
diff --git a/pkgs/applications/networking/adguardian/default.nix b/pkgs/by-name/ad/adguardian/package.nix
similarity index 100%
rename from pkgs/applications/networking/adguardian/default.nix
rename to pkgs/by-name/ad/adguardian/package.nix
diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/default.nix b/pkgs/by-name/ad/adi1090x-plymouth-themes/package.nix
similarity index 100%
rename from pkgs/data/themes/adi1090x-plymouth-themes/default.nix
rename to pkgs/by-name/ad/adi1090x-plymouth-themes/package.nix
diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix b/pkgs/by-name/ad/adi1090x-plymouth-themes/shas.nix
similarity index 100%
rename from pkgs/data/themes/adi1090x-plymouth-themes/shas.nix
rename to pkgs/by-name/ad/adi1090x-plymouth-themes/shas.nix
diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/update.sh b/pkgs/by-name/ad/adi1090x-plymouth-themes/update.sh
similarity index 100%
rename from pkgs/data/themes/adi1090x-plymouth-themes/update.sh
rename to pkgs/by-name/ad/adi1090x-plymouth-themes/update.sh
diff --git a/pkgs/applications/video/adl/default.nix b/pkgs/by-name/ad/adl/package.nix
similarity index 100%
rename from pkgs/applications/video/adl/default.nix
rename to pkgs/by-name/ad/adl/package.nix
diff --git a/pkgs/servers/adminer/default.nix b/pkgs/by-name/ad/adminer/package.nix
similarity index 100%
rename from pkgs/servers/adminer/default.nix
rename to pkgs/by-name/ad/adminer/package.nix
diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/by-name/ad/adms/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/adms/default.nix
rename to pkgs/by-name/ad/adms/package.nix
diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/by-name/ad/adns/package.nix
similarity index 100%
rename from pkgs/development/libraries/adns/default.nix
rename to pkgs/by-name/ad/adns/package.nix
diff --git a/pkgs/applications/science/math/adolc/default.nix b/pkgs/by-name/ad/adolc/package.nix
similarity index 100%
rename from pkgs/applications/science/math/adolc/default.nix
rename to pkgs/by-name/ad/adolc/package.nix
diff --git a/pkgs/tools/security/adreaper/default.nix b/pkgs/by-name/ad/adreaper/package.nix
similarity index 100%
rename from pkgs/tools/security/adreaper/default.nix
rename to pkgs/by-name/ad/adreaper/package.nix
diff --git a/pkgs/tools/misc/adrgen/default.nix b/pkgs/by-name/ad/adrgen/package.nix
similarity index 100%
rename from pkgs/tools/misc/adrgen/default.nix
rename to pkgs/by-name/ad/adrgen/package.nix
diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/by-name/ad/adriconf/package.nix
similarity index 100%
rename from pkgs/tools/graphics/adriconf/default.nix
rename to pkgs/by-name/ad/adriconf/package.nix
diff --git a/pkgs/development/libraries/adslib/default.nix b/pkgs/by-name/ad/adslib/package.nix
similarity index 100%
rename from pkgs/development/libraries/adslib/default.nix
rename to pkgs/by-name/ad/adslib/package.nix
diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/by-name/ad/advancecomp/package.nix
similarity index 100%
rename from pkgs/tools/compression/advancecomp/default.nix
rename to pkgs/by-name/ad/advancecomp/package.nix
diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/by-name/ae/aefs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/aefs/default.nix
rename to pkgs/by-name/ae/aefs/package.nix
diff --git a/pkgs/development/libraries/aemu/LFS64.patch b/pkgs/by-name/ae/aemu/LFS64.patch
similarity index 100%
rename from pkgs/development/libraries/aemu/LFS64.patch
rename to pkgs/by-name/ae/aemu/LFS64.patch
diff --git a/pkgs/development/libraries/aemu/default.nix b/pkgs/by-name/ae/aemu/package.nix
similarity index 100%
rename from pkgs/development/libraries/aemu/default.nix
rename to pkgs/by-name/ae/aemu/package.nix
diff --git a/pkgs/servers/aeron/default.nix b/pkgs/by-name/ae/aeron/package.nix
similarity index 100%
rename from pkgs/servers/aeron/default.nix
rename to pkgs/by-name/ae/aeron/package.nix
diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/by-name/ae/aerospike/package.nix
similarity index 100%
rename from pkgs/servers/nosql/aerospike/default.nix
rename to pkgs/by-name/ae/aerospike/package.nix
diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/by-name/ae/aescrypt/package.nix
similarity index 100%
rename from pkgs/tools/misc/aescrypt/default.nix
rename to pkgs/by-name/ae/aescrypt/package.nix
diff --git a/pkgs/tools/security/aesfix/default.nix b/pkgs/by-name/ae/aesfix/package.nix
similarity index 100%
rename from pkgs/tools/security/aesfix/default.nix
rename to pkgs/by-name/ae/aesfix/package.nix
diff --git a/pkgs/tools/security/aeskeyfind/default.nix b/pkgs/by-name/ae/aeskeyfind/package.nix
similarity index 100%
rename from pkgs/tools/security/aeskeyfind/default.nix
rename to pkgs/by-name/ae/aeskeyfind/package.nix
diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/by-name/ae/aespipe/package.nix
similarity index 100%
rename from pkgs/tools/security/aespipe/default.nix
rename to pkgs/by-name/ae/aespipe/package.nix
diff --git a/pkgs/applications/audio/aether-lv2/default.nix b/pkgs/by-name/ae/aether-lv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/aether-lv2/default.nix
rename to pkgs/by-name/ae/aether-lv2/package.nix
diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/by-name/ae/aewan/package.nix
similarity index 100%
rename from pkgs/applications/editors/aewan/default.nix
rename to pkgs/by-name/ae/aewan/package.nix
diff --git a/pkgs/tools/misc/afetch/default.nix b/pkgs/by-name/af/afetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/afetch/default.nix
rename to pkgs/by-name/af/afetch/package.nix
diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/by-name/af/afew/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/afew/default.nix
rename to pkgs/by-name/af/afew/package.nix
diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/by-name/af/afflib/package.nix
similarity index 100%
rename from pkgs/development/libraries/afflib/default.nix
rename to pkgs/by-name/af/afflib/package.nix
diff --git a/pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch b/pkgs/by-name/af/afio/0001-makefile-fix-installation.patch
similarity index 100%
rename from pkgs/tools/archivers/afio/0001-makefile-fix-installation.patch
rename to pkgs/by-name/af/afio/0001-makefile-fix-installation.patch
diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/by-name/af/afio/package.nix
similarity index 100%
rename from pkgs/tools/archivers/afio/default.nix
rename to pkgs/by-name/af/afio/package.nix
diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/by-name/af/afpfs-ng/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/afpfs-ng/default.nix
rename to pkgs/by-name/af/afpfs-ng/package.nix
diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/by-name/af/aften/package.nix
similarity index 100%
rename from pkgs/development/libraries/aften/default.nix
rename to pkgs/by-name/af/aften/package.nix
diff --git a/pkgs/development/libraries/aften/simd-fallback.patch b/pkgs/by-name/af/aften/simd-fallback.patch
similarity index 100%
rename from pkgs/development/libraries/aften/simd-fallback.patch
rename to pkgs/by-name/af/aften/simd-fallback.patch
diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/by-name/af/afterburn/package.nix
similarity index 100%
rename from pkgs/tools/admin/afterburn/default.nix
rename to pkgs/by-name/af/afterburn/package.nix
diff --git a/pkgs/os-specific/linux/afuse/001-darwin-fdatasync.patch b/pkgs/by-name/af/afuse/001-darwin-fdatasync.patch
similarity index 100%
rename from pkgs/os-specific/linux/afuse/001-darwin-fdatasync.patch
rename to pkgs/by-name/af/afuse/001-darwin-fdatasync.patch
diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/by-name/af/afuse/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/afuse/default.nix
rename to pkgs/by-name/af/afuse/package.nix
diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/by-name/ag/agave/package.nix
similarity index 100%
rename from pkgs/data/fonts/agave/default.nix
rename to pkgs/by-name/ag/agave/package.nix
diff --git a/pkgs/shells/zsh/agdsn-zsh-config/default.nix b/pkgs/by-name/ag/agdsn-zsh-config/package.nix
similarity index 100%
rename from pkgs/shells/zsh/agdsn-zsh-config/default.nix
rename to pkgs/by-name/ag/agdsn-zsh-config/package.nix
diff --git a/pkgs/tools/security/age-plugin-tpm/default.nix b/pkgs/by-name/ag/age-plugin-tpm/package.nix
similarity index 100%
rename from pkgs/tools/security/age-plugin-tpm/default.nix
rename to pkgs/by-name/ag/age-plugin-tpm/package.nix
diff --git a/pkgs/tools/security/age/default.nix b/pkgs/by-name/ag/age/package.nix
similarity index 100%
rename from pkgs/tools/security/age/default.nix
rename to pkgs/by-name/ag/age/package.nix
diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/by-name/ag/agedu/package.nix
similarity index 100%
rename from pkgs/tools/misc/agedu/default.nix
rename to pkgs/by-name/ag/agedu/package.nix
diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/by-name/ag/agenda/package.nix
similarity index 100%
rename from pkgs/applications/office/agenda/default.nix
rename to pkgs/by-name/ag/agenda/package.nix
diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/by-name/ag/agi/package.nix
similarity index 100%
rename from pkgs/tools/graphics/agi/default.nix
rename to pkgs/by-name/ag/agi/package.nix
diff --git a/pkgs/shells/zsh/agkozak-zsh-prompt/default.nix b/pkgs/by-name/ag/agkozak-zsh-prompt/package.nix
similarity index 100%
rename from pkgs/shells/zsh/agkozak-zsh-prompt/default.nix
rename to pkgs/by-name/ag/agkozak-zsh-prompt/package.nix
diff --git a/pkgs/development/tools/continuous-integration/agola/default.nix b/pkgs/by-name/ag/agola/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/agola/default.nix
rename to pkgs/by-name/ag/agola/package.nix
diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/by-name/ag/agrep/package.nix
similarity index 100%
rename from pkgs/tools/text/agrep/default.nix
rename to pkgs/by-name/ag/agrep/package.nix
diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/by-name/ah/aha/package.nix
similarity index 100%
rename from pkgs/tools/text/aha/default.nix
rename to pkgs/by-name/ah/aha/package.nix
diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/by-name/ah/ahcpd/package.nix
similarity index 100%
rename from pkgs/tools/networking/ahcpd/default.nix
rename to pkgs/by-name/ah/ahcpd/package.nix
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/by-name/ah/ahoviewer/package.nix
similarity index 100%
rename from pkgs/applications/graphics/ahoviewer/default.nix
rename to pkgs/by-name/ah/ahoviewer/package.nix
diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/by-name/ai/aiac/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/aiac/default.nix
rename to pkgs/by-name/ai/aiac/package.nix
diff --git a/pkgs/tools/misc/aichat/default.nix b/pkgs/by-name/ai/aichat/package.nix
similarity index 100%
rename from pkgs/tools/misc/aichat/default.nix
rename to pkgs/by-name/ai/aichat/package.nix
diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/by-name/ai/aide/package.nix
similarity index 100%
rename from pkgs/tools/security/aide/default.nix
rename to pkgs/by-name/ai/aide/package.nix
diff --git a/pkgs/applications/science/logic/aiger/fix-missing-header.patch b/pkgs/by-name/ai/aiger/fix-missing-header.patch
similarity index 100%
rename from pkgs/applications/science/logic/aiger/fix-missing-header.patch
rename to pkgs/by-name/ai/aiger/fix-missing-header.patch
diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/by-name/ai/aiger/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/aiger/default.nix
rename to pkgs/by-name/ai/aiger/package.nix
diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/by-name/ai/aileron/package.nix
similarity index 100%
rename from pkgs/data/fonts/aileron/default.nix
rename to pkgs/by-name/ai/aileron/package.nix
diff --git a/pkgs/tools/networking/ain/default.nix b/pkgs/by-name/ai/ain/package.nix
similarity index 100%
rename from pkgs/tools/networking/ain/default.nix
rename to pkgs/by-name/ai/ain/package.nix
diff --git a/pkgs/tools/security/aiodnsbrute/default.nix b/pkgs/by-name/ai/aiodnsbrute/package.nix
similarity index 100%
rename from pkgs/tools/security/aiodnsbrute/default.nix
rename to pkgs/by-name/ai/aiodnsbrute/package.nix
diff --git a/pkgs/development/tools/air/default.nix b/pkgs/by-name/ai/air/package.nix
similarity index 100%
rename from pkgs/development/tools/air/default.nix
rename to pkgs/by-name/ai/air/package.nix
diff --git a/pkgs/os-specific/darwin/airbuddy/default.nix b/pkgs/by-name/ai/airbuddy/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/airbuddy/default.nix
rename to pkgs/by-name/ai/airbuddy/package.nix
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/by-name/ai/aircrack-ng/package.nix
similarity index 100%
rename from pkgs/tools/networking/aircrack-ng/default.nix
rename to pkgs/by-name/ai/aircrack-ng/package.nix
diff --git a/pkgs/tools/networking/airgeddon/default.nix b/pkgs/by-name/ai/airgeddon/package.nix
similarity index 100%
rename from pkgs/tools/networking/airgeddon/default.nix
rename to pkgs/by-name/ai/airgeddon/package.nix
diff --git a/pkgs/games/airshipper/default.nix b/pkgs/by-name/ai/airshipper/package.nix
similarity index 100%
rename from pkgs/games/airshipper/default.nix
rename to pkgs/by-name/ai/airshipper/package.nix
diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/by-name/ai/airsonic/package.nix
similarity index 100%
rename from pkgs/servers/misc/airsonic/default.nix
rename to pkgs/by-name/ai/airsonic/package.nix
diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/by-name/ai/airspy/package.nix
similarity index 100%
rename from pkgs/applications/radio/airspy/default.nix
rename to pkgs/by-name/ai/airspy/package.nix
diff --git a/pkgs/applications/radio/airspyhf/default.nix b/pkgs/by-name/ai/airspyhf/package.nix
similarity index 100%
rename from pkgs/applications/radio/airspyhf/default.nix
rename to pkgs/by-name/ai/airspyhf/package.nix
diff --git a/pkgs/games/airstrike/default.nix b/pkgs/by-name/ai/airstrike/package.nix
similarity index 100%
rename from pkgs/games/airstrike/default.nix
rename to pkgs/by-name/ai/airstrike/package.nix
diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/by-name/ai/airwindows-lv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/airwindows-lv2/default.nix
rename to pkgs/by-name/ai/airwindows-lv2/package.nix
diff --git a/pkgs/development/libraries/aixlog/default.nix b/pkgs/by-name/ai/aixlog/package.nix
similarity index 100%
rename from pkgs/development/libraries/aixlog/default.nix
rename to pkgs/by-name/ai/aixlog/package.nix
diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/by-name/aj/aj-snapshot/package.nix
similarity index 100%
rename from pkgs/applications/audio/aj-snapshot/default.nix
rename to pkgs/by-name/aj/aj-snapshot/package.nix
diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/by-name/ak/akira-unstable/package.nix
similarity index 100%
rename from pkgs/applications/graphics/akira/default.nix
rename to pkgs/by-name/ak/akira-unstable/package.nix
diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/by-name/al/alacritty-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/alacritty-theme/default.nix
rename to pkgs/by-name/al/alacritty-theme/package.nix
diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/by-name/al/alacritty/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/alacritty/default.nix
rename to pkgs/by-name/al/alacritty/package.nix
diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/by-name/al/alarm-clock-applet/package.nix
similarity index 100%
rename from pkgs/tools/misc/alarm-clock-applet/default.nix
rename to pkgs/by-name/al/alarm-clock-applet/package.nix
diff --git a/pkgs/applications/video/alass/default.nix b/pkgs/by-name/al/alass/package.nix
similarity index 100%
rename from pkgs/applications/video/alass/default.nix
rename to pkgs/by-name/al/alass/package.nix
diff --git a/pkgs/data/themes/albatross/default.nix b/pkgs/by-name/al/albatross/package.nix
similarity index 100%
rename from pkgs/data/themes/albatross/default.nix
rename to pkgs/by-name/al/albatross/package.nix
diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/by-name/al/alchemy/package.nix
similarity index 100%
rename from pkgs/applications/graphics/alchemy/default.nix
rename to pkgs/by-name/al/alchemy/package.nix
diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/by-name/al/alda/package.nix
similarity index 100%
rename from pkgs/development/interpreters/alda/default.nix
rename to pkgs/by-name/al/alda/package.nix
diff --git a/pkgs/applications/radio/aldo/default.nix b/pkgs/by-name/al/aldo/package.nix
similarity index 100%
rename from pkgs/applications/radio/aldo/default.nix
rename to pkgs/by-name/al/aldo/package.nix
diff --git a/pkgs/data/fonts/alegreya-sans/default.nix b/pkgs/by-name/al/alegreya-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/alegreya-sans/default.nix
rename to pkgs/by-name/al/alegreya-sans/package.nix
diff --git a/pkgs/data/fonts/alegreya/default.nix b/pkgs/by-name/al/alegreya/package.nix
similarity index 100%
rename from pkgs/data/fonts/alegreya/default.nix
rename to pkgs/by-name/al/alegreya/package.nix
diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/by-name/al/alejandra/package.nix
similarity index 100%
rename from pkgs/tools/nix/alejandra/default.nix
rename to pkgs/by-name/al/alejandra/package.nix
diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/by-name/al/alertmanager-irc-relay/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/alertmanager-irc-relay/default.nix
rename to pkgs/by-name/al/alertmanager-irc-relay/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/by-name/al/alfaview/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/alfaview/default.nix
rename to pkgs/by-name/al/alfaview/package.nix
diff --git a/pkgs/development/libraries/alglib/default.nix b/pkgs/by-name/al/alglib/package.nix
similarity index 100%
rename from pkgs/development/libraries/alglib/default.nix
rename to pkgs/by-name/al/alglib/package.nix
diff --git a/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch b/pkgs/by-name/al/alglib/patch-alglib-CMakeLists.patch
similarity index 100%
rename from pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch
rename to pkgs/by-name/al/alglib/patch-alglib-CMakeLists.patch
diff --git a/pkgs/tools/networking/ali/default.nix b/pkgs/by-name/al/ali/package.nix
similarity index 100%
rename from pkgs/tools/networking/ali/default.nix
rename to pkgs/by-name/al/ali/package.nix
diff --git a/pkgs/data/fonts/alice/default.nix b/pkgs/by-name/al/alice/package.nix
similarity index 100%
rename from pkgs/data/fonts/alice/default.nix
rename to pkgs/by-name/al/alice/package.nix
diff --git a/pkgs/games/alienarena/default.nix b/pkgs/by-name/al/alienarena/package.nix
similarity index 100%
rename from pkgs/games/alienarena/default.nix
rename to pkgs/by-name/al/alienarena/package.nix
diff --git a/pkgs/tools/text/align/default.nix b/pkgs/by-name/al/align/package.nix
similarity index 100%
rename from pkgs/tools/text/align/default.nix
rename to pkgs/by-name/al/align/package.nix
diff --git a/pkgs/development/tools/build-managers/alire/default.nix b/pkgs/by-name/al/alire/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/alire/default.nix
rename to pkgs/by-name/al/alire/package.nix
diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/by-name/al/aliyun-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/aliyun-cli/default.nix
rename to pkgs/by-name/al/aliyun-cli/package.nix
diff --git a/pkgs/data/fonts/alkalami/default.nix b/pkgs/by-name/al/alkalami/package.nix
similarity index 100%
rename from pkgs/data/fonts/alkalami/default.nix
rename to pkgs/by-name/al/alkalami/package.nix
diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/by-name/al/alliance/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/alliance/default.nix
rename to pkgs/by-name/al/alliance/package.nix
diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/by-name/al/allure/package.nix
similarity index 100%
rename from pkgs/development/tools/allure/default.nix
rename to pkgs/by-name/al/allure/package.nix
diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/by-name/al/almanah/package.nix
similarity index 100%
rename from pkgs/applications/misc/almanah/default.nix
rename to pkgs/by-name/al/almanah/package.nix
diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/by-name/al/almonds/package.nix
similarity index 100%
rename from pkgs/applications/science/math/almonds/default.nix
rename to pkgs/by-name/al/almonds/package.nix
diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/by-name/al/alock/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/alock/default.nix
rename to pkgs/by-name/al/alock/package.nix
diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/by-name/al/alot/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/alot/default.nix
rename to pkgs/by-name/al/alot/package.nix
diff --git a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/pkgs/by-name/al/alpine-make-vm-image/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/alpine-make-vm-image/default.nix
rename to pkgs/by-name/al/alpine-make-vm-image/package.nix
diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/by-name/al/alpine/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/alpine/default.nix
rename to pkgs/by-name/al/alpine/package.nix
diff --git a/pkgs/applications/networking/alpnpass/default.nix b/pkgs/by-name/al/alpnpass/package.nix
similarity index 100%
rename from pkgs/applications/networking/alpnpass/default.nix
rename to pkgs/by-name/al/alpnpass/package.nix
diff --git a/pkgs/servers/alps/default.nix b/pkgs/by-name/al/alps/package.nix
similarity index 100%
rename from pkgs/servers/alps/default.nix
rename to pkgs/by-name/al/alps/package.nix
diff --git a/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/pkgs/by-name/al/alsa-scarlett-gui/package.nix
similarity index 100%
rename from pkgs/applications/audio/alsa-scarlett-gui/default.nix
rename to pkgs/by-name/al/alsa-scarlett-gui/package.nix
diff --git a/pkgs/tools/audio/alsaequal/makefile.patch b/pkgs/by-name/al/alsaequal/makefile.patch
similarity index 100%
rename from pkgs/tools/audio/alsaequal/makefile.patch
rename to pkgs/by-name/al/alsaequal/makefile.patch
diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/by-name/al/alsaequal/package.nix
similarity index 100%
rename from pkgs/tools/audio/alsaequal/default.nix
rename to pkgs/by-name/al/alsaequal/package.nix
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/by-name/al/alt-ergo/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/alt-ergo/default.nix
rename to pkgs/by-name/al/alt-ergo/package.nix
diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/by-name/al/altair/package.nix
similarity index 100%
rename from pkgs/development/tools/altair-graphql-client/default.nix
rename to pkgs/by-name/al/altair/package.nix
diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/by-name/al/altermime/package.nix
similarity index 100%
rename from pkgs/tools/networking/altermime/default.nix
rename to pkgs/by-name/al/altermime/package.nix
diff --git a/pkgs/tools/security/alterx/default.nix b/pkgs/by-name/al/alterx/package.nix
similarity index 100%
rename from pkgs/tools/security/alterx/default.nix
rename to pkgs/by-name/al/alterx/package.nix
diff --git a/pkgs/servers/althttpd/default.nix b/pkgs/by-name/al/althttpd/package.nix
similarity index 100%
rename from pkgs/servers/althttpd/default.nix
rename to pkgs/by-name/al/althttpd/package.nix
diff --git a/pkgs/tools/misc/altserver-linux/default.nix b/pkgs/by-name/al/altserver-linux/package.nix
similarity index 100%
rename from pkgs/tools/misc/altserver-linux/default.nix
rename to pkgs/by-name/al/altserver-linux/package.nix
diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/by-name/al/alttab/package.nix
similarity index 100%
rename from pkgs/tools/X11/alttab/default.nix
rename to pkgs/by-name/al/alttab/package.nix
diff --git a/pkgs/tools/games/opentracker/deps.nix b/pkgs/by-name/al/alttpr-opentracker/deps.nix
similarity index 100%
rename from pkgs/tools/games/opentracker/deps.nix
rename to pkgs/by-name/al/alttpr-opentracker/deps.nix
diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/by-name/al/alttpr-opentracker/package.nix
similarity index 100%
rename from pkgs/tools/games/opentracker/default.nix
rename to pkgs/by-name/al/alttpr-opentracker/package.nix
diff --git a/pkgs/tools/games/opentracker/remove-project.patch b/pkgs/by-name/al/alttpr-opentracker/remove-project.patch
similarity index 100%
rename from pkgs/tools/games/opentracker/remove-project.patch
rename to pkgs/by-name/al/alttpr-opentracker/remove-project.patch
diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/by-name/al/alure/package.nix
similarity index 100%
rename from pkgs/development/libraries/alure/default.nix
rename to pkgs/by-name/al/alure/package.nix
diff --git a/pkgs/development/libraries/alure2/default.nix b/pkgs/by-name/al/alure2/package.nix
similarity index 100%
rename from pkgs/development/libraries/alure2/default.nix
rename to pkgs/by-name/al/alure2/package.nix
diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/by-name/am/AMB-plugins/package.nix
similarity index 100%
rename from pkgs/applications/audio/AMB-plugins/default.nix
rename to pkgs/by-name/am/AMB-plugins/package.nix
diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/by-name/am/amass/package.nix
similarity index 100%
rename from pkgs/tools/networking/amass/default.nix
rename to pkgs/by-name/am/amass/package.nix
diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
similarity index 100%
rename from pkgs/tools/admin/amazon-ecr-credential-helper/default.nix
rename to pkgs/by-name/am/amazon-ecr-credential-helper/package.nix
diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/by-name/am/amazon-ecs-cli/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/amazon-ecs-cli/default.nix
rename to pkgs/by-name/am/amazon-ecs-cli/package.nix
diff --git a/pkgs/data/themes/amber/default.nix b/pkgs/by-name/am/amber-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/amber/default.nix
rename to pkgs/by-name/am/amber-theme/package.nix
diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/by-name/am/amd-blis/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/amd-blis/default.nix
rename to pkgs/by-name/am/amd-blis/package.nix
diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/by-name/am/amd-libflame/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/amd-libflame/default.nix
rename to pkgs/by-name/am/amd-libflame/package.nix
diff --git a/pkgs/os-specific/linux/amdctl/default.nix b/pkgs/by-name/am/amdctl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/amdctl/default.nix
rename to pkgs/by-name/am/amdctl/package.nix
diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/by-name/am/ameba/package.nix
similarity index 100%
rename from pkgs/development/tools/ameba/default.nix
rename to pkgs/by-name/am/ameba/package.nix
diff --git a/pkgs/development/libraries/amf-headers/default.nix b/pkgs/by-name/am/amf-headers/package.nix
similarity index 100%
rename from pkgs/development/libraries/amf-headers/default.nix
rename to pkgs/by-name/am/amf-headers/package.nix
diff --git a/pkgs/tools/games/minecraft/amidst/default.nix b/pkgs/by-name/am/amidst/package.nix
similarity index 100%
rename from pkgs/tools/games/minecraft/amidst/default.nix
rename to pkgs/by-name/am/amidst/package.nix
diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/by-name/am/amiri/package.nix
similarity index 100%
rename from pkgs/data/fonts/amiri/default.nix
rename to pkgs/by-name/am/amiri/package.nix
diff --git a/pkgs/development/libraries/aml/default.nix b/pkgs/by-name/am/aml/package.nix
similarity index 100%
rename from pkgs/development/libraries/aml/default.nix
rename to pkgs/by-name/am/aml/package.nix
diff --git a/pkgs/tools/security/amoco/default.nix b/pkgs/by-name/am/amoco/package.nix
similarity index 100%
rename from pkgs/tools/security/amoco/default.nix
rename to pkgs/by-name/am/amoco/package.nix
diff --git a/pkgs/games/among-sus/default.nix b/pkgs/by-name/am/among-sus/package.nix
similarity index 100%
rename from pkgs/games/among-sus/default.nix
rename to pkgs/by-name/am/among-sus/package.nix
diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/by-name/am/amrnb/package.nix
similarity index 100%
rename from pkgs/development/libraries/amrnb/default.nix
rename to pkgs/by-name/am/amrnb/package.nix
diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/by-name/am/amrwb/package.nix
similarity index 100%
rename from pkgs/development/libraries/amrwb/default.nix
rename to pkgs/by-name/am/amrwb/package.nix
diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/by-name/am/ams-lv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/ams-lv2/default.nix
rename to pkgs/by-name/am/ams-lv2/package.nix
diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/by-name/am/ams/package.nix
similarity index 100%
rename from pkgs/applications/audio/ams/default.nix
rename to pkgs/by-name/am/ams/package.nix
diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/by-name/am/amtterm/package.nix
similarity index 100%
rename from pkgs/tools/system/amtterm/default.nix
rename to pkgs/by-name/am/amtterm/package.nix
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/by-name/am/amule/package.nix
similarity index 100%
rename from pkgs/tools/networking/p2p/amule/default.nix
rename to pkgs/by-name/am/amule/package.nix
diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/by-name/an/analog/package.nix
similarity index 100%
rename from pkgs/tools/admin/analog/default.nix
rename to pkgs/by-name/an/analog/package.nix
diff --git a/pkgs/misc/ananicy/default.nix b/pkgs/by-name/an/ananicy/package.nix
similarity index 100%
rename from pkgs/misc/ananicy/default.nix
rename to pkgs/by-name/an/ananicy/package.nix
diff --git a/pkgs/data/documentation/anarchism/default.nix b/pkgs/by-name/an/anarchism/package.nix
similarity index 100%
rename from pkgs/data/documentation/anarchism/default.nix
rename to pkgs/by-name/an/anarchism/package.nix
diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/by-name/an/andagii/package.nix
similarity index 100%
rename from pkgs/data/fonts/andagii/default.nix
rename to pkgs/by-name/an/andagii/package.nix
diff --git a/pkgs/applications/science/logic/anders/default.nix b/pkgs/by-name/an/anders/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/anders/default.nix
rename to pkgs/by-name/an/anders/package.nix
diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/by-name/an/andika/package.nix
similarity index 100%
rename from pkgs/data/fonts/andika/default.nix
rename to pkgs/by-name/an/andika/package.nix
diff --git a/pkgs/tools/backup/android-backup-extractor/default.nix b/pkgs/by-name/an/android-backup-extractor/package.nix
similarity index 100%
rename from pkgs/tools/backup/android-backup-extractor/default.nix
rename to pkgs/by-name/an/android-backup-extractor/package.nix
diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/by-name/an/android-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/android-udev-rules/default.nix
rename to pkgs/by-name/an/android-udev-rules/package.nix
diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/by-name/an/andyetitmoves/package.nix
similarity index 100%
rename from pkgs/games/andyetitmoves/default.nix
rename to pkgs/by-name/an/andyetitmoves/package.nix
diff --git a/pkgs/tools/text/anew/default.nix b/pkgs/by-name/an/anew/package.nix
similarity index 100%
rename from pkgs/tools/text/anew/default.nix
rename to pkgs/by-name/an/anew/package.nix
diff --git a/pkgs/tools/text/anewer/default.nix b/pkgs/by-name/an/anewer/package.nix
similarity index 100%
rename from pkgs/tools/text/anewer/default.nix
rename to pkgs/by-name/an/anewer/package.nix
diff --git a/pkgs/games/angband/default.nix b/pkgs/by-name/an/angband/package.nix
similarity index 100%
rename from pkgs/games/angband/default.nix
rename to pkgs/by-name/an/angband/package.nix
diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/by-name/an/angelscript/package.nix
similarity index 100%
rename from pkgs/development/interpreters/angelscript/default.nix
rename to pkgs/by-name/an/angelscript/package.nix
diff --git a/pkgs/tools/text/angle-grinder/default.nix b/pkgs/by-name/an/angle-grinder/package.nix
similarity index 100%
rename from pkgs/tools/text/angle-grinder/default.nix
rename to pkgs/by-name/an/angle-grinder/package.nix
diff --git a/pkgs/applications/science/biology/angsd/default.nix b/pkgs/by-name/an/angsd/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/angsd/default.nix
rename to pkgs/by-name/an/angsd/package.nix
diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/by-name/an/ani-cli/package.nix
similarity index 100%
rename from pkgs/applications/video/ani-cli/default.nix
rename to pkgs/by-name/an/ani-cli/package.nix
diff --git a/pkgs/games/animatch/default.nix b/pkgs/by-name/an/animatch/package.nix
similarity index 100%
rename from pkgs/games/animatch/default.nix
rename to pkgs/by-name/an/animatch/package.nix
diff --git a/pkgs/development/interpreters/anko/default.nix b/pkgs/by-name/an/anko/package.nix
similarity index 100%
rename from pkgs/development/interpreters/anko/default.nix
rename to pkgs/by-name/an/anko/package.nix
diff --git a/pkgs/data/fonts/annapurna-sil/default.nix b/pkgs/by-name/an/annapurna-sil/package.nix
similarity index 100%
rename from pkgs/data/fonts/annapurna-sil/default.nix
rename to pkgs/by-name/an/annapurna-sil/package.nix
diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/by-name/an/anonymousPro/package.nix
similarity index 100%
rename from pkgs/data/fonts/anonymous-pro/default.nix
rename to pkgs/by-name/an/anonymousPro/package.nix
diff --git a/pkgs/development/tools/ansi/default.nix b/pkgs/by-name/an/ansi/package.nix
similarity index 100%
rename from pkgs/development/tools/ansi/default.nix
rename to pkgs/by-name/an/ansi/package.nix
diff --git a/pkgs/development/tools/language-servers/ansible-language-server/default.nix b/pkgs/by-name/an/ansible-language-server/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/ansible-language-server/default.nix
rename to pkgs/by-name/an/ansible-language-server/package.nix
diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/by-name/an/ansifilter/package.nix
similarity index 100%
rename from pkgs/tools/text/ansifilter/default.nix
rename to pkgs/by-name/an/ansifilter/package.nix
diff --git a/pkgs/development/compilers/ante/Cargo.lock b/pkgs/by-name/an/ante/Cargo.lock
similarity index 100%
rename from pkgs/development/compilers/ante/Cargo.lock
rename to pkgs/by-name/an/ante/Cargo.lock
diff --git a/pkgs/development/compilers/ante/default.nix b/pkgs/by-name/an/ante/package.nix
similarity index 100%
rename from pkgs/development/compilers/ante/default.nix
rename to pkgs/by-name/an/ante/package.nix
diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/by-name/an/antfs-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/antfs-cli/default.nix
rename to pkgs/by-name/an/antfs-cli/package.nix
diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/by-name/an/anthy/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/anthy/default.nix
rename to pkgs/by-name/an/anthy/package.nix
diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/by-name/an/antibody/package.nix
similarity index 100%
rename from pkgs/shells/zsh/antibody/default.nix
rename to pkgs/by-name/an/antibody/package.nix
diff --git a/pkgs/development/libraries/antic/default.nix b/pkgs/by-name/an/antic/package.nix
similarity index 100%
rename from pkgs/development/libraries/antic/default.nix
rename to pkgs/by-name/an/antic/package.nix
diff --git a/pkgs/shells/zsh/antidote/default.nix b/pkgs/by-name/an/antidote/package.nix
similarity index 100%
rename from pkgs/shells/zsh/antidote/default.nix
rename to pkgs/by-name/an/antidote/package.nix
diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/by-name/an/antigen/package.nix
similarity index 100%
rename from pkgs/shells/zsh/antigen/default.nix
rename to pkgs/by-name/an/antigen/package.nix
diff --git a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch b/pkgs/by-name/an/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch
similarity index 100%
rename from pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch
rename to pkgs/by-name/an/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch
diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/by-name/an/antiword/package.nix
similarity index 100%
rename from pkgs/applications/office/antiword/default.nix
rename to pkgs/by-name/an/antiword/package.nix
diff --git a/pkgs/games/antsimulator/default.nix b/pkgs/by-name/an/antsimulator/package.nix
similarity index 100%
rename from pkgs/games/antsimulator/default.nix
rename to pkgs/by-name/an/antsimulator/package.nix
diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/by-name/an/anttweakbar/package.nix
similarity index 100%
rename from pkgs/development/libraries/AntTweakBar/default.nix
rename to pkgs/by-name/an/anttweakbar/package.nix
diff --git a/pkgs/servers/web-apps/anuko-time-tracker/default.nix b/pkgs/by-name/an/anuko-time-tracker/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/anuko-time-tracker/default.nix
rename to pkgs/by-name/an/anuko-time-tracker/package.nix
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/by-name/an/anydesk/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/anydesk/default.nix
rename to pkgs/by-name/an/anydesk/package.nix
diff --git a/pkgs/applications/radio/anytone-emu/Cargo.lock b/pkgs/by-name/an/anytone-emu/Cargo.lock
similarity index 100%
rename from pkgs/applications/radio/anytone-emu/Cargo.lock
rename to pkgs/by-name/an/anytone-emu/Cargo.lock
diff --git a/pkgs/applications/radio/anytone-emu/default.nix b/pkgs/by-name/an/anytone-emu/package.nix
similarity index 100%
rename from pkgs/applications/radio/anytone-emu/default.nix
rename to pkgs/by-name/an/anytone-emu/package.nix
diff --git a/pkgs/servers/apache-airflow/package.json b/pkgs/by-name/ap/apache-airflow/package.json
similarity index 100%
rename from pkgs/servers/apache-airflow/package.json
rename to pkgs/by-name/ap/apache-airflow/package.json
diff --git a/pkgs/servers/apache-airflow/default.nix b/pkgs/by-name/ap/apache-airflow/package.nix
similarity index 100%
rename from pkgs/servers/apache-airflow/default.nix
rename to pkgs/by-name/ap/apache-airflow/package.nix
diff --git a/pkgs/servers/apache-airflow/providers.nix b/pkgs/by-name/ap/apache-airflow/providers.nix
similarity index 100%
rename from pkgs/servers/apache-airflow/providers.nix
rename to pkgs/by-name/ap/apache-airflow/providers.nix
diff --git a/pkgs/servers/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix
similarity index 100%
rename from pkgs/servers/apache-airflow/python-package.nix
rename to pkgs/by-name/ap/apache-airflow/python-package.nix
diff --git a/pkgs/servers/apache-airflow/update-providers.py b/pkgs/by-name/ap/apache-airflow/update-providers.py
similarity index 100%
rename from pkgs/servers/apache-airflow/update-providers.py
rename to pkgs/by-name/ap/apache-airflow/update-providers.py
diff --git a/pkgs/servers/ldap/apache-directory-server/default.nix b/pkgs/by-name/ap/apache-directory-server/package.nix
similarity index 100%
rename from pkgs/servers/ldap/apache-directory-server/default.nix
rename to pkgs/by-name/ap/apache-directory-server/package.nix
diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/by-name/ap/apache-directory-studio/package.nix
similarity index 100%
rename from pkgs/applications/networking/apache-directory-studio/default.nix
rename to pkgs/by-name/ap/apache-directory-studio/package.nix
diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/by-name/ap/apache-flex-sdk/package.nix
similarity index 100%
rename from pkgs/development/compilers/apache-flex-sdk/default.nix
rename to pkgs/by-name/ap/apache-flex-sdk/package.nix
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/by-name/ap/apacheAnt/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/apache-ant/default.nix
rename to pkgs/by-name/ap/apacheAnt/package.nix
diff --git a/pkgs/tools/security/apachetomcatscanner/default.nix b/pkgs/by-name/ap/apachetomcatscanner/package.nix
similarity index 100%
rename from pkgs/tools/security/apachetomcatscanner/default.nix
rename to pkgs/by-name/ap/apachetomcatscanner/package.nix
diff --git a/pkgs/applications/science/chemistry/apbs/default.nix b/pkgs/by-name/ap/apbs/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/apbs/default.nix
rename to pkgs/by-name/ap/apbs/package.nix
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/by-name/ap/apcupsd/package.nix
similarity index 100%
rename from pkgs/servers/apcupsd/default.nix
rename to pkgs/by-name/ap/apcupsd/package.nix
diff --git a/pkgs/applications/blockchains/aperture/default.nix b/pkgs/by-name/ap/aperture/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/aperture/default.nix
rename to pkgs/by-name/ap/aperture/package.nix
diff --git a/pkgs/development/libraries/physics/apfel/cmake.patch b/pkgs/by-name/ap/apfel/cmake.patch
similarity index 100%
rename from pkgs/development/libraries/physics/apfel/cmake.patch
rename to pkgs/by-name/ap/apfel/cmake.patch
diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/by-name/ap/apfel/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/apfel/default.nix
rename to pkgs/by-name/ap/apfel/package.nix
diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/by-name/ap/apfelgrid/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/apfelgrid/default.nix
rename to pkgs/by-name/ap/apfelgrid/package.nix
diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/by-name/ap/apfs-fuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/apfs-fuse/default.nix
rename to pkgs/by-name/ap/apfs-fuse/package.nix
diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/by-name/ap/apg/package.nix
similarity index 100%
rename from pkgs/tools/security/apg/default.nix
rename to pkgs/by-name/ap/apg/package.nix
diff --git a/pkgs/development/tools/database/apgdiff/default.nix b/pkgs/by-name/ap/apgdiff/package.nix
similarity index 100%
rename from pkgs/development/tools/database/apgdiff/default.nix
rename to pkgs/by-name/ap/apgdiff/package.nix
diff --git a/pkgs/tools/package-management/apkg/default.nix b/pkgs/by-name/ap/apkg/package.nix
similarity index 100%
rename from pkgs/tools/package-management/apkg/default.nix
rename to pkgs/by-name/ap/apkg/package.nix
diff --git a/pkgs/development/tools/apkid/default.nix b/pkgs/by-name/ap/apkid/package.nix
similarity index 100%
rename from pkgs/development/tools/apkid/default.nix
rename to pkgs/by-name/ap/apkid/package.nix
diff --git a/pkgs/tools/security/apkleaks/default.nix b/pkgs/by-name/ap/apkleaks/package.nix
similarity index 100%
rename from pkgs/tools/security/apkleaks/default.nix
rename to pkgs/by-name/ap/apkleaks/package.nix
diff --git a/pkgs/development/tools/apksigcopier/default.nix b/pkgs/by-name/ap/apksigcopier/package.nix
similarity index 100%
rename from pkgs/development/tools/apksigcopier/default.nix
rename to pkgs/by-name/ap/apksigcopier/package.nix
diff --git a/pkgs/development/tools/apksigner/deps.json b/pkgs/by-name/ap/apksigner/deps.json
similarity index 100%
rename from pkgs/development/tools/apksigner/deps.json
rename to pkgs/by-name/ap/apksigner/deps.json
diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/by-name/ap/apksigner/package.nix
similarity index 100%
rename from pkgs/development/tools/apksigner/default.nix
rename to pkgs/by-name/ap/apksigner/package.nix
diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/by-name/ap/apktool/package.nix
similarity index 100%
rename from pkgs/development/tools/apktool/default.nix
rename to pkgs/by-name/ap/apktool/package.nix
diff --git a/pkgs/tools/graphics/apng2gif/default.nix b/pkgs/by-name/ap/apng2gif/package.nix
similarity index 100%
rename from pkgs/tools/graphics/apng2gif/default.nix
rename to pkgs/by-name/ap/apng2gif/package.nix
diff --git a/pkgs/tools/graphics/apngopt/default.nix b/pkgs/by-name/ap/apngopt/package.nix
similarity index 100%
rename from pkgs/tools/graphics/apngopt/default.nix
rename to pkgs/by-name/ap/apngopt/package.nix
diff --git a/pkgs/tools/graphics/apngopt/remove-7z.patch b/pkgs/by-name/ap/apngopt/remove-7z.patch
similarity index 100%
rename from pkgs/tools/graphics/apngopt/remove-7z.patch
rename to pkgs/by-name/ap/apngopt/remove-7z.patch
diff --git a/pkgs/os-specific/darwin/apparency/default.nix b/pkgs/by-name/ap/apparency/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/apparency/default.nix
rename to pkgs/by-name/ap/apparency/package.nix
diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/by-name/ap/apparix/package.nix
similarity index 100%
rename from pkgs/tools/misc/apparix/default.nix
rename to pkgs/by-name/ap/apparix/package.nix
diff --git a/pkgs/applications/misc/appcleaner/default.nix b/pkgs/by-name/ap/appcleaner/package.nix
similarity index 100%
rename from pkgs/applications/misc/appcleaner/default.nix
rename to pkgs/by-name/ap/appcleaner/package.nix
diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/by-name/ap/appeditor/package.nix
similarity index 100%
rename from pkgs/applications/misc/appeditor/default.nix
rename to pkgs/by-name/ap/appeditor/package.nix
diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/by-name/ap/appflowy/package.nix
similarity index 100%
rename from pkgs/applications/office/appflowy/default.nix
rename to pkgs/by-name/ap/appflowy/package.nix
diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/by-name/ap/appgate-sdp/package.nix
similarity index 100%
rename from pkgs/applications/networking/appgate-sdp/default.nix
rename to pkgs/by-name/ap/appgate-sdp/package.nix
diff --git a/pkgs/tools/package-management/appimagekit/nix.patch b/pkgs/by-name/ap/appimagekit/nix.patch
similarity index 100%
rename from pkgs/tools/package-management/appimagekit/nix.patch
rename to pkgs/by-name/ap/appimagekit/nix.patch
diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/by-name/ap/appimagekit/package.nix
similarity index 100%
rename from pkgs/tools/package-management/appimagekit/default.nix
rename to pkgs/by-name/ap/appimagekit/package.nix
diff --git a/pkgs/development/libraries/appindicator-sharp/default.nix b/pkgs/by-name/ap/appindicator-sharp/package.nix
similarity index 100%
rename from pkgs/development/libraries/appindicator-sharp/default.nix
rename to pkgs/by-name/ap/appindicator-sharp/package.nix
diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/by-name/ap/apple-cursor/package.nix
similarity index 100%
rename from pkgs/data/icons/apple-cursor/default.nix
rename to pkgs/by-name/ap/apple-cursor/package.nix
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/by-name/ap/appstream-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/appstream-glib/default.nix
rename to pkgs/by-name/ap/appstream-glib/package.nix
diff --git a/pkgs/development/libraries/appstream-glib/paths.patch b/pkgs/by-name/ap/appstream-glib/paths.patch
similarity index 100%
rename from pkgs/development/libraries/appstream-glib/paths.patch
rename to pkgs/by-name/ap/appstream-glib/paths.patch
diff --git a/pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch b/pkgs/by-name/ap/appvm/0001-Remove-menu-bar.patch
similarity index 100%
rename from pkgs/applications/virtualization/appvm/0001-Remove-menu-bar.patch
rename to pkgs/by-name/ap/appvm/0001-Remove-menu-bar.patch
diff --git a/pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch b/pkgs/by-name/ap/appvm/0002-Do-not-grab-keyboard-mouse.patch
similarity index 100%
rename from pkgs/applications/virtualization/appvm/0002-Do-not-grab-keyboard-mouse.patch
rename to pkgs/by-name/ap/appvm/0002-Do-not-grab-keyboard-mouse.patch
diff --git a/pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch b/pkgs/by-name/ap/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch
similarity index 100%
rename from pkgs/applications/virtualization/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch
rename to pkgs/by-name/ap/appvm/0003-Use-name-of-appvm-applications-as-a-title.patch
diff --git a/pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch b/pkgs/by-name/ap/appvm/0004-Use-title-application-name-as-subtitle.patch
similarity index 100%
rename from pkgs/applications/virtualization/appvm/0004-Use-title-application-name-as-subtitle.patch
rename to pkgs/by-name/ap/appvm/0004-Use-title-application-name-as-subtitle.patch
diff --git a/pkgs/applications/virtualization/appvm/default.nix b/pkgs/by-name/ap/appvm/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/appvm/default.nix
rename to pkgs/by-name/ap/appvm/package.nix
diff --git a/pkgs/development/libraries/apr-util/clang-bdb.patch b/pkgs/by-name/ap/aprutil/clang-bdb.patch
similarity index 100%
rename from pkgs/development/libraries/apr-util/clang-bdb.patch
rename to pkgs/by-name/ap/aprutil/clang-bdb.patch
diff --git a/pkgs/development/libraries/apr-util/fix-libxcrypt-build.patch b/pkgs/by-name/ap/aprutil/fix-libxcrypt-build.patch
similarity index 100%
rename from pkgs/development/libraries/apr-util/fix-libxcrypt-build.patch
rename to pkgs/by-name/ap/aprutil/fix-libxcrypt-build.patch
diff --git a/pkgs/development/libraries/apr-util/include-static-dependencies.patch b/pkgs/by-name/ap/aprutil/include-static-dependencies.patch
similarity index 100%
rename from pkgs/development/libraries/apr-util/include-static-dependencies.patch
rename to pkgs/by-name/ap/aprutil/include-static-dependencies.patch
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/by-name/ap/aprutil/package.nix
similarity index 100%
rename from pkgs/development/libraries/apr-util/default.nix
rename to pkgs/by-name/ap/aprutil/package.nix
diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/by-name/ap/apt-cacher-ng/package.nix
similarity index 100%
rename from pkgs/servers/http/apt-cacher-ng/default.nix
rename to pkgs/by-name/ap/apt-cacher-ng/package.nix
diff --git a/pkgs/development/libraries/aptdec/default.nix b/pkgs/by-name/ap/aptdec/package.nix
similarity index 100%
rename from pkgs/development/libraries/aptdec/default.nix
rename to pkgs/by-name/ap/aptdec/package.nix
diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/by-name/ap/aptly/package.nix
similarity index 100%
rename from pkgs/tools/misc/aptly/default.nix
rename to pkgs/by-name/ap/aptly/package.nix
diff --git a/pkgs/tools/misc/aquosctl/default.nix b/pkgs/by-name/aq/aquosctl/package.nix
similarity index 100%
rename from pkgs/tools/misc/aquosctl/default.nix
rename to pkgs/by-name/aq/aquosctl/package.nix
diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/by-name/ar/arachne-pnr/package.nix
similarity index 100%
rename from pkgs/development/compilers/arachne-pnr/default.nix
rename to pkgs/by-name/ar/arachne-pnr/package.nix
diff --git a/pkgs/applications/science/biology/aragorn/default.nix b/pkgs/by-name/ar/aragorn/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/aragorn/default.nix
rename to pkgs/by-name/ar/aragorn/package.nix
diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/by-name/ar/arandr/package.nix
similarity index 100%
rename from pkgs/tools/X11/arandr/default.nix
rename to pkgs/by-name/ar/arandr/package.nix
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/by-name/ar/arangodb/package.nix
similarity index 100%
rename from pkgs/servers/nosql/arangodb/default.nix
rename to pkgs/by-name/ar/arangodb/package.nix
diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/by-name/ar/aravis/package.nix
similarity index 100%
rename from pkgs/development/libraries/aravis/default.nix
rename to pkgs/by-name/ar/aravis/package.nix
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/by-name/ar/arb/package.nix
similarity index 100%
rename from pkgs/development/libraries/arb/default.nix
rename to pkgs/by-name/ar/arb/package.nix
diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/by-name/ar/arc-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/arc-icon-theme/default.nix
rename to pkgs/by-name/ar/arc-icon-theme/package.nix
diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/by-name/ar/arc-kde-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/arc-kde/default.nix
rename to pkgs/by-name/ar/arc-kde-theme/package.nix
diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/by-name/ar/arc-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/arc/default.nix
rename to pkgs/by-name/ar/arc-theme/package.nix
diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/by-name/ar/arc_unpacker/package.nix
similarity index 100%
rename from pkgs/tools/archivers/arc_unpacker/default.nix
rename to pkgs/by-name/ar/arc_unpacker/package.nix
diff --git a/pkgs/tools/misc/arch-install-scripts/default.nix b/pkgs/by-name/ar/arch-install-scripts/package.nix
similarity index 100%
rename from pkgs/tools/misc/arch-install-scripts/default.nix
rename to pkgs/by-name/ar/arch-install-scripts/package.nix
diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/by-name/ar/archimedes/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/archimedes/default.nix
rename to pkgs/by-name/ar/archimedes/package.nix
diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/by-name/ar/archivebox/package.nix
similarity index 100%
rename from pkgs/applications/misc/archivebox/default.nix
rename to pkgs/by-name/ar/archivebox/package.nix
diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/by-name/ar/archiver/package.nix
similarity index 100%
rename from pkgs/applications/misc/archiver/default.nix
rename to pkgs/by-name/ar/archiver/package.nix
diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/by-name/ar/archivy/package.nix
similarity index 100%
rename from pkgs/applications/misc/archivy/default.nix
rename to pkgs/by-name/ar/archivy/package.nix
diff --git a/pkgs/development/embedded/arduino/arduino-ci/default.nix b/pkgs/by-name/ar/arduino-ci/package.nix
similarity index 100%
rename from pkgs/development/embedded/arduino/arduino-ci/default.nix
rename to pkgs/by-name/ar/arduino-ci/package.nix
diff --git a/pkgs/development/embedded/arduino/arduino-language-server/default.nix b/pkgs/by-name/ar/arduino-language-server/package.nix
similarity index 100%
rename from pkgs/development/embedded/arduino/arduino-language-server/default.nix
rename to pkgs/by-name/ar/arduino-language-server/package.nix
diff --git a/pkgs/development/embedded/arduino/arduino-mk/default.nix b/pkgs/by-name/ar/arduino-mk/package.nix
similarity index 100%
rename from pkgs/development/embedded/arduino/arduino-mk/default.nix
rename to pkgs/by-name/ar/arduino-mk/package.nix
diff --git a/pkgs/development/embedded/arduino/arduinoOTA/default.nix b/pkgs/by-name/ar/arduinoOTA/package.nix
similarity index 100%
rename from pkgs/development/embedded/arduino/arduinoOTA/default.nix
rename to pkgs/by-name/ar/arduinoOTA/package.nix
diff --git a/pkgs/games/arena/default.nix b/pkgs/by-name/ar/arena/package.nix
similarity index 100%
rename from pkgs/games/arena/default.nix
rename to pkgs/by-name/ar/arena/package.nix
diff --git a/pkgs/tools/security/ares-rs/default.nix b/pkgs/by-name/ar/ares-rs/package.nix
similarity index 100%
rename from pkgs/tools/security/ares-rs/default.nix
rename to pkgs/by-name/ar/ares-rs/package.nix
diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/by-name/ar/argo-rollouts/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/argo-rollouts/default.nix
rename to pkgs/by-name/ar/argo-rollouts/package.nix
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/by-name/ar/argo/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/argo/default.nix
rename to pkgs/by-name/ar/argo/package.nix
diff --git a/pkgs/applications/networking/cluster/argo/staticfiles.go.mod b/pkgs/by-name/ar/argo/staticfiles.go.mod
similarity index 100%
rename from pkgs/applications/networking/cluster/argo/staticfiles.go.mod
rename to pkgs/by-name/ar/argo/staticfiles.go.mod
diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/by-name/ar/argocd-autopilot/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/argocd-autopilot/default.nix
rename to pkgs/by-name/ar/argocd-autopilot/package.nix
diff --git a/pkgs/tools/security/argocd-vault-plugin/default.nix b/pkgs/by-name/ar/argocd-vault-plugin/package.nix
similarity index 100%
rename from pkgs/tools/security/argocd-vault-plugin/default.nix
rename to pkgs/by-name/ar/argocd-vault-plugin/package.nix
diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/by-name/ar/argocd/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/argocd/default.nix
rename to pkgs/by-name/ar/argocd/package.nix
diff --git a/pkgs/misc/drivers/argononed/fix-hardcoded-reboot-poweroff-paths.patch b/pkgs/by-name/ar/argononed/fix-hardcoded-reboot-poweroff-paths.patch
similarity index 100%
rename from pkgs/misc/drivers/argononed/fix-hardcoded-reboot-poweroff-paths.patch
rename to pkgs/by-name/ar/argononed/fix-hardcoded-reboot-poweroff-paths.patch
diff --git a/pkgs/misc/drivers/argononed/default.nix b/pkgs/by-name/ar/argononed/package.nix
similarity index 100%
rename from pkgs/misc/drivers/argononed/default.nix
rename to pkgs/by-name/ar/argononed/package.nix
diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/by-name/ar/argp-standalone/package.nix
similarity index 100%
rename from pkgs/development/libraries/argp-standalone/default.nix
rename to pkgs/by-name/ar/argp-standalone/package.nix
diff --git a/pkgs/development/libraries/argparse/default.nix b/pkgs/by-name/ar/argparse/package.nix
similarity index 100%
rename from pkgs/development/libraries/argparse/default.nix
rename to pkgs/by-name/ar/argparse/package.nix
diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/by-name/ar/arguments/package.nix
similarity index 100%
rename from pkgs/development/libraries/arguments/default.nix
rename to pkgs/by-name/ar/arguments/package.nix
diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/by-name/ar/argus-clients/package.nix
similarity index 100%
rename from pkgs/tools/networking/argus-clients/default.nix
rename to pkgs/by-name/ar/argus-clients/package.nix
diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/by-name/ar/argus/package.nix
similarity index 100%
rename from pkgs/tools/networking/argus/default.nix
rename to pkgs/by-name/ar/argus/package.nix
diff --git a/pkgs/tools/graphics/argyllcms/jam-cross.patch b/pkgs/by-name/ar/argyllcms/jam-cross.patch
similarity index 100%
rename from pkgs/tools/graphics/argyllcms/jam-cross.patch
rename to pkgs/by-name/ar/argyllcms/jam-cross.patch
diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/by-name/ar/argyllcms/package.nix
similarity index 100%
rename from pkgs/tools/graphics/argyllcms/default.nix
rename to pkgs/by-name/ar/argyllcms/package.nix
diff --git a/pkgs/servers/ariang/default.nix b/pkgs/by-name/ar/ariang/package.nix
similarity index 100%
rename from pkgs/servers/ariang/default.nix
rename to pkgs/by-name/ar/ariang/package.nix
diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/by-name/ar/ario/package.nix
similarity index 100%
rename from pkgs/applications/audio/ario/default.nix
rename to pkgs/by-name/ar/ario/package.nix
diff --git a/pkgs/applications/virtualization/arion/default.nix b/pkgs/by-name/ar/arion/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/arion/default.nix
rename to pkgs/by-name/ar/arion/package.nix
diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/by-name/ar/arkade/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/arkade/default.nix
rename to pkgs/by-name/ar/arkade/package.nix
diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/by-name/ar/arkpandora_ttf/package.nix
similarity index 100%
rename from pkgs/data/fonts/arkpandora/default.nix
rename to pkgs/by-name/ar/arkpandora_ttf/package.nix
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/by-name/ar/armadillo/package.nix
similarity index 100%
rename from pkgs/development/libraries/armadillo/default.nix
rename to pkgs/by-name/ar/armadillo/package.nix
diff --git a/pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch b/pkgs/by-name/ar/armadillo/use-unix-config-on-OS-X.patch
similarity index 100%
rename from pkgs/development/libraries/armadillo/use-unix-config-on-OS-X.patch
rename to pkgs/by-name/ar/armadillo/use-unix-config-on-OS-X.patch
diff --git a/pkgs/tools/misc/arp-scan/default.nix b/pkgs/by-name/ar/arp-scan/package.nix
similarity index 100%
rename from pkgs/tools/misc/arp-scan/default.nix
rename to pkgs/by-name/ar/arp-scan/package.nix
diff --git a/pkgs/tools/misc/arp-scan/remove-install-exec-hook.patch b/pkgs/by-name/ar/arp-scan/remove-install-exec-hook.patch
similarity index 100%
rename from pkgs/tools/misc/arp-scan/remove-install-exec-hook.patch
rename to pkgs/by-name/ar/arp-scan/remove-install-exec-hook.patch
diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/by-name/ar/arpa2cm/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/arpa2cm/default.nix
rename to pkgs/by-name/ar/arpa2cm/package.nix
diff --git a/pkgs/development/libraries/arpa2common/default.nix b/pkgs/by-name/ar/arpa2common/package.nix
similarity index 100%
rename from pkgs/development/libraries/arpa2common/default.nix
rename to pkgs/by-name/ar/arpa2common/package.nix
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/by-name/ar/arpack/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/arpack/default.nix
rename to pkgs/by-name/ar/arpack/package.nix
diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/by-name/ar/arping/package.nix
similarity index 100%
rename from pkgs/tools/networking/arping/default.nix
rename to pkgs/by-name/ar/arping/package.nix
diff --git a/pkgs/tools/networking/arpoison/default.nix b/pkgs/by-name/ar/arpoison/package.nix
similarity index 100%
rename from pkgs/tools/networking/arpoison/default.nix
rename to pkgs/by-name/ar/arpoison/package.nix
diff --git a/pkgs/tools/security/arsenal/default.nix b/pkgs/by-name/ar/arsenal/package.nix
similarity index 100%
rename from pkgs/tools/security/arsenal/default.nix
rename to pkgs/by-name/ar/arsenal/package.nix
diff --git a/pkgs/applications/graphics/artem/default.nix b/pkgs/by-name/ar/artem/package.nix
similarity index 100%
rename from pkgs/applications/graphics/artem/default.nix
rename to pkgs/by-name/ar/artem/package.nix
diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/by-name/ar/artha/package.nix
similarity index 100%
rename from pkgs/applications/misc/artha/default.nix
rename to pkgs/by-name/ar/artha/package.nix
diff --git a/pkgs/data/themes/artim-dark/default.nix b/pkgs/by-name/ar/artim-dark/package.nix
similarity index 100%
rename from pkgs/data/themes/artim-dark/default.nix
rename to pkgs/by-name/ar/artim-dark/package.nix
diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/by-name/ar/artyFX/package.nix
similarity index 100%
rename from pkgs/applications/audio/artyFX/default.nix
rename to pkgs/by-name/ar/artyFX/package.nix
diff --git a/pkgs/tools/security/arubaotp-seed-extractor/default.nix b/pkgs/by-name/ar/arubaotp-seed-extractor/package.nix
similarity index 100%
rename from pkgs/tools/security/arubaotp-seed-extractor/default.nix
rename to pkgs/by-name/ar/arubaotp-seed-extractor/package.nix
diff --git a/pkgs/tools/misc/as-tree/default.nix b/pkgs/by-name/as/as-tree/package.nix
similarity index 100%
rename from pkgs/tools/misc/as-tree/default.nix
rename to pkgs/by-name/as/as-tree/package.nix
diff --git a/pkgs/tools/audio/asap/default.nix b/pkgs/by-name/as/asap/package.nix
similarity index 100%
rename from pkgs/tools/audio/asap/default.nix
rename to pkgs/by-name/as/asap/package.nix
diff --git a/pkgs/tools/compression/asar/package.json b/pkgs/by-name/as/asar/package.json
similarity index 100%
rename from pkgs/tools/compression/asar/package.json
rename to pkgs/by-name/as/asar/package.json
diff --git a/pkgs/tools/compression/asar/default.nix b/pkgs/by-name/as/asar/package.nix
similarity index 100%
rename from pkgs/tools/compression/asar/default.nix
rename to pkgs/by-name/as/asar/package.nix
diff --git a/pkgs/applications/graphics/ascii-image-converter/default.nix b/pkgs/by-name/as/ascii-image-converter/package.nix
similarity index 100%
rename from pkgs/applications/graphics/ascii-image-converter/default.nix
rename to pkgs/by-name/as/ascii-image-converter/package.nix
diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/by-name/as/ascii/package.nix
similarity index 100%
rename from pkgs/tools/text/ascii/default.nix
rename to pkgs/by-name/as/ascii/package.nix
diff --git a/pkgs/applications/video/asciicam/default.nix b/pkgs/by-name/as/asciicam/package.nix
similarity index 100%
rename from pkgs/applications/video/asciicam/default.nix
rename to pkgs/by-name/as/asciicam/package.nix
diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/by-name/as/asciidoctorj/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctorj/default.nix
rename to pkgs/by-name/as/asciidoctorj/package.nix
diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/by-name/as/asciigraph/package.nix
similarity index 100%
rename from pkgs/tools/text/asciigraph/default.nix
rename to pkgs/by-name/as/asciigraph/package.nix
diff --git a/pkgs/tools/misc/asciinema-scenario/default.nix b/pkgs/by-name/as/asciinema-scenario/package.nix
similarity index 100%
rename from pkgs/tools/misc/asciinema-scenario/default.nix
rename to pkgs/by-name/as/asciinema-scenario/package.nix
diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/by-name/as/asciinema/package.nix
similarity index 100%
rename from pkgs/tools/misc/asciinema/default.nix
rename to pkgs/by-name/as/asciinema/package.nix
diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/by-name/as/asciiquarium/package.nix
similarity index 100%
rename from pkgs/applications/misc/asciiquarium/default.nix
rename to pkgs/by-name/as/asciiquarium/package.nix
diff --git a/pkgs/tools/misc/asdf-vm/default.nix b/pkgs/by-name/as/asdf-vm/package.nix
similarity index 100%
rename from pkgs/tools/misc/asdf-vm/default.nix
rename to pkgs/by-name/as/asdf-vm/package.nix
diff --git a/pkgs/os-specific/linux/aseq2json/default.nix b/pkgs/by-name/as/aseq2json/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/aseq2json/default.nix
rename to pkgs/by-name/as/aseq2json/package.nix
diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/by-name/as/ashpd-demo/package.nix
similarity index 100%
rename from pkgs/development/tools/ashpd-demo/default.nix
rename to pkgs/by-name/as/ashpd-demo/package.nix
diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/by-name/as/ashuffle/package.nix
similarity index 100%
rename from pkgs/applications/audio/ashuffle/default.nix
rename to pkgs/by-name/as/ashuffle/package.nix
diff --git a/pkgs/tools/misc/askalono/default.nix b/pkgs/by-name/as/askalono/package.nix
similarity index 100%
rename from pkgs/tools/misc/askalono/default.nix
rename to pkgs/by-name/as/askalono/package.nix
diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/by-name/as/asmfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/asmfmt/default.nix
rename to pkgs/by-name/as/asmfmt/package.nix
diff --git a/pkgs/development/libraries/asmjit/default.nix b/pkgs/by-name/as/asmjit/package.nix
similarity index 100%
rename from pkgs/development/libraries/asmjit/default.nix
rename to pkgs/by-name/as/asmjit/package.nix
diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/by-name/as/asn1c/package.nix
similarity index 100%
rename from pkgs/development/compilers/asn1c/default.nix
rename to pkgs/by-name/as/asn1c/package.nix
diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/by-name/as/asnmap/package.nix
similarity index 100%
rename from pkgs/tools/security/asnmap/default.nix
rename to pkgs/by-name/as/asnmap/package.nix
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/by-name/as/aspcud/package.nix
similarity index 100%
rename from pkgs/tools/misc/aspcud/default.nix
rename to pkgs/by-name/as/aspcud/package.nix
diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/by-name/as/aspectj/package.nix
similarity index 100%
rename from pkgs/development/compilers/aspectj/default.nix
rename to pkgs/by-name/as/aspectj/package.nix
diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/by-name/as/aspino/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/aspino/default.nix
rename to pkgs/by-name/as/aspino/package.nix
diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/by-name/as/assaultcube/package.nix
similarity index 100%
rename from pkgs/games/assaultcube/default.nix
rename to pkgs/by-name/as/assaultcube/package.nix
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/by-name/as/assh/package.nix
similarity index 100%
rename from pkgs/tools/networking/assh/default.nix
rename to pkgs/by-name/as/assh/package.nix
diff --git a/pkgs/applications/networking/cluster/assign-lb-ip/default.nix b/pkgs/by-name/as/assign-lb-ip/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/assign-lb-ip/default.nix
rename to pkgs/by-name/as/assign-lb-ip/package.nix
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/by-name/as/assimp/package.nix
similarity index 100%
rename from pkgs/development/libraries/assimp/default.nix
rename to pkgs/by-name/as/assimp/package.nix
diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/by-name/as/astc-encoder/package.nix
similarity index 100%
rename from pkgs/tools/graphics/astc-encoder/default.nix
rename to pkgs/by-name/as/astc-encoder/package.nix
diff --git a/pkgs/servers/asterisk/sccp/default.nix b/pkgs/by-name/as/asterisk-module-sccp/package.nix
similarity index 100%
rename from pkgs/servers/asterisk/sccp/default.nix
rename to pkgs/by-name/as/asterisk-module-sccp/package.nix
diff --git a/pkgs/applications/science/biology/astral/make-deterministic.patch b/pkgs/by-name/as/astral/make-deterministic.patch
similarity index 100%
rename from pkgs/applications/science/biology/astral/make-deterministic.patch
rename to pkgs/by-name/as/astral/make-deterministic.patch
diff --git a/pkgs/applications/science/biology/astral/default.nix b/pkgs/by-name/as/astral/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/astral/default.nix
rename to pkgs/by-name/as/astral/package.nix
diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/by-name/as/astrolabe-generator/package.nix
similarity index 100%
rename from pkgs/applications/science/astronomy/astrolabe-generator/default.nix
rename to pkgs/by-name/as/astrolabe-generator/package.nix
diff --git a/pkgs/applications/science/astronomy/astrolog/default.nix b/pkgs/by-name/as/astrolog/package.nix
similarity index 100%
rename from pkgs/applications/science/astronomy/astrolog/default.nix
rename to pkgs/by-name/as/astrolog/package.nix
diff --git a/pkgs/games/astromenace/default.nix b/pkgs/by-name/as/astromenace/package.nix
similarity index 100%
rename from pkgs/games/astromenace/default.nix
rename to pkgs/by-name/as/astromenace/package.nix
diff --git a/pkgs/tools/misc/astronomer/default.nix b/pkgs/by-name/as/astronomer/package.nix
similarity index 100%
rename from pkgs/tools/misc/astronomer/default.nix
rename to pkgs/by-name/as/astronomer/package.nix
diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/by-name/as/astyle/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/astyle/default.nix
rename to pkgs/by-name/as/astyle/package.nix
diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/by-name/as/asunder/package.nix
similarity index 100%
rename from pkgs/applications/audio/asunder/default.nix
rename to pkgs/by-name/as/asunder/package.nix
diff --git a/pkgs/applications/system/asusctl/Cargo.lock b/pkgs/by-name/as/asusctl/Cargo.lock
similarity index 100%
rename from pkgs/applications/system/asusctl/Cargo.lock
rename to pkgs/by-name/as/asusctl/Cargo.lock
diff --git a/pkgs/applications/system/asusctl/default.nix b/pkgs/by-name/as/asusctl/package.nix
similarity index 100%
rename from pkgs/applications/system/asusctl/default.nix
rename to pkgs/by-name/as/asusctl/package.nix
diff --git a/pkgs/development/tools/async/default.nix b/pkgs/by-name/as/async/package.nix
similarity index 100%
rename from pkgs/development/tools/async/default.nix
rename to pkgs/by-name/as/async/package.nix
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/by-name/at/at-spi2-core/package.nix
similarity index 100%
rename from pkgs/development/libraries/at-spi2-core/default.nix
rename to pkgs/by-name/at/at-spi2-core/package.nix
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/by-name/at/at/package.nix
similarity index 100%
rename from pkgs/tools/system/at/default.nix
rename to pkgs/by-name/at/at/package.nix
diff --git a/pkgs/games/atanks/default.nix b/pkgs/by-name/at/atanks/package.nix
similarity index 100%
rename from pkgs/games/atanks/default.nix
rename to pkgs/by-name/at/atanks/package.nix
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/by-name/at/atftp/package.nix
similarity index 100%
rename from pkgs/tools/networking/atftp/default.nix
rename to pkgs/by-name/at/atftp/package.nix
diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/by-name/at/atheme/package.nix
similarity index 100%
rename from pkgs/servers/irc/atheme/default.nix
rename to pkgs/by-name/at/atheme/package.nix
diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/by-name/at/atinout/package.nix
similarity index 100%
rename from pkgs/tools/networking/atinout/default.nix
rename to pkgs/by-name/at/atinout/package.nix
diff --git a/pkgs/data/fonts/atkinson-hyperlegible/default.nix b/pkgs/by-name/at/atkinson-hyperlegible/package.nix
similarity index 100%
rename from pkgs/data/fonts/atkinson-hyperlegible/default.nix
rename to pkgs/by-name/at/atkinson-hyperlegible/package.nix
diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/by-name/at/atlantis/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/atlantis/default.nix
rename to pkgs/by-name/at/atlantis/package.nix
diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/by-name/at/atlassian-cli/package.nix
similarity index 100%
rename from pkgs/applications/office/atlassian-cli/default.nix
rename to pkgs/by-name/at/atlassian-cli/package.nix
diff --git a/pkgs/applications/office/atlassian-cli/wrapper.sh b/pkgs/by-name/at/atlassian-cli/wrapper.sh
similarity index 100%
rename from pkgs/applications/office/atlassian-cli/wrapper.sh
rename to pkgs/by-name/at/atlassian-cli/wrapper.sh
diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/by-name/at/atmos/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/atmos/default.nix
rename to pkgs/by-name/at/atmos/package.nix
diff --git a/pkgs/tools/security/atomic-operator/default.nix b/pkgs/by-name/at/atomic-operator/package.nix
similarity index 100%
rename from pkgs/tools/security/atomic-operator/default.nix
rename to pkgs/by-name/at/atomic-operator/package.nix
diff --git a/pkgs/applications/blockchains/atomic-swap/default.nix b/pkgs/by-name/at/atomic-swap/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/atomic-swap/default.nix
rename to pkgs/by-name/at/atomic-swap/package.nix
diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/by-name/at/atool/package.nix
similarity index 100%
rename from pkgs/tools/archivers/atool/default.nix
rename to pkgs/by-name/at/atool/package.nix
diff --git a/pkgs/os-specific/linux/atop/atop.service.patch b/pkgs/by-name/at/atop/atop.service.patch
similarity index 100%
rename from pkgs/os-specific/linux/atop/atop.service.patch
rename to pkgs/by-name/at/atop/atop.service.patch
diff --git a/pkgs/os-specific/linux/atop/fix-paths.patch b/pkgs/by-name/at/atop/fix-paths.patch
similarity index 100%
rename from pkgs/os-specific/linux/atop/fix-paths.patch
rename to pkgs/by-name/at/atop/fix-paths.patch
diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/by-name/at/atop/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/atop/default.nix
rename to pkgs/by-name/at/atop/package.nix
diff --git a/pkgs/development/tools/ats-acc/default.nix b/pkgs/by-name/at/ats-acc/package.nix
similarity index 100%
rename from pkgs/development/tools/ats-acc/default.nix
rename to pkgs/by-name/at/ats-acc/package.nix
diff --git a/pkgs/development/compilers/ats/install-atsdoc-hats-files.patch b/pkgs/by-name/at/ats/install-atsdoc-hats-files.patch
similarity index 100%
rename from pkgs/development/compilers/ats/install-atsdoc-hats-files.patch
rename to pkgs/by-name/at/ats/install-atsdoc-hats-files.patch
diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/by-name/at/ats/package.nix
similarity index 100%
rename from pkgs/development/compilers/ats/default.nix
rename to pkgs/by-name/at/ats/package.nix
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/by-name/au/aubio/package.nix
similarity index 100%
rename from pkgs/development/libraries/aubio/default.nix
rename to pkgs/by-name/au/aubio/package.nix
diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/by-name/au/aucatctl/package.nix
similarity index 100%
rename from pkgs/applications/audio/aucatctl/default.nix
rename to pkgs/by-name/au/aucatctl/package.nix
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/by-name/au/auctex/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/tex/auctex/default.nix
rename to pkgs/by-name/au/auctex/package.nix
diff --git a/pkgs/development/libraries/audiality2/default.nix b/pkgs/by-name/au/audiality2/package.nix
similarity index 100%
rename from pkgs/development/libraries/audiality2/default.nix
rename to pkgs/by-name/au/audiality2/package.nix
diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/by-name/au/audio-recorder/package.nix
similarity index 100%
rename from pkgs/applications/audio/audio-recorder/default.nix
rename to pkgs/by-name/au/audio-recorder/package.nix
diff --git a/pkgs/tools/audio/audiowaveform/default.nix b/pkgs/by-name/au/audiowaveform/package.nix
similarity index 100%
rename from pkgs/tools/audio/audiowaveform/default.nix
rename to pkgs/by-name/au/audiowaveform/package.nix
diff --git a/pkgs/tools/system/augeas/bootstrap.diff b/pkgs/by-name/au/augeas/bootstrap.diff
similarity index 100%
rename from pkgs/tools/system/augeas/bootstrap.diff
rename to pkgs/by-name/au/augeas/bootstrap.diff
diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/by-name/au/augeas/package.nix
similarity index 100%
rename from pkgs/tools/system/augeas/default.nix
rename to pkgs/by-name/au/augeas/package.nix
diff --git a/pkgs/development/compilers/august/default.nix b/pkgs/by-name/au/august/package.nix
similarity index 100%
rename from pkgs/development/compilers/august/default.nix
rename to pkgs/by-name/au/august/package.nix
diff --git a/pkgs/games/augustus/darwin-fixes.patch b/pkgs/by-name/au/augustus/darwin-fixes.patch
similarity index 100%
rename from pkgs/games/augustus/darwin-fixes.patch
rename to pkgs/by-name/au/augustus/darwin-fixes.patch
diff --git a/pkgs/games/augustus/default.nix b/pkgs/by-name/au/augustus/package.nix
similarity index 100%
rename from pkgs/games/augustus/default.nix
rename to pkgs/by-name/au/augustus/package.nix
diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/by-name/au/aurulent-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/aurulent-sans/default.nix
rename to pkgs/by-name/au/aurulent-sans/package.nix
diff --git a/pkgs/tools/admin/auth0-cli/default.nix b/pkgs/by-name/au/auth0-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/auth0-cli/default.nix
rename to pkgs/by-name/au/auth0-cli/package.nix
diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/by-name/au/authenticator/package.nix
similarity index 100%
rename from pkgs/applications/misc/authenticator/default.nix
rename to pkgs/by-name/au/authenticator/package.nix
diff --git a/pkgs/tools/security/authz0/default.nix b/pkgs/by-name/au/authz0/package.nix
similarity index 100%
rename from pkgs/tools/security/authz0/default.nix
rename to pkgs/by-name/au/authz0/package.nix
diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/by-name/au/auto-multiple-choice/package.nix
similarity index 100%
rename from pkgs/applications/misc/auto-multiple-choice/default.nix
rename to pkgs/by-name/au/auto-multiple-choice/package.nix
diff --git a/pkgs/misc/autoadb/default.nix b/pkgs/by-name/au/autoadb/package.nix
similarity index 100%
rename from pkgs/misc/autoadb/default.nix
rename to pkgs/by-name/au/autoadb/package.nix
diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/by-name/au/autobuild/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/autobuild/default.nix
rename to pkgs/by-name/au/autobuild/package.nix
diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/by-name/au/autoconf-archive/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/autoconf-archive/default.nix
rename to pkgs/by-name/au/autoconf-archive/package.nix
diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/by-name/au/autocutsel/package.nix
similarity index 100%
rename from pkgs/tools/X11/autocutsel/default.nix
rename to pkgs/by-name/au/autocutsel/package.nix
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/by-name/au/autofs5/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/autofs/default.nix
rename to pkgs/by-name/au/autofs5/package.nix
diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/by-name/au/autogen/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/autogen/default.nix
rename to pkgs/by-name/au/autogen/package.nix
diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/by-name/au/autojump/package.nix
similarity index 100%
rename from pkgs/tools/misc/autojump/default.nix
rename to pkgs/by-name/au/autojump/package.nix
diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/by-name/au/autokey/package.nix
similarity index 100%
rename from pkgs/applications/office/autokey/default.nix
rename to pkgs/by-name/au/autokey/package.nix
diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
similarity index 100%
rename from pkgs/tools/system/automatic-timezoned/default.nix
rename to pkgs/by-name/au/automatic-timezoned/package.nix
diff --git a/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix b/pkgs/by-name/au/automaticcomponenttoolkit/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix
rename to pkgs/by-name/au/automaticcomponenttoolkit/package.nix
diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/by-name/au/automirror/package.nix
similarity index 100%
rename from pkgs/tools/misc/automirror/default.nix
rename to pkgs/by-name/au/automirror/package.nix
diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/pkgs/by-name/au/automysqlbackup/package.nix
similarity index 100%
rename from pkgs/tools/backup/automysqlbackup/default.nix
rename to pkgs/by-name/au/automysqlbackup/package.nix
diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/by-name/au/autopanosiftc/package.nix
similarity index 100%
rename from pkgs/applications/graphics/autopanosiftc/default.nix
rename to pkgs/by-name/au/autopanosiftc/package.nix
diff --git a/pkgs/tools/misc/autorandr/0001-don-t-use-sys.executable.patch b/pkgs/by-name/au/autorandr/0001-don-t-use-sys.executable.patch
similarity index 100%
rename from pkgs/tools/misc/autorandr/0001-don-t-use-sys.executable.patch
rename to pkgs/by-name/au/autorandr/0001-don-t-use-sys.executable.patch
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/by-name/au/autorandr/package.nix
similarity index 100%
rename from pkgs/tools/misc/autorandr/default.nix
rename to pkgs/by-name/au/autorandr/package.nix
diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/by-name/au/autorestic/package.nix
similarity index 100%
rename from pkgs/tools/backup/autorestic/default.nix
rename to pkgs/by-name/au/autorestic/package.nix
diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/by-name/au/autorevision/package.nix
similarity index 100%
rename from pkgs/tools/misc/autorevision/default.nix
rename to pkgs/by-name/au/autorevision/package.nix
diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/by-name/au/autospotting/package.nix
similarity index 100%
rename from pkgs/applications/misc/autospotting/default.nix
rename to pkgs/by-name/au/autospotting/package.nix
diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/by-name/au/autossh/package.nix
similarity index 100%
rename from pkgs/tools/networking/autossh/default.nix
rename to pkgs/by-name/au/autossh/package.nix
diff --git a/pkgs/applications/audio/autotalent/default.nix b/pkgs/by-name/au/autotalent/package.nix
similarity index 100%
rename from pkgs/applications/audio/autotalent/default.nix
rename to pkgs/by-name/au/autotalent/package.nix
diff --git a/pkgs/misc/autotiling-rs/default.nix b/pkgs/by-name/au/autotiling-rs/package.nix
similarity index 100%
rename from pkgs/misc/autotiling-rs/default.nix
rename to pkgs/by-name/au/autotiling-rs/package.nix
diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/by-name/au/autotrace/package.nix
similarity index 100%
rename from pkgs/applications/graphics/autotrace/default.nix
rename to pkgs/by-name/au/autotrace/package.nix
diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/by-name/av/avfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/avfs/default.nix
rename to pkgs/by-name/av/avfs/package.nix
diff --git a/pkgs/development/tools/misc/aviator/bump-golang-x-sys.patch b/pkgs/by-name/av/aviator/bump-golang-x-sys.patch
similarity index 100%
rename from pkgs/development/tools/misc/aviator/bump-golang-x-sys.patch
rename to pkgs/by-name/av/aviator/bump-golang-x-sys.patch
diff --git a/pkgs/development/tools/misc/aviator/default.nix b/pkgs/by-name/av/aviator/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/aviator/default.nix
rename to pkgs/by-name/av/aviator/package.nix
diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/by-name/av/avizo/package.nix
similarity index 100%
rename from pkgs/applications/misc/avizo/default.nix
rename to pkgs/by-name/av/avizo/package.nix
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/by-name/av/avocode/package.nix
similarity index 100%
rename from pkgs/applications/graphics/avocode/default.nix
rename to pkgs/by-name/av/avocode/package.nix
diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/by-name/av/avr8burnomat/package.nix
similarity index 100%
rename from pkgs/development/misc/avr8-burn-omat/default.nix
rename to pkgs/by-name/av/avr8burnomat/package.nix
diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/by-name/av/avra/package.nix
similarity index 100%
rename from pkgs/development/compilers/avra/default.nix
rename to pkgs/by-name/av/avra/package.nix
diff --git a/pkgs/development/embedded/avrdude/libelf.nix b/pkgs/by-name/av/avrdude/libelf.nix
similarity index 100%
rename from pkgs/development/embedded/avrdude/libelf.nix
rename to pkgs/by-name/av/avrdude/libelf.nix
diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/by-name/av/avrdude/package.nix
similarity index 100%
rename from pkgs/development/embedded/avrdude/default.nix
rename to pkgs/by-name/av/avrdude/package.nix
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/by-name/av/avrdudess/package.nix
similarity index 100%
rename from pkgs/applications/misc/avrdudess/default.nix
rename to pkgs/by-name/av/avrdudess/package.nix
diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/by-name/av/avro-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/avro-c/default.nix
rename to pkgs/by-name/av/avro-c/package.nix
diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/by-name/av/avro-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/avro-c++/default.nix
rename to pkgs/by-name/av/avro-cpp/package.nix
diff --git a/pkgs/tools/wayland/aw-watcher-window-wayland/Cargo.lock b/pkgs/by-name/aw/aw-watcher-window-wayland/Cargo.lock
similarity index 100%
rename from pkgs/tools/wayland/aw-watcher-window-wayland/Cargo.lock
rename to pkgs/by-name/aw/aw-watcher-window-wayland/Cargo.lock
diff --git a/pkgs/tools/wayland/aw-watcher-window-wayland/default.nix b/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix
similarity index 100%
rename from pkgs/tools/wayland/aw-watcher-window-wayland/default.nix
rename to pkgs/by-name/aw/aw-watcher-window-wayland/package.nix
diff --git a/pkgs/applications/misc/hmm/rustc-serialize-fix.patch b/pkgs/by-name/aw/aw-watcher-window-wayland/rustc-serialize-fix.patch
similarity index 100%
rename from pkgs/applications/misc/hmm/rustc-serialize-fix.patch
rename to pkgs/by-name/aw/aw-watcher-window-wayland/rustc-serialize-fix.patch
diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/by-name/aw/awf/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/awf/default.nix
rename to pkgs/by-name/aw/awf/package.nix
diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/by-name/aw/aws-c-auth/package.nix
similarity index 100%
rename from pkgs/development/libraries/aws-c-auth/default.nix
rename to pkgs/by-name/aw/aws-c-auth/package.nix
diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/by-name/aw/aws-c-common/package.nix
similarity index 100%
rename from pkgs/development/libraries/aws-c-common/default.nix
rename to pkgs/by-name/aw/aws-c-common/package.nix
diff --git a/pkgs/development/libraries/aws-c-common/setup-hook.sh b/pkgs/by-name/aw/aws-c-common/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/aws-c-common/setup-hook.sh
rename to pkgs/by-name/aw/aws-c-common/setup-hook.sh
diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/by-name/aw/aws-c-compression/package.nix
similarity index 100%
rename from pkgs/development/libraries/aws-c-compression/default.nix
rename to pkgs/by-name/aw/aws-c-compression/package.nix
diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/by-name/aw/aws-c-event-stream/package.nix
similarity index 100%
rename from pkgs/development/libraries/aws-c-event-stream/default.nix
rename to pkgs/by-name/aw/aws-c-event-stream/package.nix
diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/by-name/aw/aws-c-http/package.nix
similarity index 100%
rename from pkgs/development/libraries/aws-c-http/default.nix
rename to pkgs/by-name/aw/aws-c-http/package.nix
diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/by-name/aw/aws-c-mqtt/package.nix
similarity index 100%
rename from pkgs/development/libraries/aws-c-mqtt/default.nix
rename to pkgs/by-name/aw/aws-c-mqtt/package.nix
diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/by-name/aw/aws-c-s3/package.nix
similarity index 100%
rename from pkgs/development/libraries/aws-c-s3/default.nix
rename to pkgs/by-name/aw/aws-c-s3/package.nix
diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/by-name/aw/aws-c-sdkutils/package.nix
similarity index 100%
rename from pkgs/development/libraries/aws-c-sdkutils/default.nix
rename to pkgs/by-name/aw/aws-c-sdkutils/package.nix
diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/by-name/aw/aws-checksums/package.nix
similarity index 100%
rename from pkgs/development/libraries/aws-checksums/default.nix
rename to pkgs/by-name/aw/aws-checksums/package.nix
diff --git a/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch b/pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
similarity index 100%
rename from pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
rename to pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/by-name/aw/aws-crt-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/aws-crt-cpp/default.nix
rename to pkgs/by-name/aw/aws-crt-cpp/package.nix
diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/by-name/aw/aws-iam-authenticator/package.nix
similarity index 100%
rename from pkgs/tools/security/aws-iam-authenticator/default.nix
rename to pkgs/by-name/aw/aws-iam-authenticator/package.nix
diff --git a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/pkgs/by-name/aw/aws-lambda-rie/package.nix
similarity index 100%
rename from pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix
rename to pkgs/by-name/aw/aws-lambda-rie/package.nix
diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/by-name/aw/aws-nuke/package.nix
similarity index 100%
rename from pkgs/tools/admin/aws-nuke/default.nix
rename to pkgs/by-name/aw/aws-nuke/package.nix
diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/by-name/aw/aws-rotate-key/package.nix
similarity index 100%
rename from pkgs/tools/admin/aws-rotate-key/default.nix
rename to pkgs/by-name/aw/aws-rotate-key/package.nix
diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/aws-sam-cli/default.nix
rename to pkgs/by-name/aw/aws-sam-cli/package.nix
diff --git a/pkgs/tools/admin/aws-sso-creds/default.nix b/pkgs/by-name/aw/aws-sso-creds/package.nix
similarity index 100%
rename from pkgs/tools/admin/aws-sso-creds/default.nix
rename to pkgs/by-name/aw/aws-sso-creds/package.nix
diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/by-name/aw/aws_mturk_clt/package.nix
similarity index 100%
rename from pkgs/tools/misc/aws-mturk-clt/default.nix
rename to pkgs/by-name/aw/aws_mturk_clt/package.nix
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/by-name/aw/awscli/package.nix
similarity index 100%
rename from pkgs/tools/admin/awscli/default.nix
rename to pkgs/by-name/aw/awscli/package.nix
diff --git a/pkgs/tools/admin/awslimitchecker/default.nix b/pkgs/by-name/aw/awslimitchecker/package.nix
similarity index 100%
rename from pkgs/tools/admin/awslimitchecker/default.nix
rename to pkgs/by-name/aw/awslimitchecker/package.nix
diff --git a/pkgs/tools/admin/awslimitchecker/version.patch b/pkgs/by-name/aw/awslimitchecker/version.patch
similarity index 100%
rename from pkgs/tools/admin/awslimitchecker/version.patch
rename to pkgs/by-name/aw/awslimitchecker/version.patch
diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/by-name/aw/awslogs/package.nix
similarity index 100%
rename from pkgs/tools/admin/awslogs/default.nix
rename to pkgs/by-name/aw/awslogs/package.nix
diff --git a/pkgs/tools/admin/awsls/default.nix b/pkgs/by-name/aw/awsls/package.nix
similarity index 100%
rename from pkgs/tools/admin/awsls/default.nix
rename to pkgs/by-name/aw/awsls/package.nix
diff --git a/pkgs/tools/admin/awsrm/default.nix b/pkgs/by-name/aw/awsrm/package.nix
similarity index 100%
rename from pkgs/tools/admin/awsrm/default.nix
rename to pkgs/by-name/aw/awsrm/package.nix
diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/by-name/aw/awstats/package.nix
similarity index 100%
rename from pkgs/tools/system/awstats/default.nix
rename to pkgs/by-name/aw/awstats/package.nix
diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/by-name/aw/awsweeper/package.nix
similarity index 100%
rename from pkgs/tools/admin/awsweeper/default.nix
rename to pkgs/by-name/aw/awsweeper/package.nix
diff --git a/pkgs/applications/radio/ax25-apps/default.nix b/pkgs/by-name/ax/ax25-apps/package.nix
similarity index 100%
rename from pkgs/applications/radio/ax25-apps/default.nix
rename to pkgs/by-name/ax/ax25-apps/package.nix
diff --git a/pkgs/applications/radio/ax25-tools/default.nix b/pkgs/by-name/ax/ax25-tools/package.nix
similarity index 100%
rename from pkgs/applications/radio/ax25-tools/default.nix
rename to pkgs/by-name/ax/ax25-tools/package.nix
diff --git a/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix b/pkgs/by-name/ay/ayatana-webmail/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix
rename to pkgs/by-name/ay/ayatana-webmail/package.nix
diff --git a/pkgs/data/themes/ayu-theme-gtk/default.nix b/pkgs/by-name/ay/ayu-theme-gtk/package.nix
similarity index 100%
rename from pkgs/data/themes/ayu-theme-gtk/default.nix
rename to pkgs/by-name/ay/ayu-theme-gtk/package.nix
diff --git a/pkgs/data/fonts/azeret-mono/default.nix b/pkgs/by-name/az/azeret-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/azeret-mono/default.nix
rename to pkgs/by-name/az/azeret-mono/package.nix
diff --git a/pkgs/games/azimuth/default.nix b/pkgs/by-name/az/azimuth/package.nix
similarity index 100%
rename from pkgs/games/azimuth/default.nix
rename to pkgs/by-name/az/azimuth/package.nix
diff --git a/pkgs/development/libraries/azmq/default.nix b/pkgs/by-name/az/azmq/package.nix
similarity index 100%
rename from pkgs/development/libraries/azmq/default.nix
rename to pkgs/by-name/az/azmq/package.nix
diff --git a/pkgs/development/tools/azure-functions-core-tools/deps.nix b/pkgs/by-name/az/azure-functions-core-tools/deps.nix
similarity index 100%
rename from pkgs/development/tools/azure-functions-core-tools/deps.nix
rename to pkgs/by-name/az/azure-functions-core-tools/deps.nix
diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/by-name/az/azure-functions-core-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/azure-functions-core-tools/default.nix
rename to pkgs/by-name/az/azure-functions-core-tools/package.nix
diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix
similarity index 100%
rename from pkgs/development/tools/azcopy/default.nix
rename to pkgs/by-name/az/azure-storage-azcopy/package.nix
diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/by-name/az/azuredatastudio/package.nix
similarity index 100%
rename from pkgs/applications/misc/azuredatastudio/default.nix
rename to pkgs/by-name/az/azuredatastudio/package.nix
diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/by-name/b4/b4/package.nix
similarity index 100%
rename from pkgs/development/tools/b4/default.nix
rename to pkgs/by-name/b4/b4/package.nix
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch b/pkgs/by-name/b4/b43FirmwareCutter/no-root-install.patch
similarity index 100%
rename from pkgs/os-specific/linux/firmware/b43-firmware-cutter/no-root-install.patch
rename to pkgs/by-name/b4/b43FirmwareCutter/no-root-install.patch
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/by-name/b4/b43FirmwareCutter/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
rename to pkgs/by-name/b4/b43FirmwareCutter/package.nix
diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/by-name/b6/b612/package.nix
similarity index 100%
rename from pkgs/data/fonts/b612/default.nix
rename to pkgs/by-name/b6/b612/package.nix
diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/by-name/ba/babeld/package.nix
similarity index 100%
rename from pkgs/tools/networking/babeld/default.nix
rename to pkgs/by-name/ba/babeld/package.nix
diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/by-name/ba/babelstone-han/package.nix
similarity index 100%
rename from pkgs/data/fonts/babelstone-han/default.nix
rename to pkgs/by-name/ba/babelstone-han/package.nix
diff --git a/pkgs/development/libraries/babl/dev-prefix.patch b/pkgs/by-name/ba/babl/dev-prefix.patch
similarity index 100%
rename from pkgs/development/libraries/babl/dev-prefix.patch
rename to pkgs/by-name/ba/babl/dev-prefix.patch
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/by-name/ba/babl/package.nix
similarity index 100%
rename from pkgs/development/libraries/babl/default.nix
rename to pkgs/by-name/ba/babl/package.nix
diff --git a/pkgs/tools/security/baboossh/default.nix b/pkgs/by-name/ba/baboossh/package.nix
similarity index 100%
rename from pkgs/tools/security/baboossh/default.nix
rename to pkgs/by-name/ba/baboossh/package.nix
diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/by-name/ba/backblaze-b2/package.nix
similarity index 100%
rename from pkgs/development/tools/backblaze-b2/default.nix
rename to pkgs/by-name/ba/backblaze-b2/package.nix
diff --git a/pkgs/tools/misc/backdown/default.nix b/pkgs/by-name/ba/backdown/package.nix
similarity index 100%
rename from pkgs/tools/misc/backdown/default.nix
rename to pkgs/by-name/ba/backdown/package.nix
diff --git a/pkgs/development/libraries/backward-cpp/default.nix b/pkgs/by-name/ba/backward-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/backward-cpp/default.nix
rename to pkgs/by-name/ba/backward-cpp/package.nix
diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/by-name/ba/bacnet-stack/package.nix
similarity index 100%
rename from pkgs/tools/networking/bacnet-stack/default.nix
rename to pkgs/by-name/ba/bacnet-stack/package.nix
diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/by-name/ba/bada-bib/package.nix
similarity index 100%
rename from pkgs/applications/science/misc/bada-bib/default.nix
rename to pkgs/by-name/ba/bada-bib/package.nix
diff --git a/pkgs/games/badlion-client/default.nix b/pkgs/by-name/ba/badlion-client/package.nix
similarity index 100%
rename from pkgs/games/badlion-client/default.nix
rename to pkgs/by-name/ba/badlion-client/package.nix
diff --git a/pkgs/tools/security/badrobot/default.nix b/pkgs/by-name/ba/badrobot/package.nix
similarity index 100%
rename from pkgs/tools/security/badrobot/default.nix
rename to pkgs/by-name/ba/badrobot/package.nix
diff --git a/pkgs/tools/networking/badvpn/default.nix b/pkgs/by-name/ba/badvpn/package.nix
similarity index 100%
rename from pkgs/tools/networking/badvpn/default.nix
rename to pkgs/by-name/ba/badvpn/package.nix
diff --git a/pkgs/applications/networking/browsers/badwolf/default.nix b/pkgs/by-name/ba/badwolf/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/badwolf/default.nix
rename to pkgs/by-name/ba/badwolf/package.nix
diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/by-name/ba/baekmuk-ttf/package.nix
similarity index 100%
rename from pkgs/data/fonts/baekmuk-ttf/default.nix
rename to pkgs/by-name/ba/baekmuk-ttf/package.nix
diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/by-name/ba/bakoma_ttf/package.nix
similarity index 100%
rename from pkgs/data/fonts/bakoma-ttf/default.nix
rename to pkgs/by-name/ba/bakoma_ttf/package.nix
diff --git a/pkgs/tools/misc/balanceofsatoshis/default.nix b/pkgs/by-name/ba/balanceofsatoshis/package.nix
similarity index 100%
rename from pkgs/tools/misc/balanceofsatoshis/default.nix
rename to pkgs/by-name/ba/balanceofsatoshis/package.nix
diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/by-name/ba/balena-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/balena-cli/default.nix
rename to pkgs/by-name/ba/balena-cli/package.nix
diff --git a/pkgs/games/ballerburg/default.nix b/pkgs/by-name/ba/ballerburg/package.nix
similarity index 100%
rename from pkgs/games/ballerburg/default.nix
rename to pkgs/by-name/ba/ballerburg/package.nix
diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/by-name/ba/balsa/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/balsa/default.nix
rename to pkgs/by-name/ba/balsa/package.nix
diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/by-name/ba/bam/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/bam/default.nix
rename to pkgs/by-name/ba/bam/package.nix
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/by-name/ba/bamf/package.nix
similarity index 100%
rename from pkgs/development/libraries/bamf/default.nix
rename to pkgs/by-name/ba/bamf/package.nix
diff --git a/pkgs/applications/science/biology/bamtools/default.nix b/pkgs/by-name/ba/bamtools/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/bamtools/default.nix
rename to pkgs/by-name/ba/bamtools/package.nix
diff --git a/pkgs/applications/office/banana-accounting/default.nix b/pkgs/by-name/ba/banana-accounting/package.nix
similarity index 100%
rename from pkgs/applications/office/banana-accounting/default.nix
rename to pkgs/by-name/ba/banana-accounting/package.nix
diff --git a/pkgs/development/tools/analysis/banana-vera/default.nix b/pkgs/by-name/ba/banana-vera/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/banana-vera/default.nix
rename to pkgs/by-name/ba/banana-vera/package.nix
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/by-name/ba/bandwidth/package.nix
similarity index 100%
rename from pkgs/tools/misc/bandwidth/default.nix
rename to pkgs/by-name/ba/bandwidth/package.nix
diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/by-name/ba/banking/package.nix
similarity index 100%
rename from pkgs/applications/office/banking/default.nix
rename to pkgs/by-name/ba/banking/package.nix
diff --git a/pkgs/games/banner/default.nix b/pkgs/by-name/ba/banner/package.nix
similarity index 100%
rename from pkgs/games/banner/default.nix
rename to pkgs/by-name/ba/banner/package.nix
diff --git a/pkgs/tools/security/bao/default.nix b/pkgs/by-name/ba/bao/package.nix
similarity index 100%
rename from pkgs/tools/security/bao/default.nix
rename to pkgs/by-name/ba/bao/package.nix
diff --git a/pkgs/tools/security/bao/test-exe.patch b/pkgs/by-name/ba/bao/test-exe.patch
similarity index 100%
rename from pkgs/tools/security/bao/test-exe.patch
rename to pkgs/by-name/ba/bao/test-exe.patch
diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/by-name/ba/bar/package.nix
similarity index 100%
rename from pkgs/tools/system/bar/default.nix
rename to pkgs/by-name/ba/bar/package.nix
diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/by-name/ba/barcode/package.nix
similarity index 100%
rename from pkgs/tools/graphics/barcode/default.nix
rename to pkgs/by-name/ba/barcode/package.nix
diff --git a/pkgs/tools/audio/bark/default.nix b/pkgs/by-name/ba/bark/package.nix
similarity index 100%
rename from pkgs/tools/audio/bark/default.nix
rename to pkgs/by-name/ba/bark/package.nix
diff --git a/pkgs/data/fonts/barlow/default.nix b/pkgs/by-name/ba/barlow/package.nix
similarity index 100%
rename from pkgs/data/fonts/barlow/default.nix
rename to pkgs/by-name/ba/barlow/package.nix
diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/by-name/ba/barman/package.nix
similarity index 100%
rename from pkgs/tools/misc/barman/default.nix
rename to pkgs/by-name/ba/barman/package.nix
diff --git a/pkgs/tools/misc/barman/unwrap-subprocess.patch b/pkgs/by-name/ba/barman/unwrap-subprocess.patch
similarity index 100%
rename from pkgs/tools/misc/barman/unwrap-subprocess.patch
rename to pkgs/by-name/ba/barman/unwrap-subprocess.patch
diff --git a/pkgs/os-specific/darwin/bartender/default.nix b/pkgs/by-name/ba/bartender/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/bartender/default.nix
rename to pkgs/by-name/ba/bartender/package.nix
diff --git a/pkgs/tools/misc/bartib/default.nix b/pkgs/by-name/ba/bartib/package.nix
similarity index 100%
rename from pkgs/tools/misc/bartib/default.nix
rename to pkgs/by-name/ba/bartib/package.nix
diff --git a/pkgs/data/themes/base16-schemes/default.nix b/pkgs/by-name/ba/base16-schemes/package.nix
similarity index 100%
rename from pkgs/data/themes/base16-schemes/default.nix
rename to pkgs/by-name/ba/base16-schemes/package.nix
diff --git a/pkgs/applications/misc/base16-universal-manager/default.nix b/pkgs/by-name/ba/base16-universal-manager/package.nix
similarity index 100%
rename from pkgs/applications/misc/base16-universal-manager/default.nix
rename to pkgs/by-name/ba/base16-universal-manager/package.nix
diff --git a/pkgs/tools/text/base16384/default.nix b/pkgs/by-name/ba/base16384/package.nix
similarity index 100%
rename from pkgs/tools/text/base16384/default.nix
rename to pkgs/by-name/ba/base16384/package.nix
diff --git a/pkgs/servers/baserow/default.nix b/pkgs/by-name/ba/baserow/package.nix
similarity index 100%
rename from pkgs/servers/baserow/default.nix
rename to pkgs/by-name/ba/baserow/package.nix
diff --git a/pkgs/tools/text/xml/basex/basex.svg b/pkgs/by-name/ba/basex/basex.svg
similarity index 100%
rename from pkgs/tools/text/xml/basex/basex.svg
rename to pkgs/by-name/ba/basex/basex.svg
diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/by-name/ba/basex/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/basex/default.nix
rename to pkgs/by-name/ba/basex/package.nix
diff --git a/pkgs/tools/misc/basez/default.nix b/pkgs/by-name/ba/basez/package.nix
similarity index 100%
rename from pkgs/tools/misc/basez/default.nix
rename to pkgs/by-name/ba/basez/package.nix
diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/by-name/ba/bash-completion/package.nix
similarity index 100%
rename from pkgs/shells/bash/bash-completion/default.nix
rename to pkgs/by-name/ba/bash-completion/package.nix
diff --git a/pkgs/tools/admin/bash-my-aws/default.nix b/pkgs/by-name/ba/bash-my-aws/package.nix
similarity index 100%
rename from pkgs/tools/admin/bash-my-aws/default.nix
rename to pkgs/by-name/ba/bash-my-aws/package.nix
diff --git a/pkgs/development/libraries/bash/bash-preexec/default.nix b/pkgs/by-name/ba/bash-preexec/package.nix
similarity index 100%
rename from pkgs/development/libraries/bash/bash-preexec/default.nix
rename to pkgs/by-name/ba/bash-preexec/package.nix
diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/by-name/ba/bash-supergenpass/package.nix
similarity index 100%
rename from pkgs/tools/security/bash-supergenpass/default.nix
rename to pkgs/by-name/ba/bash-supergenpass/package.nix
diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/by-name/ba/bashSnippets/package.nix
similarity index 100%
rename from pkgs/applications/misc/bashSnippets/default.nix
rename to pkgs/by-name/ba/bashSnippets/package.nix
diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/by-name/ba/bash_unit/package.nix
similarity index 100%
rename from pkgs/tools/misc/bash_unit/default.nix
rename to pkgs/by-name/ba/bash_unit/package.nix
diff --git a/pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch b/pkgs/by-name/ba/bashblog/0001-Setting-markdown_bin.patch
similarity index 100%
rename from pkgs/tools/text/bashblog/0001-Setting-markdown_bin.patch
rename to pkgs/by-name/ba/bashblog/0001-Setting-markdown_bin.patch
diff --git a/pkgs/tools/text/bashblog/default.nix b/pkgs/by-name/ba/bashblog/package.nix
similarity index 100%
rename from pkgs/tools/text/bashblog/default.nix
rename to pkgs/by-name/ba/bashblog/package.nix
diff --git a/pkgs/tools/misc/bashcards/default.nix b/pkgs/by-name/ba/bashcards/package.nix
similarity index 100%
rename from pkgs/tools/misc/bashcards/default.nix
rename to pkgs/by-name/ba/bashcards/package.nix
diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/by-name/ba/bashdb/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/bashdb/default.nix
rename to pkgs/by-name/ba/bashdb/package.nix
diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/by-name/ba/bashmount/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/bashmount/default.nix
rename to pkgs/by-name/ba/bashmount/package.nix
diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/by-name/ba/bashplotlib/package.nix
similarity index 100%
rename from pkgs/tools/misc/bashplotlib/default.nix
rename to pkgs/by-name/ba/bashplotlib/package.nix
diff --git a/pkgs/applications/emulators/basiliskii/default.nix b/pkgs/by-name/ba/basiliskii/package.nix
similarity index 100%
rename from pkgs/applications/emulators/basiliskii/default.nix
rename to pkgs/by-name/ba/basiliskii/package.nix
diff --git a/pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch b/pkgs/by-name/ba/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch
similarity index 100%
rename from pkgs/applications/emulators/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch
rename to pkgs/by-name/ba/basiliskii/remove-redhat-6-workaround-for-scsi-sg.h.patch
diff --git a/pkgs/games/bastet/default.nix b/pkgs/by-name/ba/bastet/package.nix
similarity index 100%
rename from pkgs/games/bastet/default.nix
rename to pkgs/by-name/ba/bastet/package.nix
diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/by-name/ba/bats/libraries.nix
similarity index 100%
rename from pkgs/development/interpreters/bats/libraries.nix
rename to pkgs/by-name/ba/bats/libraries.nix
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/by-name/ba/bats/package.nix
similarity index 100%
rename from pkgs/development/interpreters/bats/default.nix
rename to pkgs/by-name/ba/bats/package.nix
diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/by-name/ba/batsignal/package.nix
similarity index 100%
rename from pkgs/applications/misc/batsignal/default.nix
rename to pkgs/by-name/ba/batsignal/package.nix
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/by-name/ba/baudline/package.nix
similarity index 100%
rename from pkgs/applications/audio/baudline/default.nix
rename to pkgs/by-name/ba/baudline/package.nix
diff --git a/pkgs/applications/science/biology/bayescan/default.nix b/pkgs/by-name/ba/bayescan/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/bayescan/default.nix
rename to pkgs/by-name/ba/bayescan/package.nix
diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/by-name/ba/bazarr/package.nix
similarity index 100%
rename from pkgs/servers/bazarr/default.nix
rename to pkgs/by-name/ba/bazarr/package.nix
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/by-name/ba/bazel-buildtools/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/bazel/buildtools/default.nix
rename to pkgs/by-name/ba/bazel-buildtools/package.nix
diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/by-name/ba/bazel-gazelle/package.nix
similarity index 100%
rename from pkgs/development/tools/bazel-gazelle/default.nix
rename to pkgs/by-name/ba/bazel-gazelle/package.nix
diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/by-name/ba/bazel-kazel/package.nix
similarity index 100%
rename from pkgs/development/tools/bazel-kazel/default.nix
rename to pkgs/by-name/ba/bazel-kazel/package.nix
diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/by-name/ba/bazel-remote/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
rename to pkgs/by-name/ba/bazel-remote/package.nix
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/by-name/ba/bazel-watcher/package.nix
similarity index 100%
rename from pkgs/development/tools/bazel-watcher/default.nix
rename to pkgs/by-name/ba/bazel-watcher/package.nix
diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/by-name/ba/bazelisk/package.nix
similarity index 100%
rename from pkgs/development/tools/bazelisk/default.nix
rename to pkgs/by-name/ba/bazelisk/package.nix
diff --git a/pkgs/applications/misc/bb/included-files-updates.diff b/pkgs/by-name/bb/bb/included-files-updates.diff
similarity index 100%
rename from pkgs/applications/misc/bb/included-files-updates.diff
rename to pkgs/by-name/bb/bb/included-files-updates.diff
diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/by-name/bb/bb/package.nix
similarity index 100%
rename from pkgs/applications/misc/bb/default.nix
rename to pkgs/by-name/bb/bb/package.nix
diff --git a/pkgs/tools/misc/bbe/default.nix b/pkgs/by-name/bb/bbe/package.nix
similarity index 100%
rename from pkgs/tools/misc/bbe/default.nix
rename to pkgs/by-name/bb/bbe/package.nix
diff --git a/pkgs/development/tools/bbin/default.nix b/pkgs/by-name/bb/bbin/package.nix
similarity index 100%
rename from pkgs/development/tools/bbin/default.nix
rename to pkgs/by-name/bb/bbin/package.nix
diff --git a/pkgs/development/libraries/bc-decaf/default.nix b/pkgs/by-name/bc/bc-decaf/package.nix
similarity index 100%
rename from pkgs/development/libraries/bc-decaf/default.nix
rename to pkgs/by-name/bc/bc-decaf/package.nix
diff --git a/pkgs/tools/misc/bc/cross-bc.patch b/pkgs/by-name/bc/bc/cross-bc.patch
similarity index 100%
rename from pkgs/tools/misc/bc/cross-bc.patch
rename to pkgs/by-name/bc/bc/cross-bc.patch
diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/by-name/bc/bc/package.nix
similarity index 100%
rename from pkgs/tools/misc/bc/default.nix
rename to pkgs/by-name/bc/bc/package.nix
diff --git a/pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch b/pkgs/by-name/bc/bcache-tools/bcache-udev-modern.patch
similarity index 100%
rename from pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch
rename to pkgs/by-name/bc/bcache-tools/bcache-udev-modern.patch
diff --git a/pkgs/tools/filesystems/bcache-tools/fix-static.patch b/pkgs/by-name/bc/bcache-tools/fix-static.patch
similarity index 100%
rename from pkgs/tools/filesystems/bcache-tools/fix-static.patch
rename to pkgs/by-name/bc/bcache-tools/fix-static.patch
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/by-name/bc/bcache-tools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/bcache-tools/default.nix
rename to pkgs/by-name/bc/bcache-tools/package.nix
diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/by-name/bc/bcal/package.nix
similarity index 100%
rename from pkgs/applications/science/math/bcal/default.nix
rename to pkgs/by-name/bc/bcal/package.nix
diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/by-name/bc/bcftools/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/bcftools/default.nix
rename to pkgs/by-name/bc/bcftools/package.nix
diff --git a/pkgs/development/libraries/bcg729/default.nix b/pkgs/by-name/bc/bcg729/package.nix
similarity index 100%
rename from pkgs/development/libraries/bcg729/default.nix
rename to pkgs/by-name/bc/bcg729/package.nix
diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/by-name/bc/bchoppr/package.nix
similarity index 100%
rename from pkgs/applications/audio/bchoppr/default.nix
rename to pkgs/by-name/bc/bchoppr/package.nix
diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/by-name/bc/bchunk/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/bchunk/default.nix
rename to pkgs/by-name/bc/bchunk/package.nix
diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/by-name/bc/bctoolbox/package.nix
similarity index 100%
rename from pkgs/development/libraries/bctoolbox/default.nix
rename to pkgs/by-name/bc/bctoolbox/package.nix
diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/by-name/bc/bcunit/package.nix
similarity index 100%
rename from pkgs/tools/misc/bcunit/default.nix
rename to pkgs/by-name/bc/bcunit/package.nix
diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/by-name/bd/bdf2psf/package.nix
similarity index 100%
rename from pkgs/tools/misc/bdf2psf/default.nix
rename to pkgs/by-name/bd/bdf2psf/package.nix
diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/by-name/bd/bdf2sfd/package.nix
similarity index 100%
rename from pkgs/tools/misc/bdf2sfd/default.nix
rename to pkgs/by-name/bd/bdf2sfd/package.nix
diff --git a/pkgs/tools/misc/bdfresize/default.nix b/pkgs/by-name/bd/bdfresize/package.nix
similarity index 100%
rename from pkgs/tools/misc/bdfresize/default.nix
rename to pkgs/by-name/bd/bdfresize/package.nix
diff --git a/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch b/pkgs/by-name/bd/bdfresize/remove-malloc-declaration.patch
similarity index 100%
rename from pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch
rename to pkgs/by-name/bd/bdfresize/remove-malloc-declaration.patch
diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/by-name/bd/bdsync/package.nix
similarity index 100%
rename from pkgs/tools/backup/bdsync/default.nix
rename to pkgs/by-name/bd/bdsync/package.nix
diff --git a/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/pkgs/by-name/be/beancount-language-server/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/beancount-language-server/default.nix
rename to pkgs/by-name/be/beancount-language-server/package.nix
diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/by-name/be/bearer/package.nix
similarity index 100%
rename from pkgs/development/tools/bearer/default.nix
rename to pkgs/by-name/be/bearer/package.nix
diff --git a/pkgs/development/libraries/bearssl/default.nix b/pkgs/by-name/be/bearssl/package.nix
similarity index 100%
rename from pkgs/development/libraries/bearssl/default.nix
rename to pkgs/by-name/be/bearssl/package.nix
diff --git a/pkgs/tools/misc/beats/default.nix b/pkgs/by-name/be/beats/package.nix
similarity index 100%
rename from pkgs/tools/misc/beats/default.nix
rename to pkgs/by-name/be/beats/package.nix
diff --git a/pkgs/applications/science/biology/bedops/default.nix b/pkgs/by-name/be/bedops/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/bedops/default.nix
rename to pkgs/by-name/be/bedops/package.nix
diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/by-name/be/bedtools/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/bedtools/default.nix
rename to pkgs/by-name/be/bedtools/package.nix
diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/by-name/be/beecrypt/package.nix
similarity index 100%
rename from pkgs/development/libraries/beecrypt/default.nix
rename to pkgs/by-name/be/beecrypt/package.nix
diff --git a/pkgs/os-specific/linux/beefi/default.nix b/pkgs/by-name/be/beefi/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/beefi/default.nix
rename to pkgs/by-name/be/beefi/package.nix
diff --git a/pkgs/misc/beep/default.nix b/pkgs/by-name/be/beep/package.nix
similarity index 100%
rename from pkgs/misc/beep/default.nix
rename to pkgs/by-name/be/beep/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/by-name/be/beeper/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/beeper/default.nix
rename to pkgs/by-name/be/beeper/package.nix
diff --git a/pkgs/tools/filesystems/bees/bees-service-wrapper b/pkgs/by-name/be/bees/bees-service-wrapper
similarity index 100%
rename from pkgs/tools/filesystems/bees/bees-service-wrapper
rename to pkgs/by-name/be/bees/bees-service-wrapper
diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/by-name/be/bees/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/bees/default.nix
rename to pkgs/by-name/be/bees/package.nix
diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/by-name/be/behdad-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/behdad-fonts/default.nix
rename to pkgs/by-name/be/behdad-fonts/package.nix
diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/by-name/be/belcard/package.nix
similarity index 100%
rename from pkgs/development/libraries/belcard/default.nix
rename to pkgs/by-name/be/belcard/package.nix
diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/by-name/be/belle-sip/package.nix
similarity index 100%
rename from pkgs/development/libraries/belle-sip/default.nix
rename to pkgs/by-name/be/belle-sip/package.nix
diff --git a/pkgs/os-specific/linux/below/default.nix b/pkgs/by-name/be/below/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/below/default.nix
rename to pkgs/by-name/be/below/package.nix
diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/by-name/be/belr/package.nix
similarity index 100%
rename from pkgs/development/libraries/belr/default.nix
rename to pkgs/by-name/be/belr/package.nix
diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/by-name/be/beluga/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/beluga/default.nix
rename to pkgs/by-name/be/beluga/package.nix
diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/by-name/be/bemenu/package.nix
similarity index 100%
rename from pkgs/applications/misc/bemenu/default.nix
rename to pkgs/by-name/be/bemenu/package.nix
diff --git a/pkgs/development/libraries/bencode/default.nix b/pkgs/by-name/be/bencode/package.nix
similarity index 100%
rename from pkgs/development/libraries/bencode/default.nix
rename to pkgs/by-name/be/bencode/package.nix
diff --git a/pkgs/development/libraries/bencodetools/default.nix b/pkgs/by-name/be/bencodetools/package.nix
similarity index 100%
rename from pkgs/development/libraries/bencodetools/default.nix
rename to pkgs/by-name/be/bencodetools/package.nix
diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/by-name/be/benthos/package.nix
similarity index 100%
rename from pkgs/development/tools/benthos/default.nix
rename to pkgs/by-name/be/benthos/package.nix
diff --git a/pkgs/tools/video/bento4/libap4.patch b/pkgs/by-name/be/bento4/libap4.patch
similarity index 100%
rename from pkgs/tools/video/bento4/libap4.patch
rename to pkgs/by-name/be/bento4/libap4.patch
diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/by-name/be/bento4/package.nix
similarity index 100%
rename from pkgs/tools/video/bento4/default.nix
rename to pkgs/by-name/be/bento4/package.nix
diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/by-name/be/bepasty/package.nix
similarity index 100%
rename from pkgs/tools/misc/bepasty/default.nix
rename to pkgs/by-name/be/bepasty/package.nix
diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/by-name/be/berglas/package.nix
similarity index 100%
rename from pkgs/tools/admin/berglas/default.nix
rename to pkgs/by-name/be/berglas/package.nix
diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/by-name/be/besu/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/besu/default.nix
rename to pkgs/by-name/be/besu/package.nix
diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/by-name/be/betaflight-configurator/package.nix
similarity index 100%
rename from pkgs/applications/science/robotics/betaflight-configurator/default.nix
rename to pkgs/by-name/be/betaflight-configurator/package.nix
diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/by-name/be/bettercap/package.nix
similarity index 100%
rename from pkgs/tools/security/bettercap/default.nix
rename to pkgs/by-name/be/bettercap/package.nix
diff --git a/pkgs/tools/misc/betterdiscord-installer/default.nix b/pkgs/by-name/be/betterdiscord-installer/package.nix
similarity index 100%
rename from pkgs/tools/misc/betterdiscord-installer/default.nix
rename to pkgs/by-name/be/betterdiscord-installer/package.nix
diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/by-name/be/betterlockscreen/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/betterlockscreen/default.nix
rename to pkgs/by-name/be/betterlockscreen/package.nix
diff --git a/pkgs/tools/security/beyond-identity/default.nix b/pkgs/by-name/be/beyond-identity/package.nix
similarity index 100%
rename from pkgs/tools/security/beyond-identity/default.nix
rename to pkgs/by-name/be/beyond-identity/package.nix
diff --git a/pkgs/development/compilers/bfc/default.nix b/pkgs/by-name/bf/bfc/package.nix
similarity index 100%
rename from pkgs/development/compilers/bfc/default.nix
rename to pkgs/by-name/bf/bfc/package.nix
diff --git a/pkgs/tools/misc/bfetch/default.nix b/pkgs/by-name/bf/bfetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/bfetch/default.nix
rename to pkgs/by-name/bf/bfetch/package.nix
diff --git a/pkgs/applications/version-management/bfg-repo-cleaner/default.nix b/pkgs/by-name/bf/bfg-repo-cleaner/package.nix
similarity index 100%
rename from pkgs/applications/version-management/bfg-repo-cleaner/default.nix
rename to pkgs/by-name/bf/bfg-repo-cleaner/package.nix
diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/by-name/bf/bfr/package.nix
similarity index 100%
rename from pkgs/tools/misc/bfr/default.nix
rename to pkgs/by-name/bf/bfr/package.nix
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/by-name/bf/bfs/package.nix
similarity index 100%
rename from pkgs/tools/system/bfs/default.nix
rename to pkgs/by-name/bf/bfs/package.nix
diff --git a/pkgs/tools/misc/bfscripts/default.nix b/pkgs/by-name/bf/bfscripts/package.nix
similarity index 100%
rename from pkgs/tools/misc/bfscripts/default.nix
rename to pkgs/by-name/bf/bfscripts/package.nix
diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/by-name/bf/bftools/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/bftools/default.nix
rename to pkgs/by-name/bf/bftools/package.nix
diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/by-name/bf/bftpd/package.nix
similarity index 100%
rename from pkgs/servers/ftp/bftpd/default.nix
rename to pkgs/by-name/bf/bftpd/package.nix
diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/by-name/bg/bgnet/package.nix
similarity index 100%
rename from pkgs/data/documentation/bgnet/default.nix
rename to pkgs/by-name/bg/bgnet/package.nix
diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/by-name/bg/bgpdump/package.nix
similarity index 100%
rename from pkgs/tools/networking/bgpdump/default.nix
rename to pkgs/by-name/bg/bgpdump/package.nix
diff --git a/pkgs/tools/networking/bgpq3/default.nix b/pkgs/by-name/bg/bgpq3/package.nix
similarity index 100%
rename from pkgs/tools/networking/bgpq3/default.nix
rename to pkgs/by-name/bg/bgpq3/package.nix
diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/by-name/bg/bgpq4/package.nix
similarity index 100%
rename from pkgs/tools/networking/bgpq4/default.nix
rename to pkgs/by-name/bg/bgpq4/package.nix
diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/by-name/bg/bgs/package.nix
similarity index 100%
rename from pkgs/tools/X11/bgs/default.nix
rename to pkgs/by-name/bg/bgs/package.nix
diff --git a/pkgs/tools/typesetting/bibclean/default.nix b/pkgs/by-name/bi/bibclean/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/bibclean/default.nix
rename to pkgs/by-name/bi/bibclean/package.nix
diff --git a/pkgs/tools/typesetting/biber-ms/default.nix b/pkgs/by-name/bi/biber-ms/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/biber-ms/default.nix
rename to pkgs/by-name/bi/biber-ms/package.nix
diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/by-name/bi/biber/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/biber/default.nix
rename to pkgs/by-name/bi/biber/package.nix
diff --git a/pkgs/tools/typesetting/biblatex-check/default.nix b/pkgs/by-name/bi/biblatex-check/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/biblatex-check/default.nix
rename to pkgs/by-name/bi/biblatex-check/package.nix
diff --git a/pkgs/servers/xmpp/biboumi/catch.patch b/pkgs/by-name/bi/biboumi/catch.patch
similarity index 100%
rename from pkgs/servers/xmpp/biboumi/catch.patch
rename to pkgs/by-name/bi/biboumi/catch.patch
diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/by-name/bi/biboumi/package.nix
similarity index 100%
rename from pkgs/servers/xmpp/biboumi/default.nix
rename to pkgs/by-name/bi/biboumi/package.nix
diff --git a/pkgs/tools/typesetting/bibtex-tidy/default.nix b/pkgs/by-name/bi/bibtex-tidy/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/bibtex-tidy/default.nix
rename to pkgs/by-name/bi/bibtex-tidy/package.nix
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/by-name/bi/bibtex2html/package.nix
similarity index 100%
rename from pkgs/tools/misc/bibtex2html/default.nix
rename to pkgs/by-name/bi/bibtex2html/package.nix
diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/by-name/bi/bibtool/package.nix
similarity index 100%
rename from pkgs/tools/misc/bibtool/default.nix
rename to pkgs/by-name/bi/bibtool/package.nix
diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/by-name/bi/bibutils/package.nix
similarity index 100%
rename from pkgs/tools/misc/bibutils/default.nix
rename to pkgs/by-name/bi/bibutils/package.nix
diff --git a/pkgs/development/interpreters/bic/default.nix b/pkgs/by-name/bi/bic/package.nix
similarity index 100%
rename from pkgs/development/interpreters/bic/default.nix
rename to pkgs/by-name/bi/bic/package.nix
diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/pkgs/by-name/bi/bicgl/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/bicgl/default.nix
rename to pkgs/by-name/bi/bicgl/package.nix
diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/by-name/bi/bicon/package.nix
similarity index 100%
rename from pkgs/applications/misc/bicon/default.nix
rename to pkgs/by-name/bi/bicon/package.nix
diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/by-name/bi/bicpl/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/bicpl/default.nix
rename to pkgs/by-name/bi/bicpl/package.nix
diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/by-name/bi/bigloo/package.nix
similarity index 100%
rename from pkgs/development/compilers/bigloo/default.nix
rename to pkgs/by-name/bi/bigloo/package.nix
diff --git a/pkgs/servers/bililiverecorder/default.nix b/pkgs/by-name/bi/bililiverecorder/package.nix
similarity index 100%
rename from pkgs/servers/bililiverecorder/default.nix
rename to pkgs/by-name/bi/bililiverecorder/package.nix
diff --git a/pkgs/development/tools/bin2c/default.nix b/pkgs/by-name/bi/bin2c/package.nix
similarity index 100%
rename from pkgs/development/tools/bin2c/default.nix
rename to pkgs/by-name/bi/bin2c/package.nix
diff --git a/pkgs/tools/security/binbloom/default.nix b/pkgs/by-name/bi/binbloom/package.nix
similarity index 100%
rename from pkgs/tools/security/binbloom/default.nix
rename to pkgs/by-name/bi/binbloom/package.nix
diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/by-name/bi/bind/dont-keep-configure-flags.patch
similarity index 100%
rename from pkgs/servers/dns/bind/dont-keep-configure-flags.patch
rename to pkgs/by-name/bi/bind/dont-keep-configure-flags.patch
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/by-name/bi/bind/package.nix
similarity index 100%
rename from pkgs/servers/dns/bind/default.nix
rename to pkgs/by-name/bi/bind/package.nix
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/by-name/bi/bindfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/bindfs/default.nix
rename to pkgs/by-name/bi/bindfs/package.nix
diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/by-name/bi/bingrep/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/bingrep/default.nix
rename to pkgs/by-name/bi/bingrep/package.nix
diff --git a/pkgs/applications/science/biology/bioawk/default.nix b/pkgs/by-name/bi/bioawk/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/bioawk/default.nix
rename to pkgs/by-name/bi/bioawk/package.nix
diff --git a/pkgs/development/tools/biodiff/default.nix b/pkgs/by-name/bi/biodiff/package.nix
similarity index 100%
rename from pkgs/development/tools/biodiff/default.nix
rename to pkgs/by-name/bi/biodiff/package.nix
diff --git a/pkgs/tools/networking/biosdevname/makefile.patch b/pkgs/by-name/bi/biosdevname/makefile.patch
similarity index 100%
rename from pkgs/tools/networking/biosdevname/makefile.patch
rename to pkgs/by-name/bi/biosdevname/makefile.patch
diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/by-name/bi/biosdevname/package.nix
similarity index 100%
rename from pkgs/tools/networking/biosdevname/default.nix
rename to pkgs/by-name/bi/biosdevname/package.nix
diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/by-name/bi/bip/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/bip/default.nix
rename to pkgs/by-name/bi/bip/package.nix
diff --git a/pkgs/servers/bird-lg/default.nix b/pkgs/by-name/bi/bird-lg/package.nix
similarity index 100%
rename from pkgs/servers/bird-lg/default.nix
rename to pkgs/by-name/bi/bird-lg/package.nix
diff --git a/pkgs/servers/bird/dont-create-sysconfdir-2.patch b/pkgs/by-name/bi/bird/dont-create-sysconfdir-2.patch
similarity index 100%
rename from pkgs/servers/bird/dont-create-sysconfdir-2.patch
rename to pkgs/by-name/bi/bird/dont-create-sysconfdir-2.patch
diff --git a/pkgs/servers/bird/default.nix b/pkgs/by-name/bi/bird/package.nix
similarity index 100%
rename from pkgs/servers/bird/default.nix
rename to pkgs/by-name/bi/bird/package.nix
diff --git a/pkgs/tools/security/biscuit-cli/default.nix b/pkgs/by-name/bi/biscuit-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/biscuit-cli/default.nix
rename to pkgs/by-name/bi/biscuit-cli/package.nix
diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/by-name/bi/bison/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/bison/default.nix
rename to pkgs/by-name/bi/bison/package.nix
diff --git a/pkgs/development/tools/parsing/bisonc++/default.nix b/pkgs/by-name/bi/bisoncpp/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/bisonc++/default.nix
rename to pkgs/by-name/bi/bisoncpp/package.nix
diff --git a/pkgs/applications/version-management/bit/default.nix b/pkgs/by-name/bi/bit/package.nix
similarity index 100%
rename from pkgs/applications/version-management/bit/default.nix
rename to pkgs/by-name/bi/bit/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/by-name/bi/bitlbee-discord/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
rename to pkgs/by-name/bi/bitlbee-discord/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/by-name/bi/bitlbee-facebook/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
rename to pkgs/by-name/bi/bitlbee-facebook/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/by-name/bi/bitlbee-mastodon/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix
rename to pkgs/by-name/bi/bitlbee-mastodon/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/by-name/bi/bitlbee-steam/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
rename to pkgs/by-name/bi/bitlbee-steam/package.nix
diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/by-name/bi/bitmeter/package.nix
similarity index 100%
rename from pkgs/applications/audio/bitmeter/default.nix
rename to pkgs/by-name/bi/bitmeter/package.nix
diff --git a/pkgs/tools/misc/bitwise/default.nix b/pkgs/by-name/bi/bitwise/package.nix
similarity index 100%
rename from pkgs/tools/misc/bitwise/default.nix
rename to pkgs/by-name/bi/bitwise/package.nix
diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/by-name/bi/bitwuzla/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/bitwuzla/default.nix
rename to pkgs/by-name/bi/bitwuzla/package.nix
diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/by-name/bj/bjumblr/package.nix
similarity index 100%
rename from pkgs/applications/audio/bjumblr/default.nix
rename to pkgs/by-name/bj/bjumblr/package.nix
diff --git a/pkgs/tools/security/bkcrack/default.nix b/pkgs/by-name/bk/bkcrack/package.nix
similarity index 100%
rename from pkgs/tools/security/bkcrack/default.nix
rename to pkgs/by-name/bk/bkcrack/package.nix
diff --git a/pkgs/applications/misc/bklk/default.nix b/pkgs/by-name/bk/bklk/package.nix
similarity index 100%
rename from pkgs/applications/misc/bklk/default.nix
rename to pkgs/by-name/bk/bklk/package.nix
diff --git a/pkgs/tools/misc/bkt/default.nix b/pkgs/by-name/bk/bkt/package.nix
similarity index 100%
rename from pkgs/tools/misc/bkt/default.nix
rename to pkgs/by-name/bk/bkt/package.nix
diff --git a/pkgs/tools/misc/bkyml/default.nix b/pkgs/by-name/bk/bkyml/package.nix
similarity index 100%
rename from pkgs/tools/misc/bkyml/default.nix
rename to pkgs/by-name/bk/bkyml/package.nix
diff --git a/pkgs/data/themes/blackbird/default.nix b/pkgs/by-name/bl/blackbird/package.nix
similarity index 100%
rename from pkgs/data/themes/blackbird/default.nix
rename to pkgs/by-name/bl/blackbird/package.nix
diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix b/pkgs/by-name/bl/blackbox-terminal/marble.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/blackbox-terminal/marble.nix
rename to pkgs/by-name/bl/blackbox-terminal/marble.nix
diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/by-name/bl/blackbox-terminal/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/blackbox-terminal/default.nix
rename to pkgs/by-name/bl/blackbox-terminal/package.nix
diff --git a/pkgs/development/embedded/blackmagic/helper.sh b/pkgs/by-name/bl/blackmagic/helper.sh
similarity index 100%
rename from pkgs/development/embedded/blackmagic/helper.sh
rename to pkgs/by-name/bl/blackmagic/helper.sh
diff --git a/pkgs/development/embedded/blackmagic/default.nix b/pkgs/by-name/bl/blackmagic/package.nix
similarity index 100%
rename from pkgs/development/embedded/blackmagic/default.nix
rename to pkgs/by-name/bl/blackmagic/package.nix
diff --git a/pkgs/data/fonts/blackout/default.nix b/pkgs/by-name/bl/blackout/package.nix
similarity index 100%
rename from pkgs/data/fonts/blackout/default.nix
rename to pkgs/by-name/bl/blackout/package.nix
diff --git a/pkgs/games/blackshades/default.nix b/pkgs/by-name/bl/blackshades/package.nix
similarity index 100%
rename from pkgs/games/blackshades/default.nix
rename to pkgs/by-name/bl/blackshades/package.nix
diff --git a/pkgs/tools/misc/blahaj/default.nix b/pkgs/by-name/bl/blahaj/package.nix
similarity index 100%
rename from pkgs/tools/misc/blahaj/default.nix
rename to pkgs/by-name/bl/blahaj/package.nix
diff --git a/pkgs/tools/typesetting/tex/blahtexml/default.nix b/pkgs/by-name/bl/blahtexml/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/tex/blahtexml/default.nix
rename to pkgs/by-name/bl/blahtexml/package.nix
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/by-name/bl/blas-reference/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/blas/default.nix
rename to pkgs/by-name/bl/blas-reference/package.nix
diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/by-name/bl/blas/package.nix
similarity index 100%
rename from pkgs/build-support/alternatives/blas/default.nix
rename to pkgs/by-name/bl/blas/package.nix
diff --git a/pkgs/development/libraries/blaze/default.nix b/pkgs/by-name/bl/blaze/package.nix
similarity index 100%
rename from pkgs/development/libraries/blaze/default.nix
rename to pkgs/by-name/bl/blaze/package.nix
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/by-name/bl/bleachbit/package.nix
similarity index 100%
rename from pkgs/applications/misc/bleachbit/default.nix
rename to pkgs/by-name/bl/bleachbit/package.nix
diff --git a/pkgs/shells/bash/blesh/default.nix b/pkgs/by-name/bl/blesh/package.nix
similarity index 100%
rename from pkgs/shells/bash/blesh/default.nix
rename to pkgs/by-name/bl/blesh/package.nix
diff --git a/pkgs/tools/misc/blflash/default.nix b/pkgs/by-name/bl/blflash/package.nix
similarity index 100%
rename from pkgs/tools/misc/blflash/default.nix
rename to pkgs/by-name/bl/blflash/package.nix
diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/by-name/bl/blink1-tool/package.nix
similarity index 100%
rename from pkgs/tools/misc/blink1-tool/default.nix
rename to pkgs/by-name/bl/blink1-tool/package.nix
diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/by-name/bl/blis/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/blis/default.nix
rename to pkgs/by-name/bl/blis/package.nix
diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/by-name/bl/bliss/package.nix
similarity index 100%
rename from pkgs/applications/science/math/bliss/default.nix
rename to pkgs/by-name/bl/bliss/package.nix
diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/by-name/bl/blitz/package.nix
similarity index 100%
rename from pkgs/development/libraries/blitz/default.nix
rename to pkgs/by-name/bl/blitz/package.nix
diff --git a/pkgs/os-specific/linux/blktrace/default.nix b/pkgs/by-name/bl/blktrace/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/blktrace/default.nix
rename to pkgs/by-name/bl/blktrace/package.nix
diff --git a/pkgs/servers/bloat/default.nix b/pkgs/by-name/bl/bloat/package.nix
similarity index 100%
rename from pkgs/servers/bloat/default.nix
rename to pkgs/by-name/bl/bloat/package.nix
diff --git a/pkgs/games/blobby/blobby.sh b/pkgs/by-name/bl/blobby/blobby.sh
similarity index 100%
rename from pkgs/games/blobby/blobby.sh
rename to pkgs/by-name/bl/blobby/blobby.sh
diff --git a/pkgs/games/blobby/default.nix b/pkgs/by-name/bl/blobby/package.nix
similarity index 100%
rename from pkgs/games/blobby/default.nix
rename to pkgs/by-name/bl/blobby/package.nix
diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/by-name/bl/blobfuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/blobfuse/default.nix
rename to pkgs/by-name/bl/blobfuse/package.nix
diff --git a/pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch b/pkgs/by-name/bl/blobwars/blobwars-2.00-glibc-2.38.patch
similarity index 100%
rename from pkgs/games/blobwars/blobwars-2.00-glibc-2.38.patch
rename to pkgs/by-name/bl/blobwars/blobwars-2.00-glibc-2.38.patch
diff --git a/pkgs/games/blobwars/default.nix b/pkgs/by-name/bl/blobwars/package.nix
similarity index 100%
rename from pkgs/games/blobwars/default.nix
rename to pkgs/by-name/bl/blobwars/package.nix
diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/by-name/bl/blockbook/package.nix
similarity index 100%
rename from pkgs/servers/blockbook/default.nix
rename to pkgs/by-name/bl/blockbook/package.nix
diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/by-name/bl/blockhash/package.nix
similarity index 100%
rename from pkgs/tools/graphics/blockhash/default.nix
rename to pkgs/by-name/bl/blockhash/package.nix
diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/by-name/bl/blocky/package.nix
similarity index 100%
rename from pkgs/applications/networking/blocky/default.nix
rename to pkgs/by-name/bl/blocky/package.nix
diff --git a/pkgs/applications/misc/blogc/default.nix b/pkgs/by-name/bl/blogc/package.nix
similarity index 100%
rename from pkgs/applications/misc/blogc/default.nix
rename to pkgs/by-name/bl/blogc/package.nix
diff --git a/pkgs/applications/misc/bloodhound/default.nix b/pkgs/by-name/bl/bloodhound/package.nix
similarity index 100%
rename from pkgs/applications/misc/bloodhound/default.nix
rename to pkgs/by-name/bl/bloodhound/package.nix
diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/by-name/bl/bloomrpc/package.nix
similarity index 100%
rename from pkgs/development/web/bloomrpc/default.nix
rename to pkgs/by-name/bl/bloomrpc/package.nix
diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/by-name/bl/bloop/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/bloop/default.nix
rename to pkgs/by-name/bl/bloop/package.nix
diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/by-name/bl/blst/package.nix
similarity index 100%
rename from pkgs/development/libraries/blst/default.nix
rename to pkgs/by-name/bl/blst/package.nix
diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/by-name/bl/blueberry/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/blueberry/default.nix
rename to pkgs/by-name/bl/blueberry/package.nix
diff --git a/pkgs/applications/networking/mailreaders/bluemail/default.nix b/pkgs/by-name/bl/bluemail/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/bluemail/default.nix
rename to pkgs/by-name/bl/bluemail/package.nix
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/by-name/bl/blueman/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/blueman/default.nix
rename to pkgs/by-name/bl/blueman/package.nix
diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/by-name/bl/bluemix-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/bluemix-cli/default.nix
rename to pkgs/by-name/bl/bluemix-cli/package.nix
diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/by-name/bl/bluewalker/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/bluewalker/default.nix
rename to pkgs/by-name/bl/bluewalker/package.nix
diff --git a/pkgs/applications/misc/blugon/default.nix b/pkgs/by-name/bl/blugon/package.nix
similarity index 100%
rename from pkgs/applications/misc/blugon/default.nix
rename to pkgs/by-name/bl/blugon/package.nix
diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/by-name/bl/blur-effect/package.nix
similarity index 100%
rename from pkgs/tools/graphics/blur-effect/default.nix
rename to pkgs/by-name/bl/blur-effect/package.nix
diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/by-name/bm/bmon/package.nix
similarity index 100%
rename from pkgs/tools/misc/bmon/default.nix
rename to pkgs/by-name/bm/bmon/package.nix
diff --git a/pkgs/development/web/boa/default.nix b/pkgs/by-name/bo/boa/package.nix
similarity index 100%
rename from pkgs/development/web/boa/default.nix
rename to pkgs/by-name/bo/boa/package.nix
diff --git a/pkgs/applications/misc/boatswain/default.nix b/pkgs/by-name/bo/boatswain/package.nix
similarity index 100%
rename from pkgs/applications/misc/boatswain/default.nix
rename to pkgs/by-name/bo/boatswain/package.nix
diff --git a/pkgs/development/tools/build-managers/bob/default.nix b/pkgs/by-name/bo/bob/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/bob/default.nix
rename to pkgs/by-name/bo/bob/package.nix
diff --git a/pkgs/development/libraries/boca/default.nix b/pkgs/by-name/bo/boca/package.nix
similarity index 100%
rename from pkgs/development/libraries/boca/default.nix
rename to pkgs/by-name/bo/boca/package.nix
diff --git a/pkgs/development/tools/bodyclose/default.nix b/pkgs/by-name/bo/bodyclose/package.nix
similarity index 100%
rename from pkgs/development/tools/bodyclose/default.nix
rename to pkgs/by-name/bo/bodyclose/package.nix
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/by-name/bo/bogofilter/package.nix
similarity index 100%
rename from pkgs/tools/misc/bogofilter/default.nix
rename to pkgs/by-name/bo/bogofilter/package.nix
diff --git a/pkgs/applications/audio/bolliedelayxt.lv2/default.nix b/pkgs/by-name/bo/bolliedelayxt-lv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/bolliedelayxt.lv2/default.nix
rename to pkgs/by-name/bo/bolliedelayxt-lv2/package.nix
diff --git a/pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch b/pkgs/by-name/bo/bolt/0001-skip-mkdir.patch
similarity index 100%
rename from pkgs/os-specific/linux/bolt/0001-skip-mkdir.patch
rename to pkgs/by-name/bo/bolt/0001-skip-mkdir.patch
diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/by-name/bo/bolt/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/bolt/default.nix
rename to pkgs/by-name/bo/bolt/package.nix
diff --git a/pkgs/tools/misc/boltbrowser/default.nix b/pkgs/by-name/bo/boltbrowser/package.nix
similarity index 100%
rename from pkgs/tools/misc/boltbrowser/default.nix
rename to pkgs/by-name/bo/boltbrowser/package.nix
diff --git a/pkgs/tools/admin/bom/default.nix b/pkgs/by-name/bo/bom/package.nix
similarity index 100%
rename from pkgs/tools/admin/bom/default.nix
rename to pkgs/by-name/bo/bom/package.nix
diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/by-name/bo/bombadillo/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/bombadillo/default.nix
rename to pkgs/by-name/bo/bombadillo/package.nix
diff --git a/pkgs/tools/networking/bombardier/default.nix b/pkgs/by-name/bo/bombardier/package.nix
similarity index 100%
rename from pkgs/tools/networking/bombardier/default.nix
rename to pkgs/by-name/bo/bombardier/package.nix
diff --git a/pkgs/development/tools/bomber-go/default.nix b/pkgs/by-name/bo/bomber-go/package.nix
similarity index 100%
rename from pkgs/development/tools/bomber-go/default.nix
rename to pkgs/by-name/bo/bomber-go/package.nix
diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/by-name/bo/bombono/package.nix
similarity index 100%
rename from pkgs/applications/video/bombono/default.nix
rename to pkgs/by-name/bo/bombono/package.nix
diff --git a/pkgs/tools/archivers/bomutils/default.nix b/pkgs/by-name/bo/bomutils/package.nix
similarity index 100%
rename from pkgs/tools/archivers/bomutils/default.nix
rename to pkgs/by-name/bo/bomutils/package.nix
diff --git a/pkgs/tools/misc/bonk/default.nix b/pkgs/by-name/bo/bonk/package.nix
similarity index 100%
rename from pkgs/tools/misc/bonk/default.nix
rename to pkgs/by-name/bo/bonk/package.nix
diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/by-name/bo/bonmin/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/bonmin/default.nix
rename to pkgs/by-name/bo/bonmin/package.nix
diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/by-name/bo/bonnie/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/bonnie/default.nix
rename to pkgs/by-name/bo/bonnie/package.nix
diff --git a/pkgs/development/tools/misc/bonnmotion/install.patch b/pkgs/by-name/bo/bonnmotion/install.patch
similarity index 100%
rename from pkgs/development/tools/misc/bonnmotion/install.patch
rename to pkgs/by-name/bo/bonnmotion/install.patch
diff --git a/pkgs/development/tools/misc/bonnmotion/default.nix b/pkgs/by-name/bo/bonnmotion/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/bonnmotion/default.nix
rename to pkgs/by-name/bo/bonnmotion/package.nix
diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/by-name/bo/bonzomatic/package.nix
similarity index 100%
rename from pkgs/applications/editors/bonzomatic/default.nix
rename to pkgs/by-name/bo/bonzomatic/package.nix
diff --git a/pkgs/tools/security/boofuzz/default.nix b/pkgs/by-name/bo/boofuzz/package.nix
similarity index 100%
rename from pkgs/tools/security/boofuzz/default.nix
rename to pkgs/by-name/bo/boofuzz/package.nix
diff --git a/pkgs/games/boohu/default.nix b/pkgs/by-name/bo/boohu/package.nix
similarity index 100%
rename from pkgs/games/boohu/default.nix
rename to pkgs/by-name/bo/boohu/package.nix
diff --git a/pkgs/tools/text/book-summary/default.nix b/pkgs/by-name/bo/book-summary/package.nix
similarity index 100%
rename from pkgs/tools/text/book-summary/default.nix
rename to pkgs/by-name/bo/book-summary/package.nix
diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/by-name/bo/bookworm/package.nix
similarity index 100%
rename from pkgs/applications/office/bookworm/default.nix
rename to pkgs/by-name/bo/bookworm/package.nix
diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/by-name/bo/boolector/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/boolector/default.nix
rename to pkgs/by-name/bo/boolector/package.nix
diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/by-name/bo/boolstuff/package.nix
similarity index 100%
rename from pkgs/development/libraries/boolstuff/default.nix
rename to pkgs/by-name/bo/boolstuff/package.nix
diff --git a/pkgs/applications/audio/boops/default.nix b/pkgs/by-name/bo/boops/package.nix
similarity index 100%
rename from pkgs/applications/audio/boops/default.nix
rename to pkgs/by-name/bo/boops/package.nix
diff --git a/pkgs/development/tools/boost-build/fix-clang-target.patch b/pkgs/by-name/bo/boost-build/fix-clang-target.patch
similarity index 100%
rename from pkgs/development/tools/boost-build/fix-clang-target.patch
rename to pkgs/by-name/bo/boost-build/fix-clang-target.patch
diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/by-name/bo/boost-build/package.nix
similarity index 100%
rename from pkgs/development/tools/boost-build/default.nix
rename to pkgs/by-name/bo/boost-build/package.nix
diff --git a/pkgs/development/libraries/boost-ext/boost-sml/default.nix b/pkgs/by-name/bo/boost-sml/package.nix
similarity index 100%
rename from pkgs/development/libraries/boost-ext/boost-sml/default.nix
rename to pkgs/by-name/bo/boost-sml/package.nix
diff --git a/pkgs/applications/system/booster/default.nix b/pkgs/by-name/bo/booster/package.nix
similarity index 100%
rename from pkgs/applications/system/booster/default.nix
rename to pkgs/by-name/bo/booster/package.nix
diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/by-name/bo/boot/builder.sh
similarity index 100%
rename from pkgs/development/tools/build-managers/boot/builder.sh
rename to pkgs/by-name/bo/boot/builder.sh
diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/by-name/bo/boot/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/boot/default.nix
rename to pkgs/by-name/bo/boot/package.nix
diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/by-name/bo/bootil/package.nix
similarity index 100%
rename from pkgs/development/libraries/bootil/default.nix
rename to pkgs/by-name/bo/bootil/package.nix
diff --git a/pkgs/tools/cd-dvd/bootiso/default.nix b/pkgs/by-name/bo/bootiso/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/bootiso/default.nix
rename to pkgs/by-name/bo/bootiso/package.nix
diff --git a/pkgs/tools/misc/bootspec/default.nix b/pkgs/by-name/bo/bootspec/package.nix
similarity index 100%
rename from pkgs/tools/misc/bootspec/default.nix
rename to pkgs/by-name/bo/bootspec/package.nix
diff --git a/pkgs/development/web/bootstrap-studio/default.nix b/pkgs/by-name/bo/bootstrap-studio/package.nix
similarity index 100%
rename from pkgs/development/web/bootstrap-studio/default.nix
rename to pkgs/by-name/bo/bootstrap-studio/package.nix
diff --git a/pkgs/data/fonts/borg-sans-mono/default.nix b/pkgs/by-name/bo/borg-sans-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/borg-sans-mono/default.nix
rename to pkgs/by-name/bo/borg-sans-mono/package.nix
diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/by-name/bo/borgbackup/package.nix
similarity index 100%
rename from pkgs/tools/backup/borgbackup/default.nix
rename to pkgs/by-name/bo/borgbackup/package.nix
diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/by-name/bo/borgmatic/package.nix
similarity index 100%
rename from pkgs/tools/backup/borgmatic/default.nix
rename to pkgs/by-name/bo/borgmatic/package.nix
diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/by-name/bo/boringssl/package.nix
similarity index 100%
rename from pkgs/development/libraries/boringssl/default.nix
rename to pkgs/by-name/bo/boringssl/package.nix
diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/by-name/bo/boringtun/package.nix
similarity index 100%
rename from pkgs/tools/networking/boringtun/default.nix
rename to pkgs/by-name/bo/boringtun/package.nix
diff --git a/pkgs/development/interpreters/boron/default.nix b/pkgs/by-name/bo/boron/package.nix
similarity index 100%
rename from pkgs/development/interpreters/boron/default.nix
rename to pkgs/by-name/bo/boron/package.nix
diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/by-name/bo/bosh-cli/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/bosh-cli/default.nix
rename to pkgs/by-name/bo/bosh-cli/package.nix
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/by-name/bo/bosun/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/bosun/default.nix
rename to pkgs/by-name/bo/bosun/package.nix
diff --git a/pkgs/tools/misc/bottom-rs/default.nix b/pkgs/by-name/bo/bottom-rs/package.nix
similarity index 100%
rename from pkgs/tools/misc/bottom-rs/default.nix
rename to pkgs/by-name/bo/bottom-rs/package.nix
diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/by-name/bo/boulder/package.nix
similarity index 100%
rename from pkgs/tools/admin/boulder/default.nix
rename to pkgs/by-name/bo/boulder/package.nix
diff --git a/pkgs/applications/science/biology/bowtie/default.nix b/pkgs/by-name/bo/bowtie/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/bowtie/default.nix
rename to pkgs/by-name/bo/bowtie/package.nix
diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/by-name/bo/bowtie2/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/bowtie2/default.nix
rename to pkgs/by-name/bo/bowtie2/package.nix
diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/by-name/bo/boxes/package.nix
similarity index 100%
rename from pkgs/tools/text/boxes/default.nix
rename to pkgs/by-name/bo/boxes/package.nix
diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/by-name/bo/boxfort/package.nix
similarity index 100%
rename from pkgs/development/libraries/boxfort/default.nix
rename to pkgs/by-name/bo/boxfort/package.nix
diff --git a/pkgs/tools/filesystems/boxfs/libapp-include-ctype.diff b/pkgs/by-name/bo/boxfs/libapp-include-ctype.diff
similarity index 100%
rename from pkgs/tools/filesystems/boxfs/libapp-include-ctype.diff
rename to pkgs/by-name/bo/boxfs/libapp-include-ctype.diff
diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/by-name/bo/boxfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/boxfs/default.nix
rename to pkgs/by-name/bo/boxfs/package.nix
diff --git a/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch b/pkgs/by-name/bo/boxfs/work-around-API-borkage.patch
similarity index 100%
rename from pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch
rename to pkgs/by-name/bo/boxfs/work-around-API-borkage.patch
diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/by-name/bo/boxxy/package.nix
similarity index 100%
rename from pkgs/tools/misc/boxxy/default.nix
rename to pkgs/by-name/bo/boxxy/package.nix
diff --git a/pkgs/development/tools/bpf-linker/Cargo.lock b/pkgs/by-name/bp/bpf-linker/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/bpf-linker/Cargo.lock
rename to pkgs/by-name/bp/bpf-linker/Cargo.lock
diff --git a/pkgs/development/tools/bpf-linker/default.nix b/pkgs/by-name/bp/bpf-linker/package.nix
similarity index 100%
rename from pkgs/development/tools/bpf-linker/default.nix
rename to pkgs/by-name/bp/bpf-linker/package.nix
diff --git a/pkgs/os-specific/linux/bpfmon/default.nix b/pkgs/by-name/bp/bpfmon/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/bpfmon/default.nix
rename to pkgs/by-name/bp/bpfmon/package.nix
diff --git a/pkgs/os-specific/linux/bpftools/include-asm-types-for-ppc64le.patch b/pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch
similarity index 100%
rename from pkgs/os-specific/linux/bpftools/include-asm-types-for-ppc64le.patch
rename to pkgs/by-name/bp/bpftools/include-asm-types-for-ppc64le.patch
diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/by-name/bp/bpftools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/bpftools/default.nix
rename to pkgs/by-name/bp/bpftools/package.nix
diff --git a/pkgs/os-specific/linux/bpftune/default.nix b/pkgs/by-name/bp/bpftune/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/bpftune/default.nix
rename to pkgs/by-name/bp/bpftune/package.nix
diff --git a/pkgs/tools/audio/bpm-tools/default.nix b/pkgs/by-name/bp/bpm-tools/package.nix
similarity index 100%
rename from pkgs/tools/audio/bpm-tools/default.nix
rename to pkgs/by-name/bp/bpm-tools/package.nix
diff --git a/pkgs/development/libraries/science/biology/bpp-core/default.nix b/pkgs/by-name/bp/bpp-core/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/bpp-core/default.nix
rename to pkgs/by-name/bp/bpp-core/package.nix
diff --git a/pkgs/development/libraries/science/biology/bpp-phyl/default.nix b/pkgs/by-name/bp/bpp-phyl/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/bpp-phyl/default.nix
rename to pkgs/by-name/bp/bpp-phyl/package.nix
diff --git a/pkgs/development/libraries/science/biology/bpp-popgen/default.nix b/pkgs/by-name/bp/bpp-popgen/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/bpp-popgen/default.nix
rename to pkgs/by-name/bp/bpp-popgen/package.nix
diff --git a/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/pkgs/by-name/bp/bpp-seq/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/bpp-seq/default.nix
rename to pkgs/by-name/bp/bpp-seq/package.nix
diff --git a/pkgs/applications/science/biology/bppsuite/default.nix b/pkgs/by-name/bp/bppsuite/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/bppsuite/default.nix
rename to pkgs/by-name/bp/bppsuite/package.nix
diff --git a/pkgs/data/fonts/bqn386/default.nix b/pkgs/by-name/bq/bqn386/package.nix
similarity index 100%
rename from pkgs/data/fonts/bqn386/default.nix
rename to pkgs/by-name/bq/bqn386/package.nix
diff --git a/pkgs/games/braincurses/default.nix b/pkgs/by-name/br/braincurses/package.nix
similarity index 100%
rename from pkgs/games/braincurses/default.nix
rename to pkgs/by-name/br/braincurses/package.nix
diff --git a/pkgs/applications/misc/break-time/Cargo.lock b/pkgs/by-name/br/break-time/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/break-time/Cargo.lock
rename to pkgs/by-name/br/break-time/Cargo.lock
diff --git a/pkgs/applications/misc/break-time/default.nix b/pkgs/by-name/br/break-time/package.nix
similarity index 100%
rename from pkgs/applications/misc/break-time/default.nix
rename to pkgs/by-name/br/break-time/package.nix
diff --git a/pkgs/development/misc/breakpad/default.nix b/pkgs/by-name/br/breakpad/package.nix
similarity index 100%
rename from pkgs/development/misc/breakpad/default.nix
rename to pkgs/by-name/br/breakpad/package.nix
diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/by-name/br/brev-cli/package.nix
similarity index 100%
rename from pkgs/development/misc/brev-cli/default.nix
rename to pkgs/by-name/br/brev-cli/package.nix
diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/by-name/br/brgenml1cupswrapper/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
rename to pkgs/by-name/br/brgenml1cupswrapper/package.nix
diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/by-name/br/brial/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/brial/default.nix
rename to pkgs/by-name/br/brial/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix b/pkgs/by-name/br/briar-desktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/briar-desktop/default.nix
rename to pkgs/by-name/br/briar-desktop/package.nix
diff --git a/pkgs/servers/brickd/default.nix b/pkgs/by-name/br/brickd/package.nix
similarity index 100%
rename from pkgs/servers/brickd/default.nix
rename to pkgs/by-name/br/brickd/package.nix
diff --git a/pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch b/pkgs/by-name/br/bridge-utils/autoconf-ar.patch
similarity index 100%
rename from pkgs/os-specific/linux/bridge-utils/autoconf-ar.patch
rename to pkgs/by-name/br/bridge-utils/autoconf-ar.patch
diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/by-name/br/bridge-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/bridge-utils/default.nix
rename to pkgs/by-name/br/bridge-utils/package.nix
diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/by-name/br/brig/package.nix
similarity index 100%
rename from pkgs/applications/networking/brig/default.nix
rename to pkgs/by-name/br/brig/package.nix
diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/by-name/br/brigand/package.nix
similarity index 100%
rename from pkgs/development/libraries/brigand/default.nix
rename to pkgs/by-name/br/brigand/package.nix
diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/by-name/br/brightnessctl/package.nix
similarity index 100%
rename from pkgs/misc/brightnessctl/default.nix
rename to pkgs/by-name/br/brightnessctl/package.nix
diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/by-name/br/brillo/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/brillo/default.nix
rename to pkgs/by-name/br/brillo/package.nix
diff --git a/pkgs/os-specific/linux/brillo/udev-rule.patch b/pkgs/by-name/br/brillo/udev-rule.patch
similarity index 100%
rename from pkgs/os-specific/linux/brillo/udev-rule.patch
rename to pkgs/by-name/br/brillo/udev-rule.patch
diff --git a/pkgs/data/misc/brise/fetchPackages.nix b/pkgs/by-name/br/brise/fetchPackages.nix
similarity index 100%
rename from pkgs/data/misc/brise/fetchPackages.nix
rename to pkgs/by-name/br/brise/fetchPackages.nix
diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/by-name/br/brise/package.nix
similarity index 100%
rename from pkgs/data/misc/brise/default.nix
rename to pkgs/by-name/br/brise/package.nix
diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/by-name/br/briss/package.nix
similarity index 100%
rename from pkgs/tools/graphics/briss/default.nix
rename to pkgs/by-name/br/briss/package.nix
diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/by-name/br/bristol/package.nix
similarity index 100%
rename from pkgs/applications/audio/bristol/default.nix
rename to pkgs/by-name/br/bristol/package.nix
diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/by-name/br/brlaser/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/brlaser/default.nix
rename to pkgs/by-name/br/brlaser/package.nix
diff --git a/pkgs/applications/graphics/brlcad/default.nix b/pkgs/by-name/br/brlcad/package.nix
similarity index 100%
rename from pkgs/applications/graphics/brlcad/default.nix
rename to pkgs/by-name/br/brlcad/package.nix
diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/by-name/br/brltty/package.nix
similarity index 100%
rename from pkgs/tools/misc/brltty/default.nix
rename to pkgs/by-name/br/brltty/package.nix
diff --git a/pkgs/applications/science/engineering/brmodelo/default.nix b/pkgs/by-name/br/brmodelo/package.nix
similarity index 100%
rename from pkgs/applications/science/engineering/brmodelo/default.nix
rename to pkgs/by-name/br/brmodelo/package.nix
diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/by-name/br/broadcom-bt-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
rename to pkgs/by-name/br/broadcom-bt-firmware/package.nix
diff --git a/pkgs/tools/misc/broadlink-cli/default.nix b/pkgs/by-name/br/broadlink-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/broadlink-cli/default.nix
rename to pkgs/by-name/br/broadlink-cli/package.nix
diff --git a/pkgs/data/fonts/bront/default.nix b/pkgs/by-name/br/bront_fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/bront/default.nix
rename to pkgs/by-name/br/bront_fonts/package.nix
diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/by-name/br/brook/package.nix
similarity index 100%
rename from pkgs/tools/networking/brook/default.nix
rename to pkgs/by-name/br/brook/package.nix
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/by-name/br/brotli/package.nix
similarity index 100%
rename from pkgs/tools/compression/brotli/default.nix
rename to pkgs/by-name/br/brotli/package.nix
diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/by-name/br/browserpass/package.nix
similarity index 100%
rename from pkgs/tools/security/browserpass/default.nix
rename to pkgs/by-name/br/browserpass/package.nix
diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/by-name/br/browsh/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/browsh/default.nix
rename to pkgs/by-name/br/browsh/package.nix
diff --git a/pkgs/applications/file-managers/browsr/default.nix b/pkgs/by-name/br/browsr/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/browsr/default.nix
rename to pkgs/by-name/br/browsr/package.nix
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/by-name/br/brscan4/package.nix
similarity index 100%
rename from pkgs/applications/graphics/sane/backends/brscan4/default.nix
rename to pkgs/by-name/br/brscan4/package.nix
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/preload.c b/pkgs/by-name/br/brscan4/preload.c
similarity index 100%
rename from pkgs/applications/graphics/sane/backends/brscan4/preload.c
rename to pkgs/by-name/br/brscan4/preload.c
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/by-name/br/brscan4/udev_rules_type1.nix
similarity index 100%
rename from pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
rename to pkgs/by-name/br/brscan4/udev_rules_type1.nix
diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/by-name/br/brscan5/package.nix
similarity index 100%
rename from pkgs/applications/graphics/sane/backends/brscan5/default.nix
rename to pkgs/by-name/br/brscan5/package.nix
diff --git a/pkgs/development/libraries/brunsli/default.nix b/pkgs/by-name/br/brunsli/package.nix
similarity index 100%
rename from pkgs/development/libraries/brunsli/default.nix
rename to pkgs/by-name/br/brunsli/package.nix
diff --git a/pkgs/games/brutalmaze/default.nix b/pkgs/by-name/br/brutalmaze/package.nix
similarity index 100%
rename from pkgs/games/brutalmaze/default.nix
rename to pkgs/by-name/br/brutalmaze/package.nix
diff --git a/pkgs/applications/audio/brutefir/default.nix b/pkgs/by-name/br/brutefir/package.nix
similarity index 100%
rename from pkgs/applications/audio/brutefir/default.nix
rename to pkgs/by-name/br/brutefir/package.nix
diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/by-name/br/bruteforce-luks/package.nix
similarity index 100%
rename from pkgs/tools/security/bruteforce-luks/default.nix
rename to pkgs/by-name/br/bruteforce-luks/package.nix
diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/by-name/br/brutespray/package.nix
similarity index 100%
rename from pkgs/tools/security/brutespray/default.nix
rename to pkgs/by-name/br/brutespray/package.nix
diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/by-name/bs/bschaffl/package.nix
similarity index 100%
rename from pkgs/applications/audio/bschaffl/default.nix
rename to pkgs/by-name/bs/bschaffl/package.nix
diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/by-name/bs/bsdbuild/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/bsdbuild/default.nix
rename to pkgs/by-name/bs/bsdbuild/package.nix
diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/by-name/bs/bsdgames/package.nix
similarity index 100%
rename from pkgs/games/bsdgames/default.nix
rename to pkgs/by-name/bs/bsdgames/package.nix
diff --git a/pkgs/tools/compression/bsdiff/CVE-2020-14315.patch b/pkgs/by-name/bs/bsdiff/CVE-2020-14315.patch
similarity index 100%
rename from pkgs/tools/compression/bsdiff/CVE-2020-14315.patch
rename to pkgs/by-name/bs/bsdiff/CVE-2020-14315.patch
diff --git a/pkgs/tools/compression/bsdiff/include-systypes.patch b/pkgs/by-name/bs/bsdiff/include-systypes.patch
similarity index 100%
rename from pkgs/tools/compression/bsdiff/include-systypes.patch
rename to pkgs/by-name/bs/bsdiff/include-systypes.patch
diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/by-name/bs/bsdiff/package.nix
similarity index 100%
rename from pkgs/tools/compression/bsdiff/default.nix
rename to pkgs/by-name/bs/bsdiff/package.nix
diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/by-name/bs/bsequencer/package.nix
similarity index 100%
rename from pkgs/applications/audio/bsequencer/default.nix
rename to pkgs/by-name/bs/bsequencer/package.nix
diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/by-name/bs/bshapr/package.nix
similarity index 100%
rename from pkgs/applications/audio/bshapr/default.nix
rename to pkgs/by-name/bs/bshapr/package.nix
diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/by-name/bs/bslizr/package.nix
similarity index 100%
rename from pkgs/applications/audio/bslizr/default.nix
rename to pkgs/by-name/bs/bslizr/package.nix
diff --git a/pkgs/tools/misc/bsp-layout/default.nix b/pkgs/by-name/bs/bsp-layout/package.nix
similarity index 100%
rename from pkgs/tools/misc/bsp-layout/default.nix
rename to pkgs/by-name/bs/bsp-layout/package.nix
diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/by-name/bs/bspwm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/bspwm/default.nix
rename to pkgs/by-name/bs/bspwm/package.nix
diff --git a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix b/pkgs/by-name/bt/bt-fw-converter/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix
rename to pkgs/by-name/bt/bt-fw-converter/package.nix
diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/by-name/bt/btar/package.nix
similarity index 100%
rename from pkgs/tools/backup/btar/default.nix
rename to pkgs/by-name/bt/btar/package.nix
diff --git a/pkgs/tools/misc/btc-rpc-explorer/default.nix b/pkgs/by-name/bt/btc-rpc-explorer/package.nix
similarity index 100%
rename from pkgs/tools/misc/btc-rpc-explorer/default.nix
rename to pkgs/by-name/bt/btc-rpc-explorer/package.nix
diff --git a/pkgs/applications/blockchains/btcd/default.nix b/pkgs/by-name/bt/btcd/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/btcd/default.nix
rename to pkgs/by-name/bt/btcd/package.nix
diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/by-name/bt/btcdeb/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/btcdeb/default.nix
rename to pkgs/by-name/bt/btcdeb/package.nix
diff --git a/pkgs/tools/misc/btdu/dub-lock.json b/pkgs/by-name/bt/btdu/dub-lock.json
similarity index 100%
rename from pkgs/tools/misc/btdu/dub-lock.json
rename to pkgs/by-name/bt/btdu/dub-lock.json
diff --git a/pkgs/tools/misc/btdu/default.nix b/pkgs/by-name/bt/btdu/package.nix
similarity index 100%
rename from pkgs/tools/misc/btdu/default.nix
rename to pkgs/by-name/bt/btdu/package.nix
diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/by-name/bt/btfs/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/btfs/default.nix
rename to pkgs/by-name/bt/btfs/package.nix
diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/by-name/bt/btor2tools/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/btor2tools/default.nix
rename to pkgs/by-name/bt/btor2tools/package.nix
diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/by-name/bt/btrbk/package.nix
similarity index 100%
rename from pkgs/tools/backup/btrbk/default.nix
rename to pkgs/by-name/bt/btrbk/package.nix
diff --git a/pkgs/tools/filesystems/btrfs-heatmap/default.nix b/pkgs/by-name/bt/btrfs-heatmap/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/btrfs-heatmap/default.nix
rename to pkgs/by-name/bt/btrfs-heatmap/package.nix
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/by-name/bt/btrfs-progs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/btrfs-progs/default.nix
rename to pkgs/by-name/bt/btrfs-progs/package.nix
diff --git a/pkgs/tools/filesystems/btrfs-snap/default.nix b/pkgs/by-name/bt/btrfs-snap/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/btrfs-snap/default.nix
rename to pkgs/by-name/bt/btrfs-snap/package.nix
diff --git a/pkgs/applications/networking/mailreaders/bubblemail/default.nix b/pkgs/by-name/bu/bubblemail/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/bubblemail/default.nix
rename to pkgs/by-name/bu/bubblemail/package.nix
diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/by-name/bu/bubblewrap/package.nix
similarity index 100%
rename from pkgs/tools/admin/bubblewrap/default.nix
rename to pkgs/by-name/bu/bubblewrap/package.nix
diff --git a/pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch b/pkgs/by-name/bu/buddy/gcc-4.3.3-fixes.patch
similarity index 100%
rename from pkgs/development/libraries/buddy/gcc-4.3.3-fixes.patch
rename to pkgs/by-name/bu/buddy/gcc-4.3.3-fixes.patch
diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/by-name/bu/buddy/package.nix
similarity index 100%
rename from pkgs/development/libraries/buddy/default.nix
rename to pkgs/by-name/bu/buddy/package.nix
diff --git a/pkgs/development/tools/language-servers/buf-language-server/default.nix b/pkgs/by-name/bu/buf-language-server/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/buf-language-server/default.nix
rename to pkgs/by-name/bu/buf-language-server/package.nix
diff --git a/pkgs/applications/virtualization/buildkit-nix/default.nix b/pkgs/by-name/bu/buildkit-nix/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/buildkit-nix/default.nix
rename to pkgs/by-name/bu/buildkit-nix/package.nix
diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/by-name/bu/buildkit/package.nix
similarity index 100%
rename from pkgs/development/tools/buildkit/default.nix
rename to pkgs/by-name/bu/buildkit/package.nix
diff --git a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix b/pkgs/by-name/bu/buildkite-agent-metrics/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/buildkite-agent-metrics/default.nix
rename to pkgs/by-name/bu/buildkite-agent-metrics/package.nix
diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/by-name/bu/buildkite-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/buildkite-cli/default.nix
rename to pkgs/by-name/bu/buildkite-cli/package.nix
diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/by-name/bu/buildtorrent/package.nix
similarity index 100%
rename from pkgs/tools/misc/buildtorrent/default.nix
rename to pkgs/by-name/bu/buildtorrent/package.nix
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/by-name/bu/buku/package.nix
similarity index 100%
rename from pkgs/applications/misc/buku/default.nix
rename to pkgs/by-name/bu/buku/package.nix
diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/by-name/bu/bukubrow/package.nix
similarity index 100%
rename from pkgs/tools/networking/bukubrow/default.nix
rename to pkgs/by-name/bu/bukubrow/package.nix
diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/by-name/bu/bulletml/package.nix
similarity index 100%
rename from pkgs/development/libraries/bulletml/default.nix
rename to pkgs/by-name/bu/bulletml/package.nix
diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/by-name/bu/bully/package.nix
similarity index 100%
rename from pkgs/tools/networking/bully/default.nix
rename to pkgs/by-name/bu/bully/package.nix
diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/by-name/bu/bump/package.nix
similarity index 100%
rename from pkgs/development/tools/github/bump/default.nix
rename to pkgs/by-name/bu/bump/package.nix
diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/by-name/bu/bumpver/package.nix
similarity index 100%
rename from pkgs/applications/version-management/bumpver/default.nix
rename to pkgs/by-name/bu/bumpver/package.nix
diff --git a/pkgs/development/web/bun/default.nix b/pkgs/by-name/bu/bun/package.nix
similarity index 100%
rename from pkgs/development/web/bun/default.nix
rename to pkgs/by-name/bu/bun/package.nix
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/by-name/bu/bundler/package.nix
similarity index 100%
rename from pkgs/development/ruby-modules/bundler/default.nix
rename to pkgs/by-name/bu/bundler/package.nix
diff --git a/pkgs/tools/misc/bunnyfetch/default.nix b/pkgs/by-name/bu/bunnyfetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/bunnyfetch/default.nix
rename to pkgs/by-name/bu/bunnyfetch/package.nix
diff --git a/pkgs/development/tools/bunyan-rs/default.nix b/pkgs/by-name/bu/bunyan-rs/package.nix
similarity index 100%
rename from pkgs/development/tools/bunyan-rs/default.nix
rename to pkgs/by-name/bu/bunyan-rs/package.nix
diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/by-name/bu/burp/package.nix
similarity index 100%
rename from pkgs/tools/backup/burp/default.nix
rename to pkgs/by-name/bu/burp/package.nix
diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/by-name/bu/burpsuite/package.nix
similarity index 100%
rename from pkgs/tools/networking/burpsuite/default.nix
rename to pkgs/by-name/bu/burpsuite/package.nix
diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/by-name/bu/butane/package.nix
similarity index 100%
rename from pkgs/development/tools/butane/default.nix
rename to pkgs/by-name/bu/butane/package.nix
diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/by-name/bu/buttercup-desktop/package.nix
similarity index 100%
rename from pkgs/tools/security/buttercup-desktop/default.nix
rename to pkgs/by-name/bu/buttercup-desktop/package.nix
diff --git a/pkgs/applications/audio/buzztrax/default.nix b/pkgs/by-name/bu/buzztrax/package.nix
similarity index 100%
rename from pkgs/applications/audio/buzztrax/default.nix
rename to pkgs/by-name/bu/buzztrax/package.nix
diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/by-name/bv/bvi/package.nix
similarity index 100%
rename from pkgs/applications/editors/bvi/default.nix
rename to pkgs/by-name/bv/bvi/package.nix
diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/by-name/bv/bviplus/package.nix
similarity index 100%
rename from pkgs/applications/editors/bviplus/default.nix
rename to pkgs/by-name/bv/bviplus/package.nix
diff --git a/pkgs/applications/science/biology/bwa-mem2/default.nix b/pkgs/by-name/bw/bwa-mem2/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/bwa-mem2/default.nix
rename to pkgs/by-name/bw/bwa-mem2/package.nix
diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/by-name/bw/bwa/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/bwa/default.nix
rename to pkgs/by-name/bw/bwa/package.nix
diff --git a/pkgs/development/interpreters/bwbasic/default.nix b/pkgs/by-name/bw/bwbasic/package.nix
similarity index 100%
rename from pkgs/development/interpreters/bwbasic/default.nix
rename to pkgs/by-name/bw/bwbasic/package.nix
diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/by-name/bw/bwm_ng/package.nix
similarity index 100%
rename from pkgs/tools/networking/bwm-ng/default.nix
rename to pkgs/by-name/bw/bwm_ng/package.nix
diff --git a/pkgs/tools/security/bws/Cargo.lock b/pkgs/by-name/bw/bws/Cargo.lock
similarity index 100%
rename from pkgs/tools/security/bws/Cargo.lock
rename to pkgs/by-name/bw/bws/Cargo.lock
diff --git a/pkgs/tools/security/bws/default.nix b/pkgs/by-name/bw/bws/package.nix
similarity index 100%
rename from pkgs/tools/security/bws/default.nix
rename to pkgs/by-name/bw/bws/package.nix
diff --git a/pkgs/applications/video/byzanz/add-amflags.patch b/pkgs/by-name/by/byzanz/add-amflags.patch
similarity index 100%
rename from pkgs/applications/video/byzanz/add-amflags.patch
rename to pkgs/by-name/by/byzanz/add-amflags.patch
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/by-name/by/byzanz/package.nix
similarity index 100%
rename from pkgs/applications/video/byzanz/default.nix
rename to pkgs/by-name/by/byzanz/package.nix
diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/by-name/bz/bzrtp/package.nix
similarity index 100%
rename from pkgs/development/libraries/bzrtp/default.nix
rename to pkgs/by-name/bz/bzrtp/package.nix
diff --git a/pkgs/development/tools/misc/c2ffi/default.nix b/pkgs/by-name/c2/c2ffi/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/c2ffi/default.nix
rename to pkgs/by-name/c2/c2ffi/package.nix
diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/by-name/c3/c3c/package.nix
similarity index 100%
rename from pkgs/development/compilers/c3c/default.nix
rename to pkgs/by-name/c3/c3c/package.nix
diff --git a/pkgs/applications/emulators/c64-debugger/default.nix b/pkgs/by-name/c6/c64-debugger/package.nix
similarity index 100%
rename from pkgs/applications/emulators/c64-debugger/default.nix
rename to pkgs/by-name/c6/c64-debugger/package.nix
diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/by-name/ca/cabextract/package.nix
similarity index 100%
rename from pkgs/tools/archivers/cabextract/default.nix
rename to pkgs/by-name/ca/cabextract/package.nix
diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/by-name/ca/cabin/package.nix
similarity index 100%
rename from pkgs/data/fonts/cabin/default.nix
rename to pkgs/by-name/ca/cabin/package.nix
diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/by-name/ca/cachefilesd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/cachefilesd/default.nix
rename to pkgs/by-name/ca/cachefilesd/package.nix
diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/by-name/ca/cadaver/package.nix
similarity index 100%
rename from pkgs/tools/networking/cadaver/default.nix
rename to pkgs/by-name/ca/cadaver/package.nix
diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/by-name/ca/cadical/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/cadical/default.nix
rename to pkgs/by-name/ca/cadical/package.nix
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/by-name/ca/cadvisor/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/cadvisor/default.nix
rename to pkgs/by-name/ca/cadvisor/package.nix
diff --git a/pkgs/applications/networking/mailreaders/caeml/default.nix b/pkgs/by-name/ca/caeml/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/caeml/default.nix
rename to pkgs/by-name/ca/caeml/package.nix
diff --git a/pkgs/applications/misc/caerbannog/default.nix b/pkgs/by-name/ca/caerbannog/package.nix
similarity index 100%
rename from pkgs/applications/misc/caerbannog/default.nix
rename to pkgs/by-name/ca/caerbannog/package.nix
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/by-name/ca/caf/package.nix
similarity index 100%
rename from pkgs/development/libraries/caf/default.nix
rename to pkgs/by-name/ca/caf/package.nix
diff --git a/pkgs/tools/X11/caffeine-ng/fix-build.patch b/pkgs/by-name/ca/caffeine-ng/fix-build.patch
similarity index 100%
rename from pkgs/tools/X11/caffeine-ng/fix-build.patch
rename to pkgs/by-name/ca/caffeine-ng/fix-build.patch
diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/by-name/ca/caffeine-ng/package.nix
similarity index 100%
rename from pkgs/tools/X11/caffeine-ng/default.nix
rename to pkgs/by-name/ca/caffeine-ng/package.nix
diff --git a/pkgs/tools/misc/caffeine/default.nix b/pkgs/by-name/ca/caffeine/package.nix
similarity index 100%
rename from pkgs/tools/misc/caffeine/default.nix
rename to pkgs/by-name/ca/caffeine/package.nix
diff --git a/pkgs/development/compilers/cairo/default.nix b/pkgs/by-name/ca/cairo-lang/package.nix
similarity index 100%
rename from pkgs/development/compilers/cairo/default.nix
rename to pkgs/by-name/ca/cairo-lang/package.nix
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/by-name/ca/cairo/package.nix
similarity index 100%
rename from pkgs/development/libraries/cairo/default.nix
rename to pkgs/by-name/ca/cairo/package.nix
diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/by-name/ca/cakelisp/package.nix
similarity index 100%
rename from pkgs/development/compilers/cakelisp/default.nix
rename to pkgs/by-name/ca/cakelisp/package.nix
diff --git a/pkgs/data/fonts/caladea/cambria-alias.conf b/pkgs/by-name/ca/caladea/cambria-alias.conf
similarity index 100%
rename from pkgs/data/fonts/caladea/cambria-alias.conf
rename to pkgs/by-name/ca/caladea/cambria-alias.conf
diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/by-name/ca/caladea/package.nix
similarity index 100%
rename from pkgs/data/fonts/caladea/default.nix
rename to pkgs/by-name/ca/caladea/package.nix
diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/by-name/ca/calamares-nixos-extensions/package.nix
similarity index 100%
rename from pkgs/tools/misc/calamares-nixos-extensions/default.nix
rename to pkgs/by-name/ca/calamares-nixos-extensions/package.nix
diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/by-name/ca/calc/package.nix
similarity index 100%
rename from pkgs/applications/science/math/calc/default.nix
rename to pkgs/by-name/ca/calc/package.nix
diff --git a/pkgs/development/libraries/calcium/default.nix b/pkgs/by-name/ca/calcium/package.nix
similarity index 100%
rename from pkgs/development/libraries/calcium/default.nix
rename to pkgs/by-name/ca/calcium/package.nix
diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/by-name/ca/calculix/calculix.patch
similarity index 100%
rename from pkgs/applications/science/math/calculix/calculix.patch
rename to pkgs/by-name/ca/calculix/calculix.patch
diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/by-name/ca/calculix/package.nix
similarity index 100%
rename from pkgs/applications/science/math/calculix/default.nix
rename to pkgs/by-name/ca/calculix/package.nix
diff --git a/pkgs/applications/misc/calcure/default.nix b/pkgs/by-name/ca/calcure/package.nix
similarity index 100%
rename from pkgs/applications/misc/calcure/default.nix
rename to pkgs/by-name/ca/calcure/package.nix
diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/by-name/ca/calcurse/package.nix
similarity index 100%
rename from pkgs/applications/misc/calcurse/default.nix
rename to pkgs/by-name/ca/calcurse/package.nix
diff --git a/pkgs/tools/networking/calendar-cli/default.nix b/pkgs/by-name/ca/calendar-cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/calendar-cli/default.nix
rename to pkgs/by-name/ca/calendar-cli/package.nix
diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/by-name/ca/callaudiod/package.nix
similarity index 100%
rename from pkgs/applications/audio/callaudiod/default.nix
rename to pkgs/by-name/ca/callaudiod/package.nix
diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/by-name/ca/calls/package.nix
similarity index 100%
rename from pkgs/applications/networking/calls/default.nix
rename to pkgs/by-name/ca/calls/package.nix
diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/by-name/ca/cambalache/package.nix
similarity index 100%
rename from pkgs/development/tools/cambalache/default.nix
rename to pkgs/by-name/ca/cambalache/package.nix
diff --git a/pkgs/tools/security/cameradar/default.nix b/pkgs/by-name/ca/cameradar/package.nix
similarity index 100%
rename from pkgs/tools/security/cameradar/default.nix
rename to pkgs/by-name/ca/cameradar/package.nix
diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/by-name/ca/camingo-code/package.nix
similarity index 100%
rename from pkgs/data/fonts/camingo-code/default.nix
rename to pkgs/by-name/ca/camingo-code/package.nix
diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/by-name/ca/camunda-modeler/package.nix
similarity index 100%
rename from pkgs/applications/misc/camunda-modeler/default.nix
rename to pkgs/by-name/ca/camunda-modeler/package.nix
diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/by-name/ca/can-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/can-utils/default.nix
rename to pkgs/by-name/ca/can-utils/package.nix
diff --git a/pkgs/os-specific/linux/cannelloni/default.nix b/pkgs/by-name/ca/cannelloni/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/cannelloni/default.nix
rename to pkgs/by-name/ca/cannelloni/package.nix
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/by-name/ca/canon-cups-ufr2/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/canon/default.nix
rename to pkgs/by-name/ca/canon-cups-ufr2/package.nix
diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/by-name/ca/canta-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/canta/default.nix
rename to pkgs/by-name/ca/canta-theme/package.nix
diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/by-name/ca/cantarell-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/cantarell-fonts/default.nix
rename to pkgs/by-name/ca/cantarell-fonts/package.nix
diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/by-name/ca/canto-curses/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/canto-curses/default.nix
rename to pkgs/by-name/ca/canto-curses/package.nix
diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/by-name/ca/canto-daemon/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/canto-daemon/default.nix
rename to pkgs/by-name/ca/canto-daemon/package.nix
diff --git a/pkgs/tools/networking/cantoolz/default.nix b/pkgs/by-name/ca/cantoolz/package.nix
similarity index 100%
rename from pkgs/tools/networking/cantoolz/default.nix
rename to pkgs/by-name/ca/cantoolz/package.nix
diff --git a/pkgs/data/icons/capitaine-cursors-themed/default.nix b/pkgs/by-name/ca/capitaine-cursors-themed/package.nix
similarity index 100%
rename from pkgs/data/icons/capitaine-cursors-themed/default.nix
rename to pkgs/by-name/ca/capitaine-cursors-themed/package.nix
diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/by-name/ca/capitaine-cursors/package.nix
similarity index 100%
rename from pkgs/data/icons/capitaine-cursors/default.nix
rename to pkgs/by-name/ca/capitaine-cursors/package.nix
diff --git a/pkgs/development/tools/capnproto-java/default.nix b/pkgs/by-name/ca/capnproto-java/package.nix
similarity index 100%
rename from pkgs/development/tools/capnproto-java/default.nix
rename to pkgs/by-name/ca/capnproto-java/package.nix
diff --git a/pkgs/development/tools/capnproto-rust/default.nix b/pkgs/by-name/ca/capnproto-rust/package.nix
similarity index 100%
rename from pkgs/development/tools/capnproto-rust/default.nix
rename to pkgs/by-name/ca/capnproto-rust/package.nix
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/by-name/ca/capnproto/package.nix
similarity index 100%
rename from pkgs/development/libraries/capnproto/default.nix
rename to pkgs/by-name/ca/capnproto/package.nix
diff --git a/pkgs/applications/emulators/caprice32/default.nix b/pkgs/by-name/ca/caprice32/package.nix
similarity index 100%
rename from pkgs/applications/emulators/caprice32/default.nix
rename to pkgs/by-name/ca/caprice32/package.nix
diff --git a/pkgs/applications/emulators/caprice32/string.patch b/pkgs/by-name/ca/caprice32/string.patch
similarity index 100%
rename from pkgs/applications/emulators/caprice32/string.patch
rename to pkgs/by-name/ca/caprice32/string.patch
diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/pkgs/by-name/ca/caprine-bin/build-from-appimage.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix
rename to pkgs/by-name/ca/caprine-bin/build-from-appimage.nix
diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix b/pkgs/by-name/ca/caprine-bin/build-from-dmg.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix
rename to pkgs/by-name/ca/caprine-bin/build-from-dmg.nix
diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/by-name/ca/caprine-bin/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/caprine-bin/default.nix
rename to pkgs/by-name/ca/caprine-bin/package.nix
diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/by-name/ca/caps/package.nix
similarity index 100%
rename from pkgs/applications/audio/caps/default.nix
rename to pkgs/by-name/ca/caps/package.nix
diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/by-name/ca/captive-browser/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/captive-browser/default.nix
rename to pkgs/by-name/ca/captive-browser/package.nix
diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/by-name/ca/capture/package.nix
similarity index 100%
rename from pkgs/tools/misc/capture/default.nix
rename to pkgs/by-name/ca/capture/package.nix
diff --git a/pkgs/tools/typesetting/carbon-now-cli/default.nix b/pkgs/by-name/ca/carbon-now-cli/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/carbon-now-cli/default.nix
rename to pkgs/by-name/ca/carbon-now-cli/package.nix
diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/by-name/ca/carddav-util/package.nix
similarity index 100%
rename from pkgs/tools/networking/carddav-util/default.nix
rename to pkgs/by-name/ca/carddav-util/package.nix
diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/by-name/ca/cardinal/package.nix
similarity index 100%
rename from pkgs/applications/audio/cardinal/default.nix
rename to pkgs/by-name/ca/cardinal/package.nix
diff --git a/pkgs/data/fonts/cardo/default.nix b/pkgs/by-name/ca/cardo/package.nix
similarity index 100%
rename from pkgs/data/fonts/cardo/default.nix
rename to pkgs/by-name/ca/cardo/package.nix
diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/by-name/ca/cargo-about/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-about/default.nix
rename to pkgs/by-name/ca/cargo-about/package.nix
diff --git a/pkgs/development/tools/rust/cargo-all-features/default.nix b/pkgs/by-name/ca/cargo-all-features/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-all-features/default.nix
rename to pkgs/by-name/ca/cargo-all-features/package.nix
diff --git a/pkgs/development/tools/rust/cargo-apk/default.nix b/pkgs/by-name/ca/cargo-apk/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-apk/default.nix
rename to pkgs/by-name/ca/cargo-apk/package.nix
diff --git a/pkgs/development/tools/rust/cargo-benchcmp/fix-test-binary-path.patch b/pkgs/by-name/ca/cargo-benchcmp/fix-test-binary-path.patch
similarity index 100%
rename from pkgs/development/tools/rust/cargo-benchcmp/fix-test-binary-path.patch
rename to pkgs/by-name/ca/cargo-benchcmp/fix-test-binary-path.patch
diff --git a/pkgs/development/tools/rust/cargo-benchcmp/default.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-benchcmp/default.nix
rename to pkgs/by-name/ca/cargo-benchcmp/package.nix
diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-binstall/default.nix
rename to pkgs/by-name/ca/cargo-binstall/package.nix
diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/by-name/ca/cargo-binutils/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-binutils/default.nix
rename to pkgs/by-name/ca/cargo-binutils/package.nix
diff --git a/pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch b/pkgs/by-name/ca/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch
similarity index 100%
rename from pkgs/development/tools/rust/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch
rename to pkgs/by-name/ca/cargo-bisect-rustc/0001-dynamically-patchelf-binaries.patch
diff --git a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-bisect-rustc/default.nix
rename to pkgs/by-name/ca/cargo-bisect-rustc/package.nix
diff --git a/pkgs/development/tools/rust/cargo-bitbake/default.nix b/pkgs/by-name/ca/cargo-bitbake/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-bitbake/default.nix
rename to pkgs/by-name/ca/cargo-bitbake/package.nix
diff --git a/pkgs/development/tools/rust/cargo-bolero/default.nix b/pkgs/by-name/ca/cargo-bolero/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-bolero/default.nix
rename to pkgs/by-name/ca/cargo-bolero/package.nix
diff --git a/pkgs/development/tools/rust/bootimage/default.nix b/pkgs/by-name/ca/cargo-bootimage/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/bootimage/default.nix
rename to pkgs/by-name/ca/cargo-bootimage/package.nix
diff --git a/pkgs/development/tools/rust/cargo-bundle-licenses/default.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-bundle-licenses/default.nix
rename to pkgs/by-name/ca/cargo-bundle-licenses/package.nix
diff --git a/pkgs/development/tools/rust/cargo-bundle/default.nix b/pkgs/by-name/ca/cargo-bundle/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-bundle/default.nix
rename to pkgs/by-name/ca/cargo-bundle/package.nix
diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/by-name/ca/cargo-careful/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-careful/default.nix
rename to pkgs/by-name/ca/cargo-careful/package.nix
diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/by-name/ca/cargo-chef/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-chef/default.nix
rename to pkgs/by-name/ca/cargo-chef/package.nix
diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/by-name/ca/cargo-component/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-component/default.nix
rename to pkgs/by-name/ca/cargo-component/package.nix
diff --git a/pkgs/development/tools/rust/cargo-cranky/default.nix b/pkgs/by-name/ca/cargo-cranky/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-cranky/default.nix
rename to pkgs/by-name/ca/cargo-cranky/package.nix
diff --git a/pkgs/development/tools/rust/cargo-criterion/default.nix b/pkgs/by-name/ca/cargo-criterion/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-criterion/default.nix
rename to pkgs/by-name/ca/cargo-criterion/package.nix
diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/by-name/ca/cargo-cross/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-cross/default.nix
rename to pkgs/by-name/ca/cargo-cross/package.nix
diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/by-name/ca/cargo-deb/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-deb/default.nix
rename to pkgs/by-name/ca/cargo-deb/package.nix
diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/by-name/ca/cargo-deny/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-deny/default.nix
rename to pkgs/by-name/ca/cargo-deny/package.nix
diff --git a/pkgs/development/tools/rust/cargo-depgraph/default.nix b/pkgs/by-name/ca/cargo-depgraph/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-depgraph/default.nix
rename to pkgs/by-name/ca/cargo-depgraph/package.nix
diff --git a/pkgs/development/tools/rust/cargo-dephell/Cargo.lock b/pkgs/by-name/ca/cargo-dephell/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/rust/cargo-dephell/Cargo.lock
rename to pkgs/by-name/ca/cargo-dephell/Cargo.lock
diff --git a/pkgs/development/tools/rust/cargo-dephell/default.nix b/pkgs/by-name/ca/cargo-dephell/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-dephell/default.nix
rename to pkgs/by-name/ca/cargo-dephell/package.nix
diff --git a/pkgs/development/tools/rust/cargo-diet/default.nix b/pkgs/by-name/ca/cargo-diet/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-diet/default.nix
rename to pkgs/by-name/ca/cargo-diet/package.nix
diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/by-name/ca/cargo-dist/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-dist/default.nix
rename to pkgs/by-name/ca/cargo-dist/package.nix
diff --git a/pkgs/development/tools/rust/cargo-docset/default.nix b/pkgs/by-name/ca/cargo-docset/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-docset/default.nix
rename to pkgs/by-name/ca/cargo-docset/package.nix
diff --git a/pkgs/development/tools/rust/cargo-duplicates/default.nix b/pkgs/by-name/ca/cargo-duplicates/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-duplicates/default.nix
rename to pkgs/by-name/ca/cargo-duplicates/package.nix
diff --git a/pkgs/development/tools/rust/cargo-espmonitor/default.nix b/pkgs/by-name/ca/cargo-espmonitor/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-espmonitor/default.nix
rename to pkgs/by-name/ca/cargo-espmonitor/package.nix
diff --git a/pkgs/development/tools/rust/cargo-feature/default.nix b/pkgs/by-name/ca/cargo-feature/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-feature/default.nix
rename to pkgs/by-name/ca/cargo-feature/package.nix
diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/by-name/ca/cargo-fuzz/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-fuzz/default.nix
rename to pkgs/by-name/ca/cargo-fuzz/package.nix
diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/by-name/ca/cargo-generate/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-generate/default.nix
rename to pkgs/by-name/ca/cargo-generate/package.nix
diff --git a/pkgs/development/tools/rust/cargo-guppy/default.nix b/pkgs/by-name/ca/cargo-guppy/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-guppy/default.nix
rename to pkgs/by-name/ca/cargo-guppy/package.nix
diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/by-name/ca/cargo-hack/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-hack/default.nix
rename to pkgs/by-name/ca/cargo-hack/package.nix
diff --git a/pkgs/development/tools/rust/cargo-info/default.nix b/pkgs/by-name/ca/cargo-info/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-info/default.nix
rename to pkgs/by-name/ca/cargo-info/package.nix
diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/by-name/ca/cargo-insta/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-insta/default.nix
rename to pkgs/by-name/ca/cargo-insta/package.nix
diff --git a/pkgs/development/tools/rust/cargo-kcov/default.nix b/pkgs/by-name/ca/cargo-kcov/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-kcov/default.nix
rename to pkgs/by-name/ca/cargo-kcov/package.nix
diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/by-name/ca/cargo-leptos/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-leptos/default.nix
rename to pkgs/by-name/ca/cargo-leptos/package.nix
diff --git a/pkgs/development/tools/rust/cargo-license/default.nix b/pkgs/by-name/ca/cargo-license/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-license/default.nix
rename to pkgs/by-name/ca/cargo-license/package.nix
diff --git a/pkgs/development/tools/rust/cargo-limit/default.nix b/pkgs/by-name/ca/cargo-limit/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-limit/default.nix
rename to pkgs/by-name/ca/cargo-limit/package.nix
diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-llvm-cov/default.nix
rename to pkgs/by-name/ca/cargo-llvm-cov/package.nix
diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-llvm-lines/default.nix
rename to pkgs/by-name/ca/cargo-llvm-lines/package.nix
diff --git a/pkgs/development/tools/rust/cargo-local-registry/default.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-local-registry/default.nix
rename to pkgs/by-name/ca/cargo-local-registry/package.nix
diff --git a/pkgs/development/tools/rust/cargo-lock/default.nix b/pkgs/by-name/ca/cargo-lock/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-lock/default.nix
rename to pkgs/by-name/ca/cargo-lock/package.nix
diff --git a/pkgs/development/tools/rust/cargo-machete/default.nix b/pkgs/by-name/ca/cargo-machete/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-machete/default.nix
rename to pkgs/by-name/ca/cargo-machete/package.nix
diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-mobile2/default.nix
rename to pkgs/by-name/ca/cargo-mobile2/package.nix
diff --git a/pkgs/development/tools/rust/cargo-mommy/default.nix b/pkgs/by-name/ca/cargo-mommy/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-mommy/default.nix
rename to pkgs/by-name/ca/cargo-mommy/package.nix
diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/by-name/ca/cargo-mutants/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-mutants/default.nix
rename to pkgs/by-name/ca/cargo-mutants/package.nix
diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/by-name/ca/cargo-nextest/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-nextest/default.nix
rename to pkgs/by-name/ca/cargo-nextest/package.nix
diff --git a/pkgs/development/tools/rust/cargo-play/default.nix b/pkgs/by-name/ca/cargo-play/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-play/default.nix
rename to pkgs/by-name/ca/cargo-play/package.nix
diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/by-name/ca/cargo-public-api/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-public-api/default.nix
rename to pkgs/by-name/ca/cargo-public-api/package.nix
diff --git a/pkgs/development/tools/rust/cargo-readme/default.nix b/pkgs/by-name/ca/cargo-readme/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-readme/default.nix
rename to pkgs/by-name/ca/cargo-readme/package.nix
diff --git a/pkgs/development/tools/rust/cargo-release/Cargo.lock b/pkgs/by-name/ca/cargo-release/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/rust/cargo-release/Cargo.lock
rename to pkgs/by-name/ca/cargo-release/Cargo.lock
diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/by-name/ca/cargo-release/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-release/default.nix
rename to pkgs/by-name/ca/cargo-release/package.nix
diff --git a/pkgs/development/tools/rust/cargo-rr/default.nix b/pkgs/by-name/ca/cargo-rr/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-rr/default.nix
rename to pkgs/by-name/ca/cargo-rr/package.nix
diff --git a/pkgs/development/tools/rust/cargo-run-bin/default.nix b/pkgs/by-name/ca/cargo-run-bin/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-run-bin/default.nix
rename to pkgs/by-name/ca/cargo-run-bin/package.nix
diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-semver-checks/default.nix
rename to pkgs/by-name/ca/cargo-semver-checks/package.nix
diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-show-asm/default.nix
rename to pkgs/by-name/ca/cargo-show-asm/package.nix
diff --git a/pkgs/development/tools/rust/cargo-show-asm/test-basic-x86_64.nix b/pkgs/by-name/ca/cargo-show-asm/test-basic-x86_64.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-show-asm/test-basic-x86_64.nix
rename to pkgs/by-name/ca/cargo-show-asm/test-basic-x86_64.nix
diff --git a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/pkgs/by-name/ca/cargo-shuttle/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/rust/cargo-shuttle/Cargo.lock
rename to pkgs/by-name/ca/cargo-shuttle/Cargo.lock
diff --git a/pkgs/development/tools/rust/cargo-shuttle/default.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-shuttle/default.nix
rename to pkgs/by-name/ca/cargo-shuttle/package.nix
diff --git a/pkgs/development/tools/rust/cargo-sort/default.nix b/pkgs/by-name/ca/cargo-sort/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-sort/default.nix
rename to pkgs/by-name/ca/cargo-sort/package.nix
diff --git a/pkgs/development/tools/rust/cargo-supply-chain/default.nix b/pkgs/by-name/ca/cargo-supply-chain/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-supply-chain/default.nix
rename to pkgs/by-name/ca/cargo-supply-chain/package.nix
diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/by-name/ca/cargo-sweep/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-sweep/default.nix
rename to pkgs/by-name/ca/cargo-sweep/package.nix
diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/by-name/ca/cargo-sync-readme/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-sync-readme/default.nix
rename to pkgs/by-name/ca/cargo-sync-readme/package.nix
diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/by-name/ca/cargo-tally/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-tally/default.nix
rename to pkgs/by-name/ca/cargo-tally/package.nix
diff --git a/pkgs/development/tools/rust/cargo-temp/default.nix b/pkgs/by-name/ca/cargo-temp/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-temp/default.nix
rename to pkgs/by-name/ca/cargo-temp/package.nix
diff --git a/pkgs/development/tools/rust/cargo-toml-lint/default.nix b/pkgs/by-name/ca/cargo-toml-lint/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-toml-lint/default.nix
rename to pkgs/by-name/ca/cargo-toml-lint/package.nix
diff --git a/pkgs/development/tools/rust/cargo-ui/default.nix b/pkgs/by-name/ca/cargo-ui/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-ui/default.nix
rename to pkgs/by-name/ca/cargo-ui/package.nix
diff --git a/pkgs/development/tools/rust/cargo-unused-features/default.nix b/pkgs/by-name/ca/cargo-unused-features/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-unused-features/default.nix
rename to pkgs/by-name/ca/cargo-unused-features/package.nix
diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/by-name/ca/cargo-update/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-update/default.nix
rename to pkgs/by-name/ca/cargo-update/package.nix
diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-valgrind/default.nix
rename to pkgs/by-name/ca/cargo-valgrind/package.nix
diff --git a/pkgs/development/tools/rust/cargo-wipe/default.nix b/pkgs/by-name/ca/cargo-wipe/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-wipe/default.nix
rename to pkgs/by-name/ca/cargo-wipe/package.nix
diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-workspaces/default.nix
rename to pkgs/by-name/ca/cargo-workspaces/package.nix
diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/by-name/ca/cargo-xbuild/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cargo-xbuild/default.nix
rename to pkgs/by-name/ca/cargo-xbuild/package.nix
diff --git a/pkgs/tools/security/cariddi/default.nix b/pkgs/by-name/ca/cariddi/package.nix
similarity index 100%
rename from pkgs/tools/security/cariddi/default.nix
rename to pkgs/by-name/ca/cariddi/package.nix
diff --git a/pkgs/data/fonts/carlito/calibri-alias.conf b/pkgs/by-name/ca/carlito/calibri-alias.conf
similarity index 100%
rename from pkgs/data/fonts/carlito/calibri-alias.conf
rename to pkgs/by-name/ca/carlito/calibri-alias.conf
diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/by-name/ca/carlito/package.nix
similarity index 100%
rename from pkgs/data/fonts/carlito/default.nix
rename to pkgs/by-name/ca/carlito/package.nix
diff --git a/pkgs/development/libraries/caroline/default.nix b/pkgs/by-name/ca/caroline/package.nix
similarity index 100%
rename from pkgs/development/libraries/caroline/default.nix
rename to pkgs/by-name/ca/caroline/package.nix
diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/by-name/ca/carp/package.nix
similarity index 100%
rename from pkgs/development/compilers/carp/default.nix
rename to pkgs/by-name/ca/carp/package.nix
diff --git a/pkgs/misc/cups/drivers/carps-cups/default.nix b/pkgs/by-name/ca/carps-cups/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/carps-cups/default.nix
rename to pkgs/by-name/ca/carps-cups/package.nix
diff --git a/pkgs/development/tools/carto/default.nix b/pkgs/by-name/ca/carto/package.nix
similarity index 100%
rename from pkgs/development/tools/carto/default.nix
rename to pkgs/by-name/ca/carto/package.nix
diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/by-name/ca/cascadia-code/package.nix
similarity index 100%
rename from pkgs/data/fonts/cascadia-code/default.nix
rename to pkgs/by-name/ca/cascadia-code/package.nix
diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/by-name/ca/cassowary/package.nix
similarity index 100%
rename from pkgs/tools/networking/cassowary/default.nix
rename to pkgs/by-name/ca/cassowary/package.nix
diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/pkgs/by-name/ca/castget/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/castget/default.nix
rename to pkgs/by-name/ca/castget/package.nix
diff --git a/pkgs/tools/networking/castnow/default.nix b/pkgs/by-name/ca/castnow/package.nix
similarity index 100%
rename from pkgs/tools/networking/castnow/default.nix
rename to pkgs/by-name/ca/castnow/package.nix
diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/by-name/ca/castor/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/castor/default.nix
rename to pkgs/by-name/ca/castor/package.nix
diff --git a/pkgs/tools/misc/castty/default.nix b/pkgs/by-name/ca/castty/package.nix
similarity index 100%
rename from pkgs/tools/misc/castty/default.nix
rename to pkgs/by-name/ca/castty/package.nix
diff --git a/pkgs/applications/virtualization/catatonit/default.nix b/pkgs/by-name/ca/catatonit/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/catatonit/default.nix
rename to pkgs/by-name/ca/catatonit/package.nix
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/by-name/ca/catch/package.nix
similarity index 100%
rename from pkgs/development/libraries/catch/default.nix
rename to pkgs/by-name/ca/catch/package.nix
diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/by-name/ca/catclock/package.nix
similarity index 100%
rename from pkgs/applications/misc/catclock/default.nix
rename to pkgs/by-name/ca/catclock/package.nix
diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/by-name/ca/catdoc/package.nix
similarity index 100%
rename from pkgs/tools/text/catdoc/default.nix
rename to pkgs/by-name/ca/catdoc/package.nix
diff --git a/pkgs/tools/text/catdocx/default.nix b/pkgs/by-name/ca/catdocx/package.nix
similarity index 100%
rename from pkgs/tools/text/catdocx/default.nix
rename to pkgs/by-name/ca/catdocx/package.nix
diff --git a/pkgs/tools/typesetting/tex/catdvi/default.nix b/pkgs/by-name/ca/catdvi/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/tex/catdvi/default.nix
rename to pkgs/by-name/ca/catdvi/package.nix
diff --git a/pkgs/os-specific/linux/catfs/Cargo.lock b/pkgs/by-name/ca/catfs/Cargo.lock
similarity index 100%
rename from pkgs/os-specific/linux/catfs/Cargo.lock
rename to pkgs/by-name/ca/catfs/Cargo.lock
diff --git a/pkgs/os-specific/linux/catfs/default.nix b/pkgs/by-name/ca/catfs/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/catfs/default.nix
rename to pkgs/by-name/ca/catfs/package.nix
diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/by-name/ca/catgirl/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/catgirl/default.nix
rename to pkgs/by-name/ca/catgirl/package.nix
diff --git a/pkgs/tools/misc/catimg/default.nix b/pkgs/by-name/ca/catimg/package.nix
similarity index 100%
rename from pkgs/tools/misc/catimg/default.nix
rename to pkgs/by-name/ca/catimg/package.nix
diff --git a/pkgs/tools/audio/catnip-gtk4/default.nix b/pkgs/by-name/ca/catnip-gtk4/package.nix
similarity index 100%
rename from pkgs/tools/audio/catnip-gtk4/default.nix
rename to pkgs/by-name/ca/catnip-gtk4/package.nix
diff --git a/pkgs/tools/audio/catnip/default.nix b/pkgs/by-name/ca/catnip/package.nix
similarity index 100%
rename from pkgs/tools/audio/catnip/default.nix
rename to pkgs/by-name/ca/catnip/package.nix
diff --git a/pkgs/data/themes/catppuccin-kde/color.sh b/pkgs/by-name/ca/catppuccin-kde/color.sh
similarity index 100%
rename from pkgs/data/themes/catppuccin-kde/color.sh
rename to pkgs/by-name/ca/catppuccin-kde/color.sh
diff --git a/pkgs/data/themes/catppuccin-kde/default.nix b/pkgs/by-name/ca/catppuccin-kde/package.nix
similarity index 100%
rename from pkgs/data/themes/catppuccin-kde/default.nix
rename to pkgs/by-name/ca/catppuccin-kde/package.nix
diff --git a/pkgs/data/themes/catppuccin-kvantum/default.nix b/pkgs/by-name/ca/catppuccin-kvantum/package.nix
similarity index 100%
rename from pkgs/data/themes/catppuccin-kvantum/default.nix
rename to pkgs/by-name/ca/catppuccin-kvantum/package.nix
diff --git a/pkgs/data/icons/catppuccin-papirus-folders/default.nix b/pkgs/by-name/ca/catppuccin-papirus-folders/package.nix
similarity index 100%
rename from pkgs/data/icons/catppuccin-papirus-folders/default.nix
rename to pkgs/by-name/ca/catppuccin-papirus-folders/package.nix
diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/by-name/ca/catt/package.nix
similarity index 100%
rename from pkgs/applications/video/catt/default.nix
rename to pkgs/by-name/ca/catt/package.nix
diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/by-name/ca/caudec/package.nix
similarity index 100%
rename from pkgs/applications/audio/caudec/default.nix
rename to pkgs/by-name/ca/caudec/package.nix
diff --git a/pkgs/development/tools/rust/cauwugo/default.nix b/pkgs/by-name/ca/cauwugo/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/cauwugo/default.nix
rename to pkgs/by-name/ca/cauwugo/package.nix
diff --git a/pkgs/servers/cayley/default.nix b/pkgs/by-name/ca/cayley/package.nix
similarity index 100%
rename from pkgs/servers/cayley/default.nix
rename to pkgs/by-name/ca/cayley/package.nix
diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/by-name/cb/cbatticon/package.nix
similarity index 100%
rename from pkgs/applications/misc/cbatticon/default.nix
rename to pkgs/by-name/cb/cbatticon/package.nix
diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/by-name/cb/cbc/package.nix
similarity index 100%
rename from pkgs/applications/science/math/cbc/default.nix
rename to pkgs/by-name/cb/cbc/package.nix
diff --git a/pkgs/development/tools/cbfmt/default.nix b/pkgs/by-name/cb/cbfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/cbfmt/default.nix
rename to pkgs/by-name/cb/cbfmt/package.nix
diff --git a/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch b/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch
similarity index 100%
rename from pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch
rename to pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch
diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/by-name/cb/cbmc/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/cbmc/default.nix
rename to pkgs/by-name/cb/cbmc/package.nix
diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/by-name/cb/cbonsai/package.nix
similarity index 100%
rename from pkgs/games/cbonsai/default.nix
rename to pkgs/by-name/cb/cbonsai/package.nix
diff --git a/pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff b/pkgs/by-name/cb/cbrowser/backslashes-quotes.diff
similarity index 100%
rename from pkgs/development/tools/misc/cbrowser/backslashes-quotes.diff
rename to pkgs/by-name/cb/cbrowser/backslashes-quotes.diff
diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/by-name/cb/cbrowser/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/cbrowser/default.nix
rename to pkgs/by-name/cb/cbrowser/package.nix
diff --git a/pkgs/development/embedded/cc-tool/default.nix b/pkgs/by-name/cc/cc-tool/package.nix
similarity index 100%
rename from pkgs/development/embedded/cc-tool/default.nix
rename to pkgs/by-name/cc/cc-tool/package.nix
diff --git a/pkgs/tools/misc/cc2538-bsl/default.nix b/pkgs/by-name/cc/cc2538-bsl/package.nix
similarity index 100%
rename from pkgs/tools/misc/cc2538-bsl/default.nix
rename to pkgs/by-name/cc/cc2538-bsl/package.nix
diff --git a/pkgs/tools/misc/ccal/default.nix b/pkgs/by-name/cc/ccal/package.nix
similarity index 100%
rename from pkgs/tools/misc/ccal/default.nix
rename to pkgs/by-name/cc/ccal/package.nix
diff --git a/pkgs/development/tools/analysis/cccc/cccc.patch b/pkgs/by-name/cc/cccc/cccc.patch
similarity index 100%
rename from pkgs/development/tools/analysis/cccc/cccc.patch
rename to pkgs/by-name/cc/cccc/cccc.patch
diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/by-name/cc/cccc/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/cccc/default.nix
rename to pkgs/by-name/cc/cccc/package.nix
diff --git a/pkgs/tools/cd-dvd/ccd2iso/include.patch b/pkgs/by-name/cc/ccd2iso/include.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/ccd2iso/include.patch
rename to pkgs/by-name/cc/ccd2iso/include.patch
diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/by-name/cc/ccd2iso/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/ccd2iso/default.nix
rename to pkgs/by-name/cc/ccd2iso/package.nix
diff --git a/pkgs/applications/emulators/ccemux/default.nix b/pkgs/by-name/cc/ccemux/package.nix
similarity index 100%
rename from pkgs/applications/emulators/ccemux/default.nix
rename to pkgs/by-name/cc/ccemux/package.nix
diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/by-name/cc/cconv/package.nix
similarity index 100%
rename from pkgs/tools/text/cconv/default.nix
rename to pkgs/by-name/cc/cconv/package.nix
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/by-name/cc/ccrtp/package.nix
similarity index 100%
rename from pkgs/development/libraries/ccrtp/default.nix
rename to pkgs/by-name/cc/ccrtp/package.nix
diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/by-name/cc/ccrypt/package.nix
similarity index 100%
rename from pkgs/tools/security/ccrypt/default.nix
rename to pkgs/by-name/cc/ccrypt/package.nix
diff --git a/pkgs/data/fonts/ccsymbols/default.nix b/pkgs/by-name/cc/ccsymbols/package.nix
similarity index 100%
rename from pkgs/data/fonts/ccsymbols/default.nix
rename to pkgs/by-name/cc/ccsymbols/package.nix
diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/by-name/cc/ccze/package.nix
similarity index 100%
rename from pkgs/tools/misc/ccze/default.nix
rename to pkgs/by-name/cc/ccze/package.nix
diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/by-name/cd/cddlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/cddlib/default.nix
rename to pkgs/by-name/cd/cddlib/package.nix
diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/by-name/cd/cde/package.nix
similarity index 100%
rename from pkgs/tools/package-management/cde/default.nix
rename to pkgs/by-name/cd/cde/package.nix
diff --git a/pkgs/development/tools/cdecrypt/default.nix b/pkgs/by-name/cd/cdecrypt/package.nix
similarity index 100%
rename from pkgs/development/tools/cdecrypt/default.nix
rename to pkgs/by-name/cd/cdecrypt/package.nix
diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/by-name/cd/cdesktopenv/package.nix
similarity index 100%
rename from pkgs/desktops/cdesktopenv/default.nix
rename to pkgs/by-name/cd/cdesktopenv/package.nix
diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/by-name/cd/cdi2iso/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/cdi2iso/default.nix
rename to pkgs/by-name/cd/cdi2iso/package.nix
diff --git a/pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch b/pkgs/by-name/cd/cdimgtools/nrgtool_fix_my.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/cdimgtools/nrgtool_fix_my.patch
rename to pkgs/by-name/cd/cdimgtools/nrgtool_fix_my.patch
diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/by-name/cd/cdimgtools/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/cdimgtools/default.nix
rename to pkgs/by-name/cd/cdimgtools/package.nix
diff --git a/pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch b/pkgs/by-name/cd/cdimgtools/removed_dvdcss_interface_2.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/cdimgtools/removed_dvdcss_interface_2.patch
rename to pkgs/by-name/cd/cdimgtools/removed_dvdcss_interface_2.patch
diff --git a/pkgs/tools/security/cdk-go/default.nix b/pkgs/by-name/cd/cdk-go/package.nix
similarity index 100%
rename from pkgs/tools/security/cdk-go/default.nix
rename to pkgs/by-name/cd/cdk-go/package.nix
diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/by-name/cd/cdo/package.nix
similarity index 100%
rename from pkgs/development/libraries/cdo/default.nix
rename to pkgs/by-name/cd/cdo/package.nix
diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/by-name/cd/cdogs-sdl/package.nix
similarity index 100%
rename from pkgs/games/cdogs-sdl/default.nix
rename to pkgs/by-name/cd/cdogs-sdl/package.nix
diff --git a/pkgs/tools/networking/cdpr/default.nix b/pkgs/by-name/cd/cdpr/package.nix
similarity index 100%
rename from pkgs/tools/networking/cdpr/default.nix
rename to pkgs/by-name/cd/cdpr/package.nix
diff --git a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch b/pkgs/by-name/cd/cdrkit/cdrkit-1.1.11-fno-common.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.11-fno-common.patch
rename to pkgs/by-name/cd/cdrkit/cdrkit-1.1.11-fno-common.patch
diff --git a/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch b/pkgs/by-name/cd/cdrkit/cdrkit-1.1.9-efi-boot.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch
rename to pkgs/by-name/cd/cdrkit/cdrkit-1.1.9-efi-boot.patch
diff --git a/pkgs/tools/cd-dvd/cdrkit/include-path.patch b/pkgs/by-name/cd/cdrkit/include-path.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/cdrkit/include-path.patch
rename to pkgs/by-name/cd/cdrkit/include-path.patch
diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/by-name/cd/cdrkit/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/cdrkit/default.nix
rename to pkgs/by-name/cd/cdrkit/package.nix
diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/by-name/cd/cdxgen/package.nix
similarity index 100%
rename from pkgs/tools/security/cdxgen/default.nix
rename to pkgs/by-name/cd/cdxgen/package.nix
diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/by-name/ce/cegui/package.nix
similarity index 100%
rename from pkgs/development/libraries/cegui/default.nix
rename to pkgs/by-name/ce/cegui/package.nix
diff --git a/pkgs/development/interpreters/cel-go/default.nix b/pkgs/by-name/ce/cel-go/package.nix
similarity index 100%
rename from pkgs/development/interpreters/cel-go/default.nix
rename to pkgs/by-name/ce/cel-go/package.nix
diff --git a/pkgs/applications/networking/sync/celeste/librclone-path.patch b/pkgs/by-name/ce/celeste/librclone-path.patch
similarity index 100%
rename from pkgs/applications/networking/sync/celeste/librclone-path.patch
rename to pkgs/by-name/ce/celeste/librclone-path.patch
diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/by-name/ce/celeste/package.nix
similarity index 100%
rename from pkgs/applications/networking/sync/celeste/default.nix
rename to pkgs/by-name/ce/celeste/package.nix
diff --git a/pkgs/applications/science/logic/celf/default.nix b/pkgs/by-name/ce/celf/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/celf/default.nix
rename to pkgs/by-name/ce/celf/package.nix
diff --git a/pkgs/applications/emulators/cen64/default.nix b/pkgs/by-name/ce/cen64/package.nix
similarity index 100%
rename from pkgs/applications/emulators/cen64/default.nix
rename to pkgs/by-name/ce/cen64/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/by-name/ce/centerim/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/centerim/default.nix
rename to pkgs/by-name/ce/centerim/package.nix
diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/by-name/ce/ceptre/package.nix
similarity index 100%
rename from pkgs/development/interpreters/ceptre/default.nix
rename to pkgs/by-name/ce/ceptre/package.nix
diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/by-name/ce/cernlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/cernlib/default.nix
rename to pkgs/by-name/ce/cernlib/package.nix
diff --git a/pkgs/development/libraries/physics/cernlib/setup-hook.sh b/pkgs/by-name/ce/cernlib/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/physics/cernlib/setup-hook.sh
rename to pkgs/by-name/ce/cernlib/setup-hook.sh
diff --git a/pkgs/tools/security/certgraph/default.nix b/pkgs/by-name/ce/certgraph/package.nix
similarity index 100%
rename from pkgs/tools/security/certgraph/default.nix
rename to pkgs/by-name/ce/certgraph/package.nix
diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/by-name/ce/certigo/package.nix
similarity index 100%
rename from pkgs/tools/admin/certigo/default.nix
rename to pkgs/by-name/ce/certigo/package.nix
diff --git a/pkgs/tools/security/certinfo/default.nix b/pkgs/by-name/ce/certinfo/package.nix
similarity index 100%
rename from pkgs/tools/security/certinfo/default.nix
rename to pkgs/by-name/ce/certinfo/package.nix
diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/by-name/ce/certstrap/package.nix
similarity index 100%
rename from pkgs/tools/security/certstrap/default.nix
rename to pkgs/by-name/ce/certstrap/package.nix
diff --git a/pkgs/tools/security/certsync/default.nix b/pkgs/by-name/ce/certsync/package.nix
similarity index 100%
rename from pkgs/tools/security/certsync/default.nix
rename to pkgs/by-name/ce/certsync/package.nix
diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/by-name/cf/cf-terraforming/package.nix
similarity index 100%
rename from pkgs/tools/misc/cf-terraforming/default.nix
rename to pkgs/by-name/cf/cf-terraforming/package.nix
diff --git a/pkgs/tools/admin/cf-vault/default.nix b/pkgs/by-name/cf/cf-vault/package.nix
similarity index 100%
rename from pkgs/tools/admin/cf-vault/default.nix
rename to pkgs/by-name/cf/cf-vault/package.nix
diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/by-name/cf/cfdg/package.nix
similarity index 100%
rename from pkgs/tools/graphics/cfdg/default.nix
rename to pkgs/by-name/cf/cfdg/package.nix
diff --git a/pkgs/tools/graphics/cfdg/src-info-for-default.nix b/pkgs/by-name/cf/cfdg/src-info-for-default.nix
similarity index 100%
rename from pkgs/tools/graphics/cfdg/src-info-for-default.nix
rename to pkgs/by-name/cf/cfdg/src-info-for-default.nix
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock b/pkgs/by-name/cf/cfdyndns/Cargo.lock
similarity index 100%
rename from pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock
rename to pkgs/by-name/cf/cfdyndns/Cargo.lock
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/by-name/cf/cfdyndns/package.nix
similarity index 100%
rename from pkgs/applications/networking/dyndns/cfdyndns/default.nix
rename to pkgs/by-name/cf/cfdyndns/package.nix
diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch b/pkgs/by-name/cf/cfitsio/darwin-rpath-universal.patch
similarity index 100%
rename from pkgs/development/libraries/science/astronomy/cfitsio/darwin-rpath-universal.patch
rename to pkgs/by-name/cf/cfitsio/darwin-rpath-universal.patch
diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/by-name/cf/cfitsio/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/astronomy/cfitsio/default.nix
rename to pkgs/by-name/cf/cfitsio/package.nix
diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/by-name/cf/cflow/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/cflow/default.nix
rename to pkgs/by-name/cf/cflow/package.nix
diff --git a/pkgs/applications/file-managers/cfm/default.nix b/pkgs/by-name/cf/cfm/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/cfm/default.nix
rename to pkgs/by-name/cf/cfm/package.nix
diff --git a/pkgs/tools/misc/cfonts/default.nix b/pkgs/by-name/cf/cfonts/package.nix
similarity index 100%
rename from pkgs/tools/misc/cfonts/default.nix
rename to pkgs/by-name/cf/cfonts/package.nix
diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/by-name/cf/cfr/package.nix
similarity index 100%
rename from pkgs/development/tools/java/cfr/default.nix
rename to pkgs/by-name/cf/cfr/package.nix
diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/by-name/cf/cfripper/package.nix
similarity index 100%
rename from pkgs/tools/security/cfripper/default.nix
rename to pkgs/by-name/cf/cfripper/package.nix
diff --git a/pkgs/os-specific/linux/cfs-zen-tweaks/default.nix b/pkgs/by-name/cf/cfs-zen-tweaks/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/cfs-zen-tweaks/default.nix
rename to pkgs/by-name/cf/cfs-zen-tweaks/package.nix
diff --git a/pkgs/tools/networking/cfspeedtest/default.nix b/pkgs/by-name/cf/cfspeedtest/package.nix
similarity index 100%
rename from pkgs/tools/networking/cfspeedtest/default.nix
rename to pkgs/by-name/cf/cfspeedtest/package.nix
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/by-name/cf/cfssl/package.nix
similarity index 100%
rename from pkgs/tools/security/cfssl/default.nix
rename to pkgs/by-name/cf/cfssl/package.nix
diff --git a/pkgs/development/interpreters/cg3/default.nix b/pkgs/by-name/cg/cg3/package.nix
similarity index 100%
rename from pkgs/development/interpreters/cg3/default.nix
rename to pkgs/by-name/cg/cg3/package.nix
diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/by-name/cg/cgdb/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/cgdb/default.nix
rename to pkgs/by-name/cg/cgdb/package.nix
diff --git a/pkgs/tools/graphics/cgif/default.nix b/pkgs/by-name/cg/cgif/package.nix
similarity index 100%
rename from pkgs/tools/graphics/cgif/default.nix
rename to pkgs/by-name/cg/cgif/package.nix
diff --git a/pkgs/servers/http/cgiserver/default.nix b/pkgs/by-name/cg/cgiserver/package.nix
similarity index 100%
rename from pkgs/servers/http/cgiserver/default.nix
rename to pkgs/by-name/cg/cgiserver/package.nix
diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/by-name/cg/cglm/package.nix
similarity index 100%
rename from pkgs/development/libraries/cglm/default.nix
rename to pkgs/by-name/cg/cglm/package.nix
diff --git a/pkgs/applications/blockchains/cgminer/default.nix b/pkgs/by-name/cg/cgminer/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/cgminer/default.nix
rename to pkgs/by-name/cg/cgminer/package.nix
diff --git a/pkgs/games/cgoban/default.nix b/pkgs/by-name/cg/cgoban/package.nix
similarity index 100%
rename from pkgs/games/cgoban/default.nix
rename to pkgs/by-name/cg/cgoban/package.nix
diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/by-name/cg/cgui/package.nix
similarity index 100%
rename from pkgs/development/libraries/cgui/default.nix
rename to pkgs/by-name/cg/cgui/package.nix
diff --git a/pkgs/tools/security/chain-bench/default.nix b/pkgs/by-name/ch/chain-bench/package.nix
similarity index 100%
rename from pkgs/tools/security/chain-bench/default.nix
rename to pkgs/by-name/ch/chain-bench/package.nix
diff --git a/pkgs/tools/security/chainsaw/default.nix b/pkgs/by-name/ch/chainsaw/package.nix
similarity index 100%
rename from pkgs/tools/security/chainsaw/default.nix
rename to pkgs/by-name/ch/chainsaw/package.nix
diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/by-name/ch/chamber/package.nix
similarity index 100%
rename from pkgs/tools/admin/chamber/default.nix
rename to pkgs/by-name/ch/chamber/package.nix
diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/by-name/ch/changedetection-io/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/changedetection-io/default.nix
rename to pkgs/by-name/ch/changedetection-io/package.nix
diff --git a/pkgs/tools/misc/changelogger/default.nix b/pkgs/by-name/ch/changelogger/package.nix
similarity index 100%
rename from pkgs/tools/misc/changelogger/default.nix
rename to pkgs/by-name/ch/changelogger/package.nix
diff --git a/pkgs/tools/networking/changetower/default.nix b/pkgs/by-name/ch/changetower/package.nix
similarity index 100%
rename from pkgs/tools/networking/changetower/default.nix
rename to pkgs/by-name/ch/changetower/package.nix
diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/by-name/ch/changie/package.nix
similarity index 100%
rename from pkgs/development/tools/changie/default.nix
rename to pkgs/by-name/ch/changie/package.nix
diff --git a/pkgs/tools/networking/chaos/default.nix b/pkgs/by-name/ch/chaos/package.nix
similarity index 100%
rename from pkgs/tools/networking/chaos/default.nix
rename to pkgs/by-name/ch/chaos/package.nix
diff --git a/pkgs/tools/misc/charasay/default.nix b/pkgs/by-name/ch/charasay/package.nix
similarity index 100%
rename from pkgs/tools/misc/charasay/default.nix
rename to pkgs/by-name/ch/charasay/package.nix
diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/by-name/ch/charis-sil/package.nix
similarity index 100%
rename from pkgs/data/fonts/charis-sil/default.nix
rename to pkgs/by-name/ch/charis-sil/package.nix
diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/by-name/ch/charliecloud/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/charliecloud/default.nix
rename to pkgs/by-name/ch/charliecloud/package.nix
diff --git a/pkgs/development/libraries/charls/default.nix b/pkgs/by-name/ch/charls/package.nix
similarity index 100%
rename from pkgs/development/libraries/charls/default.nix
rename to pkgs/by-name/ch/charls/package.nix
diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/by-name/ch/charm/package.nix
similarity index 100%
rename from pkgs/applications/misc/charm/default.nix
rename to pkgs/by-name/ch/charm/package.nix
diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/by-name/ch/chart-testing/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/helm/chart-testing/default.nix
rename to pkgs/by-name/ch/chart-testing/package.nix
diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/by-name/ch/chase/package.nix
similarity index 100%
rename from pkgs/tools/system/chase/default.nix
rename to pkgs/by-name/ch/chase/package.nix
diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/by-name/ch/chatblade/package.nix
similarity index 100%
rename from pkgs/applications/misc/chatblade/default.nix
rename to pkgs/by-name/ch/chatblade/package.nix
diff --git a/pkgs/tools/misc/chatgpt-cli/default.nix b/pkgs/by-name/ch/chatgpt-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/chatgpt-cli/default.nix
rename to pkgs/by-name/ch/chatgpt-cli/package.nix
diff --git a/pkgs/servers/chatgpt-retrieval-plugin/default.nix b/pkgs/by-name/ch/chatgpt-retrieval-plugin/package.nix
similarity index 100%
rename from pkgs/servers/chatgpt-retrieval-plugin/default.nix
rename to pkgs/by-name/ch/chatgpt-retrieval-plugin/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/by-name/ch/chatty/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/chatty/default.nix
rename to pkgs/by-name/ch/chatty/package.nix
diff --git a/pkgs/tools/wayland/chayang/default.nix b/pkgs/by-name/ch/chayang/package.nix
similarity index 100%
rename from pkgs/tools/wayland/chayang/default.nix
rename to pkgs/by-name/ch/chayang/package.nix
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/by-name/ch/cheat/package.nix
similarity index 100%
rename from pkgs/applications/misc/cheat/default.nix
rename to pkgs/by-name/ch/cheat/package.nix
diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/by-name/ch/check-jsonschema/package.nix
similarity index 100%
rename from pkgs/development/tools/check-jsonschema/default.nix
rename to pkgs/by-name/ch/check-jsonschema/package.nix
diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/by-name/ch/checkbashisms/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/checkbashisms/default.nix
rename to pkgs/by-name/ch/checkbashisms/package.nix
diff --git a/pkgs/tools/package-management/checkinstall/empty-dirs.patch b/pkgs/by-name/ch/checkinstall/empty-dirs.patch
similarity index 100%
rename from pkgs/tools/package-management/checkinstall/empty-dirs.patch
rename to pkgs/by-name/ch/checkinstall/empty-dirs.patch
diff --git a/pkgs/tools/package-management/checkinstall/etc-dirs.patch b/pkgs/by-name/ch/checkinstall/etc-dirs.patch
similarity index 100%
rename from pkgs/tools/package-management/checkinstall/etc-dirs.patch
rename to pkgs/by-name/ch/checkinstall/etc-dirs.patch
diff --git a/pkgs/tools/package-management/checkinstall/glibc-check.patch b/pkgs/by-name/ch/checkinstall/glibc-check.patch
similarity index 100%
rename from pkgs/tools/package-management/checkinstall/glibc-check.patch
rename to pkgs/by-name/ch/checkinstall/glibc-check.patch
diff --git a/pkgs/tools/package-management/checkinstall/missing-functions.patch b/pkgs/by-name/ch/checkinstall/missing-functions.patch
similarity index 100%
rename from pkgs/tools/package-management/checkinstall/missing-functions.patch
rename to pkgs/by-name/ch/checkinstall/missing-functions.patch
diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/by-name/ch/checkinstall/package.nix
similarity index 100%
rename from pkgs/tools/package-management/checkinstall/default.nix
rename to pkgs/by-name/ch/checkinstall/package.nix
diff --git a/pkgs/tools/package-management/checkinstall/readlink-types.patch b/pkgs/by-name/ch/checkinstall/readlink-types.patch
similarity index 100%
rename from pkgs/tools/package-management/checkinstall/readlink-types.patch
rename to pkgs/by-name/ch/checkinstall/readlink-types.patch
diff --git a/pkgs/tools/package-management/checkinstall/scandir.patch b/pkgs/by-name/ch/checkinstall/scandir.patch
similarity index 100%
rename from pkgs/tools/package-management/checkinstall/scandir.patch
rename to pkgs/by-name/ch/checkinstall/scandir.patch
diff --git a/pkgs/tools/package-management/checkinstall/set-buildroot.patch b/pkgs/by-name/ch/checkinstall/set-buildroot.patch
similarity index 100%
rename from pkgs/tools/package-management/checkinstall/set-buildroot.patch
rename to pkgs/by-name/ch/checkinstall/set-buildroot.patch
diff --git a/pkgs/tools/package-management/checkinstall/use-old-memcpy.patch b/pkgs/by-name/ch/checkinstall/use-old-memcpy.patch
similarity index 100%
rename from pkgs/tools/package-management/checkinstall/use-old-memcpy.patch
rename to pkgs/by-name/ch/checkinstall/use-old-memcpy.patch
diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/by-name/ch/checkip/package.nix
similarity index 100%
rename from pkgs/tools/networking/checkip/default.nix
rename to pkgs/by-name/ch/checkip/package.nix
diff --git a/pkgs/development/tools/checkmake/default.nix b/pkgs/by-name/ch/checkmake/package.nix
similarity index 100%
rename from pkgs/development/tools/checkmake/default.nix
rename to pkgs/by-name/ch/checkmake/package.nix
diff --git a/pkgs/development/tools/checkmate/default.nix b/pkgs/by-name/ch/checkmate/package.nix
similarity index 100%
rename from pkgs/development/tools/checkmate/default.nix
rename to pkgs/by-name/ch/checkmate/package.nix
diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/by-name/ch/checkpolicy/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/checkpolicy/default.nix
rename to pkgs/by-name/ch/checkpolicy/package.nix
diff --git a/pkgs/tools/misc/checkpwn/default.nix b/pkgs/by-name/ch/checkpwn/package.nix
similarity index 100%
rename from pkgs/tools/misc/checkpwn/default.nix
rename to pkgs/by-name/ch/checkpwn/package.nix
diff --git a/pkgs/development/mobile/checkra1n/default.nix b/pkgs/by-name/ch/checkra1n/package.nix
similarity index 100%
rename from pkgs/development/mobile/checkra1n/default.nix
rename to pkgs/by-name/ch/checkra1n/package.nix
diff --git a/pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch b/pkgs/by-name/ch/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
similarity index 100%
rename from pkgs/os-specific/linux/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
rename to pkgs/by-name/ch/checksec/0001-attempt-to-modprobe-config-before-checking-kernel.patch
diff --git a/pkgs/os-specific/linux/checksec/0002-don-t-sanatize-the-environment.patch b/pkgs/by-name/ch/checksec/0002-don-t-sanatize-the-environment.patch
similarity index 100%
rename from pkgs/os-specific/linux/checksec/0002-don-t-sanatize-the-environment.patch
rename to pkgs/by-name/ch/checksec/0002-don-t-sanatize-the-environment.patch
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/by-name/ch/checksec/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/checksec/default.nix
rename to pkgs/by-name/ch/checksec/package.nix
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/by-name/ch/checkstyle/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/checkstyle/default.nix
rename to pkgs/by-name/ch/checkstyle/package.nix
diff --git a/pkgs/applications/audio/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch b/pkgs/by-name/ch/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch
similarity index 100%
rename from pkgs/applications/audio/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch
rename to pkgs/by-name/ch/cheesecutter/0001-Drop-baked-in-build-date-for-r13y.patch
diff --git a/pkgs/applications/audio/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch b/pkgs/by-name/ch/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch
similarity index 100%
rename from pkgs/applications/audio/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch
rename to pkgs/by-name/ch/cheesecutter/0002-Prepend-libSDL.dylib-to-macOS-SDL-loader.patch
diff --git a/pkgs/applications/audio/cheesecutter/default.nix b/pkgs/by-name/ch/cheesecutter/package.nix
similarity index 100%
rename from pkgs/applications/audio/cheesecutter/default.nix
rename to pkgs/by-name/ch/cheesecutter/package.nix
diff --git a/pkgs/tools/misc/chelf/default.nix b/pkgs/by-name/ch/chelf/package.nix
similarity index 100%
rename from pkgs/tools/misc/chelf/default.nix
rename to pkgs/by-name/ch/chelf/package.nix
diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/by-name/ch/cherry/package.nix
similarity index 100%
rename from pkgs/data/fonts/cherry/default.nix
rename to pkgs/by-name/ch/cherry/package.nix
diff --git a/pkgs/tools/security/cherrybomb/default.nix b/pkgs/by-name/ch/cherrybomb/package.nix
similarity index 100%
rename from pkgs/tools/security/cherrybomb/default.nix
rename to pkgs/by-name/ch/cherrybomb/package.nix
diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/by-name/ch/cherrytree/package.nix
similarity index 100%
rename from pkgs/applications/misc/cherrytree/default.nix
rename to pkgs/by-name/ch/cherrytree/package.nix
diff --git a/pkgs/games/chessdb/default.nix b/pkgs/by-name/ch/chessdb/package.nix
similarity index 100%
rename from pkgs/games/chessdb/default.nix
rename to pkgs/by-name/ch/chessdb/package.nix
diff --git a/pkgs/development/chez-modules/chez-matchable/default.nix b/pkgs/by-name/ch/chez-matchable/package.nix
similarity index 100%
rename from pkgs/development/chez-modules/chez-matchable/default.nix
rename to pkgs/by-name/ch/chez-matchable/package.nix
diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/by-name/ch/chez-mit/package.nix
similarity index 100%
rename from pkgs/development/chez-modules/chez-mit/default.nix
rename to pkgs/by-name/ch/chez-mit/package.nix
diff --git a/pkgs/development/compilers/chez-racket/default.nix b/pkgs/by-name/ch/chez-racket/package.nix
similarity index 100%
rename from pkgs/development/compilers/chez-racket/default.nix
rename to pkgs/by-name/ch/chez-racket/package.nix
diff --git a/pkgs/development/compilers/chez-racket/setup-hook.sh b/pkgs/by-name/ch/chez-racket/setup-hook.sh
similarity index 100%
rename from pkgs/development/compilers/chez-racket/setup-hook.sh
rename to pkgs/by-name/ch/chez-racket/setup-hook.sh
diff --git a/pkgs/development/compilers/chez-racket/shared.nix b/pkgs/by-name/ch/chez-racket/shared.nix
similarity index 100%
rename from pkgs/development/compilers/chez-racket/shared.nix
rename to pkgs/by-name/ch/chez-racket/shared.nix
diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/by-name/ch/chez-scmutils/package.nix
similarity index 100%
rename from pkgs/development/chez-modules/chez-scmutils/default.nix
rename to pkgs/by-name/ch/chez-scmutils/package.nix
diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/by-name/ch/chez-srfi/package.nix
similarity index 100%
rename from pkgs/development/chez-modules/chez-srfi/default.nix
rename to pkgs/by-name/ch/chez-srfi/package.nix
diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/by-name/ch/chez/package.nix
similarity index 100%
rename from pkgs/development/compilers/chez/default.nix
rename to pkgs/by-name/ch/chez/package.nix
diff --git a/pkgs/development/compilers/chez/setup-hook.sh b/pkgs/by-name/ch/chez/setup-hook.sh
similarity index 100%
rename from pkgs/development/compilers/chez/setup-hook.sh
rename to pkgs/by-name/ch/chez/setup-hook.sh
diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/by-name/ch/chibi/package.nix
similarity index 100%
rename from pkgs/development/interpreters/chibi/default.nix
rename to pkgs/by-name/ch/chibi/package.nix
diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/by-name/ch/chipmunk/package.nix
similarity index 100%
rename from pkgs/development/libraries/chipmunk/default.nix
rename to pkgs/by-name/ch/chipmunk/package.nix
diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/by-name/ch/chisel/package.nix
similarity index 100%
rename from pkgs/tools/networking/chisel/default.nix
rename to pkgs/by-name/ch/chisel/package.nix
diff --git a/pkgs/development/tools/chit/Cargo.lock b/pkgs/by-name/ch/chit/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/chit/Cargo.lock
rename to pkgs/by-name/ch/chit/Cargo.lock
diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/by-name/ch/chit/package.nix
similarity index 100%
rename from pkgs/development/tools/chit/default.nix
rename to pkgs/by-name/ch/chit/package.nix
diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/by-name/ch/chkcrontab/package.nix
similarity index 100%
rename from pkgs/tools/admin/chkcrontab/default.nix
rename to pkgs/by-name/ch/chkcrontab/package.nix
diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/by-name/ch/chkrootkit/package.nix
similarity index 100%
rename from pkgs/tools/security/chkrootkit/default.nix
rename to pkgs/by-name/ch/chkrootkit/package.nix
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/by-name/ch/chmlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/chmlib/default.nix
rename to pkgs/by-name/ch/chmlib/package.nix
diff --git a/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch b/pkgs/by-name/ch/chntpw/00-chntpw-build-arch-autodetect.patch
similarity index 100%
rename from pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch
rename to pkgs/by-name/ch/chntpw/00-chntpw-build-arch-autodetect.patch
diff --git a/pkgs/tools/security/chntpw/01-chntpw-install-target.patch b/pkgs/by-name/ch/chntpw/01-chntpw-install-target.patch
similarity index 100%
rename from pkgs/tools/security/chntpw/01-chntpw-install-target.patch
rename to pkgs/by-name/ch/chntpw/01-chntpw-install-target.patch
diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/by-name/ch/chntpw/package.nix
similarity index 100%
rename from pkgs/tools/security/chntpw/default.nix
rename to pkgs/by-name/ch/chntpw/package.nix
diff --git a/pkgs/games/doom-ports/chocolate-doom/default.nix b/pkgs/by-name/ch/chocolate-doom/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/chocolate-doom/default.nix
rename to pkgs/by-name/ch/chocolate-doom/package.nix
diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/by-name/ch/cholmod-extra/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/cholmod-extra/default.nix
rename to pkgs/by-name/ch/cholmod-extra/package.nix
diff --git a/pkgs/data/fonts/chonburi/default.nix b/pkgs/by-name/ch/chonburi-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/chonburi/default.nix
rename to pkgs/by-name/ch/chonburi-font/package.nix
diff --git a/pkgs/tools/text/choose/default.nix b/pkgs/by-name/ch/choose/package.nix
similarity index 100%
rename from pkgs/tools/text/choose/default.nix
rename to pkgs/by-name/ch/choose/package.nix
diff --git a/pkgs/tools/security/chopchop/default.nix b/pkgs/by-name/ch/chopchop/package.nix
similarity index 100%
rename from pkgs/tools/security/chopchop/default.nix
rename to pkgs/by-name/ch/chopchop/package.nix
diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/by-name/ch/chroma/package.nix
similarity index 100%
rename from pkgs/tools/text/chroma/default.nix
rename to pkgs/by-name/ch/chroma/package.nix
diff --git a/pkgs/tools/text/chroma/src.json b/pkgs/by-name/ch/chroma/src.json
similarity index 100%
rename from pkgs/tools/text/chroma/src.json
rename to pkgs/by-name/ch/chroma/src.json
diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/by-name/ch/chromaprint/package.nix
similarity index 100%
rename from pkgs/development/libraries/chromaprint/default.nix
rename to pkgs/by-name/ch/chromaprint/package.nix
diff --git a/pkgs/tools/misc/chrome-export/default.nix b/pkgs/by-name/ch/chrome-export/package.nix
similarity index 100%
rename from pkgs/tools/misc/chrome-export/default.nix
rename to pkgs/by-name/ch/chrome-export/package.nix
diff --git a/pkgs/os-specific/linux/chromium-xorg-conf/default.nix b/pkgs/by-name/ch/chromium-xorg-conf/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/chromium-xorg-conf/default.nix
rename to pkgs/by-name/ch/chromium-xorg-conf/package.nix
diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/by-name/ch/chrpath/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/chrpath/default.nix
rename to pkgs/by-name/ch/chrpath/package.nix
diff --git a/pkgs/development/tools/misc/chruby-fish/default.nix b/pkgs/by-name/ch/chruby-fish/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/chruby-fish/default.nix
rename to pkgs/by-name/ch/chruby-fish/package.nix
diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/by-name/ch/cht-sh/package.nix
similarity index 100%
rename from pkgs/tools/misc/cht.sh/default.nix
rename to pkgs/by-name/ch/cht-sh/package.nix
diff --git a/pkgs/data/fonts/chunk/default.nix b/pkgs/by-name/ch/chunk/package.nix
similarity index 100%
rename from pkgs/data/fonts/chunk/default.nix
rename to pkgs/by-name/ch/chunk/package.nix
diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/by-name/ch/chunkfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/chunkfs/default.nix
rename to pkgs/by-name/ch/chunkfs/package.nix
diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/by-name/ch/chunksync/package.nix
similarity index 100%
rename from pkgs/tools/backup/chunksync/default.nix
rename to pkgs/by-name/ch/chunksync/package.nix
diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/by-name/ci/ciao/package.nix
similarity index 100%
rename from pkgs/development/compilers/ciao/default.nix
rename to pkgs/by-name/ci/ciao/package.nix
diff --git a/pkgs/tools/misc/cicero-tui/Cargo.lock b/pkgs/by-name/ci/cicero-tui/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/cicero-tui/Cargo.lock
rename to pkgs/by-name/ci/cicero-tui/Cargo.lock
diff --git a/pkgs/tools/misc/cicero-tui/default.nix b/pkgs/by-name/ci/cicero-tui/package.nix
similarity index 100%
rename from pkgs/tools/misc/cicero-tui/default.nix
rename to pkgs/by-name/ci/cicero-tui/package.nix
diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/by-name/ci/cider/package.nix
similarity index 100%
rename from pkgs/applications/audio/cider/default.nix
rename to pkgs/by-name/ci/cider/package.nix
diff --git a/pkgs/tools/text/cidrgrep/default.nix b/pkgs/by-name/ci/cidrgrep/package.nix
similarity index 100%
rename from pkgs/tools/text/cidrgrep/default.nix
rename to pkgs/by-name/ci/cidrgrep/package.nix
diff --git a/pkgs/tools/security/cie-middleware-linux/deps.json b/pkgs/by-name/ci/cie-middleware-linux/deps.json
similarity index 100%
rename from pkgs/tools/security/cie-middleware-linux/deps.json
rename to pkgs/by-name/ci/cie-middleware-linux/deps.json
diff --git a/pkgs/tools/security/cie-middleware-linux/default.nix b/pkgs/by-name/ci/cie-middleware-linux/package.nix
similarity index 100%
rename from pkgs/tools/security/cie-middleware-linux/default.nix
rename to pkgs/by-name/ci/cie-middleware-linux/package.nix
diff --git a/pkgs/tools/security/cie-middleware-linux/use-system-podofo.patch b/pkgs/by-name/ci/cie-middleware-linux/use-system-podofo.patch
similarity index 100%
rename from pkgs/tools/security/cie-middleware-linux/use-system-podofo.patch
rename to pkgs/by-name/ci/cie-middleware-linux/use-system-podofo.patch
diff --git a/pkgs/tools/package-management/ciel/Cargo.lock b/pkgs/by-name/ci/ciel/Cargo.lock
similarity index 100%
rename from pkgs/tools/package-management/ciel/Cargo.lock
rename to pkgs/by-name/ci/ciel/Cargo.lock
diff --git a/pkgs/tools/package-management/ciel/default.nix b/pkgs/by-name/ci/ciel/package.nix
similarity index 100%
rename from pkgs/tools/package-management/ciel/default.nix
rename to pkgs/by-name/ci/ciel/package.nix
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/by-name/ci/cifs-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/cifs-utils/default.nix
rename to pkgs/by-name/ci/cifs-utils/package.nix
diff --git a/pkgs/development/libraries/science/biology/ciftilib/default.nix b/pkgs/by-name/ci/ciftilib/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/ciftilib/default.nix
rename to pkgs/by-name/ci/ciftilib/package.nix
diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/by-name/ci/cilium-cli/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/cilium/default.nix
rename to pkgs/by-name/ci/cilium-cli/package.nix
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/by-name/ci/cinelerra/package.nix
similarity index 100%
rename from pkgs/applications/video/cinelerra/default.nix
rename to pkgs/by-name/ci/cinelerra/package.nix
diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/by-name/ci/ciopfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/ciopfs/default.nix
rename to pkgs/by-name/ci/ciopfs/package.nix
diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/by-name/ci/cipher/package.nix
similarity index 100%
rename from pkgs/applications/misc/cipher/default.nix
rename to pkgs/by-name/ci/cipher/package.nix
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/by-name/ci/circleci-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/circleci-cli/default.nix
rename to pkgs/by-name/ci/circleci-cli/package.nix
diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/by-name/ci/circumflex/package.nix
similarity index 100%
rename from pkgs/applications/networking/circumflex/default.nix
rename to pkgs/by-name/ci/circumflex/package.nix
diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/by-name/ci/circup/package.nix
similarity index 100%
rename from pkgs/development/tools/circup/default.nix
rename to pkgs/by-name/ci/circup/package.nix
diff --git a/pkgs/tools/security/cirrusgo/default.nix b/pkgs/by-name/ci/cirrusgo/package.nix
similarity index 100%
rename from pkgs/tools/security/cirrusgo/default.nix
rename to pkgs/by-name/ci/cirrusgo/package.nix
diff --git a/pkgs/development/libraries/cista/default.nix b/pkgs/by-name/ci/cista/package.nix
similarity index 100%
rename from pkgs/development/libraries/cista/default.nix
rename to pkgs/by-name/ci/cista/package.nix
diff --git a/pkgs/tools/misc/citron/default.nix b/pkgs/by-name/ci/citron/package.nix
similarity index 100%
rename from pkgs/tools/misc/citron/default.nix
rename to pkgs/by-name/ci/citron/package.nix
diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/by-name/ci/civetweb/package.nix
similarity index 100%
rename from pkgs/development/libraries/civetweb/default.nix
rename to pkgs/by-name/ci/civetweb/package.nix
diff --git a/pkgs/tools/admin/cjdns-tools/default.nix b/pkgs/by-name/cj/cjdns-tools/package.nix
similarity index 100%
rename from pkgs/tools/admin/cjdns-tools/default.nix
rename to pkgs/by-name/cj/cjdns-tools/package.nix
diff --git a/pkgs/tools/admin/cjdns-tools/wrapper.sh b/pkgs/by-name/cj/cjdns-tools/wrapper.sh
similarity index 100%
rename from pkgs/tools/admin/cjdns-tools/wrapper.sh
rename to pkgs/by-name/cj/cjdns-tools/wrapper.sh
diff --git a/pkgs/tools/networking/cjdns/Cargo.lock b/pkgs/by-name/cj/cjdns/Cargo.lock
similarity index 100%
rename from pkgs/tools/networking/cjdns/Cargo.lock
rename to pkgs/by-name/cj/cjdns/Cargo.lock
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/by-name/cj/cjdns/package.nix
similarity index 100%
rename from pkgs/tools/networking/cjdns/default.nix
rename to pkgs/by-name/cj/cjdns/package.nix
diff --git a/pkgs/tools/networking/cjdns/system-libsodium.patch b/pkgs/by-name/cj/cjdns/system-libsodium.patch
similarity index 100%
rename from pkgs/tools/networking/cjdns/system-libsodium.patch
rename to pkgs/by-name/cj/cjdns/system-libsodium.patch
diff --git a/pkgs/development/libraries/cjose/default.nix b/pkgs/by-name/cj/cjose/package.nix
similarity index 100%
rename from pkgs/development/libraries/cjose/default.nix
rename to pkgs/by-name/cj/cjose/package.nix
diff --git a/pkgs/development/libraries/cjson/default.nix b/pkgs/by-name/cj/cjson/package.nix
similarity index 100%
rename from pkgs/development/libraries/cjson/default.nix
rename to pkgs/by-name/cj/cjson/package.nix
diff --git a/pkgs/games/ckan/default.nix b/pkgs/by-name/ck/ckan/package.nix
similarity index 100%
rename from pkgs/games/ckan/default.nix
rename to pkgs/by-name/ck/ckan/package.nix
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/by-name/ck/ckbcomp/package.nix
similarity index 100%
rename from pkgs/tools/X11/ckbcomp/default.nix
rename to pkgs/by-name/ck/ckbcomp/package.nix
diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/by-name/ck/cksfv/package.nix
similarity index 100%
rename from pkgs/tools/networking/cksfv/default.nix
rename to pkgs/by-name/ck/cksfv/package.nix
diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/by-name/cl/cl-launch/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/cl-launch/default.nix
rename to pkgs/by-name/cl/cl-launch/package.nix
diff --git a/pkgs/games/cl-wordle/default.nix b/pkgs/by-name/cl/cl-wordle/package.nix
similarity index 100%
rename from pkgs/games/cl-wordle/default.nix
rename to pkgs/by-name/cl/cl-wordle/package.nix
diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/by-name/cl/cl/package.nix
similarity index 100%
rename from pkgs/development/libraries/cl/default.nix
rename to pkgs/by-name/cl/cl/package.nix
diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/by-name/cl/clac/package.nix
similarity index 100%
rename from pkgs/tools/misc/clac/default.nix
rename to pkgs/by-name/cl/clac/package.nix
diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/by-name/cl/clair/package.nix
similarity index 100%
rename from pkgs/tools/admin/clair/default.nix
rename to pkgs/by-name/cl/clair/package.nix
diff --git a/pkgs/tools/security/clairvoyance/default.nix b/pkgs/by-name/cl/clairvoyance/package.nix
similarity index 100%
rename from pkgs/tools/security/clairvoyance/default.nix
rename to pkgs/by-name/cl/clairvoyance/package.nix
diff --git a/pkgs/servers/mail/clamsmtp/header-order.patch b/pkgs/by-name/cl/clamsmtp/header-order.patch
similarity index 100%
rename from pkgs/servers/mail/clamsmtp/header-order.patch
rename to pkgs/by-name/cl/clamsmtp/header-order.patch
diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/by-name/cl/clamsmtp/package.nix
similarity index 100%
rename from pkgs/servers/mail/clamsmtp/default.nix
rename to pkgs/by-name/cl/clamsmtp/package.nix
diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/by-name/cl/clanlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/clanlib/default.nix
rename to pkgs/by-name/cl/clanlib/package.nix
diff --git a/pkgs/development/libraries/clap/default.nix b/pkgs/by-name/cl/clap/package.nix
similarity index 100%
rename from pkgs/development/libraries/clap/default.nix
rename to pkgs/by-name/cl/clap/package.nix
diff --git a/pkgs/tools/wayland/clapboard/default.nix b/pkgs/by-name/cl/clapboard/package.nix
similarity index 100%
rename from pkgs/tools/wayland/clapboard/default.nix
rename to pkgs/by-name/cl/clapboard/package.nix
diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/by-name/cl/clapper/package.nix
similarity index 100%
rename from pkgs/applications/video/clapper/default.nix
rename to pkgs/by-name/cl/clapper/package.nix
diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/by-name/cl/classads/package.nix
similarity index 100%
rename from pkgs/development/libraries/classads/default.nix
rename to pkgs/by-name/cl/classads/package.nix
diff --git a/pkgs/games/classicube/fix-linking.patch b/pkgs/by-name/cl/classicube/fix-linking.patch
similarity index 100%
rename from pkgs/games/classicube/fix-linking.patch
rename to pkgs/by-name/cl/classicube/fix-linking.patch
diff --git a/pkgs/games/classicube/font-location.patch b/pkgs/by-name/cl/classicube/font-location.patch
similarity index 100%
rename from pkgs/games/classicube/font-location.patch
rename to pkgs/by-name/cl/classicube/font-location.patch
diff --git a/pkgs/games/classicube/default.nix b/pkgs/by-name/cl/classicube/package.nix
similarity index 100%
rename from pkgs/games/classicube/default.nix
rename to pkgs/by-name/cl/classicube/package.nix
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/mime.patch b/pkgs/by-name/cl/claws-mail/mime.patch
similarity index 100%
rename from pkgs/applications/networking/mailreaders/claws-mail/mime.patch
rename to pkgs/by-name/cl/claws-mail/mime.patch
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/by-name/cl/claws-mail/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/claws-mail/default.nix
rename to pkgs/by-name/cl/claws-mail/package.nix
diff --git a/pkgs/tools/misc/claws/default.nix b/pkgs/by-name/cl/claws/package.nix
similarity index 100%
rename from pkgs/tools/misc/claws/default.nix
rename to pkgs/by-name/cl/claws/package.nix
diff --git a/pkgs/development/libraries/science/math/clblast/default.nix b/pkgs/by-name/cl/clblast/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/clblast/default.nix
rename to pkgs/by-name/cl/clblast/package.nix
diff --git a/pkgs/applications/blockchains/clboss/default.nix b/pkgs/by-name/cl/clboss/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/clboss/default.nix
rename to pkgs/by-name/cl/clboss/package.nix
diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/by-name/cl/cldr-annotations/package.nix
similarity index 100%
rename from pkgs/data/misc/cldr-annotations/default.nix
rename to pkgs/by-name/cl/cldr-annotations/package.nix
diff --git a/pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch b/pkgs/by-name/cl/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch
similarity index 100%
rename from pkgs/development/compilers/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch
rename to pkgs/by-name/cl/clean/chroot-build-support-do-not-rebuild-equal-timestamps.patch
diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/by-name/cl/clean/package.nix
similarity index 100%
rename from pkgs/development/compilers/clean/default.nix
rename to pkgs/by-name/cl/clean/package.nix
diff --git a/pkgs/data/themes/clearlooks-phenix/default.nix b/pkgs/by-name/cl/clearlooks-phenix/package.nix
similarity index 100%
rename from pkgs/data/themes/clearlooks-phenix/default.nix
rename to pkgs/by-name/cl/clearlooks-phenix/package.nix
diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/by-name/cl/clearlyU/package.nix
similarity index 100%
rename from pkgs/data/fonts/clearlyU/default.nix
rename to pkgs/by-name/cl/clearlyU/package.nix
diff --git a/pkgs/tools/misc/clematis/default.nix b/pkgs/by-name/cl/clematis/package.nix
similarity index 100%
rename from pkgs/tools/misc/clematis/default.nix
rename to pkgs/by-name/cl/clematis/package.nix
diff --git a/pkgs/applications/file-managers/clex/default.nix b/pkgs/by-name/cl/clex/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/clex/default.nix
rename to pkgs/by-name/cl/clex/package.nix
diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/by-name/cl/clfft/package.nix
similarity index 100%
rename from pkgs/development/libraries/clfft/default.nix
rename to pkgs/by-name/cl/clfft/package.nix
diff --git a/pkgs/development/libraries/physics/clhep/default.nix b/pkgs/by-name/cl/clhep/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/clhep/default.nix
rename to pkgs/by-name/cl/clhep/package.nix
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/by-name/cl/cli-visualizer/package.nix
similarity index 100%
rename from pkgs/applications/misc/cli-visualizer/default.nix
rename to pkgs/by-name/cl/cli-visualizer/package.nix
diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/by-name/cl/cli53/package.nix
similarity index 100%
rename from pkgs/tools/admin/cli53/default.nix
rename to pkgs/by-name/cl/cli53/package.nix
diff --git a/pkgs/tools/security/cliam/default.nix b/pkgs/by-name/cl/cliam/package.nix
similarity index 100%
rename from pkgs/tools/security/cliam/default.nix
rename to pkgs/by-name/cl/cliam/package.nix
diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/by-name/cl/clib/package.nix
similarity index 100%
rename from pkgs/tools/package-management/clib/default.nix
rename to pkgs/by-name/cl/clib/package.nix
diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/by-name/cl/click/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/click/default.nix
rename to pkgs/by-name/cl/click/package.nix
diff --git a/pkgs/tools/misc/clickclack/default.nix b/pkgs/by-name/cl/clickclack/package.nix
similarity index 100%
rename from pkgs/tools/misc/clickclack/default.nix
rename to pkgs/by-name/cl/clickclack/package.nix
diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix
similarity index 100%
rename from pkgs/development/tools/database/clickhouse-backup/default.nix
rename to pkgs/by-name/cl/clickhouse-backup/package.nix
diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/by-name/cl/client-ip-echo/client-ip-echo.nix
similarity index 100%
rename from pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
rename to pkgs/by-name/cl/client-ip-echo/client-ip-echo.nix
diff --git a/pkgs/servers/misc/client-ip-echo/default.nix b/pkgs/by-name/cl/client-ip-echo/package.nix
similarity index 100%
rename from pkgs/servers/misc/client-ip-echo/default.nix
rename to pkgs/by-name/cl/client-ip-echo/package.nix
diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/by-name/cl/clifm/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/clifm/default.nix
rename to pkgs/by-name/cl/clifm/package.nix
diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/by-name/cl/clightning/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/clightning/default.nix
rename to pkgs/by-name/cl/clightning/package.nix
diff --git a/pkgs/tools/text/clima/default.nix b/pkgs/by-name/cl/clima/package.nix
similarity index 100%
rename from pkgs/tools/text/clima/default.nix
rename to pkgs/by-name/cl/clima/package.nix
diff --git a/pkgs/development/interpreters/cling/no-clang-cpp.patch b/pkgs/by-name/cl/cling/no-clang-cpp.patch
similarity index 100%
rename from pkgs/development/interpreters/cling/no-clang-cpp.patch
rename to pkgs/by-name/cl/cling/no-clang-cpp.patch
diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/by-name/cl/cling/package.nix
similarity index 100%
rename from pkgs/development/interpreters/cling/default.nix
rename to pkgs/by-name/cl/cling/package.nix
diff --git a/pkgs/tools/misc/clini/default.nix b/pkgs/by-name/cl/clini/package.nix
similarity index 100%
rename from pkgs/tools/misc/clini/default.nix
rename to pkgs/by-name/cl/clini/package.nix
diff --git a/pkgs/tools/misc/clipboard-jh/default.nix b/pkgs/by-name/cl/clipboard-jh/package.nix
similarity index 100%
rename from pkgs/tools/misc/clipboard-jh/default.nix
rename to pkgs/by-name/cl/clipboard-jh/package.nix
diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/by-name/cl/clipit/package.nix
similarity index 100%
rename from pkgs/applications/misc/clipit/default.nix
rename to pkgs/by-name/cl/clipit/package.nix
diff --git a/pkgs/tools/wayland/clipman/default.nix b/pkgs/by-name/cl/clipman/package.nix
similarity index 100%
rename from pkgs/tools/wayland/clipman/default.nix
rename to pkgs/by-name/cl/clipman/package.nix
diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/by-name/cl/clipmenu/package.nix
similarity index 100%
rename from pkgs/applications/misc/clipmenu/default.nix
rename to pkgs/by-name/cl/clipmenu/package.nix
diff --git a/pkgs/tools/misc/clipnotify/default.nix b/pkgs/by-name/cl/clipnotify/package.nix
similarity index 100%
rename from pkgs/tools/misc/clipnotify/default.nix
rename to pkgs/by-name/cl/clipnotify/package.nix
diff --git a/pkgs/development/libraries/clipp/clipp.pc b/pkgs/by-name/cl/clipp/clipp.pc
similarity index 100%
rename from pkgs/development/libraries/clipp/clipp.pc
rename to pkgs/by-name/cl/clipp/clipp.pc
diff --git a/pkgs/development/libraries/clipp/default.nix b/pkgs/by-name/cl/clipp/package.nix
similarity index 100%
rename from pkgs/development/libraries/clipp/default.nix
rename to pkgs/by-name/cl/clipp/package.nix
diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/by-name/cl/clipper/package.nix
similarity index 100%
rename from pkgs/development/libraries/clipper/default.nix
rename to pkgs/by-name/cl/clipper/package.nix
diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/by-name/cl/clipqr/package.nix
similarity index 100%
rename from pkgs/applications/misc/clipqr/default.nix
rename to pkgs/by-name/cl/clipqr/package.nix
diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/by-name/cl/clips/package.nix
similarity index 100%
rename from pkgs/development/interpreters/clips/default.nix
rename to pkgs/by-name/cl/clips/package.nix
diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/by-name/cl/clipster/package.nix
similarity index 100%
rename from pkgs/tools/misc/clipster/default.nix
rename to pkgs/by-name/cl/clipster/package.nix
diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/by-name/cl/cliquer/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/cliquer/default.nix
rename to pkgs/by-name/cl/cliquer/package.nix
diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/by-name/cl/clj-kondo/package.nix
similarity index 100%
rename from pkgs/development/tools/clj-kondo/default.nix
rename to pkgs/by-name/cl/clj-kondo/package.nix
diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/by-name/cl/clmagma/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/clmagma/default.nix
rename to pkgs/by-name/cl/clmagma/package.nix
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/by-name/cl/cln/package.nix
similarity index 100%
rename from pkgs/development/libraries/cln/default.nix
rename to pkgs/by-name/cl/cln/package.nix
diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/by-name/cl/cloc/package.nix
similarity index 100%
rename from pkgs/tools/misc/cloc/default.nix
rename to pkgs/by-name/cl/cloc/package.nix
diff --git a/pkgs/applications/office/clockify/default.nix b/pkgs/by-name/cl/clockify/package.nix
similarity index 100%
rename from pkgs/applications/office/clockify/default.nix
rename to pkgs/by-name/cl/clockify/package.nix
diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/by-name/cl/clog-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/clog-cli/default.nix
rename to pkgs/by-name/cl/clog-cli/package.nix
diff --git a/pkgs/tools/misc/clolcat/default.nix b/pkgs/by-name/cl/clolcat/package.nix
similarity index 100%
rename from pkgs/tools/misc/clolcat/default.nix
rename to pkgs/by-name/cl/clolcat/package.nix
diff --git a/pkgs/games/clonehero/default.nix b/pkgs/by-name/cl/clonehero/package.nix
similarity index 100%
rename from pkgs/games/clonehero/default.nix
rename to pkgs/by-name/cl/clonehero/package.nix
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/by-name/cl/closurecompiler/package.nix
similarity index 100%
rename from pkgs/development/compilers/closure/default.nix
rename to pkgs/by-name/cl/closurecompiler/package.nix
diff --git a/pkgs/tools/networking/cloud-custodian/default.nix b/pkgs/by-name/cl/cloud-custodian/package.nix
similarity index 100%
rename from pkgs/tools/networking/cloud-custodian/default.nix
rename to pkgs/by-name/cl/cloud-custodian/package.nix
diff --git a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/pkgs/by-name/cl/cloud-hypervisor/Cargo.lock
similarity index 100%
rename from pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock
rename to pkgs/by-name/cl/cloud-hypervisor/Cargo.lock
diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/cloud-hypervisor/default.nix
rename to pkgs/by-name/cl/cloud-hypervisor/package.nix
diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/by-name/cl/cloud-nuke/package.nix
similarity index 100%
rename from pkgs/development/tools/cloud-nuke/default.nix
rename to pkgs/by-name/cl/cloud-nuke/package.nix
diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/by-name/cl/cloud-utils/package.nix
similarity index 100%
rename from pkgs/tools/misc/cloud-utils/default.nix
rename to pkgs/by-name/cl/cloud-utils/package.nix
diff --git a/pkgs/tools/security/cloudbrute/default.nix b/pkgs/by-name/cl/cloudbrute/package.nix
similarity index 100%
rename from pkgs/tools/security/cloudbrute/default.nix
rename to pkgs/by-name/cl/cloudbrute/package.nix
diff --git a/pkgs/applications/networking/cloudflare-dyndns/default.nix b/pkgs/by-name/cl/cloudflare-dyndns/package.nix
similarity index 100%
rename from pkgs/applications/networking/cloudflare-dyndns/default.nix
rename to pkgs/by-name/cl/cloudflare-dyndns/package.nix
diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix
similarity index 100%
rename from pkgs/tools/networking/cloudflare-warp/default.nix
rename to pkgs/by-name/cl/cloudflare-warp/package.nix
diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/by-name/cl/cloudfoundry-cli/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
rename to pkgs/by-name/cl/cloudfoundry-cli/package.nix
diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/by-name/cl/cloudfox/package.nix
similarity index 100%
rename from pkgs/tools/security/cloudfox/default.nix
rename to pkgs/by-name/cl/cloudfox/package.nix
diff --git a/pkgs/tools/security/cloudhunter/default.nix b/pkgs/by-name/cl/cloudhunter/package.nix
similarity index 100%
rename from pkgs/tools/security/cloudhunter/default.nix
rename to pkgs/by-name/cl/cloudhunter/package.nix
diff --git a/pkgs/tools/security/cloudlist/default.nix b/pkgs/by-name/cl/cloudlist/package.nix
similarity index 100%
rename from pkgs/tools/security/cloudlist/default.nix
rename to pkgs/by-name/cl/cloudlist/package.nix
diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/by-name/cl/cloudlog/package.nix
similarity index 100%
rename from pkgs/applications/radio/cloudlog/default.nix
rename to pkgs/by-name/cl/cloudlog/package.nix
diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/by-name/cl/cloudmonkey/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/cloudmonkey/default.nix
rename to pkgs/by-name/cl/cloudmonkey/package.nix
diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/by-name/cl/cloudsmith-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/cloudsmith-cli/default.nix
rename to pkgs/by-name/cl/cloudsmith-cli/package.nix
diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/by-name/cl/clp/package.nix
similarity index 100%
rename from pkgs/applications/science/math/clp/default.nix
rename to pkgs/by-name/cl/clp/package.nix
diff --git a/pkgs/tools/misc/clpeak/clpeak-clhpp2.diff b/pkgs/by-name/cl/clpeak/clpeak-clhpp2.diff
similarity index 100%
rename from pkgs/tools/misc/clpeak/clpeak-clhpp2.diff
rename to pkgs/by-name/cl/clpeak/clpeak-clhpp2.diff
diff --git a/pkgs/tools/misc/clpeak/default.nix b/pkgs/by-name/cl/clpeak/package.nix
similarity index 100%
rename from pkgs/tools/misc/clpeak/default.nix
rename to pkgs/by-name/cl/clpeak/package.nix
diff --git a/pkgs/tools/misc/clubhouse-cli/default.nix b/pkgs/by-name/cl/clubhouse-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/clubhouse-cli/default.nix
rename to pkgs/by-name/cl/clubhouse-cli/package.nix
diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/by-name/cl/clustal-omega/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/clustal-omega/default.nix
rename to pkgs/by-name/cl/clustal-omega/package.nix
diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/by-name/cl/clusterctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/clusterctl/default.nix
rename to pkgs/by-name/cl/clusterctl/package.nix
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/by-name/cl/clutter-gtk/package.nix
similarity index 100%
rename from pkgs/development/libraries/clutter-gtk/default.nix
rename to pkgs/by-name/cl/clutter-gtk/package.nix
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/by-name/cl/clutter/package.nix
similarity index 100%
rename from pkgs/development/libraries/clutter/default.nix
rename to pkgs/by-name/cl/clutter/package.nix
diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/by-name/cm/cm256cc/package.nix
similarity index 100%
rename from pkgs/development/libraries/cm256cc/default.nix
rename to pkgs/by-name/cm/cm256cc/package.nix
diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/by-name/cm/cm_unicode/package.nix
similarity index 100%
rename from pkgs/data/fonts/cm-unicode/default.nix
rename to pkgs/by-name/cm/cm_unicode/package.nix
diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/by-name/cm/cmark-gfm/package.nix
similarity index 100%
rename from pkgs/development/libraries/cmark-gfm/default.nix
rename to pkgs/by-name/cm/cmark-gfm/package.nix
diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/by-name/cm/cmark/package.nix
similarity index 100%
rename from pkgs/development/libraries/cmark/default.nix
rename to pkgs/by-name/cm/cmark/package.nix
diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/by-name/cm/cmctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/cmctl/default.nix
rename to pkgs/by-name/cm/cmctl/package.nix
diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/by-name/cm/cmdstan/package.nix
similarity index 100%
rename from pkgs/development/compilers/cmdstan/default.nix
rename to pkgs/by-name/cm/cmdstan/package.nix
diff --git a/pkgs/tools/text/cmigemo/no-http-tool-check.patch b/pkgs/by-name/cm/cmigemo/no-http-tool-check.patch
similarity index 100%
rename from pkgs/tools/text/cmigemo/no-http-tool-check.patch
rename to pkgs/by-name/cm/cmigemo/no-http-tool-check.patch
diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/by-name/cm/cmigemo/package.nix
similarity index 100%
rename from pkgs/tools/text/cmigemo/default.nix
rename to pkgs/by-name/cm/cmigemo/package.nix
diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/by-name/cm/cminpack/package.nix
similarity index 100%
rename from pkgs/development/libraries/cminpack/default.nix
rename to pkgs/by-name/cm/cminpack/package.nix
diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/by-name/cm/cmocka/package.nix
similarity index 100%
rename from pkgs/development/libraries/cmocka/default.nix
rename to pkgs/by-name/cm/cmocka/package.nix
diff --git a/pkgs/development/libraries/cmocka/uintptr_t.patch b/pkgs/by-name/cm/cmocka/uintptr_t.patch
similarity index 100%
rename from pkgs/development/libraries/cmocka/uintptr_t.patch
rename to pkgs/by-name/cm/cmocka/uintptr_t.patch
diff --git a/pkgs/tools/security/cmospwd/default.nix b/pkgs/by-name/cm/cmospwd/package.nix
similarity index 100%
rename from pkgs/tools/security/cmospwd/default.nix
rename to pkgs/by-name/cm/cmospwd/package.nix
diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/by-name/cm/cmrt/package.nix
similarity index 100%
rename from pkgs/development/libraries/cmrt/default.nix
rename to pkgs/by-name/cm/cmrt/package.nix
diff --git a/pkgs/applications/audio/cmt/default.nix b/pkgs/by-name/cm/cmt/package.nix
similarity index 100%
rename from pkgs/applications/audio/cmt/default.nix
rename to pkgs/by-name/cm/cmt/package.nix
diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/by-name/cm/cmtk/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/cmtk/default.nix
rename to pkgs/by-name/cm/cmtk/package.nix
diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/by-name/cm/cmusfm/package.nix
similarity index 100%
rename from pkgs/applications/audio/cmusfm/default.nix
rename to pkgs/by-name/cm/cmusfm/package.nix
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/by-name/cn/cnijfilter2/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/cnijfilter2/default.nix
rename to pkgs/by-name/cn/cnijfilter2/package.nix
diff --git a/pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch b/pkgs/by-name/cn/cnijfilter2/patches/get_protocol.patch
similarity index 100%
rename from pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch
rename to pkgs/by-name/cn/cnijfilter2/patches/get_protocol.patch
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/by-name/cn/cnijfilter_4_00/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
rename to pkgs/by-name/cn/cnijfilter_4_00/package.nix
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch b/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch
similarity index 100%
rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch
rename to pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-3.80-1-cups-1.6.patch
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch b/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch
similarity index 100%
rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch
rename to pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-3.80-6-cups-1.6.patch
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch b/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch
similarity index 100%
rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch
rename to pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-4-ppd.patch
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch b/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch
similarity index 100%
rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch
rename to pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-5-abi_x86_32.patch
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch b/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch
similarity index 100%
rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch
rename to pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-6-headers.patch
diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch b/pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch
similarity index 100%
rename from pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch
rename to pkgs/by-name/cn/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch
diff --git a/pkgs/tools/networking/cnping/default.nix b/pkgs/by-name/cn/cnping/package.nix
similarity index 100%
rename from pkgs/tools/networking/cnping/default.nix
rename to pkgs/by-name/cn/cnping/package.nix
diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/by-name/cn/cnquery/package.nix
similarity index 100%
rename from pkgs/tools/security/cnquery/default.nix
rename to pkgs/by-name/cn/cnquery/package.nix
diff --git a/pkgs/data/fonts/cnstrokeorder/default.nix b/pkgs/by-name/cn/cnstrokeorder/package.nix
similarity index 100%
rename from pkgs/data/fonts/cnstrokeorder/default.nix
rename to pkgs/by-name/cn/cnstrokeorder/package.nix
diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/by-name/cn/cntlm/package.nix
similarity index 100%
rename from pkgs/tools/networking/cntlm/default.nix
rename to pkgs/by-name/cn/cntlm/package.nix
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/by-name/cn/cntr/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/cntr/default.nix
rename to pkgs/by-name/cn/cntr/package.nix
diff --git a/pkgs/development/tools/analysis/coan/fix-big-endian-config-check.diff b/pkgs/by-name/co/coan/fix-big-endian-config-check.diff
similarity index 100%
rename from pkgs/development/tools/analysis/coan/fix-big-endian-config-check.diff
rename to pkgs/by-name/co/coan/fix-big-endian-config-check.diff
diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/by-name/co/coan/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/coan/default.nix
rename to pkgs/by-name/co/coan/package.nix
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/by-name/co/cockroachdb/package.nix
similarity index 100%
rename from pkgs/servers/sql/cockroachdb/default.nix
rename to pkgs/by-name/co/cockroachdb/package.nix
diff --git a/pkgs/os-specific/darwin/coconutbattery/default.nix b/pkgs/by-name/co/coconutbattery/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/coconutbattery/default.nix
rename to pkgs/by-name/co/coconutbattery/package.nix
diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/by-name/co/cod/package.nix
similarity index 100%
rename from pkgs/tools/misc/cod/default.nix
rename to pkgs/by-name/co/cod/package.nix
diff --git a/pkgs/development/tools/code-maat/default.nix b/pkgs/by-name/co/code-maat/package.nix
similarity index 100%
rename from pkgs/development/tools/code-maat/default.nix
rename to pkgs/by-name/co/code-maat/package.nix
diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/by-name/co/code-minimap/package.nix
similarity index 100%
rename from pkgs/tools/misc/code-minimap/default.nix
rename to pkgs/by-name/co/code-minimap/package.nix
diff --git a/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix b/pkgs/by-name/co/codeberg-pages/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/codeberg-pages/default.nix
rename to pkgs/by-name/co/codeberg-pages/package.nix
diff --git a/pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch b/pkgs/by-name/co/codeblocks/fix-clipboard-flush.patch
similarity index 100%
rename from pkgs/applications/editors/codeblocks/fix-clipboard-flush.patch
rename to pkgs/by-name/co/codeblocks/fix-clipboard-flush.patch
diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/by-name/co/codeblocks/package.nix
similarity index 100%
rename from pkgs/applications/editors/codeblocks/default.nix
rename to pkgs/by-name/co/codeblocks/package.nix
diff --git a/pkgs/applications/editors/codeblocks/writable-projects.patch b/pkgs/by-name/co/codeblocks/writable-projects.patch
similarity index 100%
rename from pkgs/applications/editors/codeblocks/writable-projects.patch
rename to pkgs/by-name/co/codeblocks/writable-projects.patch
diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/by-name/co/codebraid/package.nix
similarity index 100%
rename from pkgs/tools/misc/codebraid/default.nix
rename to pkgs/by-name/co/codebraid/package.nix
diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/by-name/co/codec2/package.nix
similarity index 100%
rename from pkgs/development/libraries/codec2/default.nix
rename to pkgs/by-name/co/codec2/package.nix
diff --git a/pkgs/tools/misc/codemov/fix-build-with-rust-1.80.patch b/pkgs/by-name/co/codemov/fix-build-with-rust-1.80.patch
similarity index 100%
rename from pkgs/tools/misc/codemov/fix-build-with-rust-1.80.patch
rename to pkgs/by-name/co/codemov/fix-build-with-rust-1.80.patch
diff --git a/pkgs/tools/misc/codemov/default.nix b/pkgs/by-name/co/codemov/package.nix
similarity index 100%
rename from pkgs/tools/misc/codemov/default.nix
rename to pkgs/by-name/co/codemov/package.nix
diff --git a/pkgs/development/tools/codeowners/default.nix b/pkgs/by-name/co/codeowners/package.nix
similarity index 100%
rename from pkgs/development/tools/codeowners/default.nix
rename to pkgs/by-name/co/codeowners/package.nix
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/by-name/co/codeql/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/codeql/default.nix
rename to pkgs/by-name/co/codeql/package.nix
diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/by-name/co/codesearch/package.nix
similarity index 100%
rename from pkgs/tools/text/codesearch/default.nix
rename to pkgs/by-name/co/codesearch/package.nix
diff --git a/pkgs/development/tools/codespell/default.nix b/pkgs/by-name/co/codespell/package.nix
similarity index 100%
rename from pkgs/development/tools/codespell/default.nix
rename to pkgs/by-name/co/codespell/package.nix
diff --git a/pkgs/tools/misc/codevis/default.nix b/pkgs/by-name/co/codevis/package.nix
similarity index 100%
rename from pkgs/tools/misc/codevis/default.nix
rename to pkgs/by-name/co/codevis/package.nix
diff --git a/pkgs/tools/security/coercer/default.nix b/pkgs/by-name/co/coercer/package.nix
similarity index 100%
rename from pkgs/tools/security/coercer/default.nix
rename to pkgs/by-name/co/coercer/package.nix
diff --git a/pkgs/development/compilers/coffeescript/default.nix b/pkgs/by-name/co/coffeescript/package.nix
similarity index 100%
rename from pkgs/development/compilers/coffeescript/default.nix
rename to pkgs/by-name/co/coffeescript/package.nix
diff --git a/pkgs/development/web/cog/default.nix b/pkgs/by-name/co/cog/package.nix
similarity index 100%
rename from pkgs/development/web/cog/default.nix
rename to pkgs/by-name/co/cog/package.nix
diff --git a/pkgs/development/libraries/science/math/coin-utils/default.nix b/pkgs/by-name/co/coin-utils/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/coin-utils/default.nix
rename to pkgs/by-name/co/coin-utils/package.nix
diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/by-name/co/coin3d/package.nix
similarity index 100%
rename from pkgs/development/libraries/coin3d/default.nix
rename to pkgs/by-name/co/coin3d/package.nix
diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/by-name/co/cointop/package.nix
similarity index 100%
rename from pkgs/applications/misc/cointop/default.nix
rename to pkgs/by-name/co/cointop/package.nix
diff --git a/pkgs/data/misc/colemak-dh/default.nix b/pkgs/by-name/co/colemak-dh/package.nix
similarity index 100%
rename from pkgs/data/misc/colemak-dh/default.nix
rename to pkgs/by-name/co/colemak-dh/package.nix
diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/by-name/co/colima/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/colima/default.nix
rename to pkgs/by-name/co/colima/package.nix
diff --git a/pkgs/applications/emulators/collapseos-cvm/default.nix b/pkgs/by-name/co/collapseos-cvm/package.nix
similarity index 100%
rename from pkgs/applications/emulators/collapseos-cvm/default.nix
rename to pkgs/by-name/co/collapseos-cvm/package.nix
diff --git a/pkgs/data/themes/colloid-gtk-theme/default.nix b/pkgs/by-name/co/colloid-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/colloid-gtk-theme/default.nix
rename to pkgs/by-name/co/colloid-gtk-theme/package.nix
diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/by-name/co/colloid-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/colloid-icon-theme/default.nix
rename to pkgs/by-name/co/colloid-icon-theme/package.nix
diff --git a/pkgs/development/compilers/colm/cross-compile.patch b/pkgs/by-name/co/colm/cross-compile.patch
similarity index 100%
rename from pkgs/development/compilers/colm/cross-compile.patch
rename to pkgs/by-name/co/colm/cross-compile.patch
diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/by-name/co/colm/package.nix
similarity index 100%
rename from pkgs/development/compilers/colm/default.nix
rename to pkgs/by-name/co/colm/package.nix
diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/by-name/co/colmena/package.nix
similarity index 100%
rename from pkgs/tools/admin/colmena/default.nix
rename to pkgs/by-name/co/colmena/package.nix
diff --git a/pkgs/games/colobot/data.nix b/pkgs/by-name/co/colobot/data.nix
similarity index 100%
rename from pkgs/games/colobot/data.nix
rename to pkgs/by-name/co/colobot/data.nix
diff --git a/pkgs/games/colobot/default.nix b/pkgs/by-name/co/colobot/package.nix
similarity index 100%
rename from pkgs/games/colobot/default.nix
rename to pkgs/by-name/co/colobot/package.nix
diff --git a/pkgs/development/libraries/science/electronics/coloquinte/default.nix b/pkgs/by-name/co/coloquinte/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/electronics/coloquinte/default.nix
rename to pkgs/by-name/co/coloquinte/package.nix
diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/by-name/co/colord-gtk/package.nix
similarity index 100%
rename from pkgs/tools/misc/colord-gtk/default.nix
rename to pkgs/by-name/co/colord-gtk/package.nix
diff --git a/pkgs/tools/misc/colord/installed-tests-path.patch b/pkgs/by-name/co/colord/installed-tests-path.patch
similarity index 100%
rename from pkgs/tools/misc/colord/installed-tests-path.patch
rename to pkgs/by-name/co/colord/installed-tests-path.patch
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/by-name/co/colord/package.nix
similarity index 100%
rename from pkgs/tools/misc/colord/default.nix
rename to pkgs/by-name/co/colord/package.nix
diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/by-name/co/colordiff/package.nix
similarity index 100%
rename from pkgs/tools/text/colordiff/default.nix
rename to pkgs/by-name/co/colordiff/package.nix
diff --git a/pkgs/tools/misc/colorless/default.nix b/pkgs/by-name/co/colorless/package.nix
similarity index 100%
rename from pkgs/tools/misc/colorless/default.nix
rename to pkgs/by-name/co/colorless/package.nix
diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/by-name/co/colormake/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/colormake/default.nix
rename to pkgs/by-name/co/colormake/package.nix
diff --git a/pkgs/tools/misc/colorpanes/default.nix b/pkgs/by-name/co/colorpanes/package.nix
similarity index 100%
rename from pkgs/tools/misc/colorpanes/default.nix
rename to pkgs/by-name/co/colorpanes/package.nix
diff --git a/pkgs/applications/misc/colorstorm/default.nix b/pkgs/by-name/co/colorstorm/package.nix
similarity index 100%
rename from pkgs/applications/misc/colorstorm/default.nix
rename to pkgs/by-name/co/colorstorm/package.nix
diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/by-name/co/colort/package.nix
similarity index 100%
rename from pkgs/applications/misc/colort/default.nix
rename to pkgs/by-name/co/colort/package.nix
diff --git a/pkgs/tools/misc/colorz/default.nix b/pkgs/by-name/co/colorz/package.nix
similarity index 100%
rename from pkgs/tools/misc/colorz/default.nix
rename to pkgs/by-name/co/colorz/package.nix
diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/by-name/co/colpack/package.nix
similarity index 100%
rename from pkgs/applications/science/math/colpack/default.nix
rename to pkgs/by-name/co/colpack/package.nix
diff --git a/pkgs/data/misc/combinatorial_designs/default.nix b/pkgs/by-name/co/combinatorial_designs/package.nix
similarity index 100%
rename from pkgs/data/misc/combinatorial_designs/default.nix
rename to pkgs/by-name/co/combinatorial_designs/package.nix
diff --git a/pkgs/development/libraries/comedilib/default.nix b/pkgs/by-name/co/comedilib/package.nix
similarity index 100%
rename from pkgs/development/libraries/comedilib/default.nix
rename to pkgs/by-name/co/comedilib/package.nix
diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/by-name/co/comfortaa/package.nix
similarity index 100%
rename from pkgs/data/fonts/comfortaa/default.nix
rename to pkgs/by-name/co/comfortaa/package.nix
diff --git a/pkgs/data/fonts/comic-mono/comic-mono-weight.conf b/pkgs/by-name/co/comic-mono/comic-mono-weight.conf
similarity index 100%
rename from pkgs/data/fonts/comic-mono/comic-mono-weight.conf
rename to pkgs/by-name/co/comic-mono/comic-mono-weight.conf
diff --git a/pkgs/data/fonts/comic-mono/default.nix b/pkgs/by-name/co/comic-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/comic-mono/default.nix
rename to pkgs/by-name/co/comic-mono/package.nix
diff --git a/pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf b/pkgs/by-name/co/comic-relief/comic-sans-ms-alias.conf
similarity index 100%
rename from pkgs/data/fonts/comic-relief/comic-sans-ms-alias.conf
rename to pkgs/by-name/co/comic-relief/comic-sans-ms-alias.conf
diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/by-name/co/comic-relief/package.nix
similarity index 100%
rename from pkgs/data/fonts/comic-relief/default.nix
rename to pkgs/by-name/co/comic-relief/package.nix
diff --git a/pkgs/data/icons/comixcursors/makefile-shell-var.patch b/pkgs/by-name/co/comixcursors/makefile-shell-var.patch
similarity index 100%
rename from pkgs/data/icons/comixcursors/makefile-shell-var.patch
rename to pkgs/by-name/co/comixcursors/makefile-shell-var.patch
diff --git a/pkgs/data/icons/comixcursors/default.nix b/pkgs/by-name/co/comixcursors/package.nix
similarity index 100%
rename from pkgs/data/icons/comixcursors/default.nix
rename to pkgs/by-name/co/comixcursors/package.nix
diff --git a/pkgs/tools/package-management/comma/default.nix b/pkgs/by-name/co/comma/package.nix
similarity index 100%
rename from pkgs/tools/package-management/comma/default.nix
rename to pkgs/by-name/co/comma/package.nix
diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/by-name/co/commandergenius/package.nix
similarity index 100%
rename from pkgs/games/commandergenius/default.nix
rename to pkgs/by-name/co/commandergenius/package.nix
diff --git a/pkgs/applications/version-management/commit-formatter/default.nix b/pkgs/by-name/co/commit-formatter/package.nix
similarity index 100%
rename from pkgs/applications/version-management/commit-formatter/default.nix
rename to pkgs/by-name/co/commit-formatter/package.nix
diff --git a/pkgs/data/fonts/commit-mono/default.nix b/pkgs/by-name/co/commit-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/commit-mono/default.nix
rename to pkgs/by-name/co/commit-mono/package.nix
diff --git a/pkgs/tools/security/commix/default.nix b/pkgs/by-name/co/commix/package.nix
similarity index 100%
rename from pkgs/tools/security/commix/default.nix
rename to pkgs/by-name/co/commix/package.nix
diff --git a/pkgs/data/misc/common-licenses/default.nix b/pkgs/by-name/co/common-licenses/package.nix
similarity index 100%
rename from pkgs/data/misc/common-licenses/default.nix
rename to pkgs/by-name/co/common-licenses/package.nix
diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/by-name/co/commonsBcel/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/commons/bcel/default.nix
rename to pkgs/by-name/co/commonsBcel/package.nix
diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/by-name/co/commonsBsf/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/commons/bsf/default.nix
rename to pkgs/by-name/co/commonsBsf/package.nix
diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/by-name/co/commonsCompress/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/commons/compress/default.nix
rename to pkgs/by-name/co/commonsCompress/package.nix
diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/by-name/co/commonsDaemon/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/commons/daemon/default.nix
rename to pkgs/by-name/co/commonsDaemon/package.nix
diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/by-name/co/commonsFileUpload/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/commons/fileupload/default.nix
rename to pkgs/by-name/co/commonsFileUpload/package.nix
diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/by-name/co/commonsIo/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/commons/io/default.nix
rename to pkgs/by-name/co/commonsIo/package.nix
diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/by-name/co/commonsLang/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/commons/lang/default.nix
rename to pkgs/by-name/co/commonsLang/package.nix
diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/by-name/co/commonsLogging/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/commons/logging/default.nix
rename to pkgs/by-name/co/commonsLogging/package.nix
diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/by-name/co/commonsMath/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/commons/math/default.nix
rename to pkgs/by-name/co/commonsMath/package.nix
diff --git a/pkgs/applications/misc/comodoro/default.nix b/pkgs/by-name/co/comodoro/package.nix
similarity index 100%
rename from pkgs/applications/misc/comodoro/default.nix
rename to pkgs/by-name/co/comodoro/package.nix
diff --git a/pkgs/tools/misc/compdb/default.nix b/pkgs/by-name/co/compdb/package.nix
similarity index 100%
rename from pkgs/tools/misc/compdb/default.nix
rename to pkgs/by-name/co/compdb/package.nix
diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/by-name/co/compile-daemon/package.nix
similarity index 100%
rename from pkgs/development/tools/compile-daemon/default.nix
rename to pkgs/by-name/co/compile-daemon/package.nix
diff --git a/pkgs/tools/misc/complete-alias/default.nix b/pkgs/by-name/co/complete-alias/package.nix
similarity index 100%
rename from pkgs/tools/misc/complete-alias/default.nix
rename to pkgs/by-name/co/complete-alias/package.nix
diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/by-name/co/complexity/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/complexity/default.nix
rename to pkgs/by-name/co/complexity/package.nix
diff --git a/pkgs/development/tools/misc/complgen/default.nix b/pkgs/by-name/co/complgen/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/complgen/default.nix
rename to pkgs/by-name/co/complgen/package.nix
diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/by-name/co/compsize/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/compsize/default.nix
rename to pkgs/by-name/co/compsize/package.nix
diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/by-name/co/computecpp-unwrapped/package.nix
similarity index 100%
rename from pkgs/development/compilers/computecpp/default.nix
rename to pkgs/by-name/co/computecpp-unwrapped/package.nix
diff --git a/pkgs/tools/text/comrak/default.nix b/pkgs/by-name/co/comrak/package.nix
similarity index 100%
rename from pkgs/tools/text/comrak/default.nix
rename to pkgs/by-name/co/comrak/package.nix
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/by-name/co/conan/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/conan/default.nix
rename to pkgs/by-name/co/conan/package.nix
diff --git a/pkgs/applications/misc/conceal/default.nix b/pkgs/by-name/co/conceal/package.nix
similarity index 100%
rename from pkgs/applications/misc/conceal/default.nix
rename to pkgs/by-name/co/conceal/package.nix
diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/by-name/co/conda/package.nix
similarity index 100%
rename from pkgs/tools/package-management/conda/default.nix
rename to pkgs/by-name/co/conda/package.nix
diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/by-name/co/conduktor/package.nix
similarity index 100%
rename from pkgs/applications/misc/conduktor/default.nix
rename to pkgs/by-name/co/conduktor/package.nix
diff --git a/pkgs/applications/misc/confetty/default.nix b/pkgs/by-name/co/confetty/package.nix
similarity index 100%
rename from pkgs/applications/misc/confetty/default.nix
rename to pkgs/by-name/co/confetty/package.nix
diff --git a/pkgs/tools/networking/configurable-http-proxy/default.nix b/pkgs/by-name/co/configurable-http-proxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/configurable-http-proxy/default.nix
rename to pkgs/by-name/co/configurable-http-proxy/package.nix
diff --git a/pkgs/servers/confluencepot/default.nix b/pkgs/by-name/co/confluencepot/package.nix
similarity index 100%
rename from pkgs/servers/confluencepot/default.nix
rename to pkgs/by-name/co/confluencepot/package.nix
diff --git a/pkgs/development/tools/confluent-cli/default.nix b/pkgs/by-name/co/confluent-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/confluent-cli/default.nix
rename to pkgs/by-name/co/confluent-cli/package.nix
diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/by-name/co/confluent-platform/package.nix
similarity index 100%
rename from pkgs/servers/confluent-platform/default.nix
rename to pkgs/by-name/co/confluent-platform/package.nix
diff --git a/pkgs/applications/version-management/conform/default.nix b/pkgs/by-name/co/conform/package.nix
similarity index 100%
rename from pkgs/applications/version-management/conform/default.nix
rename to pkgs/by-name/co/conform/package.nix
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/by-name/co/conftest/package.nix
similarity index 100%
rename from pkgs/development/tools/conftest/default.nix
rename to pkgs/by-name/co/conftest/package.nix
diff --git a/pkgs/applications/misc/confy/default.nix b/pkgs/by-name/co/confy/package.nix
similarity index 100%
rename from pkgs/applications/misc/confy/default.nix
rename to pkgs/by-name/co/confy/package.nix
diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/by-name/co/conglomerate/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/conglomerate/default.nix
rename to pkgs/by-name/co/conglomerate/package.nix
diff --git a/pkgs/applications/graphics/conjure/default.nix b/pkgs/by-name/co/conjure/package.nix
similarity index 100%
rename from pkgs/applications/graphics/conjure/default.nix
rename to pkgs/by-name/co/conjure/package.nix
diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/by-name/co/conmon-rs/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/conmon-rs/default.nix
rename to pkgs/by-name/co/conmon-rs/package.nix
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/by-name/co/conmon/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/conmon/default.nix
rename to pkgs/by-name/co/conmon/package.nix
diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/by-name/co/connect/package.nix
similarity index 100%
rename from pkgs/tools/networking/connect/default.nix
rename to pkgs/by-name/co/connect/package.nix
diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/by-name/co/conntrack-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/conntrack-tools/default.nix
rename to pkgs/by-name/co/conntrack-tools/package.nix
diff --git a/pkgs/tools/backup/conserve/default.nix b/pkgs/by-name/co/conserve/package.nix
similarity index 100%
rename from pkgs/tools/backup/conserve/default.nix
rename to pkgs/by-name/co/conserve/package.nix
diff --git a/pkgs/tools/misc/conserver/default.nix b/pkgs/by-name/co/conserver/package.nix
similarity index 100%
rename from pkgs/tools/misc/conserver/default.nix
rename to pkgs/by-name/co/conserver/package.nix
diff --git a/pkgs/development/libraries/console-bridge/default.nix b/pkgs/by-name/co/console-bridge/package.nix
similarity index 100%
rename from pkgs/development/libraries/console-bridge/default.nix
rename to pkgs/by-name/co/console-bridge/package.nix
diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/by-name/co/conspy/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/conspy/default.nix
rename to pkgs/by-name/co/conspy/package.nix
diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/by-name/co/consul-alerts/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/consul-alerts/default.nix
rename to pkgs/by-name/co/consul-alerts/package.nix
diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/by-name/co/consul-template/package.nix
similarity index 100%
rename from pkgs/tools/system/consul-template/default.nix
rename to pkgs/by-name/co/consul-template/package.nix
diff --git a/pkgs/development/tools/container2wasm/default.nix b/pkgs/by-name/co/container2wasm/package.nix
similarity index 100%
rename from pkgs/development/tools/container2wasm/default.nix
rename to pkgs/by-name/co/container2wasm/package.nix
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/by-name/co/containerd/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/containerd/default.nix
rename to pkgs/by-name/co/containerd/package.nix
diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/by-name/co/convbin/package.nix
similarity index 100%
rename from pkgs/tools/misc/convbin/default.nix
rename to pkgs/by-name/co/convbin/package.nix
diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/by-name/co/convchain/package.nix
similarity index 100%
rename from pkgs/tools/graphics/convchain/default.nix
rename to pkgs/by-name/co/convchain/package.nix
diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/by-name/co/convertlit/package.nix
similarity index 100%
rename from pkgs/tools/text/convertlit/default.nix
rename to pkgs/by-name/co/convertlit/package.nix
diff --git a/pkgs/tools/misc/convfont/default.nix b/pkgs/by-name/co/convfont/package.nix
similarity index 100%
rename from pkgs/tools/misc/convfont/default.nix
rename to pkgs/by-name/co/convfont/package.nix
diff --git a/pkgs/tools/misc/convimg/default.nix b/pkgs/by-name/co/convimg/package.nix
similarity index 100%
rename from pkgs/tools/misc/convimg/default.nix
rename to pkgs/by-name/co/convimg/package.nix
diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/by-name/co/convos/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/convos/default.nix
rename to pkgs/by-name/co/convos/package.nix
diff --git a/pkgs/data/fonts/cooper-hewitt/default.nix b/pkgs/by-name/co/cooper-hewitt/package.nix
similarity index 100%
rename from pkgs/data/fonts/cooper-hewitt/default.nix
rename to pkgs/by-name/co/cooper-hewitt/package.nix
diff --git a/pkgs/development/libraries/coordgenlibs/default.nix b/pkgs/by-name/co/coordgenlibs/package.nix
similarity index 100%
rename from pkgs/development/libraries/coordgenlibs/default.nix
rename to pkgs/by-name/co/coordgenlibs/package.nix
diff --git a/pkgs/tools/misc/copier/default.nix b/pkgs/by-name/co/copier/package.nix
similarity index 100%
rename from pkgs/tools/misc/copier/default.nix
rename to pkgs/by-name/co/copier/package.nix
diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/by-name/co/copilot-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/copilot-cli/default.nix
rename to pkgs/by-name/co/copilot-cli/package.nix
diff --git a/pkgs/development/compilers/copper/default.nix b/pkgs/by-name/co/copper/package.nix
similarity index 100%
rename from pkgs/development/compilers/copper/default.nix
rename to pkgs/by-name/co/copper/package.nix
diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/by-name/co/copyright-update/package.nix
similarity index 100%
rename from pkgs/tools/text/copyright-update/default.nix
rename to pkgs/by-name/co/copyright-update/package.nix
diff --git a/pkgs/tools/typesetting/coq2html/default.nix b/pkgs/by-name/co/coq2html/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/coq2html/default.nix
rename to pkgs/by-name/co/coq2html/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/cordless/default.nix b/pkgs/by-name/co/cordless/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/cordless/default.nix
rename to pkgs/by-name/co/cordless/package.nix
diff --git a/pkgs/development/mobile/cordova/default.nix b/pkgs/by-name/co/cordova/package.nix
similarity index 100%
rename from pkgs/development/mobile/cordova/default.nix
rename to pkgs/by-name/co/cordova/package.nix
diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/by-name/co/coredns/package.nix
similarity index 100%
rename from pkgs/servers/dns/coredns/default.nix
rename to pkgs/by-name/co/coredns/package.nix
diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/by-name/co/coreth/package.nix
similarity index 100%
rename from pkgs/applications/networking/coreth/default.nix
rename to pkgs/by-name/co/coreth/package.nix
diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/by-name/co/corkscrew/package.nix
similarity index 100%
rename from pkgs/tools/networking/corkscrew/default.nix
rename to pkgs/by-name/co/corkscrew/package.nix
diff --git a/pkgs/servers/corosync/default.nix b/pkgs/by-name/co/corosync/package.nix
similarity index 100%
rename from pkgs/servers/corosync/default.nix
rename to pkgs/by-name/co/corosync/package.nix
diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/by-name/co/corrosion/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/corrosion/default.nix
rename to pkgs/by-name/co/corrosion/package.nix
diff --git a/pkgs/games/corsix-th/darwin-cmake-no-fixup-bundle.patch b/pkgs/by-name/co/corsix-th/darwin-cmake-no-fixup-bundle.patch
similarity index 100%
rename from pkgs/games/corsix-th/darwin-cmake-no-fixup-bundle.patch
rename to pkgs/by-name/co/corsix-th/darwin-cmake-no-fixup-bundle.patch
diff --git a/pkgs/games/corsix-th/default.nix b/pkgs/by-name/co/corsix-th/package.nix
similarity index 100%
rename from pkgs/games/corsix-th/default.nix
rename to pkgs/by-name/co/corsix-th/package.nix
diff --git a/pkgs/servers/coturn/dont-call-setgroups-unconditionally.patch b/pkgs/by-name/co/coturn/dont-call-setgroups-unconditionally.patch
similarity index 100%
rename from pkgs/servers/coturn/dont-call-setgroups-unconditionally.patch
rename to pkgs/by-name/co/coturn/dont-call-setgroups-unconditionally.patch
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/by-name/co/coturn/package.nix
similarity index 100%
rename from pkgs/servers/coturn/default.nix
rename to pkgs/by-name/co/coturn/package.nix
diff --git a/pkgs/servers/coturn/pure-configure.patch b/pkgs/by-name/co/coturn/pure-configure.patch
similarity index 100%
rename from pkgs/servers/coturn/pure-configure.patch
rename to pkgs/by-name/co/coturn/pure-configure.patch
diff --git a/pkgs/data/fonts/courier-prime/default.nix b/pkgs/by-name/co/courier-prime/package.nix
similarity index 100%
rename from pkgs/data/fonts/courier-prime/default.nix
rename to pkgs/by-name/co/courier-prime/package.nix
diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/by-name/co/coursera-dl/package.nix
similarity index 100%
rename from pkgs/applications/misc/coursera-dl/default.nix
rename to pkgs/by-name/co/coursera-dl/package.nix
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/by-name/co/coursier/package.nix
similarity index 100%
rename from pkgs/development/tools/coursier/default.nix
rename to pkgs/by-name/co/coursier/package.nix
diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/by-name/co/cov-build/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/cov-build/default.nix
rename to pkgs/by-name/co/cov-build/package.nix
diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/by-name/co/cowpatty/package.nix
similarity index 100%
rename from pkgs/tools/security/cowpatty/default.nix
rename to pkgs/by-name/co/cowpatty/package.nix
diff --git a/pkgs/tools/security/coze/default.nix b/pkgs/by-name/co/coze/package.nix
similarity index 100%
rename from pkgs/tools/security/coze/default.nix
rename to pkgs/by-name/co/coze/package.nix
diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/by-name/co/cozette/package.nix
similarity index 100%
rename from pkgs/data/fonts/cozette/default.nix
rename to pkgs/by-name/co/cozette/package.nix
diff --git a/pkgs/applications/networking/cozy-drive/default.nix b/pkgs/by-name/co/cozy-drive/package.nix
similarity index 100%
rename from pkgs/applications/networking/cozy-drive/default.nix
rename to pkgs/by-name/co/cozy-drive/package.nix
diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/by-name/co/cozy/package.nix
similarity index 100%
rename from pkgs/applications/audio/cozy/default.nix
rename to pkgs/by-name/co/cozy/package.nix
diff --git a/pkgs/tools/misc/cp210x-program/default.nix b/pkgs/by-name/cp/cp210x-program/package.nix
similarity index 100%
rename from pkgs/tools/misc/cp210x-program/default.nix
rename to pkgs/by-name/cp/cp210x-program/package.nix
diff --git a/pkgs/tools/misc/cp437/default.nix b/pkgs/by-name/cp/cp437/package.nix
similarity index 100%
rename from pkgs/tools/misc/cp437/default.nix
rename to pkgs/by-name/cp/cp437/package.nix
diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/by-name/cp/cpcfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/cpcfs/default.nix
rename to pkgs/by-name/cp/cpcfs/package.nix
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/by-name/cp/cpio/package.nix
similarity index 100%
rename from pkgs/tools/archivers/cpio/default.nix
rename to pkgs/by-name/cp/cpio/package.nix
diff --git a/pkgs/applications/audio/cplay-ng/default.nix b/pkgs/by-name/cp/cplay-ng/package.nix
similarity index 100%
rename from pkgs/applications/audio/cplay-ng/default.nix
rename to pkgs/by-name/cp/cplay-ng/package.nix
diff --git a/pkgs/development/tools/cpm-cmake/default.nix b/pkgs/by-name/cp/cpm-cmake/package.nix
similarity index 100%
rename from pkgs/development/tools/cpm-cmake/default.nix
rename to pkgs/by-name/cp/cpm-cmake/package.nix
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/by-name/cp/cpp-hocon/package.nix
similarity index 100%
rename from pkgs/development/libraries/cpp-hocon/default.nix
rename to pkgs/by-name/cp/cpp-hocon/package.nix
diff --git a/pkgs/development/libraries/cpp-ipfs-http-client/default.nix b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
similarity index 100%
rename from pkgs/development/libraries/cpp-ipfs-http-client/default.nix
rename to pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
diff --git a/pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch b/pkgs/by-name/cp/cpp-ipfs-http-client/unvendor-nlohmann-json.patch
similarity index 100%
rename from pkgs/development/libraries/cpp-ipfs-http-client/unvendor-nlohmann-json.patch
rename to pkgs/by-name/cp/cpp-ipfs-http-client/unvendor-nlohmann-json.patch
diff --git a/pkgs/development/libraries/cpp-jwt/fix-version.patch b/pkgs/by-name/cp/cpp-jwt/fix-version.patch
similarity index 100%
rename from pkgs/development/libraries/cpp-jwt/fix-version.patch
rename to pkgs/by-name/cp/cpp-jwt/fix-version.patch
diff --git a/pkgs/development/libraries/cpp-jwt/default.nix b/pkgs/by-name/cp/cpp-jwt/package.nix
similarity index 100%
rename from pkgs/development/libraries/cpp-jwt/default.nix
rename to pkgs/by-name/cp/cpp-jwt/package.nix
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/by-name/cp/cpp-netlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/cpp-netlib/default.nix
rename to pkgs/by-name/cp/cpp-netlib/package.nix
diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/by-name/cp/cpp-utilities/package.nix
similarity index 100%
rename from pkgs/development/libraries/cpp-utilities/default.nix
rename to pkgs/by-name/cp/cpp-utilities/package.nix
diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/by-name/cp/cppclean/package.nix
similarity index 100%
rename from pkgs/development/tools/cppclean/default.nix
rename to pkgs/by-name/cp/cppclean/package.nix
diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/by-name/cp/cppcms/package.nix
similarity index 100%
rename from pkgs/development/libraries/cppcms/default.nix
rename to pkgs/by-name/cp/cppcms/package.nix
diff --git a/pkgs/development/libraries/cppcodec/default.nix b/pkgs/by-name/cp/cppcodec/package.nix
similarity index 100%
rename from pkgs/development/libraries/cppcodec/default.nix
rename to pkgs/by-name/cp/cppcodec/package.nix
diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/by-name/cp/cppdb/package.nix
similarity index 100%
rename from pkgs/development/libraries/cppdb/default.nix
rename to pkgs/by-name/cp/cppdb/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/cppe/default.nix b/pkgs/by-name/cp/cppe/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/cppe/default.nix
rename to pkgs/by-name/cp/cppe/package.nix
diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/by-name/cp/cppi/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/cppi/default.nix
rename to pkgs/by-name/cp/cppi/package.nix
diff --git a/pkgs/development/misc/cppreference-doc/default.nix b/pkgs/by-name/cp/cppreference-doc/package.nix
similarity index 100%
rename from pkgs/development/misc/cppreference-doc/default.nix
rename to pkgs/by-name/cp/cppreference-doc/package.nix
diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/by-name/cp/cpptest/package.nix
similarity index 100%
rename from pkgs/development/libraries/cpptest/default.nix
rename to pkgs/by-name/cp/cpptest/package.nix
diff --git a/pkgs/development/libraries/cpptoml/default.nix b/pkgs/by-name/cp/cpptoml/package.nix
similarity index 100%
rename from pkgs/development/libraries/cpptoml/default.nix
rename to pkgs/by-name/cp/cpptoml/package.nix
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/by-name/cp/cppunit/package.nix
similarity index 100%
rename from pkgs/development/libraries/cppunit/default.nix
rename to pkgs/by-name/cp/cppunit/package.nix
diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/by-name/cp/cpputest/package.nix
similarity index 100%
rename from pkgs/development/libraries/cpputest/default.nix
rename to pkgs/by-name/cp/cpputest/package.nix
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/by-name/cp/cppzmq/package.nix
similarity index 100%
rename from pkgs/development/libraries/cppzmq/default.nix
rename to pkgs/by-name/cp/cppzmq/package.nix
diff --git a/pkgs/development/tools/misc/cproto/cproto.patch b/pkgs/by-name/cp/cproto/cproto.patch
similarity index 100%
rename from pkgs/development/tools/misc/cproto/cproto.patch
rename to pkgs/by-name/cp/cproto/cproto.patch
diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/by-name/cp/cproto/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/cproto/default.nix
rename to pkgs/by-name/cp/cproto/package.nix
diff --git a/pkgs/tools/misc/cpufetch/default.nix b/pkgs/by-name/cp/cpufetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/cpufetch/default.nix
rename to pkgs/by-name/cp/cpufetch/package.nix
diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/by-name/cp/cpufrequtils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/cpufrequtils/default.nix
rename to pkgs/by-name/cp/cpufrequtils/package.nix
diff --git a/pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch b/pkgs/by-name/cp/cpufrequtils/remove-pot-creation-date.patch
similarity index 100%
rename from pkgs/os-specific/linux/cpufrequtils/remove-pot-creation-date.patch
rename to pkgs/by-name/cp/cpufrequtils/remove-pot-creation-date.patch
diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/by-name/cp/cpuid/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/cpuid/default.nix
rename to pkgs/by-name/cp/cpuid/package.nix
diff --git a/pkgs/tools/misc/cpulimit/get-missing-basename.patch b/pkgs/by-name/cp/cpulimit/get-missing-basename.patch
similarity index 100%
rename from pkgs/tools/misc/cpulimit/get-missing-basename.patch
rename to pkgs/by-name/cp/cpulimit/get-missing-basename.patch
diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/by-name/cp/cpulimit/package.nix
similarity index 100%
rename from pkgs/tools/misc/cpulimit/default.nix
rename to pkgs/by-name/cp/cpulimit/package.nix
diff --git a/pkgs/tools/misc/cpulimit/remove-sys-sysctl.h.patch b/pkgs/by-name/cp/cpulimit/remove-sys-sysctl.h.patch
similarity index 100%
rename from pkgs/tools/misc/cpulimit/remove-sys-sysctl.h.patch
rename to pkgs/by-name/cp/cpulimit/remove-sys-sysctl.h.patch
diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/by-name/cp/cpuminer/package.nix
similarity index 100%
rename from pkgs/tools/misc/cpuminer/default.nix
rename to pkgs/by-name/cp/cpuminer/package.nix
diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/by-name/cp/cpustat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/cpustat/default.nix
rename to pkgs/by-name/cp/cpustat/package.nix
diff --git a/pkgs/tools/compression/crabz/default.nix b/pkgs/by-name/cr/crabz/package.nix
similarity index 100%
rename from pkgs/tools/compression/crabz/default.nix
rename to pkgs/by-name/cr/crabz/package.nix
diff --git a/pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch b/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch
similarity index 100%
rename from pkgs/games/crack-attack/crack-attack-1.1.14-gcc43.patch
rename to pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-gcc43.patch
diff --git a/pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch b/pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch
similarity index 100%
rename from pkgs/games/crack-attack/crack-attack-1.1.14-glut.patch
rename to pkgs/by-name/cr/crack_attack/crack-attack-1.1.14-glut.patch
diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/by-name/cr/crack_attack/package.nix
similarity index 100%
rename from pkgs/games/crack-attack/default.nix
rename to pkgs/by-name/cr/crack_attack/package.nix
diff --git a/pkgs/tools/networking/crackle/default.nix b/pkgs/by-name/cr/crackle/package.nix
similarity index 100%
rename from pkgs/tools/networking/crackle/default.nix
rename to pkgs/by-name/cr/crackle/package.nix
diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/by-name/cr/cracklib/package.nix
similarity index 100%
rename from pkgs/development/libraries/cracklib/default.nix
rename to pkgs/by-name/cr/cracklib/package.nix
diff --git a/pkgs/tools/security/crackql/default.nix b/pkgs/by-name/cr/crackql/package.nix
similarity index 100%
rename from pkgs/tools/security/crackql/default.nix
rename to pkgs/by-name/cr/crackql/package.nix
diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/by-name/cr/crackxls/package.nix
similarity index 100%
rename from pkgs/tools/security/crackxls/default.nix
rename to pkgs/by-name/cr/crackxls/package.nix
diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/by-name/cr/craftos-pc/package.nix
similarity index 100%
rename from pkgs/applications/emulators/craftos-pc/default.nix
rename to pkgs/by-name/cr/craftos-pc/package.nix
diff --git a/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix b/pkgs/by-name/cr/craftos-pc/test-eval-hello-world/default.nix
similarity index 100%
rename from pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix
rename to pkgs/by-name/cr/craftos-pc/test-eval-hello-world/default.nix
diff --git a/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/init.lua b/pkgs/by-name/cr/craftos-pc/test-eval-hello-world/init.lua
similarity index 100%
rename from pkgs/applications/emulators/craftos-pc/test-eval-hello-world/init.lua
rename to pkgs/by-name/cr/craftos-pc/test-eval-hello-world/init.lua
diff --git a/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix b/pkgs/by-name/cr/craftos-pc/test-eval-periphemu/default.nix
similarity index 100%
rename from pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix
rename to pkgs/by-name/cr/craftos-pc/test-eval-periphemu/default.nix
diff --git a/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/init.lua b/pkgs/by-name/cr/craftos-pc/test-eval-periphemu/init.lua
similarity index 100%
rename from pkgs/applications/emulators/craftos-pc/test-eval-periphemu/init.lua
rename to pkgs/by-name/cr/craftos-pc/test-eval-periphemu/init.lua
diff --git a/pkgs/os-specific/linux/cramfsprogs/include-sysmacros.patch b/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch
similarity index 100%
rename from pkgs/os-specific/linux/cramfsprogs/include-sysmacros.patch
rename to pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch
diff --git a/pkgs/os-specific/linux/cramfsprogs/default.nix b/pkgs/by-name/cr/cramfsprogs/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/cramfsprogs/default.nix
rename to pkgs/by-name/cr/cramfsprogs/package.nix
diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/by-name/cr/cramfsswap/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/cramfsswap/default.nix
rename to pkgs/by-name/cr/cramfsswap/package.nix
diff --git a/pkgs/os-specific/linux/cramfsswap/parallel-make.patch b/pkgs/by-name/cr/cramfsswap/parallel-make.patch
similarity index 100%
rename from pkgs/os-specific/linux/cramfsswap/parallel-make.patch
rename to pkgs/by-name/cr/cramfsswap/parallel-make.patch
diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/by-name/cr/crc32c/package.nix
similarity index 100%
rename from pkgs/development/libraries/crc32c/default.nix
rename to pkgs/by-name/cr/crc32c/package.nix
diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/by-name/cr/crcpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/crcpp/default.nix
rename to pkgs/by-name/cr/crcpp/package.nix
diff --git a/pkgs/development/tools/crd2pulumi/default.nix b/pkgs/by-name/cr/crd2pulumi/package.nix
similarity index 100%
rename from pkgs/development/tools/crd2pulumi/default.nix
rename to pkgs/by-name/cr/crd2pulumi/package.nix
diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/by-name/cr/cre2/package.nix
similarity index 100%
rename from pkgs/development/libraries/cre2/default.nix
rename to pkgs/by-name/cr/cre2/package.nix
diff --git a/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch b/pkgs/by-name/cr/createrepo_c/fix-bash-completion-path.patch
similarity index 100%
rename from pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch
rename to pkgs/by-name/cr/createrepo_c/fix-bash-completion-path.patch
diff --git a/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch b/pkgs/by-name/cr/createrepo_c/fix-python-install-path.patch
similarity index 100%
rename from pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch
rename to pkgs/by-name/cr/createrepo_c/fix-python-install-path.patch
diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/by-name/cr/createrepo_c/package.nix
similarity index 100%
rename from pkgs/tools/package-management/createrepo_c/default.nix
rename to pkgs/by-name/cr/createrepo_c/package.nix
diff --git a/pkgs/tools/security/credential-detector/default.nix b/pkgs/by-name/cr/credential-detector/package.nix
similarity index 100%
rename from pkgs/tools/security/credential-detector/default.nix
rename to pkgs/by-name/cr/credential-detector/package.nix
diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/by-name/cr/credhub-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/credhub-cli/default.nix
rename to pkgs/by-name/cr/credhub-cli/package.nix
diff --git a/pkgs/tools/security/creds/default.nix b/pkgs/by-name/cr/creds/package.nix
similarity index 100%
rename from pkgs/tools/security/creds/default.nix
rename to pkgs/by-name/cr/creds/package.nix
diff --git a/pkgs/tools/security/credslayer/default.nix b/pkgs/by-name/cr/credslayer/package.nix
similarity index 100%
rename from pkgs/tools/security/credslayer/default.nix
rename to pkgs/by-name/cr/credslayer/package.nix
diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/by-name/cr/creep/package.nix
similarity index 100%
rename from pkgs/data/fonts/creep/default.nix
rename to pkgs/by-name/cr/creep/package.nix
diff --git a/pkgs/tools/misc/crex/default.nix b/pkgs/by-name/cr/crex/package.nix
similarity index 100%
rename from pkgs/tools/misc/crex/default.nix
rename to pkgs/by-name/cr/crex/package.nix
diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/by-name/cr/cri-tools/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/cri-tools/default.nix
rename to pkgs/by-name/cr/cri-tools/package.nix
diff --git a/pkgs/data/fonts/crimson-pro/default.nix b/pkgs/by-name/cr/crimson-pro/package.nix
similarity index 100%
rename from pkgs/data/fonts/crimson-pro/default.nix
rename to pkgs/by-name/cr/crimson-pro/package.nix
diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/by-name/cr/crimson/package.nix
similarity index 100%
rename from pkgs/data/fonts/crimson/default.nix
rename to pkgs/by-name/cr/crimson/package.nix
diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/by-name/cr/crip/package.nix
similarity index 100%
rename from pkgs/applications/audio/crip/default.nix
rename to pkgs/by-name/cr/crip/package.nix
diff --git a/pkgs/games/doom-ports/crispy-doom/default.nix b/pkgs/by-name/cr/crispy-doom/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/crispy-doom/default.nix
rename to pkgs/by-name/cr/crispy-doom/package.nix
diff --git a/pkgs/development/tools/rust/critcmp/default.nix b/pkgs/by-name/cr/critcmp/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/critcmp/default.nix
rename to pkgs/by-name/cr/critcmp/package.nix
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/by-name/cr/criu/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/criu/default.nix
rename to pkgs/by-name/cr/criu/package.nix
diff --git a/pkgs/tools/security/crlfsuite/default.nix b/pkgs/by-name/cr/crlfsuite/package.nix
similarity index 100%
rename from pkgs/tools/security/crlfsuite/default.nix
rename to pkgs/by-name/cr/crlfsuite/package.nix
diff --git a/pkgs/tools/security/crlfuzz/default.nix b/pkgs/by-name/cr/crlfuzz/package.nix
similarity index 100%
rename from pkgs/tools/security/crlfuzz/default.nix
rename to pkgs/by-name/cr/crlfuzz/package.nix
diff --git a/pkgs/development/libraries/croaring/fix-pkg-config.patch b/pkgs/by-name/cr/croaring/fix-pkg-config.patch
similarity index 100%
rename from pkgs/development/libraries/croaring/fix-pkg-config.patch
rename to pkgs/by-name/cr/croaring/fix-pkg-config.patch
diff --git a/pkgs/development/libraries/croaring/default.nix b/pkgs/by-name/cr/croaring/package.nix
similarity index 100%
rename from pkgs/development/libraries/croaring/default.nix
rename to pkgs/by-name/cr/croaring/package.nix
diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/by-name/cr/croc/package.nix
similarity index 100%
rename from pkgs/tools/networking/croc/default.nix
rename to pkgs/by-name/cr/croc/package.nix
diff --git a/pkgs/tools/networking/croc/test-local-relay.nix b/pkgs/by-name/cr/croc/test-local-relay.nix
similarity index 100%
rename from pkgs/tools/networking/croc/test-local-relay.nix
rename to pkgs/by-name/cr/croc/test-local-relay.nix
diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/by-name/cr/cromfs/package.nix
similarity index 100%
rename from pkgs/tools/archivers/cromfs/default.nix
rename to pkgs/by-name/cr/cromfs/package.nix
diff --git a/pkgs/development/libraries/crossguid/default.nix b/pkgs/by-name/cr/crossguid/package.nix
similarity index 100%
rename from pkgs/development/libraries/crossguid/default.nix
rename to pkgs/by-name/cr/crossguid/package.nix
diff --git a/pkgs/tools/security/crowbar/default.nix b/pkgs/by-name/cr/crowbar/package.nix
similarity index 100%
rename from pkgs/tools/security/crowbar/default.nix
rename to pkgs/by-name/cr/crowbar/package.nix
diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/by-name/cr/crowdin-cli/package.nix
similarity index 100%
rename from pkgs/tools/text/crowdin-cli/default.nix
rename to pkgs/by-name/cr/crowdin-cli/package.nix
diff --git a/pkgs/tools/security/crowdsec/default.nix b/pkgs/by-name/cr/crowdsec/package.nix
similarity index 100%
rename from pkgs/tools/security/crowdsec/default.nix
rename to pkgs/by-name/cr/crowdsec/package.nix
diff --git a/pkgs/games/crrcsim/gcc6.patch b/pkgs/by-name/cr/crrcsim/gcc6.patch
similarity index 100%
rename from pkgs/games/crrcsim/gcc6.patch
rename to pkgs/by-name/cr/crrcsim/gcc6.patch
diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/by-name/cr/crrcsim/package.nix
similarity index 100%
rename from pkgs/games/crrcsim/default.nix
rename to pkgs/by-name/cr/crrcsim/package.nix
diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/by-name/cr/crudini/package.nix
similarity index 100%
rename from pkgs/tools/misc/crudini/default.nix
rename to pkgs/by-name/cr/crudini/package.nix
diff --git a/pkgs/applications/misc/crumbs/default.nix b/pkgs/by-name/cr/crumbs/package.nix
similarity index 100%
rename from pkgs/applications/misc/crumbs/default.nix
rename to pkgs/by-name/cr/crumbs/package.nix
diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/by-name/cr/crun/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/crun/default.nix
rename to pkgs/by-name/cr/crun/package.nix
diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/by-name/cr/crunch/package.nix
similarity index 100%
rename from pkgs/tools/security/crunch/default.nix
rename to pkgs/by-name/cr/crunch/package.nix
diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/by-name/cr/cryfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/cryfs/default.nix
rename to pkgs/by-name/cr/cryfs/package.nix
diff --git a/pkgs/applications/blockchains/crypto-org-wallet/default.nix b/pkgs/by-name/cr/crypto-org-wallet/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/crypto-org-wallet/default.nix
rename to pkgs/by-name/cr/crypto-org-wallet/package.nix
diff --git a/pkgs/tools/misc/crypto-tracker/default.nix b/pkgs/by-name/cr/crypto-tracker/package.nix
similarity index 100%
rename from pkgs/tools/misc/crypto-tracker/default.nix
rename to pkgs/by-name/cr/crypto-tracker/package.nix
diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/by-name/cr/cryptominisat/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/cryptominisat/default.nix
rename to pkgs/by-name/cr/cryptominisat/package.nix
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/by-name/cr/cryptopp/package.nix
similarity index 100%
rename from pkgs/development/libraries/crypto++/default.nix
rename to pkgs/by-name/cr/cryptopp/package.nix
diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/by-name/cr/cryptoverif/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/cryptoverif/default.nix
rename to pkgs/by-name/cr/cryptoverif/package.nix
diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/by-name/cr/cryptsetup/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/cryptsetup/default.nix
rename to pkgs/by-name/cr/cryptsetup/package.nix
diff --git a/pkgs/os-specific/linux/cryptsetup/relative-token-path.patch b/pkgs/by-name/cr/cryptsetup/relative-token-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/cryptsetup/relative-token-path.patch
rename to pkgs/by-name/cr/cryptsetup/relative-token-path.patch
diff --git a/pkgs/development/compilers/crystal2nix/default.nix b/pkgs/by-name/cr/crystal2nix/package.nix
similarity index 100%
rename from pkgs/development/compilers/crystal2nix/default.nix
rename to pkgs/by-name/cr/crystal2nix/package.nix
diff --git a/pkgs/development/compilers/crystal2nix/shards.nix b/pkgs/by-name/cr/crystal2nix/shards.nix
similarity index 100%
rename from pkgs/development/compilers/crystal2nix/shards.nix
rename to pkgs/by-name/cr/crystal2nix/shards.nix
diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/by-name/cs/csa/package.nix
similarity index 100%
rename from pkgs/applications/audio/csa/default.nix
rename to pkgs/by-name/cs/csa/package.nix
diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/by-name/cs/cscope/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/cscope/default.nix
rename to pkgs/by-name/cs/cscope/package.nix
diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/by-name/cs/csdp/package.nix
similarity index 100%
rename from pkgs/applications/science/math/csdp/default.nix
rename to pkgs/by-name/cs/csdp/package.nix
diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/by-name/cs/csdr/package.nix
similarity index 100%
rename from pkgs/applications/radio/csdr/default.nix
rename to pkgs/by-name/cs/csdr/package.nix
diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/by-name/cs/csfml/package.nix
similarity index 100%
rename from pkgs/development/libraries/csfml/default.nix
rename to pkgs/by-name/cs/csfml/package.nix
diff --git a/pkgs/os-specific/linux/cshatag/default.nix b/pkgs/by-name/cs/cshatag/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/cshatag/default.nix
rename to pkgs/by-name/cs/cshatag/package.nix
diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/by-name/cs/csmith/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/csmith/default.nix
rename to pkgs/by-name/cs/csmith/package.nix
diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/by-name/cs/csound-manual/package.nix
similarity index 100%
rename from pkgs/applications/audio/csound/csound-manual/default.nix
rename to pkgs/by-name/cs/csound-manual/package.nix
diff --git a/pkgs/tools/misc/csv2latex/default.nix b/pkgs/by-name/cs/csv2latex/package.nix
similarity index 100%
rename from pkgs/tools/misc/csv2latex/default.nix
rename to pkgs/by-name/cs/csv2latex/package.nix
diff --git a/pkgs/applications/office/csv2odf/default.nix b/pkgs/by-name/cs/csv2odf/package.nix
similarity index 100%
rename from pkgs/applications/office/csv2odf/default.nix
rename to pkgs/by-name/cs/csv2odf/package.nix
diff --git a/pkgs/tools/misc/csv2parquet/default.nix b/pkgs/by-name/cs/csv2parquet/package.nix
similarity index 100%
rename from pkgs/tools/misc/csv2parquet/default.nix
rename to pkgs/by-name/cs/csv2parquet/package.nix
diff --git a/pkgs/tools/graphics/csv2svg/default.nix b/pkgs/by-name/cs/csv2svg/package.nix
similarity index 100%
rename from pkgs/tools/graphics/csv2svg/default.nix
rename to pkgs/by-name/cs/csv2svg/package.nix
diff --git a/pkgs/tools/text/csvdiff/default.nix b/pkgs/by-name/cs/csvdiff/package.nix
similarity index 100%
rename from pkgs/tools/text/csvdiff/default.nix
rename to pkgs/by-name/cs/csvdiff/package.nix
diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/by-name/cs/csview/package.nix
similarity index 100%
rename from pkgs/tools/text/csview/default.nix
rename to pkgs/by-name/cs/csview/package.nix
diff --git a/pkgs/tools/text/csvquote/csvquote-path.patch b/pkgs/by-name/cs/csvquote/csvquote-path.patch
similarity index 100%
rename from pkgs/tools/text/csvquote/csvquote-path.patch
rename to pkgs/by-name/cs/csvquote/csvquote-path.patch
diff --git a/pkgs/tools/text/csvquote/default.nix b/pkgs/by-name/cs/csvquote/package.nix
similarity index 100%
rename from pkgs/tools/text/csvquote/default.nix
rename to pkgs/by-name/cs/csvquote/package.nix
diff --git a/pkgs/tools/misc/csvs-to-sqlite/default.nix b/pkgs/by-name/cs/csvs-to-sqlite/package.nix
similarity index 100%
rename from pkgs/tools/misc/csvs-to-sqlite/default.nix
rename to pkgs/by-name/cs/csvs-to-sqlite/package.nix
diff --git a/pkgs/applications/science/electronics/csxcad/default.nix b/pkgs/by-name/cs/csxcad/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/csxcad/default.nix
rename to pkgs/by-name/cs/csxcad/package.nix
diff --git a/pkgs/applications/science/electronics/csxcad/searchPath.patch b/pkgs/by-name/cs/csxcad/searchPath.patch
similarity index 100%
rename from pkgs/applications/science/electronics/csxcad/searchPath.patch
rename to pkgs/by-name/cs/csxcad/searchPath.patch
diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/by-name/ct/ctlptl/package.nix
similarity index 100%
rename from pkgs/development/tools/ctlptl/default.nix
rename to pkgs/by-name/ct/ctlptl/package.nix
diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/by-name/ct/ctmg/package.nix
similarity index 100%
rename from pkgs/tools/security/ctmg/default.nix
rename to pkgs/by-name/ct/ctmg/package.nix
diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/by-name/ct/ctodo/package.nix
similarity index 100%
rename from pkgs/applications/misc/ctodo/default.nix
rename to pkgs/by-name/ct/ctodo/package.nix
diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/by-name/ct/ctop/package.nix
similarity index 100%
rename from pkgs/tools/system/ctop/default.nix
rename to pkgs/by-name/ct/ctop/package.nix
diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/by-name/ct/ctpl/package.nix
similarity index 100%
rename from pkgs/development/libraries/ctpl/default.nix
rename to pkgs/by-name/ct/ctpl/package.nix
diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/by-name/ct/ctpp2/package.nix
similarity index 100%
rename from pkgs/development/libraries/ctpp2/default.nix
rename to pkgs/by-name/ct/ctpp2/package.nix
diff --git a/pkgs/development/libraries/ctre/default.nix b/pkgs/by-name/ct/ctre/package.nix
similarity index 100%
rename from pkgs/development/libraries/ctre/default.nix
rename to pkgs/by-name/ct/ctre/package.nix
diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/by-name/ct/ctrtool/package.nix
similarity index 100%
rename from pkgs/tools/archivers/ctrtool/default.nix
rename to pkgs/by-name/ct/ctrtool/package.nix
diff --git a/pkgs/development/libraries/ctypes_sh/default.nix b/pkgs/by-name/ct/ctypes_sh/package.nix
similarity index 100%
rename from pkgs/development/libraries/ctypes_sh/default.nix
rename to pkgs/by-name/ct/ctypes_sh/package.nix
diff --git a/pkgs/development/libraries/cudd/cudd.patch b/pkgs/by-name/cu/cudd/cudd.patch
similarity index 100%
rename from pkgs/development/libraries/cudd/cudd.patch
rename to pkgs/by-name/cu/cudd/cudd.patch
diff --git a/pkgs/development/libraries/cudd/default.nix b/pkgs/by-name/cu/cudd/package.nix
similarity index 100%
rename from pkgs/development/libraries/cudd/default.nix
rename to pkgs/by-name/cu/cudd/package.nix
diff --git a/pkgs/development/tools/cuelsp/default.nix b/pkgs/by-name/cu/cuelsp/package.nix
similarity index 100%
rename from pkgs/development/tools/cuelsp/default.nix
rename to pkgs/by-name/cu/cuelsp/package.nix
diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/by-name/cu/cuetools/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/cuetools/default.nix
rename to pkgs/by-name/cu/cuetools/package.nix
diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/by-name/cu/culmus/package.nix
similarity index 100%
rename from pkgs/data/fonts/culmus/default.nix
rename to pkgs/by-name/cu/culmus/package.nix
diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/by-name/cu/cum/package.nix
similarity index 100%
rename from pkgs/applications/misc/cum/default.nix
rename to pkgs/by-name/cu/cum/package.nix
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/by-name/cu/cuneiform/package.nix
similarity index 100%
rename from pkgs/tools/graphics/cuneiform/default.nix
rename to pkgs/by-name/cu/cuneiform/package.nix
diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/by-name/cu/cunit/package.nix
similarity index 100%
rename from pkgs/tools/misc/cunit/default.nix
rename to pkgs/by-name/cu/cunit/package.nix
diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/by-name/cu/cups-bjnp/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/cups-bjnp/default.nix
rename to pkgs/by-name/cu/cups-bjnp/package.nix
diff --git a/pkgs/misc/cups/drivers/hll2350dw/default.nix b/pkgs/by-name/cu/cups-brother-hll2350dw/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/hll2350dw/default.nix
rename to pkgs/by-name/cu/cups-brother-hll2350dw/package.nix
diff --git a/pkgs/misc/cups/drivers/brother/hll2375dw/fix-perm.patch b/pkgs/by-name/cu/cups-brother-hll2375dw/fix-perm.patch
similarity index 100%
rename from pkgs/misc/cups/drivers/brother/hll2375dw/fix-perm.patch
rename to pkgs/by-name/cu/cups-brother-hll2375dw/fix-perm.patch
diff --git a/pkgs/misc/cups/drivers/brother/hll2375dw/default.nix b/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/brother/hll2375dw/default.nix
rename to pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
diff --git a/pkgs/misc/cups/drivers/mfcl2750dw/default.nix b/pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfcl2750dw/default.nix
rename to pkgs/by-name/cu/cups-brother-mfcl2750dw/package.nix
diff --git a/pkgs/misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix b/pkgs/by-name/cu/cups-drv-rastertosag-gdi/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/cups-drv-rastertosag-gdi/default.nix
rename to pkgs/by-name/cu/cups-drv-rastertosag-gdi/package.nix
diff --git a/pkgs/misc/cups/drivers/dymo/fix-includes.patch b/pkgs/by-name/cu/cups-dymo/fix-includes.patch
similarity index 100%
rename from pkgs/misc/cups/drivers/dymo/fix-includes.patch
rename to pkgs/by-name/cu/cups-dymo/fix-includes.patch
diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/by-name/cu/cups-dymo/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/dymo/default.nix
rename to pkgs/by-name/cu/cups-dymo/package.nix
diff --git a/pkgs/misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw/default.nix b/pkgs/by-name/cu/cups-kyocera-ecosys-m2x35-40-p2x35-40dnw/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw/default.nix
rename to pkgs/by-name/cu/cups-kyocera-ecosys-m2x35-40-p2x35-40dnw/package.nix
diff --git a/pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix b/pkgs/by-name/cu/cups-kyocera-ecosys-m552x-p502x/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/kyocera-ecosys-m552x-p502x/default.nix
rename to pkgs/by-name/cu/cups-kyocera-ecosys-m552x-p502x/package.nix
diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/by-name/cu/cups-kyocera/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/kyocera/default.nix
rename to pkgs/by-name/cu/cups-kyocera/package.nix
diff --git a/pkgs/misc/cups/drivers/kyodialog/default.nix b/pkgs/by-name/cu/cups-kyodialog/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/kyodialog/default.nix
rename to pkgs/by-name/cu/cups-kyodialog/package.nix
diff --git a/pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix b/pkgs/by-name/cu/cups-pdf-to-pdf/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/cups-pdf-to-pdf/default.nix
rename to pkgs/by-name/cu/cups-pdf-to-pdf/package.nix
diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/by-name/cu/cups-toshiba-estudio/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/estudio/default.nix
rename to pkgs/by-name/cu/cups-toshiba-estudio/package.nix
diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/by-name/cu/cups-zj-58/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/zj-58/default.nix
rename to pkgs/by-name/cu/cups-zj-58/package.nix
diff --git a/pkgs/data/fonts/curie/default.nix b/pkgs/by-name/cu/curie/package.nix
similarity index 100%
rename from pkgs/data/fonts/curie/default.nix
rename to pkgs/by-name/cu/curie/package.nix
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/by-name/cu/curlMinimal/package.nix
similarity index 100%
rename from pkgs/tools/networking/curl/default.nix
rename to pkgs/by-name/cu/curlMinimal/package.nix
diff --git a/pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch b/pkgs/by-name/cu/curlftpfs/fix-rpl_malloc.patch
similarity index 100%
rename from pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch
rename to pkgs/by-name/cu/curlftpfs/fix-rpl_malloc.patch
diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/by-name/cu/curlftpfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/curlftpfs/default.nix
rename to pkgs/by-name/cu/curlftpfs/package.nix
diff --git a/pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch b/pkgs/by-name/cu/curlftpfs/suse-bug-580609.patch
similarity index 100%
rename from pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch
rename to pkgs/by-name/cu/curlftpfs/suse-bug-580609.patch
diff --git a/pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch b/pkgs/by-name/cu/curlftpfs/suse-bug-955687.patch
similarity index 100%
rename from pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch
rename to pkgs/by-name/cu/curlftpfs/suse-bug-955687.patch
diff --git a/pkgs/tools/networking/curlie/bump-golang-x-sys.patch b/pkgs/by-name/cu/curlie/bump-golang-x-sys.patch
similarity index 100%
rename from pkgs/tools/networking/curlie/bump-golang-x-sys.patch
rename to pkgs/by-name/cu/curlie/bump-golang-x-sys.patch
diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/by-name/cu/curlie/package.nix
similarity index 100%
rename from pkgs/tools/networking/curlie/default.nix
rename to pkgs/by-name/cu/curlie/package.nix
diff --git a/pkgs/development/libraries/curlpp/curl_8_10_build_failure.patch b/pkgs/by-name/cu/curlpp/curl_8_10_build_failure.patch
similarity index 100%
rename from pkgs/development/libraries/curlpp/curl_8_10_build_failure.patch
rename to pkgs/by-name/cu/curlpp/curl_8_10_build_failure.patch
diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/by-name/cu/curlpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/curlpp/default.nix
rename to pkgs/by-name/cu/curlpp/package.nix
diff --git a/pkgs/applications/audio/curseradio/mpv.patch b/pkgs/by-name/cu/curseradio/mpv.patch
similarity index 100%
rename from pkgs/applications/audio/curseradio/mpv.patch
rename to pkgs/by-name/cu/curseradio/mpv.patch
diff --git a/pkgs/applications/audio/curseradio/default.nix b/pkgs/by-name/cu/curseradio/package.nix
similarity index 100%
rename from pkgs/applications/audio/curseradio/default.nix
rename to pkgs/by-name/cu/curseradio/package.nix
diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/by-name/cu/curtail/package.nix
similarity index 100%
rename from pkgs/applications/graphics/curtail/default.nix
rename to pkgs/by-name/cu/curtail/package.nix
diff --git a/pkgs/applications/graphics/curv/default.nix b/pkgs/by-name/cu/curv/package.nix
similarity index 100%
rename from pkgs/applications/graphics/curv/default.nix
rename to pkgs/by-name/cu/curv/package.nix
diff --git a/pkgs/applications/video/cutecapture/default.nix b/pkgs/by-name/cu/cutecapture/package.nix
similarity index 100%
rename from pkgs/applications/video/cutecapture/default.nix
rename to pkgs/by-name/cu/cutecapture/package.nix
diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/by-name/cu/cutee/package.nix
similarity index 100%
rename from pkgs/development/libraries/cutee/default.nix
rename to pkgs/by-name/cu/cutee/package.nix
diff --git a/pkgs/games/cuyo/default.nix b/pkgs/by-name/cu/cuyo/package.nix
similarity index 100%
rename from pkgs/games/cuyo/default.nix
rename to pkgs/by-name/cu/cuyo/package.nix
diff --git a/pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch b/pkgs/by-name/cv/cvc4/cvc4-bash-patsub-replacement.patch
similarity index 100%
rename from pkgs/applications/science/logic/cvc4/cvc4-bash-patsub-replacement.patch
rename to pkgs/by-name/cv/cvc4/cvc4-bash-patsub-replacement.patch
diff --git a/pkgs/applications/science/logic/cvc4/minisat-fenv.patch b/pkgs/by-name/cv/cvc4/minisat-fenv.patch
similarity index 100%
rename from pkgs/applications/science/logic/cvc4/minisat-fenv.patch
rename to pkgs/by-name/cv/cvc4/minisat-fenv.patch
diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/by-name/cv/cvc4/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/cvc4/default.nix
rename to pkgs/by-name/cv/cvc4/package.nix
diff --git a/pkgs/development/tools/analysis/cvehound/default.nix b/pkgs/by-name/cv/cvehound/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/cvehound/default.nix
rename to pkgs/by-name/cv/cvehound/package.nix
diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/by-name/cv/cvs-fast-export/package.nix
similarity index 100%
rename from pkgs/applications/version-management/cvs-fast-export/default.nix
rename to pkgs/by-name/cv/cvs-fast-export/package.nix
diff --git a/pkgs/applications/version-management/cvs/CVE-2012-0804.patch b/pkgs/by-name/cv/cvs/CVE-2012-0804.patch
similarity index 100%
rename from pkgs/applications/version-management/cvs/CVE-2012-0804.patch
rename to pkgs/by-name/cv/cvs/CVE-2012-0804.patch
diff --git a/pkgs/applications/version-management/cvs/CVE-2017-12836.patch b/pkgs/by-name/cv/cvs/CVE-2017-12836.patch
similarity index 100%
rename from pkgs/applications/version-management/cvs/CVE-2017-12836.patch
rename to pkgs/by-name/cv/cvs/CVE-2017-12836.patch
diff --git a/pkgs/applications/version-management/cvs/getcwd-chroot.patch b/pkgs/by-name/cv/cvs/getcwd-chroot.patch
similarity index 100%
rename from pkgs/applications/version-management/cvs/getcwd-chroot.patch
rename to pkgs/by-name/cv/cvs/getcwd-chroot.patch
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/by-name/cv/cvs/package.nix
similarity index 100%
rename from pkgs/applications/version-management/cvs/default.nix
rename to pkgs/by-name/cv/cvs/package.nix
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/by-name/cv/cvs2svn/package.nix
similarity index 100%
rename from pkgs/applications/version-management/cvs2svn/default.nix
rename to pkgs/by-name/cv/cvs2svn/package.nix
diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/by-name/cv/cvsps/package.nix
similarity index 100%
rename from pkgs/applications/version-management/cvsps/default.nix
rename to pkgs/by-name/cv/cvsps/package.nix
diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/by-name/cv/cvsq/package.nix
similarity index 100%
rename from pkgs/applications/version-management/cvsq/default.nix
rename to pkgs/by-name/cv/cvsq/package.nix
diff --git a/pkgs/tools/admin/cw/default.nix b/pkgs/by-name/cw/cw/package.nix
similarity index 100%
rename from pkgs/tools/admin/cw/default.nix
rename to pkgs/by-name/cw/cw/package.nix
diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/by-name/cw/cwebbin/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/cwebbin/default.nix
rename to pkgs/by-name/cw/cwebbin/package.nix
diff --git a/pkgs/development/libraries/cwiid/fix-ar.diff b/pkgs/by-name/cw/cwiid/fix-ar.diff
similarity index 100%
rename from pkgs/development/libraries/cwiid/fix-ar.diff
rename to pkgs/by-name/cw/cwiid/fix-ar.diff
diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/by-name/cw/cwiid/package.nix
similarity index 100%
rename from pkgs/development/libraries/cwiid/default.nix
rename to pkgs/by-name/cw/cwiid/package.nix
diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/by-name/cw/cwltool/package.nix
similarity index 100%
rename from pkgs/applications/science/misc/cwltool/default.nix
rename to pkgs/by-name/cw/cwltool/package.nix
diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/by-name/cw/cwm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/cwm/default.nix
rename to pkgs/by-name/cw/cwm/package.nix
diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/by-name/cx/cxx-prettyprint/package.nix
similarity index 100%
rename from pkgs/development/libraries/cxx-prettyprint/default.nix
rename to pkgs/by-name/cx/cxx-prettyprint/package.nix
diff --git a/pkgs/development/libraries/cxx-rs/Cargo.lock b/pkgs/by-name/cx/cxx-rs/Cargo.lock
similarity index 100%
rename from pkgs/development/libraries/cxx-rs/Cargo.lock
rename to pkgs/by-name/cx/cxx-rs/Cargo.lock
diff --git a/pkgs/development/libraries/cxx-rs/default.nix b/pkgs/by-name/cx/cxx-rs/package.nix
similarity index 100%
rename from pkgs/development/libraries/cxx-rs/default.nix
rename to pkgs/by-name/cx/cxx-rs/package.nix
diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/by-name/cx/cxxopts/package.nix
similarity index 100%
rename from pkgs/development/libraries/cxxopts/default.nix
rename to pkgs/by-name/cx/cxxopts/package.nix
diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/by-name/cx/cxxtools/package.nix
similarity index 100%
rename from pkgs/development/libraries/cxxtools/default.nix
rename to pkgs/by-name/cx/cxxtools/package.nix
diff --git a/pkgs/applications/graphics/cyan/default.nix b/pkgs/by-name/cy/cyan/package.nix
similarity index 100%
rename from pkgs/applications/graphics/cyan/default.nix
rename to pkgs/by-name/cy/cyan/package.nix
diff --git a/pkgs/development/interpreters/cyber/default.nix b/pkgs/by-name/cy/cyber/package.nix
similarity index 100%
rename from pkgs/development/interpreters/cyber/default.nix
rename to pkgs/by-name/cy/cyber/package.nix
diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/by-name/cy/cyberchef/package.nix
similarity index 100%
rename from pkgs/tools/misc/cyberchef/default.nix
rename to pkgs/by-name/cy/cyberchef/package.nix
diff --git a/pkgs/applications/networking/cyberduck/default.nix b/pkgs/by-name/cy/cyberduck/package.nix
similarity index 100%
rename from pkgs/applications/networking/cyberduck/default.nix
rename to pkgs/by-name/cy/cyberduck/package.nix
diff --git a/pkgs/development/interpreters/cyclone/default.nix b/pkgs/by-name/cy/cyclone-scheme/package.nix
similarity index 100%
rename from pkgs/development/interpreters/cyclone/default.nix
rename to pkgs/by-name/cy/cyclone-scheme/package.nix
diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/by-name/cy/cyclone/package.nix
similarity index 100%
rename from pkgs/applications/audio/pd-plugins/cyclone/default.nix
rename to pkgs/by-name/cy/cyclone/package.nix
diff --git a/pkgs/development/libraries/cyclonedds/0001-Use-full-path-in-pkgconfig.patch b/pkgs/by-name/cy/cyclonedds/0001-Use-full-path-in-pkgconfig.patch
similarity index 100%
rename from pkgs/development/libraries/cyclonedds/0001-Use-full-path-in-pkgconfig.patch
rename to pkgs/by-name/cy/cyclonedds/0001-Use-full-path-in-pkgconfig.patch
diff --git a/pkgs/development/libraries/cyclonedds/default.nix b/pkgs/by-name/cy/cyclonedds/package.nix
similarity index 100%
rename from pkgs/development/libraries/cyclonedds/default.nix
rename to pkgs/by-name/cy/cyclonedds/package.nix
diff --git a/pkgs/tools/misc/cyclonedx-python/default.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix
similarity index 100%
rename from pkgs/tools/misc/cyclonedx-python/default.nix
rename to pkgs/by-name/cy/cyclonedx-python/package.nix
diff --git a/pkgs/development/libraries/cyrus-sasl-xoauth2/default.nix b/pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix
similarity index 100%
rename from pkgs/development/libraries/cyrus-sasl-xoauth2/default.nix
rename to pkgs/by-name/cy/cyrus-sasl-xoauth2/package.nix
diff --git a/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch b/pkgs/by-name/cy/cyrus_sasl/cyrus-sasl-ac-try-run-fix.patch
similarity index 100%
rename from pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch
rename to pkgs/by-name/cy/cyrus_sasl/cyrus-sasl-ac-try-run-fix.patch
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/by-name/cy/cyrus_sasl/package.nix
similarity index 100%
rename from pkgs/development/libraries/cyrus-sasl/default.nix
rename to pkgs/by-name/cy/cyrus_sasl/package.nix
diff --git a/pkgs/applications/version-management/cz-cli/default.nix b/pkgs/by-name/cz/cz-cli/package.nix
similarity index 100%
rename from pkgs/applications/version-management/cz-cli/default.nix
rename to pkgs/by-name/cz/cz-cli/package.nix
diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/by-name/cz/czmq/package.nix
similarity index 100%
rename from pkgs/development/libraries/czmq/default.nix
rename to pkgs/by-name/cz/czmq/package.nix
diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/by-name/d-/d-seams/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/d-seams/default.nix
rename to pkgs/by-name/d-/d-seams/package.nix
diff --git a/pkgs/development/tools/misc/d-spy/default.nix b/pkgs/by-name/d-/d-spy/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/d-spy/default.nix
rename to pkgs/by-name/d-/d-spy/package.nix
diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/by-name/d2/d2/package.nix
similarity index 100%
rename from pkgs/tools/text/d2/default.nix
rename to pkgs/by-name/d2/d2/package.nix
diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/by-name/d2/d2coding/package.nix
similarity index 100%
rename from pkgs/data/fonts/d2coding/default.nix
rename to pkgs/by-name/d2/d2coding/package.nix
diff --git a/pkgs/development/libraries/dab_lib/default.nix b/pkgs/by-name/da/dab_lib/package.nix
similarity index 100%
rename from pkgs/development/libraries/dab_lib/default.nix
rename to pkgs/by-name/da/dab_lib/package.nix
diff --git a/pkgs/tools/misc/dabet/default.nix b/pkgs/by-name/da/dabet/package.nix
similarity index 100%
rename from pkgs/tools/misc/dabet/default.nix
rename to pkgs/by-name/da/dabet/package.nix
diff --git a/pkgs/applications/radio/dabtools/default.nix b/pkgs/by-name/da/dabtools/package.nix
similarity index 100%
rename from pkgs/applications/radio/dabtools/default.nix
rename to pkgs/by-name/da/dabtools/package.nix
diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/by-name/da/dadadodo/package.nix
similarity index 100%
rename from pkgs/tools/text/dadadodo/default.nix
rename to pkgs/by-name/da/dadadodo/package.nix
diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/by-name/da/dae/package.nix
similarity index 100%
rename from pkgs/tools/networking/dae/default.nix
rename to pkgs/by-name/da/dae/package.nix
diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/by-name/da/daemon/package.nix
similarity index 100%
rename from pkgs/tools/system/daemon/default.nix
rename to pkgs/by-name/da/daemon/package.nix
diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/by-name/da/daemonize/package.nix
similarity index 100%
rename from pkgs/tools/system/daemonize/default.nix
rename to pkgs/by-name/da/daemonize/package.nix
diff --git a/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch b/pkgs/by-name/da/daemontools/fix-nix-usernamespace-build.patch
similarity index 100%
rename from pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch
rename to pkgs/by-name/da/daemontools/fix-nix-usernamespace-build.patch
diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/by-name/da/daemontools/package.nix
similarity index 100%
rename from pkgs/tools/admin/daemontools/default.nix
rename to pkgs/by-name/da/daemontools/package.nix
diff --git a/pkgs/applications/science/logic/dafny/deps.nix b/pkgs/by-name/da/dafny/deps.nix
similarity index 100%
rename from pkgs/applications/science/logic/dafny/deps.nix
rename to pkgs/by-name/da/dafny/deps.nix
diff --git a/pkgs/applications/science/logic/dafny/default.nix b/pkgs/by-name/da/dafny/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/dafny/default.nix
rename to pkgs/by-name/da/dafny/package.nix
diff --git a/pkgs/tools/misc/daktilo/default.nix b/pkgs/by-name/da/daktilo/package.nix
similarity index 100%
rename from pkgs/tools/misc/daktilo/default.nix
rename to pkgs/by-name/da/daktilo/package.nix
diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/by-name/da/dale/package.nix
similarity index 100%
rename from pkgs/development/compilers/dale/default.nix
rename to pkgs/by-name/da/dale/package.nix
diff --git a/pkgs/tools/security/dalfox/default.nix b/pkgs/by-name/da/dalfox/package.nix
similarity index 100%
rename from pkgs/tools/security/dalfox/default.nix
rename to pkgs/by-name/da/dalfox/package.nix
diff --git a/pkgs/tools/admin/damon/default.nix b/pkgs/by-name/da/damon/package.nix
similarity index 100%
rename from pkgs/tools/admin/damon/default.nix
rename to pkgs/by-name/da/damon/package.nix
diff --git a/pkgs/data/fonts/dancing-script/default.nix b/pkgs/by-name/da/dancing-script/package.nix
similarity index 100%
rename from pkgs/data/fonts/dancing-script/default.nix
rename to pkgs/by-name/da/dancing-script/package.nix
diff --git a/pkgs/servers/dante/clang-osint-m4.patch b/pkgs/by-name/da/dante/clang-osint-m4.patch
similarity index 100%
rename from pkgs/servers/dante/clang-osint-m4.patch
rename to pkgs/by-name/da/dante/clang-osint-m4.patch
diff --git a/pkgs/servers/dante/dante-1.4.3-miniupnpc-2.2.8.patch b/pkgs/by-name/da/dante/dante-1.4.3-miniupnpc-2.2.8.patch
similarity index 100%
rename from pkgs/servers/dante/dante-1.4.3-miniupnpc-2.2.8.patch
rename to pkgs/by-name/da/dante/dante-1.4.3-miniupnpc-2.2.8.patch
diff --git a/pkgs/servers/dante/default.nix b/pkgs/by-name/da/dante/package.nix
similarity index 100%
rename from pkgs/servers/dante/default.nix
rename to pkgs/by-name/da/dante/package.nix
diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/by-name/da/dapper/package.nix
similarity index 100%
rename from pkgs/development/tools/dapper/default.nix
rename to pkgs/by-name/da/dapper/package.nix
diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/by-name/da/daq/package.nix
similarity index 100%
rename from pkgs/applications/networking/ids/daq/default.nix
rename to pkgs/by-name/da/daq/package.nix
diff --git a/pkgs/applications/emulators/darcnes/label.patch b/pkgs/by-name/da/darcnes/label.patch
similarity index 100%
rename from pkgs/applications/emulators/darcnes/label.patch
rename to pkgs/by-name/da/darcnes/label.patch
diff --git a/pkgs/applications/emulators/darcnes/default.nix b/pkgs/by-name/da/darcnes/package.nix
similarity index 100%
rename from pkgs/applications/emulators/darcnes/default.nix
rename to pkgs/by-name/da/darcnes/package.nix
diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/by-name/da/darkhttpd/package.nix
similarity index 100%
rename from pkgs/servers/http/darkhttpd/default.nix
rename to pkgs/by-name/da/darkhttpd/package.nix
diff --git a/pkgs/tools/audio/darkice/fix-undeclared-memmove.patch b/pkgs/by-name/da/darkice/fix-undeclared-memmove.patch
similarity index 100%
rename from pkgs/tools/audio/darkice/fix-undeclared-memmove.patch
rename to pkgs/by-name/da/darkice/fix-undeclared-memmove.patch
diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/by-name/da/darkice/package.nix
similarity index 100%
rename from pkgs/tools/audio/darkice/default.nix
rename to pkgs/by-name/da/darkice/package.nix
diff --git a/pkgs/applications/misc/darkman/go-mod.patch b/pkgs/by-name/da/darkman/go-mod.patch
similarity index 100%
rename from pkgs/applications/misc/darkman/go-mod.patch
rename to pkgs/by-name/da/darkman/go-mod.patch
diff --git a/pkgs/applications/misc/darkman/makefile.patch b/pkgs/by-name/da/darkman/makefile.patch
similarity index 100%
rename from pkgs/applications/misc/darkman/makefile.patch
rename to pkgs/by-name/da/darkman/makefile.patch
diff --git a/pkgs/applications/misc/darkman/default.nix b/pkgs/by-name/da/darkman/package.nix
similarity index 100%
rename from pkgs/applications/misc/darkman/default.nix
rename to pkgs/by-name/da/darkman/package.nix
diff --git a/pkgs/games/darkplaces/default.nix b/pkgs/by-name/da/darkplaces/package.nix
similarity index 100%
rename from pkgs/games/darkplaces/default.nix
rename to pkgs/by-name/da/darkplaces/package.nix
diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/by-name/da/darkstat/package.nix
similarity index 100%
rename from pkgs/tools/networking/darkstat/default.nix
rename to pkgs/by-name/da/darkstat/package.nix
diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/by-name/da/darktile/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/darktile/default.nix
rename to pkgs/by-name/da/darktile/package.nix
diff --git a/pkgs/applications/emulators/darling/default.nix b/pkgs/by-name/da/darling/package.nix
similarity index 100%
rename from pkgs/applications/emulators/darling/default.nix
rename to pkgs/by-name/da/darling/package.nix
diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/by-name/da/das_watchdog/package.nix
similarity index 100%
rename from pkgs/tools/system/das_watchdog/default.nix
rename to pkgs/by-name/da/das_watchdog/package.nix
diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/by-name/da/dasel/package.nix
similarity index 100%
rename from pkgs/applications/misc/dasel/default.nix
rename to pkgs/by-name/da/dasel/package.nix
diff --git a/pkgs/shells/dash/default.nix b/pkgs/by-name/da/dash/package.nix
similarity index 100%
rename from pkgs/shells/dash/default.nix
rename to pkgs/by-name/da/dash/package.nix
diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/by-name/da/dasher/package.nix
similarity index 100%
rename from pkgs/applications/accessibility/dasher/default.nix
rename to pkgs/by-name/da/dasher/package.nix
diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/by-name/da/dashing/package.nix
similarity index 100%
rename from pkgs/tools/misc/dashing/default.nix
rename to pkgs/by-name/da/dashing/package.nix
diff --git a/pkgs/tools/misc/dasht/default.nix b/pkgs/by-name/da/dasht/package.nix
similarity index 100%
rename from pkgs/tools/misc/dasht/default.nix
rename to pkgs/by-name/da/dasht/package.nix
diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/by-name/da/dasm/package.nix
similarity index 100%
rename from pkgs/development/compilers/dasm/default.nix
rename to pkgs/by-name/da/dasm/package.nix
diff --git a/pkgs/development/misc/datafusion/default.nix b/pkgs/by-name/da/datafusion-cli/package.nix
similarity index 100%
rename from pkgs/development/misc/datafusion/default.nix
rename to pkgs/by-name/da/datafusion-cli/package.nix
diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/by-name/da/datamash/package.nix
similarity index 100%
rename from pkgs/tools/misc/datamash/default.nix
rename to pkgs/by-name/da/datamash/package.nix
diff --git a/pkgs/tools/misc/datefmt/default.nix b/pkgs/by-name/da/datefmt/package.nix
similarity index 100%
rename from pkgs/tools/misc/datefmt/default.nix
rename to pkgs/by-name/da/datefmt/package.nix
diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/by-name/da/datefudge/package.nix
similarity index 100%
rename from pkgs/tools/system/datefudge/default.nix
rename to pkgs/by-name/da/datefudge/package.nix
diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/by-name/da/dateutils/package.nix
similarity index 100%
rename from pkgs/tools/misc/dateutils/default.nix
rename to pkgs/by-name/da/dateutils/package.nix
diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/by-name/da/datree/package.nix
similarity index 100%
rename from pkgs/development/tools/datree/default.nix
rename to pkgs/by-name/da/datree/package.nix
diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/by-name/da/dav1d/package.nix
similarity index 100%
rename from pkgs/development/libraries/dav1d/default.nix
rename to pkgs/by-name/da/dav1d/package.nix
diff --git a/pkgs/servers/http/dave/go-modules.patch b/pkgs/by-name/da/dave/go-modules.patch
similarity index 100%
rename from pkgs/servers/http/dave/go-modules.patch
rename to pkgs/by-name/da/dave/go-modules.patch
diff --git a/pkgs/servers/http/dave/default.nix b/pkgs/by-name/da/dave/package.nix
similarity index 100%
rename from pkgs/servers/http/dave/default.nix
rename to pkgs/by-name/da/dave/package.nix
diff --git a/pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch b/pkgs/by-name/da/davfs2/0001-umount_davfs-substitute-ps-command.patch
similarity index 100%
rename from pkgs/tools/filesystems/davfs2/0001-umount_davfs-substitute-ps-command.patch
rename to pkgs/by-name/da/davfs2/0001-umount_davfs-substitute-ps-command.patch
diff --git a/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch b/pkgs/by-name/da/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch
similarity index 100%
rename from pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch
rename to pkgs/by-name/da/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch
diff --git a/pkgs/tools/filesystems/davfs2/disable-suid.patch b/pkgs/by-name/da/davfs2/disable-suid.patch
similarity index 100%
rename from pkgs/tools/filesystems/davfs2/disable-suid.patch
rename to pkgs/by-name/da/davfs2/disable-suid.patch
diff --git a/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch b/pkgs/by-name/da/davfs2/fix-sysconfdir.patch
similarity index 100%
rename from pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch
rename to pkgs/by-name/da/davfs2/fix-sysconfdir.patch
diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/by-name/da/davfs2/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/davfs2/default.nix
rename to pkgs/by-name/da/davfs2/package.nix
diff --git a/pkgs/tools/security/davtest/default.nix b/pkgs/by-name/da/davtest/package.nix
similarity index 100%
rename from pkgs/tools/security/davtest/default.nix
rename to pkgs/by-name/da/davtest/package.nix
diff --git a/pkgs/applications/science/physics/dawn/default.nix b/pkgs/by-name/da/dawn/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/dawn/default.nix
rename to pkgs/by-name/da/dawn/package.nix
diff --git a/pkgs/applications/science/physics/dawncut/default.nix b/pkgs/by-name/da/dawncut/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/dawncut/default.nix
rename to pkgs/by-name/da/dawncut/package.nix
diff --git a/pkgs/applications/networking/remote/dayon/default.nix b/pkgs/by-name/da/dayon/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/dayon/default.nix
rename to pkgs/by-name/da/dayon/package.nix
diff --git a/pkgs/servers/db-rest/default.nix b/pkgs/by-name/db/db-rest/package.nix
similarity index 100%
rename from pkgs/servers/db-rest/default.nix
rename to pkgs/by-name/db/db-rest/package.nix
diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/by-name/db/dbacl/package.nix
similarity index 100%
rename from pkgs/tools/misc/dbacl/default.nix
rename to pkgs/by-name/db/dbacl/package.nix
diff --git a/pkgs/development/libraries/science/math/dbcsr/default.nix b/pkgs/by-name/db/dbcsr/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/dbcsr/default.nix
rename to pkgs/by-name/db/dbcsr/package.nix
diff --git a/pkgs/development/tools/misc/dbench/fix-missing-stdint.patch b/pkgs/by-name/db/dbench/fix-missing-stdint.patch
similarity index 100%
rename from pkgs/development/tools/misc/dbench/fix-missing-stdint.patch
rename to pkgs/by-name/db/dbench/fix-missing-stdint.patch
diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/by-name/db/dbench/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/dbench/default.nix
rename to pkgs/by-name/db/dbench/package.nix
diff --git a/pkgs/development/tools/database/dblab/default.nix b/pkgs/by-name/db/dblab/package.nix
similarity index 100%
rename from pkgs/development/tools/database/dblab/default.nix
rename to pkgs/by-name/db/dblab/package.nix
diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/by-name/db/dblatex/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/tex/dblatex/default.nix
rename to pkgs/by-name/db/dblatex/package.nix
diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/by-name/db/dbmate/package.nix
similarity index 100%
rename from pkgs/development/tools/database/dbmate/default.nix
rename to pkgs/by-name/db/dbmate/package.nix
diff --git a/pkgs/tools/security/dbmonster/default.nix b/pkgs/by-name/db/dbmonster/package.nix
similarity index 100%
rename from pkgs/tools/security/dbmonster/default.nix
rename to pkgs/by-name/db/dbmonster/package.nix
diff --git a/pkgs/os-specific/linux/dbus-broker/disable-test.patch b/pkgs/by-name/db/dbus-broker/disable-test.patch
similarity index 100%
rename from pkgs/os-specific/linux/dbus-broker/disable-test.patch
rename to pkgs/by-name/db/dbus-broker/disable-test.patch
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/by-name/db/dbus-broker/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/dbus-broker/default.nix
rename to pkgs/by-name/db/dbus-broker/package.nix
diff --git a/pkgs/os-specific/linux/dbus-broker/paths.patch b/pkgs/by-name/db/dbus-broker/paths.patch
similarity index 100%
rename from pkgs/os-specific/linux/dbus-broker/paths.patch
rename to pkgs/by-name/db/dbus-broker/paths.patch
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/by-name/db/dbus-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/dbus-glib/default.nix
rename to pkgs/by-name/db/dbus-glib/package.nix
diff --git a/pkgs/development/tools/dbus-test-runner/default.nix b/pkgs/by-name/db/dbus-test-runner/package.nix
similarity index 100%
rename from pkgs/development/tools/dbus-test-runner/default.nix
rename to pkgs/by-name/db/dbus-test-runner/package.nix
diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/by-name/db/dbus_cplusplus/package.nix
similarity index 100%
rename from pkgs/development/libraries/dbus-cplusplus/default.nix
rename to pkgs/by-name/db/dbus_cplusplus/package.nix
diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/by-name/db/dbus_java/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/dbus-java/default.nix
rename to pkgs/by-name/db/dbus_java/package.nix
diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/by-name/db/dbx/package.nix
similarity index 100%
rename from pkgs/applications/misc/dbx/default.nix
rename to pkgs/by-name/db/dbx/package.nix
diff --git a/pkgs/development/libraries/dbxml/cxx11.patch b/pkgs/by-name/db/dbxml/cxx11.patch
similarity index 100%
rename from pkgs/development/libraries/dbxml/cxx11.patch
rename to pkgs/by-name/db/dbxml/cxx11.patch
diff --git a/pkgs/development/libraries/dbxml/incorrect-optimization.patch b/pkgs/by-name/db/dbxml/incorrect-optimization.patch
similarity index 100%
rename from pkgs/development/libraries/dbxml/incorrect-optimization.patch
rename to pkgs/by-name/db/dbxml/incorrect-optimization.patch
diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/by-name/db/dbxml/package.nix
similarity index 100%
rename from pkgs/development/libraries/dbxml/default.nix
rename to pkgs/by-name/db/dbxml/package.nix
diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/by-name/dc/dcadec/package.nix
similarity index 100%
rename from pkgs/development/tools/dcadec/default.nix
rename to pkgs/by-name/dc/dcadec/package.nix
diff --git a/pkgs/tools/networking/dcap/default.nix b/pkgs/by-name/dc/dcap/package.nix
similarity index 100%
rename from pkgs/tools/networking/dcap/default.nix
rename to pkgs/by-name/dc/dcap/package.nix
diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/by-name/dc/dcfldd/package.nix
similarity index 100%
rename from pkgs/tools/system/dcfldd/default.nix
rename to pkgs/by-name/dc/dcfldd/package.nix
diff --git a/pkgs/os-specific/linux/dcgm/default.nix b/pkgs/by-name/dc/dcgm/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/dcgm/default.nix
rename to pkgs/by-name/dc/dcgm/package.nix
diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/by-name/dc/dclib/package.nix
similarity index 100%
rename from pkgs/development/libraries/dclib/default.nix
rename to pkgs/by-name/dc/dclib/package.nix
diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/by-name/dc/dclxvi/package.nix
similarity index 100%
rename from pkgs/development/libraries/dclxvi/default.nix
rename to pkgs/by-name/dc/dclxvi/package.nix
diff --git a/pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch b/pkgs/by-name/dc/dcm2niix/dont-fetch-external-libs.patch
similarity index 100%
rename from pkgs/applications/science/biology/dcm2niix/dont-fetch-external-libs.patch
rename to pkgs/by-name/dc/dcm2niix/dont-fetch-external-libs.patch
diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/by-name/dc/dcm2niix/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/dcm2niix/default.nix
rename to pkgs/by-name/dc/dcm2niix/package.nix
diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/by-name/dc/dcmtk/package.nix
similarity index 100%
rename from pkgs/applications/science/medicine/dcmtk/default.nix
rename to pkgs/by-name/dc/dcmtk/package.nix
diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/by-name/dc/dconf/package.nix
similarity index 100%
rename from pkgs/development/libraries/dconf/default.nix
rename to pkgs/by-name/dc/dconf/package.nix
diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/by-name/dc/dcraw/package.nix
similarity index 100%
rename from pkgs/tools/graphics/dcraw/default.nix
rename to pkgs/by-name/dc/dcraw/package.nix
diff --git a/pkgs/applications/blockchains/dcrctl/default.nix b/pkgs/by-name/dc/dcrctl/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/dcrctl/default.nix
rename to pkgs/by-name/dc/dcrctl/package.nix
diff --git a/pkgs/applications/blockchains/dcrd/default.nix b/pkgs/by-name/dc/dcrd/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/dcrd/default.nix
rename to pkgs/by-name/dc/dcrd/package.nix
diff --git a/pkgs/applications/blockchains/dcrwallet/default.nix b/pkgs/by-name/dc/dcrwallet/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/dcrwallet/default.nix
rename to pkgs/by-name/dc/dcrwallet/package.nix
diff --git a/pkgs/tools/text/dcs/default.nix b/pkgs/by-name/dc/dcs/package.nix
similarity index 100%
rename from pkgs/tools/text/dcs/default.nix
rename to pkgs/by-name/dc/dcs/package.nix
diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/by-name/dd/dd_rescue/package.nix
similarity index 100%
rename from pkgs/tools/system/dd_rescue/default.nix
rename to pkgs/by-name/dd/dd_rescue/package.nix
diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/by-name/dd/ddate/package.nix
similarity index 100%
rename from pkgs/tools/misc/ddate/default.nix
rename to pkgs/by-name/dd/ddate/package.nix
diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix
similarity index 100%
rename from pkgs/data/misc/ddccontrol-db/default.nix
rename to pkgs/by-name/dd/ddccontrol-db/package.nix
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/by-name/dd/ddccontrol/package.nix
similarity index 100%
rename from pkgs/tools/misc/ddccontrol/default.nix
rename to pkgs/by-name/dd/ddccontrol/package.nix
diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/by-name/dd/ddclient/package.nix
similarity index 100%
rename from pkgs/tools/networking/ddclient/default.nix
rename to pkgs/by-name/dd/ddclient/package.nix
diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/by-name/dd/ddcutil/package.nix
similarity index 100%
rename from pkgs/tools/misc/ddcutil/default.nix
rename to pkgs/by-name/dd/ddcutil/package.nix
diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/by-name/dd/ddd/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/ddd/default.nix
rename to pkgs/by-name/dd/ddd/package.nix
diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/by-name/dd/ddev/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/ddev/default.nix
rename to pkgs/by-name/dd/ddev/package.nix
diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/by-name/dd/ddgr/package.nix
similarity index 100%
rename from pkgs/applications/misc/ddgr/default.nix
rename to pkgs/by-name/dd/ddgr/package.nix
diff --git a/pkgs/tools/system/ddh/default.nix b/pkgs/by-name/dd/ddh/package.nix
similarity index 100%
rename from pkgs/tools/system/ddh/default.nix
rename to pkgs/by-name/dd/ddh/package.nix
diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/by-name/dd/ddns-go/package.nix
similarity index 100%
rename from pkgs/tools/networking/ddns-go/default.nix
rename to pkgs/by-name/dd/ddns-go/package.nix
diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/by-name/dd/ddosify/package.nix
similarity index 100%
rename from pkgs/development/tools/ddosify/default.nix
rename to pkgs/by-name/dd/ddosify/package.nix
diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/by-name/dd/ddrescue/package.nix
similarity index 100%
rename from pkgs/tools/system/ddrescue/default.nix
rename to pkgs/by-name/dd/ddrescue/package.nix
diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/by-name/dd/ddrescueview/package.nix
similarity index 100%
rename from pkgs/tools/system/ddrescueview/default.nix
rename to pkgs/by-name/dd/ddrescueview/package.nix
diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/by-name/dd/ddrutility/package.nix
similarity index 100%
rename from pkgs/tools/system/ddrutility/default.nix
rename to pkgs/by-name/dd/ddrutility/package.nix
diff --git a/pkgs/tools/filesystems/dduper/default.nix b/pkgs/by-name/dd/dduper/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/dduper/default.nix
rename to pkgs/by-name/dd/dduper/package.nix
diff --git a/pkgs/development/tools/deadnix/default.nix b/pkgs/by-name/de/deadnix/package.nix
similarity index 100%
rename from pkgs/development/tools/deadnix/default.nix
rename to pkgs/by-name/de/deadnix/package.nix
diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/by-name/de/deadpixi-sam-unstable/package.nix
similarity index 100%
rename from pkgs/applications/editors/deadpixi-sam/default.nix
rename to pkgs/by-name/de/deadpixi-sam-unstable/package.nix
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/by-name/de/debian-devscripts/package.nix
similarity index 100%
rename from pkgs/tools/misc/debian-devscripts/default.nix
rename to pkgs/by-name/de/debian-devscripts/package.nix
diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/by-name/de/debian-goodies/package.nix
similarity index 100%
rename from pkgs/applications/misc/debian-goodies/default.nix
rename to pkgs/by-name/de/debian-goodies/package.nix
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/by-name/de/debootstrap/package.nix
similarity index 100%
rename from pkgs/tools/misc/debootstrap/default.nix
rename to pkgs/by-name/de/debootstrap/package.nix
diff --git a/pkgs/development/tools/misc/debugedit/default.nix b/pkgs/by-name/de/debugedit/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/debugedit/default.nix
rename to pkgs/by-name/de/debugedit/package.nix
diff --git a/pkgs/development/tools/dec-decode/default.nix b/pkgs/by-name/de/dec-decode/package.nix
similarity index 100%
rename from pkgs/development/tools/dec-decode/default.nix
rename to pkgs/by-name/de/dec-decode/package.nix
diff --git a/pkgs/applications/misc/deckmaster/default.nix b/pkgs/by-name/de/deckmaster/package.nix
similarity index 100%
rename from pkgs/applications/misc/deckmaster/default.nix
rename to pkgs/by-name/de/deckmaster/package.nix
diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/by-name/de/deco/package.nix
similarity index 100%
rename from pkgs/applications/misc/deco/default.nix
rename to pkgs/by-name/de/deco/package.nix
diff --git a/pkgs/tools/networking/decode-spam-headers/default.nix b/pkgs/by-name/de/decode-spam-headers/package.nix
similarity index 100%
rename from pkgs/tools/networking/decode-spam-headers/default.nix
rename to pkgs/by-name/de/decode-spam-headers/package.nix
diff --git a/pkgs/tools/security/decoder/default.nix b/pkgs/by-name/de/decoder/package.nix
similarity index 100%
rename from pkgs/tools/security/decoder/default.nix
rename to pkgs/by-name/de/decoder/package.nix
diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/by-name/de/dedup/package.nix
similarity index 100%
rename from pkgs/tools/backup/dedup/default.nix
rename to pkgs/by-name/de/dedup/package.nix
diff --git a/pkgs/applications/version-management/deepgit/default.nix b/pkgs/by-name/de/deepgit/package.nix
similarity index 100%
rename from pkgs/applications/version-management/deepgit/default.nix
rename to pkgs/by-name/de/deepgit/package.nix
diff --git a/pkgs/tools/security/deepsea/default.nix b/pkgs/by-name/de/deepsea/package.nix
similarity index 100%
rename from pkgs/tools/security/deepsea/default.nix
rename to pkgs/by-name/de/deepsea/package.nix
diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/pkgs/by-name/de/deeptools/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/deeptools/default.nix
rename to pkgs/by-name/de/deeptools/package.nix
diff --git a/pkgs/shells/zsh/zsh-deer/default.nix b/pkgs/by-name/de/deer/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-deer/default.nix
rename to pkgs/by-name/de/deer/package.nix
diff --git a/pkgs/shells/zsh/zsh-deer/realpath.patch b/pkgs/by-name/de/deer/realpath.patch
similarity index 100%
rename from pkgs/shells/zsh/zsh-deer/realpath.patch
rename to pkgs/by-name/de/deer/realpath.patch
diff --git a/pkgs/applications/video/deface/default.nix b/pkgs/by-name/de/deface/package.nix
similarity index 100%
rename from pkgs/applications/video/deface/default.nix
rename to pkgs/by-name/de/deface/package.nix
diff --git a/pkgs/applications/version-management/degit/default.nix b/pkgs/by-name/de/degit/package.nix
similarity index 100%
rename from pkgs/applications/version-management/degit/default.nix
rename to pkgs/by-name/de/degit/package.nix
diff --git a/pkgs/development/tools/misc/deheader/default.nix b/pkgs/by-name/de/deheader/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/deheader/default.nix
rename to pkgs/by-name/de/deheader/package.nix
diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/by-name/de/dehydrated/package.nix
similarity index 100%
rename from pkgs/tools/admin/dehydrated/default.nix
rename to pkgs/by-name/de/dehydrated/package.nix
diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/by-name/de/deja-dup/fix-paths.patch
similarity index 100%
rename from pkgs/applications/backup/deja-dup/fix-paths.patch
rename to pkgs/by-name/de/deja-dup/fix-paths.patch
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/by-name/de/deja-dup/package.nix
similarity index 100%
rename from pkgs/applications/backup/deja-dup/default.nix
rename to pkgs/by-name/de/deja-dup/package.nix
diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/by-name/de/dejagnu/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/dejagnu/default.nix
rename to pkgs/by-name/de/dejagnu/package.nix
diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/by-name/de/dejsonlz4/package.nix
similarity index 100%
rename from pkgs/tools/compression/dejsonlz4/default.nix
rename to pkgs/by-name/de/dejsonlz4/package.nix
diff --git a/pkgs/applications/audio/delayarchitect/default.nix b/pkgs/by-name/de/delayarchitect/package.nix
similarity index 100%
rename from pkgs/applications/audio/delayarchitect/default.nix
rename to pkgs/by-name/de/delayarchitect/package.nix
diff --git a/pkgs/misc/drivers/dell-530cdn/default.nix b/pkgs/by-name/de/dell-530cdn/package.nix
similarity index 100%
rename from pkgs/misc/drivers/dell-530cdn/default.nix
rename to pkgs/by-name/de/dell-530cdn/package.nix
diff --git a/pkgs/tools/system/dell-command-configure/default.nix b/pkgs/by-name/de/dell-command-configure/package.nix
similarity index 100%
rename from pkgs/tools/system/dell-command-configure/default.nix
rename to pkgs/by-name/de/dell-command-configure/package.nix
diff --git a/pkgs/tools/system/dell-command-configure/wrapper-lib.c b/pkgs/by-name/de/dell-command-configure/wrapper-lib.c
similarity index 100%
rename from pkgs/tools/system/dell-command-configure/wrapper-lib.c
rename to pkgs/by-name/de/dell-command-configure/wrapper-lib.c
diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/by-name/de/delly/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/delly/default.nix
rename to pkgs/by-name/de/delly/package.nix
diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/by-name/de/delta/package.nix
similarity index 100%
rename from pkgs/applications/version-management/delta/default.nix
rename to pkgs/by-name/de/delta/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/by-name/de/deltachat-cursed/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix
rename to pkgs/by-name/de/deltachat-cursed/package.nix
diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/by-name/de/delve/package.nix
similarity index 100%
rename from pkgs/development/tools/delve/default.nix
rename to pkgs/by-name/de/delve/package.nix
diff --git a/pkgs/servers/demoit/default.nix b/pkgs/by-name/de/demoit/package.nix
similarity index 100%
rename from pkgs/servers/demoit/default.nix
rename to pkgs/by-name/de/demoit/package.nix
diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/by-name/de/dendrite/package.nix
similarity index 100%
rename from pkgs/servers/dendrite/default.nix
rename to pkgs/by-name/de/dendrite/package.nix
diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/by-name/de/denemo/package.nix
similarity index 100%
rename from pkgs/applications/audio/denemo/default.nix
rename to pkgs/by-name/de/denemo/package.nix
diff --git a/pkgs/tools/graphics/deqp-runner/default.nix b/pkgs/by-name/de/deqp-runner/package.nix
similarity index 100%
rename from pkgs/tools/graphics/deqp-runner/default.nix
rename to pkgs/by-name/de/deqp-runner/package.nix
diff --git a/pkgs/tools/security/der-ascii/default.nix b/pkgs/by-name/de/der-ascii/package.nix
similarity index 100%
rename from pkgs/tools/security/der-ascii/default.nix
rename to pkgs/by-name/de/der-ascii/package.nix
diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/by-name/de/deskew/package.nix
similarity index 100%
rename from pkgs/applications/graphics/deskew/default.nix
rename to pkgs/by-name/de/deskew/package.nix
diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/by-name/de/desktop-file-utils/package.nix
similarity index 100%
rename from pkgs/tools/misc/desktop-file-utils/default.nix
rename to pkgs/by-name/de/desktop-file-utils/package.nix
diff --git a/pkgs/tools/misc/desktop-file-utils/setup-hook.sh b/pkgs/by-name/de/desktop-file-utils/setup-hook.sh
similarity index 100%
rename from pkgs/tools/misc/desktop-file-utils/setup-hook.sh
rename to pkgs/by-name/de/desktop-file-utils/setup-hook.sh
diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/by-name/de/desync/package.nix
similarity index 100%
rename from pkgs/applications/networking/sync/desync/default.nix
rename to pkgs/by-name/de/desync/package.nix
diff --git a/pkgs/development/tools/detekt/default.nix b/pkgs/by-name/de/detekt/package.nix
similarity index 100%
rename from pkgs/development/tools/detekt/default.nix
rename to pkgs/by-name/de/detekt/package.nix
diff --git a/pkgs/build-support/deterministic-uname/deterministic-uname.sh b/pkgs/by-name/de/deterministic-uname/deterministic-uname.sh
similarity index 100%
rename from pkgs/build-support/deterministic-uname/deterministic-uname.sh
rename to pkgs/by-name/de/deterministic-uname/deterministic-uname.sh
diff --git a/pkgs/build-support/deterministic-uname/default.nix b/pkgs/by-name/de/deterministic-uname/package.nix
similarity index 100%
rename from pkgs/build-support/deterministic-uname/default.nix
rename to pkgs/by-name/de/deterministic-uname/package.nix
diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/by-name/de/detox/package.nix
similarity index 100%
rename from pkgs/tools/misc/detox/default.nix
rename to pkgs/by-name/de/detox/package.nix
diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/by-name/de/devd/package.nix
similarity index 100%
rename from pkgs/development/tools/devd/default.nix
rename to pkgs/by-name/de/devd/package.nix
diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/by-name/de/devdocs-desktop/package.nix
similarity index 100%
rename from pkgs/applications/misc/devdocs-desktop/default.nix
rename to pkgs/by-name/de/devdocs-desktop/package.nix
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/by-name/de/devede/package.nix
similarity index 100%
rename from pkgs/applications/video/devede/default.nix
rename to pkgs/by-name/de/devede/package.nix
diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/by-name/de/devmem2/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/devmem2/default.nix
rename to pkgs/by-name/de/devmem2/package.nix
diff --git a/pkgs/tools/X11/devour/default.nix b/pkgs/by-name/de/devour/package.nix
similarity index 100%
rename from pkgs/tools/X11/devour/default.nix
rename to pkgs/by-name/de/devour/package.nix
diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/by-name/de/devspace/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/devspace/default.nix
rename to pkgs/by-name/de/devspace/package.nix
diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/by-name/de/devtodo/package.nix
similarity index 100%
rename from pkgs/development/tools/devtodo/default.nix
rename to pkgs/by-name/de/devtodo/package.nix
diff --git a/pkgs/servers/dex/default.nix b/pkgs/by-name/de/dex-oidc/package.nix
similarity index 100%
rename from pkgs/servers/dex/default.nix
rename to pkgs/by-name/de/dex-oidc/package.nix
diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/by-name/de/dex/package.nix
similarity index 100%
rename from pkgs/tools/X11/dex/default.nix
rename to pkgs/by-name/de/dex/package.nix
diff --git a/pkgs/development/tools/java/dex2jar/default.nix b/pkgs/by-name/de/dex2jar/package.nix
similarity index 100%
rename from pkgs/development/tools/java/dex2jar/default.nix
rename to pkgs/by-name/de/dex2jar/package.nix
diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/by-name/df/dfc/package.nix
similarity index 100%
rename from pkgs/tools/system/dfc/default.nix
rename to pkgs/by-name/df/dfc/package.nix
diff --git a/pkgs/tools/text/dfmt/default.nix b/pkgs/by-name/df/dfmt/package.nix
similarity index 100%
rename from pkgs/tools/text/dfmt/default.nix
rename to pkgs/by-name/df/dfmt/package.nix
diff --git a/pkgs/tools/system/dfrs/default.nix b/pkgs/by-name/df/dfrs/package.nix
similarity index 100%
rename from pkgs/tools/system/dfrs/default.nix
rename to pkgs/by-name/df/dfrs/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/dftd4/fortran-module-dir.patch b/pkgs/by-name/df/dftd4/fortran-module-dir.patch
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/dftd4/fortran-module-dir.patch
rename to pkgs/by-name/df/dftd4/fortran-module-dir.patch
diff --git a/pkgs/development/libraries/science/chemistry/dftd4/default.nix b/pkgs/by-name/df/dftd4/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/dftd4/default.nix
rename to pkgs/by-name/df/dftd4/package.nix
diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/by-name/df/dfu-programmer/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/dfu-programmer/default.nix
rename to pkgs/by-name/df/dfu-programmer/package.nix
diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/by-name/df/dfu-util/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/dfu-util/default.nix
rename to pkgs/by-name/df/dfu-util/package.nix
diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/by-name/dg/dgraph/package.nix
similarity index 100%
rename from pkgs/servers/dgraph/default.nix
rename to pkgs/by-name/dg/dgraph/package.nix
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/by-name/dh/dhcpcd/package.nix
similarity index 100%
rename from pkgs/tools/networking/dhcpcd/default.nix
rename to pkgs/by-name/dh/dhcpcd/package.nix
diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/by-name/dh/dhcpdump/package.nix
similarity index 100%
rename from pkgs/tools/networking/dhcpdump/default.nix
rename to pkgs/by-name/dh/dhcpdump/package.nix
diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/by-name/dh/dhcping/package.nix
similarity index 100%
rename from pkgs/tools/networking/dhcping/default.nix
rename to pkgs/by-name/dh/dhcping/package.nix
diff --git a/pkgs/games/doom-ports/dhewm3/default.nix b/pkgs/by-name/dh/dhewm3/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/dhewm3/default.nix
rename to pkgs/by-name/dh/dhewm3/package.nix
diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/by-name/dh/dhex/package.nix
similarity index 100%
rename from pkgs/applications/editors/dhex/default.nix
rename to pkgs/by-name/dh/dhex/package.nix
diff --git a/pkgs/applications/networking/p2p/dht/default.nix b/pkgs/by-name/dh/dht/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/dht/default.nix
rename to pkgs/by-name/dh/dht/package.nix
diff --git a/pkgs/tools/system/di/default.nix b/pkgs/by-name/di/di/package.nix
similarity index 100%
rename from pkgs/tools/system/di/default.nix
rename to pkgs/by-name/di/di/package.nix
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/by-name/di/dia/package.nix
similarity index 100%
rename from pkgs/applications/graphics/dia/default.nix
rename to pkgs/by-name/di/dia/package.nix
diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/by-name/di/diamond/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/diamond/default.nix
rename to pkgs/by-name/di/diamond/package.nix
diff --git a/pkgs/servers/dico/default.nix b/pkgs/by-name/di/dico/package.nix
similarity index 100%
rename from pkgs/servers/dico/default.nix
rename to pkgs/by-name/di/dico/package.nix
diff --git a/pkgs/applications/misc/dict-cc-py/default.nix b/pkgs/by-name/di/dict-cc-py/package.nix
similarity index 100%
rename from pkgs/applications/misc/dict-cc-py/default.nix
rename to pkgs/by-name/di/dict-cc-py/package.nix
diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/by-name/di/diction/package.nix
similarity index 100%
rename from pkgs/tools/text/diction/default.nix
rename to pkgs/by-name/di/diction/package.nix
diff --git a/pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch b/pkgs/by-name/di/dictu/0001-force-sqlite-to-be-found.patch
similarity index 100%
rename from pkgs/development/compilers/dictu/0001-force-sqlite-to-be-found.patch
rename to pkgs/by-name/di/dictu/0001-force-sqlite-to-be-found.patch
diff --git a/pkgs/development/compilers/dictu/default.nix b/pkgs/by-name/di/dictu/package.nix
similarity index 100%
rename from pkgs/development/compilers/dictu/default.nix
rename to pkgs/by-name/di/dictu/package.nix
diff --git a/pkgs/tools/misc/didu/default.nix b/pkgs/by-name/di/didu/package.nix
similarity index 100%
rename from pkgs/tools/misc/didu/default.nix
rename to pkgs/by-name/di/didu/package.nix
diff --git a/pkgs/applications/misc/diebahn/default.nix b/pkgs/by-name/di/diebahn/package.nix
similarity index 100%
rename from pkgs/applications/misc/diebahn/default.nix
rename to pkgs/by-name/di/diebahn/package.nix
diff --git a/pkgs/tools/security/dieharder/default.nix b/pkgs/by-name/di/dieharder/package.nix
similarity index 100%
rename from pkgs/tools/security/dieharder/default.nix
rename to pkgs/by-name/di/dieharder/package.nix
diff --git a/pkgs/tools/security/dieharder/stdint.patch b/pkgs/by-name/di/dieharder/stdint.patch
similarity index 100%
rename from pkgs/tools/security/dieharder/stdint.patch
rename to pkgs/by-name/di/dieharder/stdint.patch
diff --git a/pkgs/applications/version-management/diff-so-fancy/default.nix b/pkgs/by-name/di/diff-so-fancy/package.nix
similarity index 100%
rename from pkgs/applications/version-management/diff-so-fancy/default.nix
rename to pkgs/by-name/di/diff-so-fancy/package.nix
diff --git a/pkgs/tools/misc/diffoci/default.nix b/pkgs/by-name/di/diffoci/package.nix
similarity index 100%
rename from pkgs/tools/misc/diffoci/default.nix
rename to pkgs/by-name/di/diffoci/package.nix
diff --git a/pkgs/tools/text/diffsitter/default.nix b/pkgs/by-name/di/diffsitter/package.nix
similarity index 100%
rename from pkgs/tools/text/diffsitter/default.nix
rename to pkgs/by-name/di/diffsitter/package.nix
diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/by-name/di/diffstat/package.nix
similarity index 100%
rename from pkgs/tools/text/diffstat/default.nix
rename to pkgs/by-name/di/diffstat/package.nix
diff --git a/pkgs/tools/text/difftastic/Cargo.lock b/pkgs/by-name/di/difftastic/Cargo.lock
similarity index 100%
rename from pkgs/tools/text/difftastic/Cargo.lock
rename to pkgs/by-name/di/difftastic/Cargo.lock
diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/by-name/di/difftastic/package.nix
similarity index 100%
rename from pkgs/tools/text/difftastic/default.nix
rename to pkgs/by-name/di/difftastic/package.nix
diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/by-name/di/diffuse/package.nix
similarity index 100%
rename from pkgs/applications/misc/diffuse/default.nix
rename to pkgs/by-name/di/diffuse/package.nix
diff --git a/pkgs/applications/radio/digiham/default.nix b/pkgs/by-name/di/digiham/package.nix
similarity index 100%
rename from pkgs/applications/radio/digiham/default.nix
rename to pkgs/by-name/di/digiham/package.nix
diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/by-name/di/digital/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/digital/default.nix
rename to pkgs/by-name/di/digital/package.nix
diff --git a/pkgs/tools/misc/digitemp/default.nix b/pkgs/by-name/di/digitemp/package.nix
similarity index 100%
rename from pkgs/tools/misc/digitemp/default.nix
rename to pkgs/by-name/di/digitemp/package.nix
diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/by-name/di/dina-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/dina/default.nix
rename to pkgs/by-name/di/dina-font/package.nix
diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/by-name/di/ding-libs/package.nix
similarity index 100%
rename from pkgs/tools/misc/ding-libs/default.nix
rename to pkgs/by-name/di/ding-libs/package.nix
diff --git a/pkgs/applications/audio/diopser/default.nix b/pkgs/by-name/di/diopser/package.nix
similarity index 100%
rename from pkgs/applications/audio/diopser/default.nix
rename to pkgs/by-name/di/diopser/package.nix
diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/by-name/di/dioxus-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/dioxus-cli/default.nix
rename to pkgs/by-name/di/dioxus-cli/package.nix
diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/by-name/di/dirb/package.nix
similarity index 100%
rename from pkgs/tools/networking/dirb/default.nix
rename to pkgs/by-name/di/dirb/package.nix
diff --git a/pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch b/pkgs/by-name/di/dirdiff/dirdiff-2.1-vars.patch
similarity index 100%
rename from pkgs/tools/text/dirdiff/dirdiff-2.1-vars.patch
rename to pkgs/by-name/di/dirdiff/dirdiff-2.1-vars.patch
diff --git a/pkgs/tools/text/dirdiff/default.nix b/pkgs/by-name/di/dirdiff/package.nix
similarity index 100%
rename from pkgs/tools/text/dirdiff/default.nix
rename to pkgs/by-name/di/dirdiff/package.nix
diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/by-name/di/directfb/package.nix
similarity index 100%
rename from pkgs/development/libraries/directfb/default.nix
rename to pkgs/by-name/di/directfb/package.nix
diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/by-name/di/directvnc/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/directvnc/default.nix
rename to pkgs/by-name/di/directvnc/package.nix
diff --git a/pkgs/development/libraries/directx-headers/default.nix b/pkgs/by-name/di/directx-headers/package.nix
similarity index 100%
rename from pkgs/development/libraries/directx-headers/default.nix
rename to pkgs/by-name/di/directx-headers/package.nix
diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/by-name/di/direvent/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/direvent/default.nix
rename to pkgs/by-name/di/direvent/package.nix
diff --git a/pkgs/tools/security/dirstalk/default.nix b/pkgs/by-name/di/dirstalk/package.nix
similarity index 100%
rename from pkgs/tools/security/dirstalk/default.nix
rename to pkgs/by-name/di/dirstalk/package.nix
diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/by-name/di/dirt/package.nix
similarity index 100%
rename from pkgs/applications/audio/dirt/default.nix
rename to pkgs/by-name/di/dirt/package.nix
diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/by-name/di/dirvish/package.nix
similarity index 100%
rename from pkgs/tools/backup/dirvish/default.nix
rename to pkgs/by-name/di/dirvish/package.nix
diff --git a/pkgs/tools/misc/discocss/default.nix b/pkgs/by-name/di/discocss/package.nix
similarity index 100%
rename from pkgs/tools/misc/discocss/default.nix
rename to pkgs/by-name/di/discocss/package.nix
diff --git a/pkgs/tools/networking/discord-sh/default.nix b/pkgs/by-name/di/discord-sh/package.nix
similarity index 100%
rename from pkgs/tools/networking/discord-sh/default.nix
rename to pkgs/by-name/di/discord-sh/package.nix
diff --git a/pkgs/tools/text/discount/fix-configure-path.patch b/pkgs/by-name/di/discount/fix-configure-path.patch
similarity index 100%
rename from pkgs/tools/text/discount/fix-configure-path.patch
rename to pkgs/by-name/di/discount/fix-configure-path.patch
diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/by-name/di/discount/package.nix
similarity index 100%
rename from pkgs/tools/text/discount/default.nix
rename to pkgs/by-name/di/discount/package.nix
diff --git a/pkgs/servers/web-apps/discourse/mail_receiver/default.nix b/pkgs/by-name/di/discourse-mail-receiver/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/discourse/mail_receiver/default.nix
rename to pkgs/by-name/di/discourse-mail-receiver/package.nix
diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/by-name/di/disfetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/disfetch/default.nix
rename to pkgs/by-name/di/disfetch/package.nix
diff --git a/pkgs/tools/filesystems/disk-inventory-x/default.nix b/pkgs/by-name/di/disk-inventory-x/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/disk-inventory-x/default.nix
rename to pkgs/by-name/di/disk-inventory-x/package.nix
diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/by-name/di/disk_indicator/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/disk-indicator/default.nix
rename to pkgs/by-name/di/disk_indicator/package.nix
diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/by-name/di/diskonaut/package.nix
similarity index 100%
rename from pkgs/tools/misc/diskonaut/default.nix
rename to pkgs/by-name/di/diskonaut/package.nix
diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/by-name/di/diskrsync/package.nix
similarity index 100%
rename from pkgs/tools/backup/diskrsync/default.nix
rename to pkgs/by-name/di/diskrsync/package.nix
diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/by-name/di/diskscan/package.nix
similarity index 100%
rename from pkgs/tools/misc/diskscan/default.nix
rename to pkgs/by-name/di/diskscan/package.nix
diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/by-name/di/dislocker/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/dislocker/default.nix
rename to pkgs/by-name/di/dislocker/package.nix
diff --git a/pkgs/tools/security/dismap/default.nix b/pkgs/by-name/di/dismap/package.nix
similarity index 100%
rename from pkgs/tools/security/dismap/default.nix
rename to pkgs/by-name/di/dismap/package.nix
diff --git a/pkgs/tools/security/dismember/default.nix b/pkgs/by-name/di/dismember/package.nix
similarity index 100%
rename from pkgs/tools/security/dismember/default.nix
rename to pkgs/by-name/di/dismember/package.nix
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/by-name/di/disnixos/package.nix
similarity index 100%
rename from pkgs/tools/package-management/disnix/disnixos/default.nix
rename to pkgs/by-name/di/disnixos/package.nix
diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/by-name/di/distgen/package.nix
similarity index 100%
rename from pkgs/development/tools/distgen/default.nix
rename to pkgs/by-name/di/distgen/package.nix
diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/by-name/di/distrobox/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/distrobox/default.nix
rename to pkgs/by-name/di/distrobox/package.nix
diff --git a/pkgs/applications/virtualization/distrobox/relative-default-icon.patch b/pkgs/by-name/di/distrobox/relative-default-icon.patch
similarity index 100%
rename from pkgs/applications/virtualization/distrobox/relative-default-icon.patch
rename to pkgs/by-name/di/distrobox/relative-default-icon.patch
diff --git a/pkgs/tools/virtualization/distrobuilder/generator.nix b/pkgs/by-name/di/distrobuilder/generator.nix
similarity index 100%
rename from pkgs/tools/virtualization/distrobuilder/generator.nix
rename to pkgs/by-name/di/distrobuilder/generator.nix
diff --git a/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch b/pkgs/by-name/di/distrobuilder/nixos-generator.patch
similarity index 100%
rename from pkgs/tools/virtualization/distrobuilder/nixos-generator.patch
rename to pkgs/by-name/di/distrobuilder/nixos-generator.patch
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/by-name/di/distrobuilder/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/distrobuilder/default.nix
rename to pkgs/by-name/di/distrobuilder/package.nix
diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/by-name/di/diswall/package.nix
similarity index 100%
rename from pkgs/applications/networking/diswall/default.nix
rename to pkgs/by-name/di/diswall/package.nix
diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/by-name/di/dit/package.nix
similarity index 100%
rename from pkgs/applications/editors/dit/default.nix
rename to pkgs/by-name/di/dit/package.nix
diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/by-name/di/ditaa/package.nix
similarity index 100%
rename from pkgs/tools/graphics/ditaa/default.nix
rename to pkgs/by-name/di/ditaa/package.nix
diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/by-name/di/dive/package.nix
similarity index 100%
rename from pkgs/development/tools/dive/default.nix
rename to pkgs/by-name/di/dive/package.nix
diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/by-name/di/diylc/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/diylc/default.nix
rename to pkgs/by-name/di/diylc/package.nix
diff --git a/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch b/pkgs/by-name/dj/djbdns/fix-nix-usernamespace-build.patch
similarity index 100%
rename from pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch
rename to pkgs/by-name/dj/djbdns/fix-nix-usernamespace-build.patch
diff --git a/pkgs/tools/networking/djbdns/hier.patch b/pkgs/by-name/dj/djbdns/hier.patch
similarity index 100%
rename from pkgs/tools/networking/djbdns/hier.patch
rename to pkgs/by-name/dj/djbdns/hier.patch
diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/by-name/dj/djbdns/package.nix
similarity index 100%
rename from pkgs/tools/networking/djbdns/default.nix
rename to pkgs/by-name/dj/djbdns/package.nix
diff --git a/pkgs/tools/networking/djbdns/softlimit.patch b/pkgs/by-name/dj/djbdns/softlimit.patch
similarity index 100%
rename from pkgs/tools/networking/djbdns/softlimit.patch
rename to pkgs/by-name/dj/djbdns/softlimit.patch
diff --git a/pkgs/tools/misc/djenrandom/default.nix b/pkgs/by-name/dj/djenrandom/package.nix
similarity index 100%
rename from pkgs/tools/misc/djenrandom/default.nix
rename to pkgs/by-name/dj/djenrandom/package.nix
diff --git a/pkgs/development/tools/djlint/default.nix b/pkgs/by-name/dj/djlint/package.nix
similarity index 100%
rename from pkgs/development/tools/djlint/default.nix
rename to pkgs/by-name/dj/djlint/package.nix
diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/by-name/dj/djmount/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/djmount/default.nix
rename to pkgs/by-name/dj/djmount/package.nix
diff --git a/pkgs/tools/text/djot-js/default.nix b/pkgs/by-name/dj/djot-js/package.nix
similarity index 100%
rename from pkgs/tools/text/djot-js/default.nix
rename to pkgs/by-name/dj/djot-js/package.nix
diff --git a/pkgs/applications/graphics/djv/default.nix b/pkgs/by-name/dj/djv/package.nix
similarity index 100%
rename from pkgs/applications/graphics/djv/default.nix
rename to pkgs/by-name/dj/djv/package.nix
diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/by-name/dj/djvu2pdf/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/djvu2pdf/default.nix
rename to pkgs/by-name/dj/djvu2pdf/package.nix
diff --git a/pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch b/pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch
similarity index 100%
rename from pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch
rename to pkgs/by-name/dj/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch
diff --git a/pkgs/applications/misc/djvulibre/c++17-register-class.patch b/pkgs/by-name/dj/djvulibre/c++17-register-class.patch
similarity index 100%
rename from pkgs/applications/misc/djvulibre/c++17-register-class.patch
rename to pkgs/by-name/dj/djvulibre/c++17-register-class.patch
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/by-name/dj/djvulibre/package.nix
similarity index 100%
rename from pkgs/applications/misc/djvulibre/default.nix
rename to pkgs/by-name/dj/djvulibre/package.nix
diff --git a/pkgs/applications/window-managers/dk/default.nix b/pkgs/by-name/dk/dk/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/dk/default.nix
rename to pkgs/by-name/dk/dk/package.nix
diff --git a/pkgs/applications/science/chemistry/dkh/default.nix b/pkgs/by-name/dk/dkh/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/dkh/default.nix
rename to pkgs/by-name/dk/dkh/package.nix
diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/by-name/dk/dkimproxy/package.nix
similarity index 100%
rename from pkgs/servers/mail/dkimproxy/default.nix
rename to pkgs/by-name/dk/dkimproxy/package.nix
diff --git a/pkgs/tools/audio/dl-librescore/default.nix b/pkgs/by-name/dl/dl-librescore/package.nix
similarity index 100%
rename from pkgs/tools/audio/dl-librescore/default.nix
rename to pkgs/by-name/dl/dl-librescore/package.nix
diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/by-name/dl/dl-poly-classic-mpi/package.nix
similarity index 100%
rename from pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix
rename to pkgs/by-name/dl/dl-poly-classic-mpi/package.nix
diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/by-name/dl/dleyna-connector-dbus/package.nix
similarity index 100%
rename from pkgs/development/libraries/dleyna-connector-dbus/default.nix
rename to pkgs/by-name/dl/dleyna-connector-dbus/package.nix
diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/by-name/dl/dleyna-core/package.nix
similarity index 100%
rename from pkgs/development/libraries/dleyna-core/default.nix
rename to pkgs/by-name/dl/dleyna-core/package.nix
diff --git a/pkgs/development/libraries/dleyna-core/setup-hook.sh b/pkgs/by-name/dl/dleyna-core/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/dleyna-core/setup-hook.sh
rename to pkgs/by-name/dl/dleyna-core/setup-hook.sh
diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/by-name/dl/dleyna-renderer/package.nix
similarity index 100%
rename from pkgs/development/libraries/dleyna-renderer/default.nix
rename to pkgs/by-name/dl/dleyna-renderer/package.nix
diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/by-name/dl/dleyna-server/package.nix
similarity index 100%
rename from pkgs/development/libraries/dleyna-server/default.nix
rename to pkgs/by-name/dl/dleyna-server/package.nix
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/by-name/dl/dlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/dlib/default.nix
rename to pkgs/by-name/dl/dlib/package.nix
diff --git a/pkgs/applications/emulators/dlx/default.nix b/pkgs/by-name/dl/dlx/package.nix
similarity index 100%
rename from pkgs/applications/emulators/dlx/default.nix
rename to pkgs/by-name/dl/dlx/package.nix
diff --git a/pkgs/data/fonts/dm-sans/default.nix b/pkgs/by-name/dm/dm-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/dm-sans/default.nix
rename to pkgs/by-name/dm/dm-sans/package.nix
diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix
rename to pkgs/by-name/dm/dmarc-metrics-exporter/package.nix
diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/by-name/dm/dmg2img/package.nix
similarity index 100%
rename from pkgs/tools/misc/dmg2img/default.nix
rename to pkgs/by-name/dm/dmg2img/package.nix
diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/by-name/dm/dmidecode/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/dmidecode/default.nix
rename to pkgs/by-name/dm/dmidecode/package.nix
diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/by-name/dm/dmrconfig/package.nix
similarity index 100%
rename from pkgs/applications/radio/dmrconfig/default.nix
rename to pkgs/by-name/dm/dmrconfig/package.nix
diff --git a/pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch b/pkgs/by-name/dm/dmtcp/ld-linux-so-buffer-size.patch
similarity index 100%
rename from pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch
rename to pkgs/by-name/dm/dmtcp/ld-linux-so-buffer-size.patch
diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/by-name/dm/dmtcp/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/dmtcp/default.nix
rename to pkgs/by-name/dm/dmtcp/package.nix
diff --git a/pkgs/tools/nix/dnadd/default.nix b/pkgs/by-name/dn/dnadd/package.nix
similarity index 100%
rename from pkgs/tools/nix/dnadd/default.nix
rename to pkgs/by-name/dn/dnadd/package.nix
diff --git a/pkgs/applications/misc/dnd-tools/default.nix b/pkgs/by-name/dn/dnd-tools/package.nix
similarity index 100%
rename from pkgs/applications/misc/dnd-tools/default.nix
rename to pkgs/by-name/dn/dnd-tools/package.nix
diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/by-name/dn/dnf5/package.nix
similarity index 100%
rename from pkgs/tools/package-management/dnf5/default.nix
rename to pkgs/by-name/dn/dnf5/package.nix
diff --git a/pkgs/tools/graphics/dnglab/default.nix b/pkgs/by-name/dn/dnglab/package.nix
similarity index 100%
rename from pkgs/tools/graphics/dnglab/default.nix
rename to pkgs/by-name/dn/dnglab/package.nix
diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/by-name/dn/dns-root-data/package.nix
similarity index 100%
rename from pkgs/data/misc/dns-root-data/default.nix
rename to pkgs/by-name/dn/dns-root-data/package.nix
diff --git a/pkgs/data/misc/dns-root-data/root.ds b/pkgs/by-name/dn/dns-root-data/root.ds
similarity index 100%
rename from pkgs/data/misc/dns-root-data/root.ds
rename to pkgs/by-name/dn/dns-root-data/root.ds
diff --git a/pkgs/data/misc/dns-root-data/root.key b/pkgs/by-name/dn/dns-root-data/root.key
similarity index 100%
rename from pkgs/data/misc/dns-root-data/root.key
rename to pkgs/by-name/dn/dns-root-data/root.key
diff --git a/pkgs/data/misc/dns-root-data/update-root-key.sh b/pkgs/by-name/dn/dns-root-data/update-root-key.sh
similarity index 100%
rename from pkgs/data/misc/dns-root-data/update-root-key.sh
rename to pkgs/by-name/dn/dns-root-data/update-root-key.sh
diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/by-name/dn/dnscontrol/package.nix
similarity index 100%
rename from pkgs/applications/networking/dnscontrol/default.nix
rename to pkgs/by-name/dn/dnscontrol/package.nix
diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/by-name/dn/dnscrypt-proxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/dnscrypt-proxy/default.nix
rename to pkgs/by-name/dn/dnscrypt-proxy/package.nix
diff --git a/pkgs/servers/dns/dnsdist/disable-network-tests.patch b/pkgs/by-name/dn/dnsdist/disable-network-tests.patch
similarity index 100%
rename from pkgs/servers/dns/dnsdist/disable-network-tests.patch
rename to pkgs/by-name/dn/dnsdist/disable-network-tests.patch
diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/by-name/dn/dnsdist/package.nix
similarity index 100%
rename from pkgs/servers/dns/dnsdist/default.nix
rename to pkgs/by-name/dn/dnsdist/package.nix
diff --git a/pkgs/tools/security/dnsenum/default.nix b/pkgs/by-name/dn/dnsenum/package.nix
similarity index 100%
rename from pkgs/tools/security/dnsenum/default.nix
rename to pkgs/by-name/dn/dnsenum/package.nix
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/by-name/dn/dnsmasq/package.nix
similarity index 100%
rename from pkgs/tools/networking/dnsmasq/default.nix
rename to pkgs/by-name/dn/dnsmasq/package.nix
diff --git a/pkgs/tools/networking/dnsmon-go/default.nix b/pkgs/by-name/dn/dnsmon-go/package.nix
similarity index 100%
rename from pkgs/tools/networking/dnsmon-go/default.nix
rename to pkgs/by-name/dn/dnsmon-go/package.nix
diff --git a/pkgs/tools/networking/dnsmonster/default.nix b/pkgs/by-name/dn/dnsmonster/package.nix
similarity index 100%
rename from pkgs/tools/networking/dnsmonster/default.nix
rename to pkgs/by-name/dn/dnsmonster/package.nix
diff --git a/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/pkgs/by-name/dn/dnsname-cni/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/dnsname-cni/default.nix
rename to pkgs/by-name/dn/dnsname-cni/package.nix
diff --git a/pkgs/tools/security/dnspeep/Cargo.lock b/pkgs/by-name/dn/dnspeep/Cargo.lock
similarity index 100%
rename from pkgs/tools/security/dnspeep/Cargo.lock
rename to pkgs/by-name/dn/dnspeep/Cargo.lock
diff --git a/pkgs/tools/security/dnspeep/default.nix b/pkgs/by-name/dn/dnspeep/package.nix
similarity index 100%
rename from pkgs/tools/security/dnspeep/default.nix
rename to pkgs/by-name/dn/dnspeep/package.nix
diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/by-name/dn/dnsperf/package.nix
similarity index 100%
rename from pkgs/tools/networking/dnsperf/default.nix
rename to pkgs/by-name/dn/dnsperf/package.nix
diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/by-name/dn/dnsproxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/dnsproxy/default.nix
rename to pkgs/by-name/dn/dnsproxy/package.nix
diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/by-name/dn/dnsrecon/package.nix
similarity index 100%
rename from pkgs/tools/security/dnsrecon/default.nix
rename to pkgs/by-name/dn/dnsrecon/package.nix
diff --git a/pkgs/tools/networking/dnstake/default.nix b/pkgs/by-name/dn/dnstake/package.nix
similarity index 100%
rename from pkgs/tools/networking/dnstake/default.nix
rename to pkgs/by-name/dn/dnstake/package.nix
diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/by-name/dn/dnstop/package.nix
similarity index 100%
rename from pkgs/tools/networking/dnstop/default.nix
rename to pkgs/by-name/dn/dnstop/package.nix
diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/by-name/dn/dnstwist/package.nix
similarity index 100%
rename from pkgs/tools/networking/dnstwist/default.nix
rename to pkgs/by-name/dn/dnstwist/package.nix
diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/by-name/dn/dnsx/package.nix
similarity index 100%
rename from pkgs/tools/security/dnsx/default.nix
rename to pkgs/by-name/dn/dnsx/package.nix
diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/by-name/do/do-agent/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/do-agent/default.nix
rename to pkgs/by-name/do/do-agent/package.nix
diff --git a/pkgs/tools/security/doas-sudo-shim/default.nix b/pkgs/by-name/do/doas-sudo-shim/package.nix
similarity index 100%
rename from pkgs/tools/security/doas-sudo-shim/default.nix
rename to pkgs/by-name/do/doas-sudo-shim/package.nix
diff --git a/pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch b/pkgs/by-name/do/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch
similarity index 100%
rename from pkgs/tools/security/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch
rename to pkgs/by-name/do/doas/0001-add-NixOS-specific-dirs-to-safe-PATH.patch
diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/by-name/do/doas/package.nix
similarity index 100%
rename from pkgs/tools/security/doas/default.nix
rename to pkgs/by-name/do/doas/package.nix
diff --git a/pkgs/development/tools/doc2go/default.nix b/pkgs/by-name/do/doc2go/package.nix
similarity index 100%
rename from pkgs/development/tools/doc2go/default.nix
rename to pkgs/by-name/do/doc2go/package.nix
diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/by-name/do/docbook2mdoc/package.nix
similarity index 100%
rename from pkgs/tools/misc/docbook2mdoc/default.nix
rename to pkgs/by-name/do/docbook2mdoc/package.nix
diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/by-name/do/docbook2odf/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/docbook2odf/default.nix
rename to pkgs/by-name/do/docbook2odf/package.nix
diff --git a/pkgs/tools/typesetting/docbook2x/db2x_texixml-to-stdout.patch b/pkgs/by-name/do/docbook2x/db2x_texixml-to-stdout.patch
similarity index 100%
rename from pkgs/tools/typesetting/docbook2x/db2x_texixml-to-stdout.patch
rename to pkgs/by-name/do/docbook2x/db2x_texixml-to-stdout.patch
diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/by-name/do/docbook2x/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/docbook2x/default.nix
rename to pkgs/by-name/do/docbook2x/package.nix
diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/by-name/do/docbook5/package.nix
similarity index 100%
rename from pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
rename to pkgs/by-name/do/docbook5/package.nix
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat b/pkgs/by-name/do/docbook_xml_ebnf_dtd/docbook-ebnf.cat
similarity index 100%
rename from pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/docbook-ebnf.cat
rename to pkgs/by-name/do/docbook_xml_ebnf_dtd/docbook-ebnf.cat
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/by-name/do/docbook_xml_ebnf_dtd/package.nix
similarity index 100%
rename from pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix
rename to pkgs/by-name/do/docbook_xml_ebnf_dtd/package.nix
diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/by-name/do/dockbarx/package.nix
similarity index 100%
rename from pkgs/applications/misc/dockbarx/default.nix
rename to pkgs/by-name/do/dockbarx/package.nix
diff --git a/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix b/pkgs/by-name/do/docker-compose-language-service/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/docker-compose-language-service/default.nix
rename to pkgs/by-name/do/docker-compose-language-service/package.nix
diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/by-name/do/docker-credential-helpers/package.nix
similarity index 100%
rename from pkgs/tools/admin/docker-credential-helpers/default.nix
rename to pkgs/by-name/do/docker-credential-helpers/package.nix
diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/by-name/do/docker-ls/package.nix
similarity index 100%
rename from pkgs/tools/misc/docker-ls/default.nix
rename to pkgs/by-name/do/docker-ls/package.nix
diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/by-name/do/docker-slim/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/docker-slim/default.nix
rename to pkgs/by-name/do/docker-slim/package.nix
diff --git a/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix b/pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix
rename to pkgs/by-name/do/dockerfile-language-server-nodejs/package.nix
diff --git a/pkgs/development/tools/dockfmt/default.nix b/pkgs/by-name/do/dockfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/dockfmt/default.nix
rename to pkgs/by-name/do/dockfmt/package.nix
diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/by-name/do/dockle/package.nix
similarity index 100%
rename from pkgs/development/tools/dockle/default.nix
rename to pkgs/by-name/do/dockle/package.nix
diff --git a/pkgs/tools/virtualization/dockstarter/default.nix b/pkgs/by-name/do/dockstarter/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/dockstarter/default.nix
rename to pkgs/by-name/do/dockstarter/package.nix
diff --git a/pkgs/os-specific/darwin/dockutil/generated/default.nix b/pkgs/by-name/do/dockutil/generated/default.nix
similarity index 100%
rename from pkgs/os-specific/darwin/dockutil/generated/default.nix
rename to pkgs/by-name/do/dockutil/generated/default.nix
diff --git a/pkgs/os-specific/darwin/dockutil/generated/workspace-state.json b/pkgs/by-name/do/dockutil/generated/workspace-state.json
similarity index 100%
rename from pkgs/os-specific/darwin/dockutil/generated/workspace-state.json
rename to pkgs/by-name/do/dockutil/generated/workspace-state.json
diff --git a/pkgs/os-specific/darwin/dockutil/default.nix b/pkgs/by-name/do/dockutil/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/dockutil/default.nix
rename to pkgs/by-name/do/dockutil/package.nix
diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/by-name/do/doclifter/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/doclifter/default.nix
rename to pkgs/by-name/do/doclifter/package.nix
diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/by-name/do/docopt_cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/docopt_cpp/default.nix
rename to pkgs/by-name/do/docopt_cpp/package.nix
diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/by-name/do/doctest/package.nix
similarity index 100%
rename from pkgs/development/libraries/doctest/default.nix
rename to pkgs/by-name/do/doctest/package.nix
diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/by-name/do/doctl/package.nix
similarity index 100%
rename from pkgs/development/tools/doctl/default.nix
rename to pkgs/by-name/do/doctl/package.nix
diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/by-name/do/docui/package.nix
similarity index 100%
rename from pkgs/tools/misc/docui/default.nix
rename to pkgs/by-name/do/docui/package.nix
diff --git a/pkgs/applications/office/documenso/default.nix b/pkgs/by-name/do/documenso/package.nix
similarity index 100%
rename from pkgs/applications/office/documenso/default.nix
rename to pkgs/by-name/do/documenso/package.nix
diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/by-name/do/documize-community/package.nix
similarity index 100%
rename from pkgs/servers/documize-community/default.nix
rename to pkgs/by-name/do/documize-community/package.nix
diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/by-name/do/dog/package.nix
similarity index 100%
rename from pkgs/tools/system/dog/default.nix
rename to pkgs/by-name/do/dog/package.nix
diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/by-name/do/doitlive/package.nix
similarity index 100%
rename from pkgs/tools/misc/doitlive/default.nix
rename to pkgs/by-name/do/doitlive/package.nix
diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/by-name/do/dokuwiki/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/dokuwiki/default.nix
rename to pkgs/by-name/do/dokuwiki/package.nix
diff --git a/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix b/pkgs/by-name/do/dolbybcsoftwaredecode/package.nix
similarity index 100%
rename from pkgs/applications/audio/dolbybcsoftwaredecode/default.nix
rename to pkgs/by-name/do/dolbybcsoftwaredecode/package.nix
diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/by-name/do/dolibarr/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/dolibarr/default.nix
rename to pkgs/by-name/do/dolibarr/package.nix
diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/by-name/do/dolt/package.nix
similarity index 100%
rename from pkgs/servers/sql/dolt/default.nix
rename to pkgs/by-name/do/dolt/package.nix
diff --git a/pkgs/games/domination/default.nix b/pkgs/by-name/do/domination/package.nix
similarity index 100%
rename from pkgs/games/domination/default.nix
rename to pkgs/by-name/do/domination/package.nix
diff --git a/pkgs/tools/misc/domine/default.nix b/pkgs/by-name/do/domine/package.nix
similarity index 100%
rename from pkgs/tools/misc/domine/default.nix
rename to pkgs/by-name/do/domine/package.nix
diff --git a/pkgs/tools/misc/domine/pubspec.lock.json b/pkgs/by-name/do/domine/pubspec.lock.json
similarity index 100%
rename from pkgs/tools/misc/domine/pubspec.lock.json
rename to pkgs/by-name/do/domine/pubspec.lock.json
diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/by-name/do/domoticz/package.nix
similarity index 100%
rename from pkgs/servers/domoticz/default.nix
rename to pkgs/by-name/do/domoticz/package.nix
diff --git a/pkgs/applications/misc/done/default.nix b/pkgs/by-name/do/done/package.nix
similarity index 100%
rename from pkgs/applications/misc/done/default.nix
rename to pkgs/by-name/do/done/package.nix
diff --git a/pkgs/tools/security/donkey/default.nix b/pkgs/by-name/do/donkey/package.nix
similarity index 100%
rename from pkgs/tools/security/donkey/default.nix
rename to pkgs/by-name/do/donkey/package.nix
diff --git a/pkgs/tools/security/dontgo403/default.nix b/pkgs/by-name/do/dontgo403/package.nix
similarity index 100%
rename from pkgs/tools/security/dontgo403/default.nix
rename to pkgs/by-name/do/dontgo403/package.nix
diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/by-name/do/doodle/package.nix
similarity index 100%
rename from pkgs/applications/search/doodle/default.nix
rename to pkgs/by-name/do/doodle/package.nix
diff --git a/pkgs/tools/system/dool/default.nix b/pkgs/by-name/do/dool/package.nix
similarity index 100%
rename from pkgs/tools/system/dool/default.nix
rename to pkgs/by-name/do/dool/package.nix
diff --git a/pkgs/tools/security/doona/default.nix b/pkgs/by-name/do/doona/package.nix
similarity index 100%
rename from pkgs/tools/security/doona/default.nix
rename to pkgs/by-name/do/doona/package.nix
diff --git a/pkgs/development/tools/misc/doq/default.nix b/pkgs/by-name/do/doq/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/doq/default.nix
rename to pkgs/by-name/do/doq/package.nix
diff --git a/pkgs/tools/security/dorkscout/default.nix b/pkgs/by-name/do/dorkscout/package.nix
similarity index 100%
rename from pkgs/tools/security/dorkscout/default.nix
rename to pkgs/by-name/do/dorkscout/package.nix
diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/by-name/do/dos2unix/package.nix
similarity index 100%
rename from pkgs/tools/text/dos2unix/default.nix
rename to pkgs/by-name/do/dos2unix/package.nix
diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/by-name/do/dosage/package.nix
similarity index 100%
rename from pkgs/applications/graphics/dosage/default.nix
rename to pkgs/by-name/do/dosage/package.nix
diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/by-name/do/dosemu_fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/dosemu-fonts/default.nix
rename to pkgs/by-name/do/dosemu_fonts/package.nix
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/by-name/do/dosfstools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/dosfstools/default.nix
rename to pkgs/by-name/do/dosfstools/package.nix
diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/by-name/do/dosis/package.nix
similarity index 100%
rename from pkgs/data/fonts/dosis/default.nix
rename to pkgs/by-name/do/dosis/package.nix
diff --git a/pkgs/development/tools/language-servers/dot-language-server/default.nix b/pkgs/by-name/do/dot-language-server/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/dot-language-server/default.nix
rename to pkgs/by-name/do/dot-language-server/package.nix
diff --git a/pkgs/tools/misc/dotacat/default.nix b/pkgs/by-name/do/dotacat/package.nix
similarity index 100%
rename from pkgs/tools/misc/dotacat/default.nix
rename to pkgs/by-name/do/dotacat/package.nix
diff --git a/pkgs/data/fonts/dotcolon-fonts/default.nix b/pkgs/by-name/do/dotcolon-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/dotcolon-fonts/default.nix
rename to pkgs/by-name/do/dotcolon-fonts/package.nix
diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/by-name/do/dotconf/package.nix
similarity index 100%
rename from pkgs/development/libraries/dotconf/default.nix
rename to pkgs/by-name/do/dotconf/package.nix
diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/by-name/do/dotfiles/package.nix
similarity index 100%
rename from pkgs/applications/misc/dotfiles/default.nix
rename to pkgs/by-name/do/dotfiles/package.nix
diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh b/pkgs/by-name/do/dotnetbuildhelpers/create-pkg-config-for-dll.sh
similarity index 100%
rename from pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh
rename to pkgs/by-name/do/dotnetbuildhelpers/create-pkg-config-for-dll.sh
diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix b/pkgs/by-name/do/dotnetbuildhelpers/package.nix
similarity index 100%
rename from pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix
rename to pkgs/by-name/do/dotnetbuildhelpers/package.nix
diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh b/pkgs/by-name/do/dotnetbuildhelpers/patch-fsharp-targets.sh
similarity index 100%
rename from pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh
rename to pkgs/by-name/do/dotnetbuildhelpers/patch-fsharp-targets.sh
diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh b/pkgs/by-name/do/dotnetbuildhelpers/placate-nuget.sh
similarity index 100%
rename from pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh
rename to pkgs/by-name/do/dotnetbuildhelpers/placate-nuget.sh
diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh b/pkgs/by-name/do/dotnetbuildhelpers/placate-paket.sh
similarity index 100%
rename from pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh
rename to pkgs/by-name/do/dotnetbuildhelpers/placate-paket.sh
diff --git a/pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh b/pkgs/by-name/do/dotnetbuildhelpers/remove-duplicated-dlls.sh
similarity index 100%
rename from pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh
rename to pkgs/by-name/do/dotnetbuildhelpers/remove-duplicated-dlls.sh
diff --git a/pkgs/tools/dotool/fix-paths.patch b/pkgs/by-name/do/dotool/fix-paths.patch
similarity index 100%
rename from pkgs/tools/dotool/fix-paths.patch
rename to pkgs/by-name/do/dotool/fix-paths.patch
diff --git a/pkgs/tools/dotool/default.nix b/pkgs/by-name/do/dotool/package.nix
similarity index 100%
rename from pkgs/tools/dotool/default.nix
rename to pkgs/by-name/do/dotool/package.nix
diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/by-name/do/double-conversion/package.nix
similarity index 100%
rename from pkgs/development/libraries/double-conversion/default.nix
rename to pkgs/by-name/do/double-conversion/package.nix
diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/by-name/do/doulos-sil/package.nix
similarity index 100%
rename from pkgs/data/fonts/doulos-sil/default.nix
rename to pkgs/by-name/do/doulos-sil/package.nix
diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/by-name/do/dovecot_fts_xapian/package.nix
similarity index 100%
rename from pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
rename to pkgs/by-name/do/dovecot_fts_xapian/package.nix
diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/by-name/do/dovecot_pigeonhole/package.nix
similarity index 100%
rename from pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
rename to pkgs/by-name/do/dovecot_pigeonhole/package.nix
diff --git a/pkgs/applications/misc/dozenal/lua-header.patch b/pkgs/by-name/do/dozenal/lua-header.patch
similarity index 100%
rename from pkgs/applications/misc/dozenal/lua-header.patch
rename to pkgs/by-name/do/dozenal/lua-header.patch
diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/by-name/do/dozenal/package.nix
similarity index 100%
rename from pkgs/applications/misc/dozenal/default.nix
rename to pkgs/by-name/do/dozenal/package.nix
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/by-name/dp/dpdk/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/dpdk/default.nix
rename to pkgs/by-name/dp/dpdk/package.nix
diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/by-name/dp/dpic/package.nix
similarity index 100%
rename from pkgs/tools/graphics/dpic/default.nix
rename to pkgs/by-name/dp/dpic/package.nix
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/by-name/dp/dpkg/package.nix
similarity index 100%
rename from pkgs/tools/package-management/dpkg/default.nix
rename to pkgs/by-name/dp/dpkg/package.nix
diff --git a/pkgs/tools/package-management/dpkg/setup-hook.sh b/pkgs/by-name/dp/dpkg/setup-hook.sh
similarity index 100%
rename from pkgs/tools/package-management/dpkg/setup-hook.sh
rename to pkgs/by-name/dp/dpkg/setup-hook.sh
diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/by-name/dp/dpt-rp1-py/package.nix
similarity index 100%
rename from pkgs/tools/misc/dpt-rp1-py/default.nix
rename to pkgs/by-name/dp/dpt-rp1-py/package.nix
diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/by-name/dq/dqlite/package.nix
similarity index 100%
rename from pkgs/development/libraries/dqlite/default.nix
rename to pkgs/by-name/dq/dqlite/package.nix
diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/by-name/dr/dr14_tmeter/package.nix
similarity index 100%
rename from pkgs/applications/audio/dr14_tmeter/default.nix
rename to pkgs/by-name/dr/dr14_tmeter/package.nix
diff --git a/pkgs/applications/video/dra-cla/default.nix b/pkgs/by-name/dr/dra-cla/package.nix
similarity index 100%
rename from pkgs/applications/video/dra-cla/default.nix
rename to pkgs/by-name/dr/dra-cla/package.nix
diff --git a/pkgs/data/icons/dracula-icon-theme/default.nix b/pkgs/by-name/dr/dracula-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/dracula-icon-theme/default.nix
rename to pkgs/by-name/dr/dracula-icon-theme/package.nix
diff --git a/pkgs/data/themes/dracula-qt5-theme/default.nix b/pkgs/by-name/dr/dracula-qt5-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/dracula-qt5-theme/default.nix
rename to pkgs/by-name/dr/dracula-qt5-theme/package.nix
diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/by-name/dr/dracula-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/dracula-theme/default.nix
rename to pkgs/by-name/dr/dracula-theme/package.nix
diff --git a/pkgs/os-specific/linux/dracut/default.nix b/pkgs/by-name/dr/dracut/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/dracut/default.nix
rename to pkgs/by-name/dr/dracut/package.nix
diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/by-name/dr/dragonfly-reverb/package.nix
similarity index 100%
rename from pkgs/applications/audio/dragonfly-reverb/default.nix
rename to pkgs/by-name/dr/dragonfly-reverb/package.nix
diff --git a/pkgs/servers/nosql/dragonflydb/fixes.patch b/pkgs/by-name/dr/dragonflydb/fixes.patch
similarity index 100%
rename from pkgs/servers/nosql/dragonflydb/fixes.patch
rename to pkgs/by-name/dr/dragonflydb/fixes.patch
diff --git a/pkgs/servers/nosql/dragonflydb/glog.patch b/pkgs/by-name/dr/dragonflydb/glog.patch
similarity index 100%
rename from pkgs/servers/nosql/dragonflydb/glog.patch
rename to pkgs/by-name/dr/dragonflydb/glog.patch
diff --git a/pkgs/servers/nosql/dragonflydb/default.nix b/pkgs/by-name/dr/dragonflydb/package.nix
similarity index 100%
rename from pkgs/servers/nosql/dragonflydb/default.nix
rename to pkgs/by-name/dr/dragonflydb/package.nix
diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/by-name/dr/drat-trim/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/drat-trim/default.nix
rename to pkgs/by-name/dr/drat-trim/package.nix
diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/by-name/dr/drawing/package.nix
similarity index 100%
rename from pkgs/applications/graphics/drawing/default.nix
rename to pkgs/by-name/dr/drawing/package.nix
diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/by-name/dr/driftctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/driftctl/default.nix
rename to pkgs/by-name/dr/driftctl/package.nix
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/by-name/dr/driftnet/package.nix
similarity index 100%
rename from pkgs/tools/networking/driftnet/default.nix
rename to pkgs/by-name/dr/driftnet/package.nix
diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/by-name/dr/drip/package.nix
similarity index 100%
rename from pkgs/development/tools/drip/default.nix
rename to pkgs/by-name/dr/drip/package.nix
diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/by-name/dr/drive/package.nix
similarity index 100%
rename from pkgs/applications/networking/drive/default.nix
rename to pkgs/by-name/dr/drive/package.nix
diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/by-name/dr/drm_info/package.nix
similarity index 100%
rename from pkgs/development/tools/drm_info/default.nix
rename to pkgs/by-name/dr/drm_info/package.nix
diff --git a/pkgs/development/libraries/drogon/fix_find_package.patch b/pkgs/by-name/dr/drogon/fix_find_package.patch
similarity index 100%
rename from pkgs/development/libraries/drogon/fix_find_package.patch
rename to pkgs/by-name/dr/drogon/fix_find_package.patch
diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/by-name/dr/drogon/package.nix
similarity index 100%
rename from pkgs/development/libraries/drogon/default.nix
rename to pkgs/by-name/dr/drogon/package.nix
diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/by-name/dr/droidcam/package.nix
similarity index 100%
rename from pkgs/applications/video/droidcam/default.nix
rename to pkgs/by-name/dr/droidcam/package.nix
diff --git a/pkgs/tools/inputmethods/droidmote/default.nix b/pkgs/by-name/dr/droidmote/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/droidmote/default.nix
rename to pkgs/by-name/dr/droidmote/package.nix
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch b/pkgs/by-name/dr/drone-cli/0001-use-builtin-go-syscerts.patch
similarity index 100%
rename from pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch
rename to pkgs/by-name/dr/drone-cli/0001-use-builtin-go-syscerts.patch
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/by-name/dr/drone-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/drone-cli/default.nix
rename to pkgs/by-name/dr/drone-cli/package.nix
diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/by-name/dr/drone-runner-docker/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
rename to pkgs/by-name/dr/drone-runner-docker/package.nix
diff --git a/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix b/pkgs/by-name/dr/drone-runner-exec/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix
rename to pkgs/by-name/dr/drone-runner-exec/package.nix
diff --git a/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix b/pkgs/by-name/dr/drone-runner-ssh/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix
rename to pkgs/by-name/dr/drone-runner-ssh/package.nix
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/by-name/dr/dropbear/package.nix
similarity index 100%
rename from pkgs/tools/networking/dropbear/default.nix
rename to pkgs/by-name/dr/dropbear/package.nix
diff --git a/pkgs/tools/networking/dropbear/pass-path.patch b/pkgs/by-name/dr/dropbear/pass-path.patch
similarity index 100%
rename from pkgs/tools/networking/dropbear/pass-path.patch
rename to pkgs/by-name/dr/dropbear/pass-path.patch
diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/by-name/dr/dropwatch/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/dropwatch/default.nix
rename to pkgs/by-name/dr/dropwatch/package.nix
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/by-name/dr/drumgizmo/package.nix
similarity index 100%
rename from pkgs/applications/audio/drumgizmo/default.nix
rename to pkgs/by-name/dr/drumgizmo/package.nix
diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/by-name/ds/dsd/package.nix
similarity index 100%
rename from pkgs/applications/radio/dsd/default.nix
rename to pkgs/by-name/ds/dsd/package.nix
diff --git a/pkgs/development/libraries/dsdcc/default.nix b/pkgs/by-name/ds/dsdcc/package.nix
similarity index 100%
rename from pkgs/development/libraries/dsdcc/default.nix
rename to pkgs/by-name/ds/dsdcc/package.nix
diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/by-name/ds/dsf2flac/package.nix
similarity index 100%
rename from pkgs/applications/audio/dsf2flac/default.nix
rename to pkgs/by-name/ds/dsf2flac/package.nix
diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/by-name/ds/dsniff/package.nix
similarity index 100%
rename from pkgs/tools/networking/dsniff/default.nix
rename to pkgs/by-name/ds/dsniff/package.nix
diff --git a/pkgs/servers/mail/dspam/mariadb.patch b/pkgs/by-name/ds/dspam/mariadb.patch
similarity index 100%
rename from pkgs/servers/mail/dspam/mariadb.patch
rename to pkgs/by-name/ds/dspam/mariadb.patch
diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/by-name/ds/dspam/package.nix
similarity index 100%
rename from pkgs/servers/mail/dspam/default.nix
rename to pkgs/by-name/ds/dspam/package.nix
diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/by-name/ds/dsq/package.nix
similarity index 100%
rename from pkgs/tools/misc/dsq/default.nix
rename to pkgs/by-name/ds/dsq/package.nix
diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/by-name/ds/dsseries/package.nix
similarity index 100%
rename from pkgs/applications/graphics/sane/backends/dsseries/default.nix
rename to pkgs/by-name/ds/dsseries/package.nix
diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/by-name/ds/dssi/package.nix
similarity index 100%
rename from pkgs/development/libraries/dssi/default.nix
rename to pkgs/by-name/ds/dssi/package.nix
diff --git a/pkgs/applications/science/biology/dssp/default.nix b/pkgs/by-name/ds/dssp/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/dssp/default.nix
rename to pkgs/by-name/ds/dssp/package.nix
diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/by-name/ds/dstask/package.nix
similarity index 100%
rename from pkgs/applications/misc/dstask/default.nix
rename to pkgs/by-name/ds/dstask/package.nix
diff --git a/pkgs/os-specific/linux/dstat/fix_pluginpath.patch b/pkgs/by-name/ds/dstat/fix_pluginpath.patch
similarity index 100%
rename from pkgs/os-specific/linux/dstat/fix_pluginpath.patch
rename to pkgs/by-name/ds/dstat/fix_pluginpath.patch
diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/by-name/ds/dstat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/dstat/default.nix
rename to pkgs/by-name/ds/dstat/package.nix
diff --git a/pkgs/development/tools/dstp/default.nix b/pkgs/by-name/ds/dstp/package.nix
similarity index 100%
rename from pkgs/development/tools/dstp/default.nix
rename to pkgs/by-name/ds/dstp/package.nix
diff --git a/pkgs/applications/networking/dsvpn/default.nix b/pkgs/by-name/ds/dsvpn/package.nix
similarity index 100%
rename from pkgs/applications/networking/dsvpn/default.nix
rename to pkgs/by-name/ds/dsvpn/package.nix
diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/by-name/dt/dt-schema/package.nix
similarity index 100%
rename from pkgs/development/tools/dt-schema/default.nix
rename to pkgs/by-name/dt/dt-schema/package.nix
diff --git a/pkgs/tools/text/dt/default.nix b/pkgs/by-name/dt/dt/package.nix
similarity index 100%
rename from pkgs/tools/text/dt/default.nix
rename to pkgs/by-name/dt/dt/package.nix
diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/by-name/dt/dtach/package.nix
similarity index 100%
rename from pkgs/tools/misc/dtach/default.nix
rename to pkgs/by-name/dt/dtach/package.nix
diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/by-name/dt/dtc/package.nix
similarity index 100%
rename from pkgs/development/compilers/dtc/default.nix
rename to pkgs/by-name/dt/dtc/package.nix
diff --git a/pkgs/applications/terminal-emulators/dterm/default.nix b/pkgs/by-name/dt/dterm/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/dterm/default.nix
rename to pkgs/by-name/dt/dterm/package.nix
diff --git a/pkgs/tools/misc/dtool/default.nix b/pkgs/by-name/dt/dtool/package.nix
similarity index 100%
rename from pkgs/tools/misc/dtool/default.nix
rename to pkgs/by-name/dt/dtool/package.nix
diff --git a/pkgs/tools/misc/dtool/rustc-serialize-fix.patch b/pkgs/by-name/dt/dtool/rustc-serialize-fix.patch
similarity index 100%
rename from pkgs/tools/misc/dtool/rustc-serialize-fix.patch
rename to pkgs/by-name/dt/dtool/rustc-serialize-fix.patch
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/by-name/dt/dtrx/package.nix
similarity index 100%
rename from pkgs/tools/compression/dtrx/default.nix
rename to pkgs/by-name/dt/dtrx/package.nix
diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/by-name/du/duc/package.nix
similarity index 100%
rename from pkgs/tools/misc/duc/default.nix
rename to pkgs/by-name/du/duc/package.nix
diff --git a/pkgs/servers/duckling-proxy/default.nix b/pkgs/by-name/du/duckling-proxy/package.nix
similarity index 100%
rename from pkgs/servers/duckling-proxy/default.nix
rename to pkgs/by-name/du/duckling-proxy/package.nix
diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/by-name/du/duf/package.nix
similarity index 100%
rename from pkgs/tools/misc/duf/default.nix
rename to pkgs/by-name/du/duf/package.nix
diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/by-name/du/dufs/package.nix
similarity index 100%
rename from pkgs/servers/http/dufs/default.nix
rename to pkgs/by-name/du/dufs/package.nix
diff --git a/pkgs/development/interpreters/duktape/duktape.pc.in b/pkgs/by-name/du/duktape/duktape.pc.in
similarity index 100%
rename from pkgs/development/interpreters/duktape/duktape.pc.in
rename to pkgs/by-name/du/duktape/duktape.pc.in
diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/by-name/du/duktape/package.nix
similarity index 100%
rename from pkgs/development/interpreters/duktape/default.nix
rename to pkgs/by-name/du/duktape/package.nix
diff --git a/pkgs/development/tools/dum/default.nix b/pkgs/by-name/du/dum/package.nix
similarity index 100%
rename from pkgs/development/tools/dum/default.nix
rename to pkgs/by-name/du/dum/package.nix
diff --git a/pkgs/applications/virtualization/dumb-init/default.nix b/pkgs/by-name/du/dumb-init/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/dumb-init/default.nix
rename to pkgs/by-name/du/dumb-init/package.nix
diff --git a/pkgs/misc/dumb/default.nix b/pkgs/by-name/du/dumb/package.nix
similarity index 100%
rename from pkgs/misc/dumb/default.nix
rename to pkgs/by-name/du/dumb/package.nix
diff --git a/pkgs/tools/backup/dump/default.nix b/pkgs/by-name/du/dump/package.nix
similarity index 100%
rename from pkgs/tools/backup/dump/default.nix
rename to pkgs/by-name/du/dump/package.nix
diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/by-name/du/dump1090/package.nix
similarity index 100%
rename from pkgs/applications/radio/dump1090/default.nix
rename to pkgs/by-name/du/dump1090/package.nix
diff --git a/pkgs/tools/security/dumpasn1/configpath.patch b/pkgs/by-name/du/dumpasn1/configpath.patch
similarity index 100%
rename from pkgs/tools/security/dumpasn1/configpath.patch
rename to pkgs/by-name/du/dumpasn1/configpath.patch
diff --git a/pkgs/tools/security/dumpasn1/default.nix b/pkgs/by-name/du/dumpasn1/package.nix
similarity index 100%
rename from pkgs/tools/security/dumpasn1/default.nix
rename to pkgs/by-name/du/dumpasn1/package.nix
diff --git a/pkgs/tools/archivers/dumpnar/default.nix b/pkgs/by-name/du/dumpnar/package.nix
similarity index 100%
rename from pkgs/tools/archivers/dumpnar/default.nix
rename to pkgs/by-name/du/dumpnar/package.nix
diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/by-name/du/dumptorrent/package.nix
similarity index 100%
rename from pkgs/tools/misc/dumptorrent/default.nix
rename to pkgs/by-name/du/dumptorrent/package.nix
diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/by-name/du/duo-unix/package.nix
similarity index 100%
rename from pkgs/tools/security/duo-unix/default.nix
rename to pkgs/by-name/du/duo-unix/package.nix
diff --git a/pkgs/tools/misc/dupd/default.nix b/pkgs/by-name/du/dupd/package.nix
similarity index 100%
rename from pkgs/tools/misc/dupd/default.nix
rename to pkgs/by-name/du/dupd/package.nix
diff --git a/pkgs/tools/filesystems/dupe-krill/default.nix b/pkgs/by-name/du/dupe-krill/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/dupe-krill/default.nix
rename to pkgs/by-name/du/dupe-krill/package.nix
diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/by-name/du/duperemove/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/duperemove/default.nix
rename to pkgs/by-name/du/duperemove/package.nix
diff --git a/pkgs/tools/backup/duplicity/keep-pythonpath-in-testing.patch b/pkgs/by-name/du/duplicity/keep-pythonpath-in-testing.patch
similarity index 100%
rename from pkgs/tools/backup/duplicity/keep-pythonpath-in-testing.patch
rename to pkgs/by-name/du/duplicity/keep-pythonpath-in-testing.patch
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/by-name/du/duplicity/package.nix
similarity index 100%
rename from pkgs/tools/backup/duplicity/default.nix
rename to pkgs/by-name/du/duplicity/package.nix
diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/by-name/du/duply/package.nix
similarity index 100%
rename from pkgs/tools/backup/duply/default.nix
rename to pkgs/by-name/du/duply/package.nix
diff --git a/pkgs/tools/misc/dutree/default.nix b/pkgs/by-name/du/dutree/package.nix
similarity index 100%
rename from pkgs/tools/misc/dutree/default.nix
rename to pkgs/by-name/du/dutree/package.nix
diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/by-name/dv/dvd-slideshow/package.nix
similarity index 100%
rename from pkgs/applications/video/dvd-slideshow/default.nix
rename to pkgs/by-name/dv/dvd-slideshow/package.nix
diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/by-name/dv/dvd-vr/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/dvd-vr/default.nix
rename to pkgs/by-name/dv/dvd-vr/package.nix
diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/by-name/dv/dvdauthor/package.nix
similarity index 100%
rename from pkgs/applications/video/dvdauthor/default.nix
rename to pkgs/by-name/dv/dvdauthor/package.nix
diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/by-name/dv/dvdbackup/package.nix
similarity index 100%
rename from pkgs/applications/video/dvdbackup/default.nix
rename to pkgs/by-name/dv/dvdbackup/package.nix
diff --git a/pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch b/pkgs/by-name/dv/dvdisaster/dvdrom.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/dvdisaster/dvdrom.patch
rename to pkgs/by-name/dv/dvdisaster/dvdrom.patch
diff --git a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch b/pkgs/by-name/dv/dvdisaster/encryption.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/dvdisaster/encryption.patch
rename to pkgs/by-name/dv/dvdisaster/encryption.patch
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/by-name/dv/dvdisaster/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/dvdisaster/default.nix
rename to pkgs/by-name/dv/dvdisaster/package.nix
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch b/pkgs/by-name/dv/dvdplusrwtools/darwin.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/dvd+rw-tools/darwin.patch
rename to pkgs/by-name/dv/dvdplusrwtools/darwin.patch
diff --git a/pkgs/tools/cd-dvd/dvd+rw-tools/default.nix b/pkgs/by-name/dv/dvdplusrwtools/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/dvd+rw-tools/default.nix
rename to pkgs/by-name/dv/dvdplusrwtools/package.nix
diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/by-name/dv/dvgrab/package.nix
similarity index 100%
rename from pkgs/tools/video/dvgrab/default.nix
rename to pkgs/by-name/dv/dvgrab/package.nix
diff --git a/pkgs/tools/misc/dwarf2json/default.nix b/pkgs/by-name/dw/dwarf2json/package.nix
similarity index 100%
rename from pkgs/tools/misc/dwarf2json/default.nix
rename to pkgs/by-name/dw/dwarf2json/package.nix
diff --git a/pkgs/tools/filesystems/dwarfs/default.nix b/pkgs/by-name/dw/dwarfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/dwarfs/default.nix
rename to pkgs/by-name/dw/dwarfs/package.nix
diff --git a/pkgs/applications/misc/dwdiff/default.nix b/pkgs/by-name/dw/dwdiff/package.nix
similarity index 100%
rename from pkgs/applications/misc/dwdiff/default.nix
rename to pkgs/by-name/dw/dwdiff/package.nix
diff --git a/pkgs/applications/misc/dwmbar/default.nix b/pkgs/by-name/dw/dwmbar/package.nix
similarity index 100%
rename from pkgs/applications/misc/dwmbar/default.nix
rename to pkgs/by-name/dw/dwmbar/package.nix
diff --git a/pkgs/applications/misc/dwmblocks/default.nix b/pkgs/by-name/dw/dwmblocks/package.nix
similarity index 100%
rename from pkgs/applications/misc/dwmblocks/default.nix
rename to pkgs/by-name/dw/dwmblocks/package.nix
diff --git a/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix b/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix
similarity index 100%
rename from pkgs/tools/misc/dwt1-shell-color-scripts/default.nix
rename to pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix
diff --git a/pkgs/development/tools/misc/dwz/default.nix b/pkgs/by-name/dw/dwz/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/dwz/default.nix
rename to pkgs/by-name/dw/dwz/package.nix
diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/by-name/dy/dydisnix/package.nix
similarity index 100%
rename from pkgs/tools/package-management/disnix/dydisnix/default.nix
rename to pkgs/by-name/dy/dydisnix/package.nix
diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/by-name/dy/dyff/package.nix
similarity index 100%
rename from pkgs/development/tools/dyff/default.nix
rename to pkgs/by-name/dy/dyff/package.nix
diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/by-name/dy/dynamic-colors/package.nix
similarity index 100%
rename from pkgs/tools/misc/dynamic-colors/default.nix
rename to pkgs/by-name/dy/dynamic-colors/package.nix
diff --git a/pkgs/tools/graphics/dynamic-wallpaper/default.nix b/pkgs/by-name/dy/dynamic-wallpaper/package.nix
similarity index 100%
rename from pkgs/tools/graphics/dynamic-wallpaper/default.nix
rename to pkgs/by-name/dy/dynamic-wallpaper/package.nix
diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/by-name/dy/dyncall/package.nix
similarity index 100%
rename from pkgs/development/libraries/dyncall/default.nix
rename to pkgs/by-name/dy/dyncall/package.nix
diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/by-name/dy/dyndnsc/package.nix
similarity index 100%
rename from pkgs/applications/networking/dyndns/dyndnsc/default.nix
rename to pkgs/by-name/dy/dyndnsc/package.nix
diff --git a/pkgs/tools/filesystems/dysk/default.nix b/pkgs/by-name/dy/dysk/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/dysk/default.nix
rename to pkgs/by-name/dy/dysk/package.nix
diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/by-name/dz/dzen2/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/dzen2/default.nix
rename to pkgs/by-name/dz/dzen2/package.nix
diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/by-name/e1/e16/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/e16/default.nix
rename to pkgs/by-name/e1/e16/package.nix
diff --git a/pkgs/data/themes/e17gtk/default.nix b/pkgs/by-name/e1/e17gtk/package.nix
similarity index 100%
rename from pkgs/data/themes/e17gtk/default.nix
rename to pkgs/by-name/e1/e17gtk/package.nix
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/by-name/e2/e2fsprogs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/e2fsprogs/default.nix
rename to pkgs/by-name/e2/e2fsprogs/package.nix
diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/by-name/e2/e2tools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/e2tools/default.nix
rename to pkgs/by-name/e2/e2tools/package.nix
diff --git a/pkgs/tools/misc/ea/default.nix b/pkgs/by-name/ea/ea/package.nix
similarity index 100%
rename from pkgs/tools/misc/ea/default.nix
rename to pkgs/by-name/ea/ea/package.nix
diff --git a/pkgs/tools/text/each/default.nix b/pkgs/by-name/ea/each/package.nix
similarity index 100%
rename from pkgs/tools/text/each/default.nix
rename to pkgs/by-name/ea/each/package.nix
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/by-name/ea/eaglemode/package.nix
similarity index 100%
rename from pkgs/applications/misc/eaglemode/default.nix
rename to pkgs/by-name/ea/eaglemode/package.nix
diff --git a/pkgs/tools/security/earlybird/default.nix b/pkgs/by-name/ea/earlybird/package.nix
similarity index 100%
rename from pkgs/tools/security/earlybird/default.nix
rename to pkgs/by-name/ea/earlybird/package.nix
diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/by-name/ea/eartag/package.nix
similarity index 100%
rename from pkgs/applications/audio/eartag/default.nix
rename to pkgs/by-name/ea/eartag/package.nix
diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/by-name/ea/earthly/package.nix
similarity index 100%
rename from pkgs/development/tools/earthly/default.nix
rename to pkgs/by-name/ea/earthly/package.nix
diff --git a/pkgs/tools/misc/easeprobe/default.nix b/pkgs/by-name/ea/easeprobe/package.nix
similarity index 100%
rename from pkgs/tools/misc/easeprobe/default.nix
rename to pkgs/by-name/ea/easeprobe/package.nix
diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/by-name/ea/easyjson/package.nix
similarity index 100%
rename from pkgs/development/tools/easyjson/default.nix
rename to pkgs/by-name/ea/easyjson/package.nix
diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/by-name/ea/easyloggingpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/easyloggingpp/default.nix
rename to pkgs/by-name/ea/easyloggingpp/package.nix
diff --git a/pkgs/development/embedded/easypdkprog/default.nix b/pkgs/by-name/ea/easypdkprog/package.nix
similarity index 100%
rename from pkgs/development/embedded/easypdkprog/default.nix
rename to pkgs/by-name/ea/easypdkprog/package.nix
diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/by-name/ea/easyrsa/package.nix
similarity index 100%
rename from pkgs/tools/networking/easyrsa/default.nix
rename to pkgs/by-name/ea/easyrsa/package.nix
diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/by-name/ea/easysnap/package.nix
similarity index 100%
rename from pkgs/tools/backup/easysnap/default.nix
rename to pkgs/by-name/ea/easysnap/package.nix
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/by-name/ea/easytag/package.nix
similarity index 100%
rename from pkgs/applications/audio/easytag/default.nix
rename to pkgs/by-name/ea/easytag/package.nix
diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/by-name/eb/eb-garamond/package.nix
similarity index 100%
rename from pkgs/data/fonts/eb-garamond/default.nix
rename to pkgs/by-name/eb/eb-garamond/package.nix
diff --git a/pkgs/applications/radio/ebook2cw/default.nix b/pkgs/by-name/eb/ebook2cw/package.nix
similarity index 100%
rename from pkgs/applications/radio/ebook2cw/default.nix
rename to pkgs/by-name/eb/ebook2cw/package.nix
diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/by-name/eb/ebook_tools/package.nix
similarity index 100%
rename from pkgs/tools/text/ebook-tools/default.nix
rename to pkgs/by-name/eb/ebook_tools/package.nix
diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/by-name/eb/ebtables/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ebtables/default.nix
rename to pkgs/by-name/eb/ebtables/package.nix
diff --git a/pkgs/applications/audio/ebumeter/default.nix b/pkgs/by-name/eb/ebumeter/package.nix
similarity index 100%
rename from pkgs/applications/audio/ebumeter/default.nix
rename to pkgs/by-name/eb/ebumeter/package.nix
diff --git a/pkgs/servers/ebusd/default.nix b/pkgs/by-name/eb/ebusd/package.nix
similarity index 100%
rename from pkgs/servers/ebusd/default.nix
rename to pkgs/by-name/eb/ebusd/package.nix
diff --git a/pkgs/servers/ebusd/patches/ebusd-cmake.patch b/pkgs/by-name/eb/ebusd/patches/ebusd-cmake.patch
similarity index 100%
rename from pkgs/servers/ebusd/patches/ebusd-cmake.patch
rename to pkgs/by-name/eb/ebusd/patches/ebusd-cmake.patch
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/by-name/ec/ec2-ami-tools/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/ec2-ami-tools/default.nix
rename to pkgs/by-name/ec/ec2-ami-tools/package.nix
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/writable.patch b/pkgs/by-name/ec/ec2-ami-tools/writable.patch
similarity index 100%
rename from pkgs/tools/virtualization/ec2-ami-tools/writable.patch
rename to pkgs/by-name/ec/ec2-ami-tools/writable.patch
diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/by-name/ec/ec2-api-tools/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/ec2-api-tools/default.nix
rename to pkgs/by-name/ec/ec2-api-tools/package.nix
diff --git a/pkgs/development/tools/ec2-metadata-mock/default.nix b/pkgs/by-name/ec/ec2-metadata-mock/package.nix
similarity index 100%
rename from pkgs/development/tools/ec2-metadata-mock/default.nix
rename to pkgs/by-name/ec/ec2-metadata-mock/package.nix
diff --git a/pkgs/tools/security/ec2stepshell/default.nix b/pkgs/by-name/ec/ec2stepshell/package.nix
similarity index 100%
rename from pkgs/tools/security/ec2stepshell/default.nix
rename to pkgs/by-name/ec/ec2stepshell/package.nix
diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/by-name/ec/ecasound/package.nix
similarity index 100%
rename from pkgs/applications/audio/ecasound/default.nix
rename to pkgs/by-name/ec/ecasound/package.nix
diff --git a/pkgs/tools/security/ecdsatool/ctype-header-c99-implicit-function-declaration.patch b/pkgs/by-name/ec/ecdsatool/ctype-header-c99-implicit-function-declaration.patch
similarity index 100%
rename from pkgs/tools/security/ecdsatool/ctype-header-c99-implicit-function-declaration.patch
rename to pkgs/by-name/ec/ecdsatool/ctype-header-c99-implicit-function-declaration.patch
diff --git a/pkgs/tools/security/ecdsatool/openssl-header-c99-implicit-function-declaration.patch b/pkgs/by-name/ec/ecdsatool/openssl-header-c99-implicit-function-declaration.patch
similarity index 100%
rename from pkgs/tools/security/ecdsatool/openssl-header-c99-implicit-function-declaration.patch
rename to pkgs/by-name/ec/ecdsatool/openssl-header-c99-implicit-function-declaration.patch
diff --git a/pkgs/tools/security/ecdsatool/default.nix b/pkgs/by-name/ec/ecdsatool/package.nix
similarity index 100%
rename from pkgs/tools/security/ecdsatool/default.nix
rename to pkgs/by-name/ec/ecdsatool/package.nix
diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/by-name/ec/ecdsautils/package.nix
similarity index 100%
rename from pkgs/tools/security/ecdsautils/default.nix
rename to pkgs/by-name/ec/ecdsautils/package.nix
diff --git a/pkgs/servers/echoip/default.nix b/pkgs/by-name/ec/echoip/package.nix
similarity index 100%
rename from pkgs/servers/echoip/default.nix
rename to pkgs/by-name/ec/echoip/package.nix
diff --git a/pkgs/applications/blockchains/eclair/default.nix b/pkgs/by-name/ec/eclair/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/eclair/default.nix
rename to pkgs/by-name/ec/eclair/package.nix
diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/by-name/ec/eclib/package.nix
similarity index 100%
rename from pkgs/development/libraries/eclib/default.nix
rename to pkgs/by-name/ec/eclib/package.nix
diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/by-name/ec/eclipse-mat/package.nix
similarity index 100%
rename from pkgs/development/tools/eclipse-mat/default.nix
rename to pkgs/by-name/ec/eclipse-mat/package.nix
diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/by-name/ec/ecm/package.nix
similarity index 100%
rename from pkgs/applications/science/math/ecm/default.nix
rename to pkgs/by-name/ec/ecm/package.nix
diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/by-name/ec/ecopcr/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/ecopcr/default.nix
rename to pkgs/by-name/ec/ecopcr/package.nix
diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/by-name/ec/ecos/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/ecos/default.nix
rename to pkgs/by-name/ec/ecos/package.nix
diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/by-name/ec/ecs-agent/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/ecs-agent/default.nix
rename to pkgs/by-name/ec/ecs-agent/package.nix
diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/by-name/ec/ecwolf/package.nix
similarity index 100%
rename from pkgs/games/ecwolf/default.nix
rename to pkgs/by-name/ec/ecwolf/package.nix
diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/by-name/ed/edac-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/edac-utils/default.nix
rename to pkgs/by-name/ed/edac-utils/package.nix
diff --git a/pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix b/pkgs/by-name/ed/edgetpu-compiler/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/robotics/edgetpu-compiler/default.nix
rename to pkgs/by-name/ed/edgetpu-compiler/package.nix
diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/by-name/ed/edid-decode/package.nix
similarity index 100%
rename from pkgs/tools/misc/edid-decode/default.nix
rename to pkgs/by-name/ed/edid-decode/package.nix
diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/by-name/ed/edid-generator/package.nix
similarity index 100%
rename from pkgs/tools/misc/edid-generator/default.nix
rename to pkgs/by-name/ed/edid-generator/package.nix
diff --git a/pkgs/tools/misc/edir/default.nix b/pkgs/by-name/ed/edir/package.nix
similarity index 100%
rename from pkgs/tools/misc/edir/default.nix
rename to pkgs/by-name/ed/edir/package.nix
diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/by-name/ed/editline/package.nix
similarity index 100%
rename from pkgs/development/libraries/editline/default.nix
rename to pkgs/by-name/ed/editline/package.nix
diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/editorconfig-checker/default.nix
rename to pkgs/by-name/ed/editorconfig-checker/package.nix
diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/by-name/ed/editorconfig-core-c/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/editorconfig-core-c/default.nix
rename to pkgs/by-name/ed/editorconfig-core-c/package.nix
diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/by-name/ed/editres/package.nix
similarity index 100%
rename from pkgs/tools/graphics/editres/default.nix
rename to pkgs/by-name/ed/editres/package.nix
diff --git a/pkgs/tools/misc/edk2-uefi-shell/default.nix b/pkgs/by-name/ed/edk2-uefi-shell/package.nix
similarity index 100%
rename from pkgs/tools/misc/edk2-uefi-shell/default.nix
rename to pkgs/by-name/ed/edk2-uefi-shell/package.nix
diff --git a/pkgs/development/embedded/edl/default.nix b/pkgs/by-name/ed/edl/package.nix
similarity index 100%
rename from pkgs/development/embedded/edl/default.nix
rename to pkgs/by-name/ed/edl/package.nix
diff --git a/pkgs/development/libraries/science/biology/edlib/default.nix b/pkgs/by-name/ed/edlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/edlib/default.nix
rename to pkgs/by-name/ed/edlib/package.nix
diff --git a/pkgs/data/fonts/edukai/default.nix b/pkgs/by-name/ed/edukai/package.nix
similarity index 100%
rename from pkgs/data/fonts/edukai/default.nix
rename to pkgs/by-name/ed/edukai/package.nix
diff --git a/pkgs/data/fonts/eduli/default.nix b/pkgs/by-name/ed/eduli/package.nix
similarity index 100%
rename from pkgs/data/fonts/eduli/default.nix
rename to pkgs/by-name/ed/eduli/package.nix
diff --git a/pkgs/data/fonts/edusong/default.nix b/pkgs/by-name/ed/edusong/package.nix
similarity index 100%
rename from pkgs/data/fonts/edusong/default.nix
rename to pkgs/by-name/ed/edusong/package.nix
diff --git a/pkgs/data/fonts/edwin/default.nix b/pkgs/by-name/ed/edwin/package.nix
similarity index 100%
rename from pkgs/data/fonts/edwin/default.nix
rename to pkgs/by-name/ed/edwin/package.nix
diff --git a/pkgs/applications/editors/edwood/default.nix b/pkgs/by-name/ed/edwood/package.nix
similarity index 100%
rename from pkgs/applications/editors/edwood/default.nix
rename to pkgs/by-name/ed/edwood/package.nix
diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/by-name/ef/eff/package.nix
similarity index 100%
rename from pkgs/development/interpreters/eff/default.nix
rename to pkgs/by-name/ef/eff/package.nix
diff --git a/pkgs/tools/compression/efficient-compression-tool/default.nix b/pkgs/by-name/ef/efficient-compression-tool/package.nix
similarity index 100%
rename from pkgs/tools/compression/efficient-compression-tool/default.nix
rename to pkgs/by-name/ef/efficient-compression-tool/package.nix
diff --git a/pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch b/pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch
similarity index 100%
rename from pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch
rename to pkgs/by-name/ef/efficient-compression-tool/use-nixpkgs-libpng.patch
diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/by-name/ef/effitask/package.nix
similarity index 100%
rename from pkgs/applications/misc/effitask/default.nix
rename to pkgs/by-name/ef/effitask/package.nix
diff --git a/pkgs/tools/security/efitools/aarch64.patch b/pkgs/by-name/ef/efitools/aarch64.patch
similarity index 100%
rename from pkgs/tools/security/efitools/aarch64.patch
rename to pkgs/by-name/ef/efitools/aarch64.patch
diff --git a/pkgs/tools/security/efitools/default.nix b/pkgs/by-name/ef/efitools/package.nix
similarity index 100%
rename from pkgs/tools/security/efitools/default.nix
rename to pkgs/by-name/ef/efitools/package.nix
diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/by-name/ef/efivar/package.nix
similarity index 100%
rename from pkgs/tools/system/efivar/default.nix
rename to pkgs/by-name/ef/efivar/package.nix
diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/by-name/ef/efm-langserver/package.nix
similarity index 100%
rename from pkgs/development/tools/efm-langserver/default.nix
rename to pkgs/by-name/ef/efm-langserver/package.nix
diff --git a/pkgs/data/fonts/efont-unicode/default.nix b/pkgs/by-name/ef/efont-unicode/package.nix
similarity index 100%
rename from pkgs/data/fonts/efont-unicode/default.nix
rename to pkgs/by-name/ef/efont-unicode/package.nix
diff --git a/pkgs/tools/misc/eget/default.nix b/pkgs/by-name/eg/eget/package.nix
similarity index 100%
rename from pkgs/tools/misc/eget/default.nix
rename to pkgs/by-name/eg/eget/package.nix
diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/by-name/eg/eggdbus/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/eggdbus/default.nix
rename to pkgs/by-name/eg/eggdbus/package.nix
diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/by-name/eg/eggdrop/package.nix
similarity index 100%
rename from pkgs/tools/networking/eggdrop/default.nix
rename to pkgs/by-name/eg/eggdrop/package.nix
diff --git a/pkgs/applications/science/logic/egglog/Cargo.lock b/pkgs/by-name/eg/egglog/Cargo.lock
similarity index 100%
rename from pkgs/applications/science/logic/egglog/Cargo.lock
rename to pkgs/by-name/eg/egglog/Cargo.lock
diff --git a/pkgs/applications/science/logic/egglog/default.nix b/pkgs/by-name/eg/egglog/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/egglog/default.nix
rename to pkgs/by-name/eg/egglog/package.nix
diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/by-name/eg/eggnog-mapper/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/eggnog-mapper/default.nix
rename to pkgs/by-name/eg/eggnog-mapper/package.nix
diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/by-name/eg/egl-wayland/package.nix
similarity index 100%
rename from pkgs/development/libraries/egl-wayland/default.nix
rename to pkgs/by-name/eg/egl-wayland/package.nix
diff --git a/pkgs/development/libraries/eglexternalplatform/default.nix b/pkgs/by-name/eg/eglexternalplatform/package.nix
similarity index 100%
rename from pkgs/development/libraries/eglexternalplatform/default.nix
rename to pkgs/by-name/eg/eglexternalplatform/package.nix
diff --git a/pkgs/tools/misc/ego/default.nix b/pkgs/by-name/eg/ego/package.nix
similarity index 100%
rename from pkgs/tools/misc/ego/default.nix
rename to pkgs/by-name/eg/ego/package.nix
diff --git a/pkgs/games/egoboo/default.nix b/pkgs/by-name/eg/egoboo/package.nix
similarity index 100%
rename from pkgs/games/egoboo/default.nix
rename to pkgs/by-name/eg/egoboo/package.nix
diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/by-name/eg/egypt/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/egypt/default.nix
rename to pkgs/by-name/eg/egypt/package.nix
diff --git a/pkgs/tools/filesystems/eiciel/default.nix b/pkgs/by-name/ei/eiciel/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/eiciel/default.nix
rename to pkgs/by-name/ei/eiciel/package.nix
diff --git a/pkgs/games/eidolon/Cargo.lock b/pkgs/by-name/ei/eidolon/Cargo.lock
similarity index 100%
rename from pkgs/games/eidolon/Cargo.lock
rename to pkgs/by-name/ei/eidolon/Cargo.lock
diff --git a/pkgs/games/eidolon/default.nix b/pkgs/by-name/ei/eidolon/package.nix
similarity index 100%
rename from pkgs/games/eidolon/default.nix
rename to pkgs/by-name/ei/eidolon/package.nix
diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/by-name/ei/eigenmath/package.nix
similarity index 100%
rename from pkgs/applications/science/math/eigenmath/default.nix
rename to pkgs/by-name/ei/eigenmath/package.nix
diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/by-name/ej/ejson/package.nix
similarity index 100%
rename from pkgs/development/tools/ejson/default.nix
rename to pkgs/by-name/ej/ejson/package.nix
diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/by-name/ej/ejson2env/package.nix
similarity index 100%
rename from pkgs/tools/admin/ejson2env/default.nix
rename to pkgs/by-name/ej/ejson2env/package.nix
diff --git a/pkgs/tools/admin/ejson2env/test-decryption.nix b/pkgs/by-name/ej/ejson2env/test-decryption.nix
similarity index 100%
rename from pkgs/tools/admin/ejson2env/test-decryption.nix
rename to pkgs/by-name/ej/ejson2env/test-decryption.nix
diff --git a/pkgs/development/tools/build-managers/ekam/default.nix b/pkgs/by-name/ek/ekam/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/ekam/default.nix
rename to pkgs/by-name/ek/ekam/package.nix
diff --git a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/pkgs/by-name/el/elan/0001-dynamically-patchelf-binaries.patch
similarity index 100%
rename from pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch
rename to pkgs/by-name/el/elan/0001-dynamically-patchelf-binaries.patch
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/by-name/el/elan/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/elan/default.nix
rename to pkgs/by-name/el/elan/package.nix
diff --git a/pkgs/applications/misc/elastic/default.nix b/pkgs/by-name/el/elastic/package.nix
similarity index 100%
rename from pkgs/applications/misc/elastic/default.nix
rename to pkgs/by-name/el/elastic/package.nix
diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/by-name/el/electricsheep/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/electricsheep/default.nix
rename to pkgs/by-name/el/electricsheep/package.nix
diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/by-name/el/electron-fiddle/package.nix
similarity index 100%
rename from pkgs/development/tools/electron-fiddle/default.nix
rename to pkgs/by-name/el/electron-fiddle/package.nix
diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/by-name/el/electron-mail/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/electron-mail/default.nix
rename to pkgs/by-name/el/electron-mail/package.nix
diff --git a/pkgs/applications/science/chemistry/element/default.nix b/pkgs/by-name/el/element/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/element/default.nix
rename to pkgs/by-name/el/element/package.nix
diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/by-name/el/elementary-xfce-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/elementary-xfce-icon-theme/default.nix
rename to pkgs/by-name/el/elementary-xfce-icon-theme/package.nix
diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/by-name/el/elf-header-real/package.nix
similarity index 100%
rename from pkgs/development/libraries/elf-header/default.nix
rename to pkgs/by-name/el/elf-header-real/package.nix
diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/by-name/el/elfcat/package.nix
similarity index 100%
rename from pkgs/tools/misc/elfcat/default.nix
rename to pkgs/by-name/el/elfcat/package.nix
diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/by-name/el/elfinfo/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/elfinfo/default.nix
rename to pkgs/by-name/el/elfinfo/package.nix
diff --git a/pkgs/development/libraries/elfio/default.nix b/pkgs/by-name/el/elfio/package.nix
similarity index 100%
rename from pkgs/development/libraries/elfio/default.nix
rename to pkgs/by-name/el/elfio/package.nix
diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/by-name/el/elfkickers/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/elfkickers/default.nix
rename to pkgs/by-name/el/elfkickers/package.nix
diff --git a/pkgs/development/tools/misc/elfutils/cxx-header-collision.patch b/pkgs/by-name/el/elfutils/cxx-header-collision.patch
similarity index 100%
rename from pkgs/development/tools/misc/elfutils/cxx-header-collision.patch
rename to pkgs/by-name/el/elfutils/cxx-header-collision.patch
diff --git a/pkgs/development/tools/misc/elfutils/debug-info-from-env.patch b/pkgs/by-name/el/elfutils/debug-info-from-env.patch
similarity index 100%
rename from pkgs/development/tools/misc/elfutils/debug-info-from-env.patch
rename to pkgs/by-name/el/elfutils/debug-info-from-env.patch
diff --git a/pkgs/development/tools/misc/elfutils/musl-error_h.patch b/pkgs/by-name/el/elfutils/musl-error_h.patch
similarity index 100%
rename from pkgs/development/tools/misc/elfutils/musl-error_h.patch
rename to pkgs/by-name/el/elfutils/musl-error_h.patch
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/by-name/el/elfutils/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/elfutils/default.nix
rename to pkgs/by-name/el/elfutils/package.nix
diff --git a/pkgs/applications/misc/elfx86exts/default.nix b/pkgs/by-name/el/elfx86exts/package.nix
similarity index 100%
rename from pkgs/applications/misc/elfx86exts/default.nix
rename to pkgs/by-name/el/elfx86exts/package.nix
diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/by-name/el/eli/package.nix
similarity index 100%
rename from pkgs/development/compilers/eli/default.nix
rename to pkgs/by-name/el/eli/package.nix
diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/by-name/el/eliot-tree/package.nix
similarity index 100%
rename from pkgs/development/tools/eliot-tree/default.nix
rename to pkgs/by-name/el/eliot-tree/package.nix
diff --git a/pkgs/development/tools/elkhound/default.nix b/pkgs/by-name/el/elkhound/package.nix
similarity index 100%
rename from pkgs/development/tools/elkhound/default.nix
rename to pkgs/by-name/el/elkhound/package.nix
diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/by-name/el/ell/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ell/default.nix
rename to pkgs/by-name/el/ell/package.nix
diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/by-name/el/elliptic_curves/package.nix
similarity index 100%
rename from pkgs/data/misc/elliptic_curves/default.nix
rename to pkgs/by-name/el/elliptic_curves/package.nix
diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/by-name/el/elmerfem/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/elmerfem/default.nix
rename to pkgs/by-name/el/elmerfem/package.nix
diff --git a/pkgs/applications/misc/elogind/Add-missing-musl_missing.h-includes-for-basename.patch b/pkgs/by-name/el/elogind/Add-missing-musl_missing.h-includes-for-basename.patch
similarity index 100%
rename from pkgs/applications/misc/elogind/Add-missing-musl_missing.h-includes-for-basename.patch
rename to pkgs/by-name/el/elogind/Add-missing-musl_missing.h-includes-for-basename.patch
diff --git a/pkgs/applications/misc/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch b/pkgs/by-name/el/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch
similarity index 100%
rename from pkgs/applications/misc/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch
rename to pkgs/by-name/el/elogind/Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch
diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/by-name/el/elogind/package.nix
similarity index 100%
rename from pkgs/applications/misc/elogind/default.nix
rename to pkgs/by-name/el/elogind/package.nix
diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/by-name/el/elpa/package.nix
similarity index 100%
rename from pkgs/development/libraries/elpa/default.nix
rename to pkgs/by-name/el/elpa/package.nix
diff --git a/pkgs/development/libraries/elpa/pkg-config.patch b/pkgs/by-name/el/elpa/pkg-config.patch
similarity index 100%
rename from pkgs/development/libraries/elpa/pkg-config.patch
rename to pkgs/by-name/el/elpa/pkg-config.patch
diff --git a/pkgs/development/tools/eltclsh/default.nix b/pkgs/by-name/el/eltclsh/package.nix
similarity index 100%
rename from pkgs/development/tools/eltclsh/default.nix
rename to pkgs/by-name/el/eltclsh/package.nix
diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/by-name/em/emacs-all-the-icons-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix
rename to pkgs/by-name/em/emacs-all-the-icons-fonts/package.nix
diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/by-name/em/email/package.nix
similarity index 100%
rename from pkgs/tools/networking/email/default.nix
rename to pkgs/by-name/em/email/package.nix
diff --git a/pkgs/applications/graphics/emblem/default.nix b/pkgs/by-name/em/emblem/package.nix
similarity index 100%
rename from pkgs/applications/graphics/emblem/default.nix
rename to pkgs/by-name/em/emblem/package.nix
diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/by-name/em/emboss/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/emboss/default.nix
rename to pkgs/by-name/em/emboss/package.nix
diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/by-name/em/emem/package.nix
similarity index 100%
rename from pkgs/applications/misc/emem/default.nix
rename to pkgs/by-name/em/emem/package.nix
diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/by-name/em/emma/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/emma/default.nix
rename to pkgs/by-name/em/emma/package.nix
diff --git a/pkgs/development/tools/language-servers/emmet-language-server/package-lock.json b/pkgs/by-name/em/emmet-language-server/package-lock.json
similarity index 100%
rename from pkgs/development/tools/language-servers/emmet-language-server/package-lock.json
rename to pkgs/by-name/em/emmet-language-server/package-lock.json
diff --git a/pkgs/development/tools/language-servers/emmet-language-server/default.nix b/pkgs/by-name/em/emmet-language-server/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/emmet-language-server/default.nix
rename to pkgs/by-name/em/emmet-language-server/package.nix
diff --git a/pkgs/development/tools/language-servers/emmet-ls/default.nix b/pkgs/by-name/em/emmet-ls/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/emmet-ls/default.nix
rename to pkgs/by-name/em/emmet-ls/package.nix
diff --git a/pkgs/applications/misc/emoji-picker/default.nix b/pkgs/by-name/em/emoji-picker/package.nix
similarity index 100%
rename from pkgs/applications/misc/emoji-picker/default.nix
rename to pkgs/by-name/em/emoji-picker/package.nix
diff --git a/pkgs/applications/misc/emoji-picker/xsys.patch b/pkgs/by-name/em/emoji-picker/xsys.patch
similarity index 100%
rename from pkgs/applications/misc/emoji-picker/xsys.patch
rename to pkgs/by-name/em/emoji-picker/xsys.patch
diff --git a/pkgs/applications/misc/emojipick/default.nix b/pkgs/by-name/em/emojipick/package.nix
similarity index 100%
rename from pkgs/applications/misc/emojipick/default.nix
rename to pkgs/by-name/em/emojipick/package.nix
diff --git a/pkgs/applications/display-managers/emptty/default.nix b/pkgs/by-name/em/emptty/package.nix
similarity index 100%
rename from pkgs/applications/display-managers/emptty/default.nix
rename to pkgs/by-name/em/emptty/package.nix
diff --git a/pkgs/tools/misc/empty/0.6-Makefile.patch b/pkgs/by-name/em/empty/0.6-Makefile.patch
similarity index 100%
rename from pkgs/tools/misc/empty/0.6-Makefile.patch
rename to pkgs/by-name/em/empty/0.6-Makefile.patch
diff --git a/pkgs/tools/misc/empty/default.nix b/pkgs/by-name/em/empty/package.nix
similarity index 100%
rename from pkgs/tools/misc/empty/default.nix
rename to pkgs/by-name/em/empty/package.nix
diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/by-name/em/emuflight-configurator/package.nix
similarity index 100%
rename from pkgs/applications/science/robotics/emuflight-configurator/default.nix
rename to pkgs/by-name/em/emuflight-configurator/package.nix
diff --git a/pkgs/applications/graphics/emulsion-palette/default.nix b/pkgs/by-name/em/emulsion-palette/package.nix
similarity index 100%
rename from pkgs/applications/graphics/emulsion-palette/default.nix
rename to pkgs/by-name/em/emulsion-palette/package.nix
diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/by-name/em/emv/package.nix
similarity index 100%
rename from pkgs/tools/misc/emv/default.nix
rename to pkgs/by-name/em/emv/package.nix
diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/by-name/en/enblend-enfuse/package.nix
similarity index 100%
rename from pkgs/tools/graphics/enblend-enfuse/default.nix
rename to pkgs/by-name/en/enblend-enfuse/package.nix
diff --git a/pkgs/tools/security/enc/default.nix b/pkgs/by-name/en/enc/package.nix
similarity index 100%
rename from pkgs/tools/security/enc/default.nix
rename to pkgs/by-name/en/enc/package.nix
diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/by-name/en/enca/package.nix
similarity index 100%
rename from pkgs/tools/text/enca/default.nix
rename to pkgs/by-name/en/enca/package.nix
diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/by-name/en/enchive/package.nix
similarity index 100%
rename from pkgs/tools/security/enchive/default.nix
rename to pkgs/by-name/en/enchive/package.nix
diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/by-name/en/encode-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/encode-sans/default.nix
rename to pkgs/by-name/en/encode-sans/package.nix
diff --git a/pkgs/tools/misc/encpipe/default.nix b/pkgs/by-name/en/encpipe/package.nix
similarity index 100%
rename from pkgs/tools/misc/encpipe/default.nix
rename to pkgs/by-name/en/encpipe/package.nix
diff --git a/pkgs/applications/office/endeavour/default.nix b/pkgs/by-name/en/endeavour/package.nix
similarity index 100%
rename from pkgs/applications/office/endeavour/default.nix
rename to pkgs/by-name/en/endeavour/package.nix
diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/by-name/en/endgame-singularity/package.nix
similarity index 100%
rename from pkgs/games/endgame-singularity/default.nix
rename to pkgs/by-name/en/endgame-singularity/package.nix
diff --git a/pkgs/games/endless-sky/fixes.patch b/pkgs/by-name/en/endless-sky/fixes.patch
similarity index 100%
rename from pkgs/games/endless-sky/fixes.patch
rename to pkgs/by-name/en/endless-sky/fixes.patch
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/by-name/en/endless-sky/package.nix
similarity index 100%
rename from pkgs/games/endless-sky/default.nix
rename to pkgs/by-name/en/endless-sky/package.nix
diff --git a/pkgs/servers/endlessh/default.nix b/pkgs/by-name/en/endlessh/package.nix
similarity index 100%
rename from pkgs/servers/endlessh/default.nix
rename to pkgs/by-name/en/endlessh/package.nix
diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/by-name/en/enet/package.nix
similarity index 100%
rename from pkgs/development/libraries/enet/default.nix
rename to pkgs/by-name/en/enet/package.nix
diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/by-name/en/engelsystem/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/engelsystem/default.nix
rename to pkgs/by-name/en/engelsystem/package.nix
diff --git a/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix b/pkgs/by-name/en/enhanced-ctorrent/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix
rename to pkgs/by-name/en/enhanced-ctorrent/package.nix
diff --git a/pkgs/games/enigma/default.nix b/pkgs/by-name/en/enigma/package.nix
similarity index 100%
rename from pkgs/games/enigma/default.nix
rename to pkgs/by-name/en/enigma/package.nix
diff --git a/pkgs/tools/misc/enjarify/default.nix b/pkgs/by-name/en/enjarify/package.nix
similarity index 100%
rename from pkgs/tools/misc/enjarify/default.nix
rename to pkgs/by-name/en/enjarify/package.nix
diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/by-name/en/enpass/data.json
similarity index 100%
rename from pkgs/tools/security/enpass/data.json
rename to pkgs/by-name/en/enpass/data.json
diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/by-name/en/enpass/package.nix
similarity index 100%
rename from pkgs/tools/security/enpass/default.nix
rename to pkgs/by-name/en/enpass/package.nix
diff --git a/pkgs/tools/security/enpass/update_script.py b/pkgs/by-name/en/enpass/update_script.py
similarity index 100%
rename from pkgs/tools/security/enpass/update_script.py
rename to pkgs/by-name/en/enpass/update_script.py
diff --git a/pkgs/tools/text/enscript/0001-use-system-getopt.patch b/pkgs/by-name/en/enscript/0001-use-system-getopt.patch
similarity index 100%
rename from pkgs/tools/text/enscript/0001-use-system-getopt.patch
rename to pkgs/by-name/en/enscript/0001-use-system-getopt.patch
diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/by-name/en/enscript/package.nix
similarity index 100%
rename from pkgs/tools/text/enscript/default.nix
rename to pkgs/by-name/en/enscript/package.nix
diff --git a/pkgs/applications/audio/ensemble-chorus/juice-cxx-packing-fix.diff b/pkgs/by-name/en/ensemble-chorus/juice-cxx-packing-fix.diff
similarity index 100%
rename from pkgs/applications/audio/ensemble-chorus/juice-cxx-packing-fix.diff
rename to pkgs/by-name/en/ensemble-chorus/juice-cxx-packing-fix.diff
diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/by-name/en/ensemble-chorus/package.nix
similarity index 100%
rename from pkgs/applications/audio/ensemble-chorus/default.nix
rename to pkgs/by-name/en/ensemble-chorus/package.nix
diff --git a/pkgs/development/tools/ent/default.nix b/pkgs/by-name/en/ent-go/package.nix
similarity index 100%
rename from pkgs/development/tools/ent/default.nix
rename to pkgs/by-name/en/ent-go/package.nix
diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/by-name/en/ent/package.nix
similarity index 100%
rename from pkgs/tools/misc/ent/default.nix
rename to pkgs/by-name/en/ent/package.nix
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/by-name/en/entr/package.nix
similarity index 100%
rename from pkgs/tools/misc/entr/default.nix
rename to pkgs/by-name/en/entr/package.nix
diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/by-name/en/entt/package.nix
similarity index 100%
rename from pkgs/development/libraries/entt/default.nix
rename to pkgs/by-name/en/entt/package.nix
diff --git a/pkgs/applications/graphics/entwine/default.nix b/pkgs/by-name/en/entwine/package.nix
similarity index 100%
rename from pkgs/applications/graphics/entwine/default.nix
rename to pkgs/by-name/en/entwine/package.nix
diff --git a/pkgs/tools/security/enum4linux-ng/default.nix b/pkgs/by-name/en/enum4linux-ng/package.nix
similarity index 100%
rename from pkgs/tools/security/enum4linux-ng/default.nix
rename to pkgs/by-name/en/enum4linux-ng/package.nix
diff --git a/pkgs/tools/security/enum4linux/default.nix b/pkgs/by-name/en/enum4linux/package.nix
similarity index 100%
rename from pkgs/tools/security/enum4linux/default.nix
rename to pkgs/by-name/en/enum4linux/package.nix
diff --git a/pkgs/tools/misc/enumer/default.nix b/pkgs/by-name/en/enumer/package.nix
similarity index 100%
rename from pkgs/tools/misc/enumer/default.nix
rename to pkgs/by-name/en/enumer/package.nix
diff --git a/pkgs/tools/security/enumerepo/default.nix b/pkgs/by-name/en/enumerepo/package.nix
similarity index 100%
rename from pkgs/tools/security/enumerepo/default.nix
rename to pkgs/by-name/en/enumerepo/package.nix
diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/by-name/en/envconsul/package.nix
similarity index 100%
rename from pkgs/tools/system/envconsul/default.nix
rename to pkgs/by-name/en/envconsul/package.nix
diff --git a/pkgs/tools/filesystems/envfs/default.nix b/pkgs/by-name/en/envfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/envfs/default.nix
rename to pkgs/by-name/en/envfs/package.nix
diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/by-name/en/envsubst/package.nix
similarity index 100%
rename from pkgs/tools/misc/envsubst/default.nix
rename to pkgs/by-name/en/envsubst/package.nix
diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/by-name/en/envypn-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/envypn-font/default.nix
rename to pkgs/by-name/en/envypn-font/package.nix
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/by-name/eo/eolie/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/eolie/default.nix
rename to pkgs/by-name/eo/eolie/package.nix
diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/by-name/eo/eos-installer/package.nix
similarity index 100%
rename from pkgs/applications/misc/eos-installer/default.nix
rename to pkgs/by-name/eo/eos-installer/package.nix
diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/by-name/eo/eot_utilities/package.nix
similarity index 100%
rename from pkgs/tools/misc/eot-utilities/default.nix
rename to pkgs/by-name/eo/eot_utilities/package.nix
diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/by-name/ep/epeg/package.nix
similarity index 100%
rename from pkgs/applications/graphics/epeg/default.nix
rename to pkgs/by-name/ep/epeg/package.nix
diff --git a/pkgs/applications/video/epgstation/epgstation.1 b/pkgs/by-name/ep/epgstation/epgstation.1
similarity index 100%
rename from pkgs/applications/video/epgstation/epgstation.1
rename to pkgs/by-name/ep/epgstation/epgstation.1
diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/by-name/ep/epgstation/package.nix
similarity index 100%
rename from pkgs/applications/video/epgstation/default.nix
rename to pkgs/by-name/ep/epgstation/package.nix
diff --git a/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch b/pkgs/by-name/ep/epgstation/use-mysql-over-domain-socket.patch
similarity index 100%
rename from pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch
rename to pkgs/by-name/ep/epgstation/use-mysql-over-domain-socket.patch
diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/by-name/ep/ephemeral/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/ephemeral/default.nix
rename to pkgs/by-name/ep/ephemeral/package.nix
diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/by-name/ep/ephemeralpg/package.nix
similarity index 100%
rename from pkgs/development/tools/database/ephemeralpg/default.nix
rename to pkgs/by-name/ep/ephemeralpg/package.nix
diff --git a/pkgs/tools/system/epilys-bb/default.nix b/pkgs/by-name/ep/epilys-bb/package.nix
similarity index 100%
rename from pkgs/tools/system/epilys-bb/default.nix
rename to pkgs/by-name/ep/epilys-bb/package.nix
diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/by-name/ep/eplot/package.nix
similarity index 100%
rename from pkgs/tools/graphics/eplot/default.nix
rename to pkgs/by-name/ep/eplot/package.nix
diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/by-name/ep/epm/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/epm/default.nix
rename to pkgs/by-name/ep/epm/package.nix
diff --git a/pkgs/applications/misc/epr/default.nix b/pkgs/by-name/ep/epr/package.nix
similarity index 100%
rename from pkgs/applications/misc/epr/default.nix
rename to pkgs/by-name/ep/epr/package.nix
diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/by-name/ep/epson-201106w/package.nix
similarity index 100%
rename from pkgs/misc/drivers/epson-201106w/default.nix
rename to pkgs/by-name/ep/epson-201106w/package.nix
diff --git a/pkgs/misc/drivers/epson-201401w/fixbuild.patch b/pkgs/by-name/ep/epson-201401w/fixbuild.patch
similarity index 100%
rename from pkgs/misc/drivers/epson-201401w/fixbuild.patch
rename to pkgs/by-name/ep/epson-201401w/fixbuild.patch
diff --git a/pkgs/misc/drivers/epson-201401w/default.nix b/pkgs/by-name/ep/epson-201401w/package.nix
similarity index 100%
rename from pkgs/misc/drivers/epson-201401w/default.nix
rename to pkgs/by-name/ep/epson-201401w/package.nix
diff --git a/pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch b/pkgs/by-name/ep/epson-alc1100/cups-data-dir.patch
similarity index 100%
rename from pkgs/misc/drivers/epson-alc1100/cups-data-dir.patch
rename to pkgs/by-name/ep/epson-alc1100/cups-data-dir.patch
diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/by-name/ep/epson-alc1100/package.nix
similarity index 100%
rename from pkgs/misc/drivers/epson-alc1100/default.nix
rename to pkgs/by-name/ep/epson-alc1100/package.nix
diff --git a/pkgs/misc/drivers/epson-alc1100/ppd.patch b/pkgs/by-name/ep/epson-alc1100/ppd.patch
similarity index 100%
rename from pkgs/misc/drivers/epson-alc1100/ppd.patch
rename to pkgs/by-name/ep/epson-alc1100/ppd.patch
diff --git a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch b/pkgs/by-name/ep/epson-escpr/cups-filter-ppd-dirs.patch
similarity index 100%
rename from pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
rename to pkgs/by-name/ep/epson-escpr/cups-filter-ppd-dirs.patch
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/by-name/ep/epson-escpr/package.nix
similarity index 100%
rename from pkgs/misc/drivers/epson-escpr/default.nix
rename to pkgs/by-name/ep/epson-escpr/package.nix
diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/by-name/ep/epson-escpr2/package.nix
similarity index 100%
rename from pkgs/misc/drivers/epson-escpr2/default.nix
rename to pkgs/by-name/ep/epson-escpr2/package.nix
diff --git a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/pkgs/by-name/ep/epson-workforce-635-nx625-series/package.nix
similarity index 100%
rename from pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix
rename to pkgs/by-name/ep/epson-workforce-635-nx625-series/package.nix
diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/by-name/ep/epson_201207w/package.nix
similarity index 100%
rename from pkgs/misc/drivers/epson_201207w/default.nix
rename to pkgs/by-name/ep/epson_201207w/package.nix
diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/by-name/ep/epstool/package.nix
similarity index 100%
rename from pkgs/tools/graphics/epstool/default.nix
rename to pkgs/by-name/ep/epstool/package.nix
diff --git a/pkgs/tools/text/epub2txt2/default.nix b/pkgs/by-name/ep/epub2txt2/package.nix
similarity index 100%
rename from pkgs/tools/text/epub2txt2/default.nix
rename to pkgs/by-name/ep/epub2txt2/package.nix
diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/by-name/ep/epubcheck/package.nix
similarity index 100%
rename from pkgs/tools/text/epubcheck/default.nix
rename to pkgs/by-name/ep/epubcheck/package.nix
diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/by-name/eq/eq10q/package.nix
similarity index 100%
rename from pkgs/applications/audio/eq10q/default.nix
rename to pkgs/by-name/eq/eq10q/package.nix
diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/by-name/eq/equilux-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/equilux-theme/default.nix
rename to pkgs/by-name/eq/equilux-theme/package.nix
diff --git a/pkgs/tools/games/er-patcher/default.nix b/pkgs/by-name/er/er-patcher/package.nix
similarity index 100%
rename from pkgs/tools/games/er-patcher/default.nix
rename to pkgs/by-name/er/er-patcher/package.nix
diff --git a/pkgs/tools/system/erdtree/default.nix b/pkgs/by-name/er/erdtree/package.nix
similarity index 100%
rename from pkgs/tools/system/erdtree/default.nix
rename to pkgs/by-name/er/erdtree/package.nix
diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/by-name/er/eresi/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/eresi/default.nix
rename to pkgs/by-name/er/eresi/package.nix
diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/by-name/er/erg/package.nix
similarity index 100%
rename from pkgs/development/compilers/erg/default.nix
rename to pkgs/by-name/er/erg/package.nix
diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/by-name/er/ergo/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/ergo/default.nix
rename to pkgs/by-name/er/ergo/package.nix
diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/by-name/er/ergochat/package.nix
similarity index 100%
rename from pkgs/servers/irc/ergochat/default.nix
rename to pkgs/by-name/er/ergochat/package.nix
diff --git a/pkgs/applications/science/chemistry/ergoscf/math-constants.patch b/pkgs/by-name/er/ergoscf/math-constants.patch
similarity index 100%
rename from pkgs/applications/science/chemistry/ergoscf/math-constants.patch
rename to pkgs/by-name/er/ergoscf/math-constants.patch
diff --git a/pkgs/applications/science/chemistry/ergoscf/default.nix b/pkgs/by-name/er/ergoscf/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/ergoscf/default.nix
rename to pkgs/by-name/er/ergoscf/package.nix
diff --git a/pkgs/applications/misc/ericw-tools/default.nix b/pkgs/by-name/er/ericw-tools/package.nix
similarity index 100%
rename from pkgs/applications/misc/ericw-tools/default.nix
rename to pkgs/by-name/er/ericw-tools/package.nix
diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/by-name/er/erigon/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/erigon/default.nix
rename to pkgs/by-name/er/erigon/package.nix
diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/by-name/er/erofs-utils/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/erofs-utils/default.nix
rename to pkgs/by-name/er/erofs-utils/package.nix
diff --git a/pkgs/tools/security/erosmb/default.nix b/pkgs/by-name/er/erosmb/package.nix
similarity index 100%
rename from pkgs/tools/security/erosmb/default.nix
rename to pkgs/by-name/er/erosmb/package.nix
diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/by-name/er/errbot/package.nix
similarity index 100%
rename from pkgs/applications/networking/errbot/default.nix
rename to pkgs/by-name/er/errbot/package.nix
diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/by-name/er/errcheck/package.nix
similarity index 100%
rename from pkgs/development/tools/errcheck/default.nix
rename to pkgs/by-name/er/errcheck/package.nix
diff --git a/pkgs/shells/es/default.nix b/pkgs/by-name/es/es/package.nix
similarity index 100%
rename from pkgs/shells/es/default.nix
rename to pkgs/by-name/es/es/package.nix
diff --git a/pkgs/tools/security/eschalot/default.nix b/pkgs/by-name/es/eschalot/package.nix
similarity index 100%
rename from pkgs/tools/security/eschalot/default.nix
rename to pkgs/by-name/es/eschalot/package.nix
diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/by-name/es/escrotum/package.nix
similarity index 100%
rename from pkgs/tools/graphics/escrotum/default.nix
rename to pkgs/by-name/es/escrotum/package.nix
diff --git a/pkgs/os-specific/linux/esdm/default.nix b/pkgs/by-name/es/esdm/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/esdm/default.nix
rename to pkgs/by-name/es/esdm/package.nix
diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/by-name/es/esh/package.nix
similarity index 100%
rename from pkgs/tools/text/esh/default.nix
rename to pkgs/by-name/es/esh/package.nix
diff --git a/pkgs/applications/office/espanso/Cargo.lock b/pkgs/by-name/es/espanso/Cargo.lock
similarity index 100%
rename from pkgs/applications/office/espanso/Cargo.lock
rename to pkgs/by-name/es/espanso/Cargo.lock
diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/by-name/es/espanso/package.nix
similarity index 100%
rename from pkgs/applications/office/espanso/default.nix
rename to pkgs/by-name/es/espanso/package.nix
diff --git a/pkgs/applications/accessibility/espeakup/default.nix b/pkgs/by-name/es/espeakup/package.nix
similarity index 100%
rename from pkgs/applications/accessibility/espeakup/default.nix
rename to pkgs/by-name/es/espeakup/package.nix
diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/by-name/es/esptool-ck/package.nix
similarity index 100%
rename from pkgs/tools/misc/esptool-ck/default.nix
rename to pkgs/by-name/es/esptool-ck/package.nix
diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/by-name/es/esptool/package.nix
similarity index 100%
rename from pkgs/tools/misc/esptool/default.nix
rename to pkgs/by-name/es/esptool/package.nix
diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/by-name/es/espup/package.nix
similarity index 100%
rename from pkgs/development/tools/espup/default.nix
rename to pkgs/by-name/es/espup/package.nix
diff --git a/pkgs/tools/audio/essentia-extractor/default.nix b/pkgs/by-name/es/essentia-extractor/package.nix
similarity index 100%
rename from pkgs/tools/audio/essentia-extractor/default.nix
rename to pkgs/by-name/es/essentia-extractor/package.nix
diff --git a/pkgs/tools/graphics/esshader/default.nix b/pkgs/by-name/es/esshader/package.nix
similarity index 100%
rename from pkgs/tools/graphics/esshader/default.nix
rename to pkgs/by-name/es/esshader/package.nix
diff --git a/pkgs/applications/science/biology/est-sfs/default.nix b/pkgs/by-name/es/est-sfs/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/est-sfs/default.nix
rename to pkgs/by-name/es/est-sfs/package.nix
diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/by-name/et/et/package.nix
similarity index 100%
rename from pkgs/applications/misc/et/default.nix
rename to pkgs/by-name/et/et/package.nix
diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/by-name/et/etBook/package.nix
similarity index 100%
rename from pkgs/data/fonts/et-book/default.nix
rename to pkgs/by-name/et/etBook/package.nix
diff --git a/pkgs/servers/etebase/default.nix b/pkgs/by-name/et/etebase-server/package.nix
similarity index 100%
rename from pkgs/servers/etebase/default.nix
rename to pkgs/by-name/et/etebase-server/package.nix
diff --git a/pkgs/servers/etebase/secret.patch b/pkgs/by-name/et/etebase-server/secret.patch
similarity index 100%
rename from pkgs/servers/etebase/secret.patch
rename to pkgs/by-name/et/etebase-server/secret.patch
diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/by-name/et/eternal-terminal/package.nix
similarity index 100%
rename from pkgs/tools/networking/eternal-terminal/default.nix
rename to pkgs/by-name/et/eternal-terminal/package.nix
diff --git a/pkgs/games/doom-ports/eternity-engine/default.nix b/pkgs/by-name/et/eternity/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/eternity-engine/default.nix
rename to pkgs/by-name/et/eternity/package.nix
diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/by-name/et/etesync-dav/package.nix
similarity index 100%
rename from pkgs/applications/misc/etesync-dav/default.nix
rename to pkgs/by-name/et/etesync-dav/package.nix
diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/by-name/et/ethash/package.nix
similarity index 100%
rename from pkgs/development/libraries/ethash/default.nix
rename to pkgs/by-name/et/ethash/package.nix
diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/by-name/et/etherape/package.nix
similarity index 100%
rename from pkgs/applications/networking/sniffers/etherape/default.nix
rename to pkgs/by-name/et/etherape/package.nix
diff --git a/pkgs/os-specific/linux/ethq/default.nix b/pkgs/by-name/et/ethq/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ethq/default.nix
rename to pkgs/by-name/et/ethq/package.nix
diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/by-name/et/ethtool/package.nix
similarity index 100%
rename from pkgs/tools/misc/ethtool/default.nix
rename to pkgs/by-name/et/ethtool/package.nix
diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/by-name/et/ets/package.nix
similarity index 100%
rename from pkgs/tools/misc/ets/default.nix
rename to pkgs/by-name/et/ets/package.nix
diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/by-name/et/ettercap/package.nix
similarity index 100%
rename from pkgs/applications/networking/sniffers/ettercap/default.nix
rename to pkgs/by-name/et/ettercap/package.nix
diff --git a/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch b/pkgs/by-name/eu/eukleides/gs-allowpstransparency.patch
similarity index 100%
rename from pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch
rename to pkgs/by-name/eu/eukleides/gs-allowpstransparency.patch
diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/by-name/eu/eukleides/package.nix
similarity index 100%
rename from pkgs/applications/science/math/eukleides/default.nix
rename to pkgs/by-name/eu/eukleides/package.nix
diff --git a/pkgs/applications/science/math/eukleides/use-CC.patch b/pkgs/by-name/eu/eukleides/use-CC.patch
similarity index 100%
rename from pkgs/applications/science/math/eukleides/use-CC.patch
rename to pkgs/by-name/eu/eukleides/use-CC.patch
diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/by-name/eu/eunomia/package.nix
similarity index 100%
rename from pkgs/data/fonts/eunomia/default.nix
rename to pkgs/by-name/eu/eunomia/package.nix
diff --git a/pkgs/games/doom-ports/eureka-editor/default.nix b/pkgs/by-name/eu/eureka-editor/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/eureka-editor/default.nix
rename to pkgs/by-name/eu/eureka-editor/package.nix
diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/by-name/ev/eva/package.nix
similarity index 100%
rename from pkgs/tools/misc/eva/default.nix
rename to pkgs/by-name/ev/eva/package.nix
diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/by-name/ev/evans/package.nix
similarity index 100%
rename from pkgs/development/tools/evans/default.nix
rename to pkgs/by-name/ev/evans/package.nix
diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/by-name/ev/evcc/package.nix
similarity index 100%
rename from pkgs/servers/home-automation/evcc/default.nix
rename to pkgs/by-name/ev/evcc/package.nix
diff --git a/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix b/pkgs/by-name/ev/evdev-proto/package.nix
similarity index 100%
rename from pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix
rename to pkgs/by-name/ev/evdev-proto/package.nix
diff --git a/pkgs/tools/inputmethods/evdevremapkeys/default.nix b/pkgs/by-name/ev/evdevremapkeys/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/evdevremapkeys/default.nix
rename to pkgs/by-name/ev/evdevremapkeys/package.nix
diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/by-name/ev/evemu/package.nix
similarity index 100%
rename from pkgs/tools/system/evemu/default.nix
rename to pkgs/by-name/ev/evemu/package.nix
diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/by-name/ev/eventlog/package.nix
similarity index 100%
rename from pkgs/development/libraries/eventlog/default.nix
rename to pkgs/by-name/ev/eventlog/package.nix
diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/by-name/ev/eventstat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/eventstat/default.nix
rename to pkgs/by-name/ev/eventstat/package.nix
diff --git a/pkgs/games/everspace/default.nix b/pkgs/by-name/ev/everspace/package.nix
similarity index 100%
rename from pkgs/games/everspace/default.nix
rename to pkgs/by-name/ev/everspace/package.nix
diff --git a/pkgs/tools/misc/evhz/default.nix b/pkgs/by-name/ev/evhz/package.nix
similarity index 100%
rename from pkgs/tools/misc/evhz/default.nix
rename to pkgs/by-name/ev/evhz/package.nix
diff --git a/pkgs/tools/security/evil-winrm/Gemfile b/pkgs/by-name/ev/evil-winrm/Gemfile
similarity index 100%
rename from pkgs/tools/security/evil-winrm/Gemfile
rename to pkgs/by-name/ev/evil-winrm/Gemfile
diff --git a/pkgs/tools/security/evil-winrm/Gemfile.lock b/pkgs/by-name/ev/evil-winrm/Gemfile.lock
similarity index 100%
rename from pkgs/tools/security/evil-winrm/Gemfile.lock
rename to pkgs/by-name/ev/evil-winrm/Gemfile.lock
diff --git a/pkgs/tools/security/evil-winrm/gemset.nix b/pkgs/by-name/ev/evil-winrm/gemset.nix
similarity index 100%
rename from pkgs/tools/security/evil-winrm/gemset.nix
rename to pkgs/by-name/ev/evil-winrm/gemset.nix
diff --git a/pkgs/tools/security/evil-winrm/default.nix b/pkgs/by-name/ev/evil-winrm/package.nix
similarity index 100%
rename from pkgs/tools/security/evil-winrm/default.nix
rename to pkgs/by-name/ev/evil-winrm/package.nix
diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/by-name/ev/evmdis/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/evmdis/default.nix
rename to pkgs/by-name/ev/evmdis/package.nix
diff --git a/pkgs/tools/inputmethods/evscript/default.nix b/pkgs/by-name/ev/evscript/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/evscript/default.nix
rename to pkgs/by-name/ev/evscript/package.nix
diff --git a/pkgs/tools/inputmethods/evsieve/default.nix b/pkgs/by-name/ev/evsieve/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/evsieve/default.nix
rename to pkgs/by-name/ev/evsieve/package.nix
diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/by-name/ev/evtest/package.nix
similarity index 100%
rename from pkgs/applications/misc/evtest/default.nix
rename to pkgs/by-name/ev/evtest/package.nix
diff --git a/pkgs/tools/security/evtx/default.nix b/pkgs/by-name/ev/evtx/package.nix
similarity index 100%
rename from pkgs/tools/security/evtx/default.nix
rename to pkgs/by-name/ev/evtx/package.nix
diff --git a/pkgs/servers/networking/exabgp/default.nix b/pkgs/by-name/ex/exabgp/package.nix
similarity index 100%
rename from pkgs/servers/networking/exabgp/default.nix
rename to pkgs/by-name/ex/exabgp/package.nix
diff --git a/pkgs/applications/audio/exact-audio-copy/default.nix b/pkgs/by-name/ex/exactaudiocopy/package.nix
similarity index 100%
rename from pkgs/applications/audio/exact-audio-copy/default.nix
rename to pkgs/by-name/ex/exactaudiocopy/package.nix
diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/by-name/ex/exaile/package.nix
similarity index 100%
rename from pkgs/applications/audio/exaile/default.nix
rename to pkgs/by-name/ex/exaile/package.nix
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/by-name/ex/exempi/package.nix
similarity index 100%
rename from pkgs/development/libraries/exempi/default.nix
rename to pkgs/by-name/ex/exempi/package.nix
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/by-name/ex/exercism/package.nix
similarity index 100%
rename from pkgs/applications/misc/exercism/default.nix
rename to pkgs/by-name/ex/exercism/package.nix
diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/by-name/ex/exfat/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/exfat/default.nix
rename to pkgs/by-name/ex/exfat/package.nix
diff --git a/pkgs/tools/filesystems/exfatprogs/default.nix b/pkgs/by-name/ex/exfatprogs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/exfatprogs/default.nix
rename to pkgs/by-name/ex/exfatprogs/package.nix
diff --git a/pkgs/development/tools/exhaustive/default.nix b/pkgs/by-name/ex/exhaustive/package.nix
similarity index 100%
rename from pkgs/development/tools/exhaustive/default.nix
rename to pkgs/by-name/ex/exhaustive/package.nix
diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/by-name/ex/exif/package.nix
similarity index 100%
rename from pkgs/tools/graphics/exif/default.nix
rename to pkgs/by-name/ex/exif/package.nix
diff --git a/pkgs/tools/graphics/exifprobe/default.nix b/pkgs/by-name/ex/exifprobe/package.nix
similarity index 100%
rename from pkgs/tools/graphics/exifprobe/default.nix
rename to pkgs/by-name/ex/exifprobe/package.nix
diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/by-name/ex/exiftags/package.nix
similarity index 100%
rename from pkgs/tools/graphics/exiftags/default.nix
rename to pkgs/by-name/ex/exiftags/package.nix
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/by-name/ex/exim/package.nix
similarity index 100%
rename from pkgs/servers/mail/exim/default.nix
rename to pkgs/by-name/ex/exim/package.nix
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/by-name/ex/exiv2/package.nix
similarity index 100%
rename from pkgs/development/libraries/exiv2/default.nix
rename to pkgs/by-name/ex/exiv2/package.nix
diff --git a/pkgs/applications/science/biology/exonerate/default.nix b/pkgs/by-name/ex/exonerate/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/exonerate/default.nix
rename to pkgs/by-name/ex/exonerate/package.nix
diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/by-name/ex/exoscale-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/exoscale-cli/default.nix
rename to pkgs/by-name/ex/exoscale-cli/package.nix
diff --git a/pkgs/build-support/expand-response-params/expand-response-params.c b/pkgs/by-name/ex/expand-response-params/expand-response-params.c
similarity index 100%
rename from pkgs/build-support/expand-response-params/expand-response-params.c
rename to pkgs/by-name/ex/expand-response-params/expand-response-params.c
diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/by-name/ex/expand-response-params/package.nix
similarity index 100%
rename from pkgs/build-support/expand-response-params/default.nix
rename to pkgs/by-name/ex/expand-response-params/package.nix
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/by-name/ex/expat/package.nix
similarity index 100%
rename from pkgs/development/libraries/expat/default.nix
rename to pkgs/by-name/ex/expat/package.nix
diff --git a/pkgs/development/libraries/expected-lite/default.nix b/pkgs/by-name/ex/expected-lite/package.nix
similarity index 100%
rename from pkgs/development/libraries/expected-lite/default.nix
rename to pkgs/by-name/ex/expected-lite/package.nix
diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/by-name/ex/expenses/package.nix
similarity index 100%
rename from pkgs/applications/misc/expenses/default.nix
rename to pkgs/by-name/ex/expenses/package.nix
diff --git a/pkgs/development/tools/explain/default.nix b/pkgs/by-name/ex/explain/package.nix
similarity index 100%
rename from pkgs/development/tools/explain/default.nix
rename to pkgs/by-name/ex/explain/package.nix
diff --git a/pkgs/tools/security/expliot/default.nix b/pkgs/by-name/ex/expliot/package.nix
similarity index 100%
rename from pkgs/tools/security/expliot/default.nix
rename to pkgs/by-name/ex/expliot/package.nix
diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/by-name/ex/exploitdb/package.nix
similarity index 100%
rename from pkgs/tools/security/exploitdb/default.nix
rename to pkgs/by-name/ex/exploitdb/package.nix
diff --git a/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/pkgs/by-name/ex/exportarr/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/prometheus/exportarr/default.nix
rename to pkgs/by-name/ex/exportarr/package.nix
diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/by-name/ex/expr/package.nix
similarity index 100%
rename from pkgs/development/interpreters/expr/default.nix
rename to pkgs/by-name/ex/expr/package.nix
diff --git a/pkgs/applications/networking/expressvpn/default.nix b/pkgs/by-name/ex/expressvpn/package.nix
similarity index 100%
rename from pkgs/applications/networking/expressvpn/default.nix
rename to pkgs/by-name/ex/expressvpn/package.nix
diff --git a/pkgs/development/libraries/exprtk/default.nix b/pkgs/by-name/ex/exprtk/package.nix
similarity index 100%
rename from pkgs/development/libraries/exprtk/default.nix
rename to pkgs/by-name/ex/exprtk/package.nix
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/by-name/ex/exrtools/package.nix
similarity index 100%
rename from pkgs/applications/graphics/exrtools/default.nix
rename to pkgs/by-name/ex/exrtools/package.nix
diff --git a/pkgs/tools/filesystems/ext4magic/glibc-fix.patch b/pkgs/by-name/ex/ext4magic/glibc-fix.patch
similarity index 100%
rename from pkgs/tools/filesystems/ext4magic/glibc-fix.patch
rename to pkgs/by-name/ex/ext4magic/glibc-fix.patch
diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/by-name/ex/ext4magic/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/ext4magic/default.nix
rename to pkgs/by-name/ex/ext4magic/package.nix
diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/by-name/ex/extism-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/extism-cli/default.nix
rename to pkgs/by-name/ex/extism-cli/package.nix
diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/by-name/ex/extra-container/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/extra-container/default.nix
rename to pkgs/by-name/ex/extra-container/package.nix
diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/by-name/ex/extrace/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/extrace/default.nix
rename to pkgs/by-name/ex/extrace/package.nix
diff --git a/pkgs/applications/misc/extract_url/default.nix b/pkgs/by-name/ex/extract_url/package.nix
similarity index 100%
rename from pkgs/applications/misc/extract_url/default.nix
rename to pkgs/by-name/ex/extract_url/package.nix
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/by-name/ex/extremetuxracer/package.nix
similarity index 100%
rename from pkgs/games/extremetuxracer/default.nix
rename to pkgs/by-name/ex/extremetuxracer/package.nix
diff --git a/pkgs/tools/security/extrude/default.nix b/pkgs/by-name/ex/extrude/package.nix
similarity index 100%
rename from pkgs/tools/security/extrude/default.nix
rename to pkgs/by-name/ex/extrude/package.nix
diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/by-name/ex/extundelete/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/extundelete/default.nix
rename to pkgs/by-name/ex/extundelete/package.nix
diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/by-name/ey/eyedropper/package.nix
similarity index 100%
rename from pkgs/applications/graphics/eyedropper/default.nix
rename to pkgs/by-name/ey/eyedropper/package.nix
diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/by-name/ez/ezminc/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/EZminc/default.nix
rename to pkgs/by-name/ez/ezminc/package.nix
diff --git a/pkgs/development/tools/misc/ezno/default.nix b/pkgs/by-name/ez/ezno/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/ezno/default.nix
rename to pkgs/by-name/ez/ezno/package.nix
diff --git a/pkgs/games/ezquake/default.nix b/pkgs/by-name/ez/ezquake/package.nix
similarity index 100%
rename from pkgs/games/ezquake/default.nix
rename to pkgs/by-name/ez/ezquake/package.nix
diff --git a/pkgs/data/fonts/ezra-sil/default.nix b/pkgs/by-name/ez/ezra-sil/package.nix
similarity index 100%
rename from pkgs/data/fonts/ezra-sil/default.nix
rename to pkgs/by-name/ez/ezra-sil/package.nix
diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/by-name/ez/ezstream/package.nix
similarity index 100%
rename from pkgs/tools/audio/ezstream/default.nix
rename to pkgs/by-name/ez/ezstream/package.nix
diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/by-name/ez/eztrace/package.nix
similarity index 100%
rename from pkgs/development/tools/profiling/EZTrace/default.nix
rename to pkgs/by-name/ez/eztrace/package.nix
diff --git a/pkgs/data/fonts/f1_8/default.nix b/pkgs/by-name/f1/f1_8/package.nix
similarity index 100%
rename from pkgs/data/fonts/f1_8/default.nix
rename to pkgs/by-name/f1/f1_8/package.nix
diff --git a/pkgs/applications/video/f1viewer/default.nix b/pkgs/by-name/f1/f1viewer/package.nix
similarity index 100%
rename from pkgs/applications/video/f1viewer/default.nix
rename to pkgs/by-name/f1/f1viewer/package.nix
diff --git a/pkgs/tools/misc/f2/default.nix b/pkgs/by-name/f2/f2/package.nix
similarity index 100%
rename from pkgs/tools/misc/f2/default.nix
rename to pkgs/by-name/f2/f2/package.nix
diff --git a/pkgs/development/tools/f2c/default.nix b/pkgs/by-name/f2/f2c/package.nix
similarity index 100%
rename from pkgs/development/tools/f2c/default.nix
rename to pkgs/by-name/f2/f2c/package.nix
diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/by-name/f3/f3/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/f3/default.nix
rename to pkgs/by-name/f3/f3/package.nix
diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/by-name/f5/f5_6/package.nix
similarity index 100%
rename from pkgs/data/fonts/f5_6/default.nix
rename to pkgs/by-name/f5/f5_6/package.nix
diff --git a/pkgs/data/fonts/fa_1/default.nix b/pkgs/by-name/fa/fa_1/package.nix
similarity index 100%
rename from pkgs/data/fonts/fa_1/default.nix
rename to pkgs/by-name/fa/fa_1/package.nix
diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/by-name/fa/faac/package.nix
similarity index 100%
rename from pkgs/development/libraries/faac/default.nix
rename to pkgs/by-name/fa/faac/package.nix
diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/by-name/fa/faad2/package.nix
similarity index 100%
rename from pkgs/development/libraries/faad2/default.nix
rename to pkgs/by-name/fa/faad2/package.nix
diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/by-name/fa/faas-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/faas-cli/default.nix
rename to pkgs/by-name/fa/faas-cli/package.nix
diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/by-name/fa/faba-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/faba-icon-theme/default.nix
rename to pkgs/by-name/fa/faba-icon-theme/package.nix
diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/by-name/fa/faba-mono-icons/package.nix
similarity index 100%
rename from pkgs/data/icons/faba-mono-icons/default.nix
rename to pkgs/by-name/fa/faba-mono-icons/package.nix
diff --git a/pkgs/tools/games/minecraft/fabric-installer/default.nix b/pkgs/by-name/fa/fabric-installer/package.nix
similarity index 100%
rename from pkgs/tools/games/minecraft/fabric-installer/default.nix
rename to pkgs/by-name/fa/fabric-installer/package.nix
diff --git a/pkgs/tools/backup/fabs/default.nix b/pkgs/by-name/fa/fabs/package.nix
similarity index 100%
rename from pkgs/tools/backup/fabs/default.nix
rename to pkgs/by-name/fa/fabs/package.nix
diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/by-name/fa/facedetect/package.nix
similarity index 100%
rename from pkgs/tools/graphics/facedetect/default.nix
rename to pkgs/by-name/fa/facedetect/package.nix
diff --git a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix b/pkgs/by-name/fa/facetimehd-calibration/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix
rename to pkgs/by-name/fa/facetimehd-calibration/package.nix
diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/by-name/fa/facetimehd-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
rename to pkgs/by-name/fa/facetimehd-firmware/package.nix
diff --git a/pkgs/applications/misc/faircamp/Cargo.lock b/pkgs/by-name/fa/faircamp/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/faircamp/Cargo.lock
rename to pkgs/by-name/fa/faircamp/Cargo.lock
diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/by-name/fa/faircamp/package.nix
similarity index 100%
rename from pkgs/applications/misc/faircamp/default.nix
rename to pkgs/by-name/fa/faircamp/package.nix
diff --git a/pkgs/applications/misc/faircamp/test-wav.nix b/pkgs/by-name/fa/faircamp/test-wav.nix
similarity index 100%
rename from pkgs/applications/misc/faircamp/test-wav.nix
rename to pkgs/by-name/fa/faircamp/test-wav.nix
diff --git a/pkgs/games/fairymax/default.nix b/pkgs/by-name/fa/fairymax/package.nix
similarity index 100%
rename from pkgs/games/fairymax/default.nix
rename to pkgs/by-name/fa/fairymax/package.nix
diff --git a/pkgs/build-support/fake-nss/default.nix b/pkgs/by-name/fa/fakeNss/package.nix
similarity index 100%
rename from pkgs/build-support/fake-nss/default.nix
rename to pkgs/by-name/fa/fakeNss/package.nix
diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/by-name/fa/fakechroot/package.nix
similarity index 100%
rename from pkgs/tools/system/fakechroot/default.nix
rename to pkgs/by-name/fa/fakechroot/package.nix
diff --git a/pkgs/tools/system/fakeroot/einval.patch b/pkgs/by-name/fa/fakeroot/einval.patch
similarity index 100%
rename from pkgs/tools/system/fakeroot/einval.patch
rename to pkgs/by-name/fa/fakeroot/einval.patch
diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/by-name/fa/fakeroot/package.nix
similarity index 100%
rename from pkgs/tools/system/fakeroot/default.nix
rename to pkgs/by-name/fa/fakeroot/package.nix
diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/by-name/fa/fakeroute/package.nix
similarity index 100%
rename from pkgs/tools/networking/fakeroute/default.nix
rename to pkgs/by-name/fa/fakeroute/package.nix
diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/by-name/fa/faketty/package.nix
similarity index 100%
rename from pkgs/tools/misc/faketty/default.nix
rename to pkgs/by-name/fa/faketty/package.nix
diff --git a/pkgs/applications/networking/cluster/falcoctl/default.nix b/pkgs/by-name/fa/falcoctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/falcoctl/default.nix
rename to pkgs/by-name/fa/falcoctl/package.nix
diff --git a/pkgs/os-specific/linux/fan2go/default.nix b/pkgs/by-name/fa/fan2go/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/fan2go/default.nix
rename to pkgs/by-name/fa/fan2go/package.nix
diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/by-name/fa/fanctl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/fanctl/default.nix
rename to pkgs/by-name/fa/fanctl/package.nix
diff --git a/pkgs/tools/system/fancy-motd/default.nix b/pkgs/by-name/fa/fancy-motd/package.nix
similarity index 100%
rename from pkgs/tools/system/fancy-motd/default.nix
rename to pkgs/by-name/fa/fancy-motd/package.nix
diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/by-name/fa/fanficfare/package.nix
similarity index 100%
rename from pkgs/tools/text/fanficfare/default.nix
rename to pkgs/by-name/fa/fanficfare/package.nix
diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/by-name/fa/fantasque-sans-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/fantasque-sans-mono/default.nix
rename to pkgs/by-name/fa/fantasque-sans-mono/package.nix
diff --git a/pkgs/data/fonts/fanwood/default.nix b/pkgs/by-name/fa/fanwood/package.nix
similarity index 100%
rename from pkgs/data/fonts/fanwood/default.nix
rename to pkgs/by-name/fa/fanwood/package.nix
diff --git a/pkgs/development/tools/faq/default.nix b/pkgs/by-name/fa/faq/package.nix
similarity index 100%
rename from pkgs/development/tools/faq/default.nix
rename to pkgs/by-name/fa/faq/package.nix
diff --git a/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix
similarity index 100%
rename from pkgs/tools/security/faraday-agent-dispatcher/default.nix
rename to pkgs/by-name/fa/faraday-agent-dispatcher/package.nix
diff --git a/pkgs/tools/security/faraday-cli/default.nix b/pkgs/by-name/fa/faraday-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/faraday-cli/default.nix
rename to pkgs/by-name/fa/faraday-cli/package.nix
diff --git a/pkgs/applications/blockchains/faraday/default.nix b/pkgs/by-name/fa/faraday/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/faraday/default.nix
rename to pkgs/by-name/fa/faraday/package.nix
diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/by-name/fa/farbfeld/package.nix
similarity index 100%
rename from pkgs/development/libraries/farbfeld/default.nix
rename to pkgs/by-name/fa/farbfeld/package.nix
diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/by-name/fa/fasd/package.nix
similarity index 100%
rename from pkgs/tools/misc/fasd/default.nix
rename to pkgs/by-name/fa/fasd/package.nix
diff --git a/pkgs/development/compilers/fasmg/default.nix b/pkgs/by-name/fa/fasmg/package.nix
similarity index 100%
rename from pkgs/development/compilers/fasmg/default.nix
rename to pkgs/by-name/fa/fasmg/package.nix
diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in b/pkgs/by-name/fa/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in
similarity index 100%
rename from pkgs/development/libraries/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in
rename to pkgs/by-name/fa/fast-cpp-csv-parser/fast-cpp-csv-parser.pc.in
diff --git a/pkgs/development/libraries/fast-cpp-csv-parser/default.nix b/pkgs/by-name/fa/fast-cpp-csv-parser/package.nix
similarity index 100%
rename from pkgs/development/libraries/fast-cpp-csv-parser/default.nix
rename to pkgs/by-name/fa/fast-cpp-csv-parser/package.nix
diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/by-name/fa/fast-downward/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/fast-downward/default.nix
rename to pkgs/by-name/fa/fast-downward/package.nix
diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/by-name/fa/fastJson/package.nix
similarity index 100%
rename from pkgs/development/libraries/fastjson/default.nix
rename to pkgs/by-name/fa/fastJson/package.nix
diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/by-name/fa/fastd/package.nix
similarity index 100%
rename from pkgs/tools/networking/fastd/default.nix
rename to pkgs/by-name/fa/fastd/package.nix
diff --git a/pkgs/development/tools/fastddsgen/deps.json b/pkgs/by-name/fa/fastddsgen/deps.json
similarity index 100%
rename from pkgs/development/tools/fastddsgen/deps.json
rename to pkgs/by-name/fa/fastddsgen/deps.json
diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/by-name/fa/fastddsgen/package.nix
similarity index 100%
rename from pkgs/development/tools/fastddsgen/default.nix
rename to pkgs/by-name/fa/fastddsgen/package.nix
diff --git a/pkgs/development/tools/fastgron/default.nix b/pkgs/by-name/fa/fastgron/package.nix
similarity index 100%
rename from pkgs/development/tools/fastgron/default.nix
rename to pkgs/by-name/fa/fastgron/package.nix
diff --git a/pkgs/applications/science/physics/fasthenry/default.nix b/pkgs/by-name/fa/fasthenry/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/fasthenry/default.nix
rename to pkgs/by-name/fa/fasthenry/package.nix
diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/by-name/fa/fastjet-contrib/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/fastjet-contrib/default.nix
rename to pkgs/by-name/fa/fastjet-contrib/package.nix
diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/by-name/fa/fastjet/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/fastjet/default.nix
rename to pkgs/by-name/fa/fastjet/package.nix
diff --git a/pkgs/servers/fastnetmon-advanced/default.nix b/pkgs/by-name/fa/fastnetmon-advanced/package.nix
similarity index 100%
rename from pkgs/servers/fastnetmon-advanced/default.nix
rename to pkgs/by-name/fa/fastnetmon-advanced/package.nix
diff --git a/pkgs/development/libraries/physics/fastnlo-toolkit/default.nix b/pkgs/by-name/fa/fastnlo-toolkit/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/fastnlo-toolkit/default.nix
rename to pkgs/by-name/fa/fastnlo-toolkit/package.nix
diff --git a/pkgs/development/libraries/physics/fastnlo-toolkit/yoda2_support.patch b/pkgs/by-name/fa/fastnlo-toolkit/yoda2_support.patch
similarity index 100%
rename from pkgs/development/libraries/physics/fastnlo-toolkit/yoda2_support.patch
rename to pkgs/by-name/fa/fastnlo-toolkit/yoda2_support.patch
diff --git a/pkgs/applications/science/biology/fastp/default.nix b/pkgs/by-name/fa/fastp/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/fastp/default.nix
rename to pkgs/by-name/fa/fastp/package.nix
diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/by-name/fa/fastpbkdf2/package.nix
similarity index 100%
rename from pkgs/development/libraries/fastpbkdf2/default.nix
rename to pkgs/by-name/fa/fastpbkdf2/package.nix
diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/pkgs/by-name/fa/fasttext/package.nix
similarity index 100%
rename from pkgs/applications/science/machine-learning/fasttext/default.nix
rename to pkgs/by-name/fa/fasttext/package.nix
diff --git a/pkgs/development/tools/fatcat/default.nix b/pkgs/by-name/fa/fatcat/package.nix
similarity index 100%
rename from pkgs/development/tools/fatcat/default.nix
rename to pkgs/by-name/fa/fatcat/package.nix
diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/by-name/fa/fatrace/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/fatrace/default.nix
rename to pkgs/by-name/fa/fatrace/package.nix
diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/by-name/fa/fatresize/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/fatresize/default.nix
rename to pkgs/by-name/fa/fatresize/package.nix
diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/by-name/fa/fatsort/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/fatsort/default.nix
rename to pkgs/by-name/fa/fatsort/package.nix
diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/by-name/fa/faudio/package.nix
similarity index 100%
rename from pkgs/development/libraries/faudio/default.nix
rename to pkgs/by-name/fa/faudio/package.nix
diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/by-name/fa/faustPhysicalModeling/package.nix
similarity index 100%
rename from pkgs/applications/audio/faustPhysicalModeling/default.nix
rename to pkgs/by-name/fa/faustPhysicalModeling/package.nix
diff --git a/pkgs/tools/misc/fbcat/default.nix b/pkgs/by-name/fb/fbcat/package.nix
similarity index 100%
rename from pkgs/tools/misc/fbcat/default.nix
rename to pkgs/by-name/fb/fbcat/package.nix
diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/by-name/fb/fbida/package.nix
similarity index 100%
rename from pkgs/applications/graphics/fbida/default.nix
rename to pkgs/by-name/fb/fbida/package.nix
diff --git a/pkgs/development/libraries/fbjni/default.nix b/pkgs/by-name/fb/fbjni/package.nix
similarity index 100%
rename from pkgs/development/libraries/fbjni/default.nix
rename to pkgs/by-name/fb/fbjni/package.nix
diff --git a/pkgs/development/tools/fblog/default.nix b/pkgs/by-name/fb/fblog/package.nix
similarity index 100%
rename from pkgs/development/tools/fblog/default.nix
rename to pkgs/by-name/fb/fblog/package.nix
diff --git a/pkgs/tools/misc/fbmark/default.nix b/pkgs/by-name/fb/fbmark/package.nix
similarity index 100%
rename from pkgs/tools/misc/fbmark/default.nix
rename to pkgs/by-name/fb/fbmark/package.nix
diff --git a/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch b/pkgs/by-name/fb/fbmenugen/0001-Fix-paths.patch
similarity index 100%
rename from pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch
rename to pkgs/by-name/fb/fbmenugen/0001-Fix-paths.patch
diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/by-name/fb/fbmenugen/package.nix
similarity index 100%
rename from pkgs/applications/misc/fbmenugen/default.nix
rename to pkgs/by-name/fb/fbmenugen/package.nix
diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/by-name/fb/fbpanel/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/fbpanel/default.nix
rename to pkgs/by-name/fb/fbpanel/package.nix
diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/by-name/fb/fbterm/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/fbterm/default.nix
rename to pkgs/by-name/fb/fbterm/package.nix
diff --git a/pkgs/os-specific/linux/fbterm/select.patch b/pkgs/by-name/fb/fbterm/select.patch
similarity index 100%
rename from pkgs/os-specific/linux/fbterm/select.patch
rename to pkgs/by-name/fb/fbterm/select.patch
diff --git a/pkgs/tools/graphics/fbv/default.nix b/pkgs/by-name/fb/fbv/package.nix
similarity index 100%
rename from pkgs/tools/graphics/fbv/default.nix
rename to pkgs/by-name/fb/fbv/package.nix
diff --git a/pkgs/tools/admin/fbvnc/default.nix b/pkgs/by-name/fb/fbvnc/package.nix
similarity index 100%
rename from pkgs/tools/admin/fbvnc/default.nix
rename to pkgs/by-name/fb/fbvnc/package.nix
diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/by-name/fc/fcft/package.nix
similarity index 100%
rename from pkgs/development/libraries/fcft/default.nix
rename to pkgs/by-name/fc/fcft/package.nix
diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/by-name/fc/fcgiwrap/package.nix
similarity index 100%
rename from pkgs/servers/fcgiwrap/default.nix
rename to pkgs/by-name/fc/fcgiwrap/package.nix
diff --git a/pkgs/development/libraries/fcl/default.nix b/pkgs/by-name/fc/fcl/package.nix
similarity index 100%
rename from pkgs/development/libraries/fcl/default.nix
rename to pkgs/by-name/fc/fcl/package.nix
diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/by-name/fc/fcppt/package.nix
similarity index 100%
rename from pkgs/development/libraries/fcppt/default.nix
rename to pkgs/by-name/fc/fcppt/package.nix
diff --git a/pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch b/pkgs/by-name/fc/fcrackzip/fcrackzip_forkexec.patch
similarity index 100%
rename from pkgs/tools/security/fcrackzip/fcrackzip_forkexec.patch
rename to pkgs/by-name/fc/fcrackzip/fcrackzip_forkexec.patch
diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/by-name/fc/fcrackzip/package.nix
similarity index 100%
rename from pkgs/tools/security/fcrackzip/default.nix
rename to pkgs/by-name/fc/fcrackzip/package.nix
diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/by-name/fc/fcron/package.nix
similarity index 100%
rename from pkgs/tools/system/fcron/default.nix
rename to pkgs/by-name/fc/fcron/package.nix
diff --git a/pkgs/tools/system/fcron/relative-fcronsighup.patch b/pkgs/by-name/fc/fcron/relative-fcronsighup.patch
similarity index 100%
rename from pkgs/tools/system/fcron/relative-fcronsighup.patch
rename to pkgs/by-name/fc/fcron/relative-fcronsighup.patch
diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/by-name/fd/fd/package.nix
similarity index 100%
rename from pkgs/tools/misc/fd/default.nix
rename to pkgs/by-name/fd/fd/package.nix
diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/by-name/fd/fdk-aac-encoder/package.nix
similarity index 100%
rename from pkgs/applications/audio/fdkaac/default.nix
rename to pkgs/by-name/fd/fdk-aac-encoder/package.nix
diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/by-name/fd/fdk_aac/package.nix
similarity index 100%
rename from pkgs/development/libraries/fdk-aac/default.nix
rename to pkgs/by-name/fd/fdk_aac/package.nix
diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/by-name/fd/fdm/package.nix
similarity index 100%
rename from pkgs/tools/networking/fdm/default.nix
rename to pkgs/by-name/fd/fdm/package.nix
diff --git a/pkgs/tools/misc/fdtools/new-skalibs.patch b/pkgs/by-name/fd/fdtools/new-skalibs.patch
similarity index 100%
rename from pkgs/tools/misc/fdtools/new-skalibs.patch
rename to pkgs/by-name/fd/fdtools/new-skalibs.patch
diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/by-name/fd/fdtools/package.nix
similarity index 100%
rename from pkgs/tools/misc/fdtools/default.nix
rename to pkgs/by-name/fd/fdtools/package.nix
diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/by-name/fd/fdupes/package.nix
similarity index 100%
rename from pkgs/tools/misc/fdupes/default.nix
rename to pkgs/by-name/fd/fdupes/package.nix
diff --git a/pkgs/applications/misc/fead/default.nix b/pkgs/by-name/fe/fead/package.nix
similarity index 100%
rename from pkgs/applications/misc/fead/default.nix
rename to pkgs/by-name/fe/fead/package.nix
diff --git a/pkgs/tools/misc/fedifetcher/default.nix b/pkgs/by-name/fe/fedifetcher/package.nix
similarity index 100%
rename from pkgs/tools/misc/fedifetcher/default.nix
rename to pkgs/by-name/fe/fedifetcher/package.nix
diff --git a/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix b/pkgs/by-name/fe/feed2imap-go/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/feed2imap-go/default.nix
rename to pkgs/by-name/fe/feed2imap-go/package.nix
diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/by-name/fe/feedbackd/package.nix
similarity index 100%
rename from pkgs/applications/misc/feedbackd/default.nix
rename to pkgs/by-name/fe/feedbackd/package.nix
diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/by-name/fe/feedgnuplot/package.nix
similarity index 100%
rename from pkgs/tools/graphics/feedgnuplot/default.nix
rename to pkgs/by-name/fe/feedgnuplot/package.nix
diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/by-name/fe/fehlstart/package.nix
similarity index 100%
rename from pkgs/applications/misc/fehlstart/default.nix
rename to pkgs/by-name/fe/fehlstart/package.nix
diff --git a/pkgs/applications/misc/fehlstart/use-nix-profiles.patch b/pkgs/by-name/fe/fehlstart/use-nix-profiles.patch
similarity index 100%
rename from pkgs/applications/misc/fehlstart/use-nix-profiles.patch
rename to pkgs/by-name/fe/fehlstart/use-nix-profiles.patch
diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/by-name/fe/feishu/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/feishu/default.nix
rename to pkgs/by-name/fe/feishu/package.nix
diff --git a/pkgs/development/interpreters/femtolisp/default.nix b/pkgs/by-name/fe/femtolisp/package.nix
similarity index 100%
rename from pkgs/development/interpreters/femtolisp/default.nix
rename to pkgs/by-name/fe/femtolisp/package.nix
diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/by-name/fe/fend/package.nix
similarity index 100%
rename from pkgs/tools/misc/fend/default.nix
rename to pkgs/by-name/fe/fend/package.nix
diff --git a/pkgs/tools/networking/ferm/import-ferm-wrapped.patch b/pkgs/by-name/fe/ferm/import-ferm-wrapped.patch
similarity index 100%
rename from pkgs/tools/networking/ferm/import-ferm-wrapped.patch
rename to pkgs/by-name/fe/ferm/import-ferm-wrapped.patch
diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/by-name/fe/ferm/package.nix
similarity index 100%
rename from pkgs/tools/networking/ferm/default.nix
rename to pkgs/by-name/fe/ferm/package.nix
diff --git a/pkgs/development/tools/fermyon-spin/default.nix b/pkgs/by-name/fe/fermyon-spin/package.nix
similarity index 100%
rename from pkgs/development/tools/fermyon-spin/default.nix
rename to pkgs/by-name/fe/fermyon-spin/package.nix
diff --git a/pkgs/development/tools/fermyon-spin/update.sh b/pkgs/by-name/fe/fermyon-spin/update.sh
similarity index 100%
rename from pkgs/development/tools/fermyon-spin/update.sh
rename to pkgs/by-name/fe/fermyon-spin/update.sh
diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/by-name/fe/ferretdb/package.nix
similarity index 100%
rename from pkgs/servers/nosql/ferretdb/default.nix
rename to pkgs/by-name/fe/ferretdb/package.nix
diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/by-name/fe/ferrum/package.nix
similarity index 100%
rename from pkgs/data/fonts/ferrum/default.nix
rename to pkgs/by-name/fe/ferrum/package.nix
diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/by-name/fe/fet-sh/package.nix
similarity index 100%
rename from pkgs/tools/misc/fet-sh/default.nix
rename to pkgs/by-name/fe/fet-sh/package.nix
diff --git a/pkgs/tools/misc/fetch-scm/default.nix b/pkgs/by-name/fe/fetch-scm/package.nix
similarity index 100%
rename from pkgs/tools/misc/fetch-scm/default.nix
rename to pkgs/by-name/fe/fetch-scm/package.nix
diff --git a/pkgs/applications/networking/cluster/fetchit/default.nix b/pkgs/by-name/fe/fetchit/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/fetchit/default.nix
rename to pkgs/by-name/fe/fetchit/package.nix
diff --git a/pkgs/tools/misc/fetchutils/default.nix b/pkgs/by-name/fe/fetchutils/package.nix
similarity index 100%
rename from pkgs/tools/misc/fetchutils/default.nix
rename to pkgs/by-name/fe/fetchutils/package.nix
diff --git a/pkgs/applications/misc/ff2mpv/default.nix b/pkgs/by-name/ff/ff2mpv/package.nix
similarity index 100%
rename from pkgs/applications/misc/ff2mpv/default.nix
rename to pkgs/by-name/ff/ff2mpv/package.nix
diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/by-name/ff/ffcast/package.nix
similarity index 100%
rename from pkgs/tools/X11/ffcast/default.nix
rename to pkgs/by-name/ff/ffcast/package.nix
diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/by-name/ff/fff/package.nix
similarity index 100%
rename from pkgs/applications/misc/fff/default.nix
rename to pkgs/by-name/ff/fff/package.nix
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/by-name/ff/fflas-ffpack/package.nix
similarity index 100%
rename from pkgs/development/libraries/fflas-ffpack/default.nix
rename to pkgs/by-name/ff/fflas-ffpack/package.nix
diff --git a/pkgs/misc/cups/drivers/fflinuxprint/default.nix b/pkgs/by-name/ff/fflinuxprint/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/fflinuxprint/default.nix
rename to pkgs/by-name/ff/fflinuxprint/package.nix
diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/by-name/ff/ffmpegthumbnailer/package.nix
similarity index 100%
rename from pkgs/development/libraries/ffmpegthumbnailer/default.nix
rename to pkgs/by-name/ff/ffmpegthumbnailer/package.nix
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/by-name/ff/ffms/package.nix
similarity index 100%
rename from pkgs/development/libraries/ffms/default.nix
rename to pkgs/by-name/ff/ffms/package.nix
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/by-name/ff/fftw/package.nix
similarity index 100%
rename from pkgs/development/libraries/fftw/default.nix
rename to pkgs/by-name/ff/fftw/package.nix
diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/by-name/ff/ffuf/package.nix
similarity index 100%
rename from pkgs/tools/security/ffuf/default.nix
rename to pkgs/by-name/ff/ffuf/package.nix
diff --git a/pkgs/data/fonts/fg-virgil/default.nix b/pkgs/by-name/fg/fg-virgil/package.nix
similarity index 100%
rename from pkgs/data/fonts/fg-virgil/default.nix
rename to pkgs/by-name/fg/fg-virgil/package.nix
diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/by-name/fg/fgallery/package.nix
similarity index 100%
rename from pkgs/tools/graphics/fgallery/default.nix
rename to pkgs/by-name/fg/fgallery/package.nix
diff --git a/pkgs/tools/nix/fh/default.nix b/pkgs/by-name/fh/fh/package.nix
similarity index 100%
rename from pkgs/tools/nix/fh/default.nix
rename to pkgs/by-name/fh/fh/package.nix
diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/by-name/fh/fheroes2/package.nix
similarity index 100%
rename from pkgs/games/fheroes2/default.nix
rename to pkgs/by-name/fh/fheroes2/package.nix
diff --git a/pkgs/tools/misc/fiano/default.nix b/pkgs/by-name/fi/fiano/package.nix
similarity index 100%
rename from pkgs/tools/misc/fiano/default.nix
rename to pkgs/by-name/fi/fiano/package.nix
diff --git a/pkgs/servers/fiche/default.nix b/pkgs/by-name/fi/fiche/package.nix
similarity index 100%
rename from pkgs/servers/fiche/default.nix
rename to pkgs/by-name/fi/fiche/package.nix
diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/by-name/fi/fierce/package.nix
similarity index 100%
rename from pkgs/tools/security/fierce/default.nix
rename to pkgs/by-name/fi/fierce/package.nix
diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/by-name/fi/fig2dev/package.nix
similarity index 100%
rename from pkgs/applications/graphics/fig2dev/default.nix
rename to pkgs/by-name/fi/fig2dev/package.nix
diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/by-name/fi/figlet/package.nix
similarity index 100%
rename from pkgs/tools/misc/figlet/default.nix
rename to pkgs/by-name/fi/figlet/package.nix
diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/by-name/fi/fiji/package.nix
similarity index 100%
rename from pkgs/applications/graphics/fiji/default.nix
rename to pkgs/by-name/fi/fiji/package.nix
diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/by-name/fi/file-rename/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/file-rename/default.nix
rename to pkgs/by-name/fi/file-rename/package.nix
diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/by-name/fi/filebench/package.nix
similarity index 100%
rename from pkgs/tools/misc/filebench/default.nix
rename to pkgs/by-name/fi/filebench/package.nix
diff --git a/pkgs/applications/networking/filebrowser/default.nix b/pkgs/by-name/fi/filebrowser/package.nix
similarity index 100%
rename from pkgs/applications/networking/filebrowser/default.nix
rename to pkgs/by-name/fi/filebrowser/package.nix
diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/by-name/fi/filegive/package.nix
similarity index 100%
rename from pkgs/tools/networking/filegive/default.nix
rename to pkgs/by-name/fi/filegive/package.nix
diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/by-name/fi/fileshare/package.nix
similarity index 100%
rename from pkgs/servers/fileshare/default.nix
rename to pkgs/by-name/fi/fileshare/package.nix
diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/by-name/fi/fileshelter/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/fileshelter/default.nix
rename to pkgs/by-name/fi/fileshelter/package.nix
diff --git a/pkgs/applications/misc/filet/default.nix b/pkgs/by-name/fi/filet/package.nix
similarity index 100%
rename from pkgs/applications/misc/filet/default.nix
rename to pkgs/by-name/fi/filet/package.nix
diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/by-name/fi/filter-audio/package.nix
similarity index 100%
rename from pkgs/development/libraries/filter-audio/default.nix
rename to pkgs/by-name/fi/filter-audio/package.nix
diff --git a/pkgs/servers/filtron/default.nix b/pkgs/by-name/fi/filtron/package.nix
similarity index 100%
rename from pkgs/servers/filtron/default.nix
rename to pkgs/by-name/fi/filtron/package.nix
diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/by-name/fi/fim/package.nix
similarity index 100%
rename from pkgs/tools/graphics/fim/default.nix
rename to pkgs/by-name/fi/fim/package.nix
diff --git a/pkgs/tools/X11/find-cursor/default.nix b/pkgs/by-name/fi/find-cursor/package.nix
similarity index 100%
rename from pkgs/tools/X11/find-cursor/default.nix
rename to pkgs/by-name/fi/find-cursor/package.nix
diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/by-name/fi/findbugs/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/findbugs/default.nix
rename to pkgs/by-name/fi/findbugs/package.nix
diff --git a/pkgs/applications/misc/findex/default.nix b/pkgs/by-name/fi/findex/package.nix
similarity index 100%
rename from pkgs/applications/misc/findex/default.nix
rename to pkgs/by-name/fi/findex/package.nix
diff --git a/pkgs/development/tools/misc/findnewest/default.nix b/pkgs/by-name/fi/findnewest/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/findnewest/default.nix
rename to pkgs/by-name/fi/findnewest/package.nix
diff --git a/pkgs/tools/networking/findomain/Cargo.lock b/pkgs/by-name/fi/findomain/Cargo.lock
similarity index 100%
rename from pkgs/tools/networking/findomain/Cargo.lock
rename to pkgs/by-name/fi/findomain/Cargo.lock
diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/by-name/fi/findomain/package.nix
similarity index 100%
rename from pkgs/tools/networking/findomain/default.nix
rename to pkgs/by-name/fi/findomain/package.nix
diff --git a/pkgs/tools/misc/findup/default.nix b/pkgs/by-name/fi/findup/package.nix
similarity index 100%
rename from pkgs/tools/misc/findup/default.nix
rename to pkgs/by-name/fi/findup/package.nix
diff --git a/pkgs/tools/security/fingerprintx/default.nix b/pkgs/by-name/fi/fingerprintx/package.nix
similarity index 100%
rename from pkgs/tools/security/fingerprintx/default.nix
rename to pkgs/by-name/fi/fingerprintx/package.nix
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/by-name/fi/fio/package.nix
similarity index 100%
rename from pkgs/tools/system/fio/default.nix
rename to pkgs/by-name/fi/fio/package.nix
diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/by-name/fi/fioctl/package.nix
similarity index 100%
rename from pkgs/tools/admin/fioctl/default.nix
rename to pkgs/by-name/fi/fioctl/package.nix
diff --git a/pkgs/data/fonts/fira-go/default.nix b/pkgs/by-name/fi/fira-go/package.nix
similarity index 100%
rename from pkgs/data/fonts/fira-go/default.nix
rename to pkgs/by-name/fi/fira-go/package.nix
diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/by-name/fi/firectl/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/firectl/default.nix
rename to pkgs/by-name/fi/firectl/package.nix
diff --git a/pkgs/applications/misc/firefly-desktop/default.nix b/pkgs/by-name/fi/firefly-desktop/package.nix
similarity index 100%
rename from pkgs/applications/misc/firefly-desktop/default.nix
rename to pkgs/by-name/fi/firefly-desktop/package.nix
diff --git a/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch b/pkgs/by-name/fi/firejail/fbuilder-call-firejail-on-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch
rename to pkgs/by-name/fi/firejail/fbuilder-call-firejail-on-path.patch
diff --git a/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch b/pkgs/by-name/fi/firejail/mount-nix-dir-on-overlay.patch
similarity index 100%
rename from pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch
rename to pkgs/by-name/fi/firejail/mount-nix-dir-on-overlay.patch
diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/by-name/fi/firejail/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firejail/default.nix
rename to pkgs/by-name/fi/firejail/package.nix
diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/by-name/fi/firestarter/package.nix
similarity index 100%
rename from pkgs/applications/misc/firestarter/default.nix
rename to pkgs/by-name/fi/firestarter/package.nix
diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/by-name/fi/firewalld/package.nix
similarity index 100%
rename from pkgs/applications/networking/firewalld/default.nix
rename to pkgs/by-name/fi/firewalld/package.nix
diff --git a/pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch b/pkgs/by-name/fi/firewalld/respect-xml-catalog-files-var.patch
similarity index 100%
rename from pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patch
rename to pkgs/by-name/fi/firewalld/respect-xml-catalog-files-var.patch
diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/Cargo.lock b/pkgs/by-name/fi/firmware-manager/Cargo.lock
similarity index 100%
rename from pkgs/os-specific/linux/firmware/firmware-manager/Cargo.lock
rename to pkgs/by-name/fi/firmware-manager/Cargo.lock
diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/by-name/fi/firmware-manager/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/firmware-manager/default.nix
rename to pkgs/by-name/fi/firmware-manager/package.nix
diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/by-name/fi/firmware-updater/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/firmware-updater/default.nix
rename to pkgs/by-name/fi/firmware-updater/package.nix
diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock.json b/pkgs/by-name/fi/firmware-updater/pubspec.lock.json
similarity index 100%
rename from pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock.json
rename to pkgs/by-name/fi/firmware-updater/pubspec.lock.json
diff --git a/pkgs/development/compilers/firrtl/default.nix b/pkgs/by-name/fi/firrtl/package.nix
similarity index 100%
rename from pkgs/development/compilers/firrtl/default.nix
rename to pkgs/by-name/fi/firrtl/package.nix
diff --git a/pkgs/games/fish-fillets-ng/icon.xpm b/pkgs/by-name/fi/fish-fillets-ng/icon.xpm
similarity index 100%
rename from pkgs/games/fish-fillets-ng/icon.xpm
rename to pkgs/by-name/fi/fish-fillets-ng/icon.xpm
diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/by-name/fi/fish-fillets-ng/package.nix
similarity index 100%
rename from pkgs/games/fish-fillets-ng/default.nix
rename to pkgs/by-name/fi/fish-fillets-ng/package.nix
diff --git a/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch b/pkgs/by-name/fi/fish-irssi/irssi-include-dir.patch
similarity index 100%
rename from pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch
rename to pkgs/by-name/fi/fish-irssi/irssi-include-dir.patch
diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/by-name/fi/fish-irssi/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/irssi/fish/default.nix
rename to pkgs/by-name/fi/fish-irssi/package.nix
diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/by-name/fi/fishnet/package.nix
similarity index 100%
rename from pkgs/servers/fishnet/default.nix
rename to pkgs/by-name/fi/fishnet/package.nix
diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/by-name/fi/fission/package.nix
similarity index 100%
rename from pkgs/development/tools/fission/default.nix
rename to pkgs/by-name/fi/fission/package.nix
diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/by-name/fi/fits-cloudctl/package.nix
similarity index 100%
rename from pkgs/tools/admin/fits-cloudctl/default.nix
rename to pkgs/by-name/fi/fits-cloudctl/package.nix
diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/by-name/fi/fityk/package.nix
similarity index 100%
rename from pkgs/applications/science/misc/fityk/default.nix
rename to pkgs/by-name/fi/fityk/package.nix
diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/by-name/fi/fixedsys-excelsior/package.nix
similarity index 100%
rename from pkgs/data/fonts/fixedsys-excelsior/default.nix
rename to pkgs/by-name/fi/fixedsys-excelsior/package.nix
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/by-name/fl/flac/package.nix
similarity index 100%
rename from pkgs/applications/audio/flac/default.nix
rename to pkgs/by-name/fl/flac/package.nix
diff --git a/pkgs/applications/audio/flac2all/default.nix b/pkgs/by-name/fl/flac2all/package.nix
similarity index 100%
rename from pkgs/applications/audio/flac2all/default.nix
rename to pkgs/by-name/fl/flac2all/package.nix
diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/by-name/fl/flamegraph/package.nix
similarity index 100%
rename from pkgs/development/tools/flamegraph/default.nix
rename to pkgs/by-name/fl/flamegraph/package.nix
diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/by-name/fl/flamerobin/package.nix
similarity index 100%
rename from pkgs/applications/misc/flamerobin/default.nix
rename to pkgs/by-name/fl/flamerobin/package.nix
diff --git a/pkgs/applications/radio/flamp/default.nix b/pkgs/by-name/fl/flamp/package.nix
similarity index 100%
rename from pkgs/applications/radio/flamp/default.nix
rename to pkgs/by-name/fl/flamp/package.nix
diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/by-name/fl/flann/package.nix
similarity index 100%
rename from pkgs/development/libraries/flann/default.nix
rename to pkgs/by-name/fl/flann/package.nix
diff --git a/pkgs/tools/security/flare-floss/default.nix b/pkgs/by-name/fl/flare-floss/package.nix
similarity index 100%
rename from pkgs/tools/security/flare-floss/default.nix
rename to pkgs/by-name/fl/flare-floss/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/pkgs/by-name/fl/flare-signal/Cargo.lock
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock
rename to pkgs/by-name/fl/flare-signal/Cargo.lock
diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/by-name/fl/flare-signal/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/flare-signal/default.nix
rename to pkgs/by-name/fl/flare-signal/package.nix
diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/by-name/fl/flashbench/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/flashbench/default.nix
rename to pkgs/by-name/fl/flashbench/package.nix
diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/by-name/fl/flashfocus/package.nix
similarity index 100%
rename from pkgs/misc/flashfocus/default.nix
rename to pkgs/by-name/fl/flashfocus/package.nix
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/by-name/fl/flashrom/package.nix
similarity index 100%
rename from pkgs/tools/misc/flashrom/default.nix
rename to pkgs/by-name/fl/flashrom/package.nix
diff --git a/pkgs/development/compilers/flasm/default.nix b/pkgs/by-name/fl/flasm/package.nix
similarity index 100%
rename from pkgs/development/compilers/flasm/default.nix
rename to pkgs/by-name/fl/flasm/package.nix
diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/by-name/fl/flat-remix-gnome/package.nix
similarity index 100%
rename from pkgs/data/themes/flat-remix-gnome/default.nix
rename to pkgs/by-name/fl/flat-remix-gnome/package.nix
diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/by-name/fl/flat-remix-gtk/package.nix
similarity index 100%
rename from pkgs/data/themes/flat-remix-gtk/default.nix
rename to pkgs/by-name/fl/flat-remix-gtk/package.nix
diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/by-name/fl/flatcc/package.nix
similarity index 100%
rename from pkgs/development/libraries/flatcc/default.nix
rename to pkgs/by-name/fl/flatcc/package.nix
diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/by-name/fl/flavours/package.nix
similarity index 100%
rename from pkgs/applications/misc/flavours/default.nix
rename to pkgs/by-name/fl/flavours/package.nix
diff --git a/pkgs/development/tools/flawfinder/default.nix b/pkgs/by-name/fl/flawfinder/package.nix
similarity index 100%
rename from pkgs/development/tools/flawfinder/default.nix
rename to pkgs/by-name/fl/flawfinder/package.nix
diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/by-name/fl/flex-ncat/package.nix
similarity index 100%
rename from pkgs/applications/radio/flex-ncat/default.nix
rename to pkgs/by-name/fl/flex-ncat/package.nix
diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/by-name/fl/flex-ndax/package.nix
similarity index 100%
rename from pkgs/applications/radio/flex-ndax/default.nix
rename to pkgs/by-name/fl/flex-ndax/package.nix
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/by-name/fl/flexcpp/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/flexc++/default.nix
rename to pkgs/by-name/fl/flexcpp/package.nix
diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/by-name/fl/flexibee/package.nix
similarity index 100%
rename from pkgs/applications/office/flexibee/default.nix
rename to pkgs/by-name/fl/flexibee/package.nix
diff --git a/pkgs/tools/misc/flexoptix-app/disable-autoupdate.patch b/pkgs/by-name/fl/flexoptix-app/disable-autoupdate.patch
similarity index 100%
rename from pkgs/tools/misc/flexoptix-app/disable-autoupdate.patch
rename to pkgs/by-name/fl/flexoptix-app/disable-autoupdate.patch
diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/by-name/fl/flexoptix-app/package.nix
similarity index 100%
rename from pkgs/tools/misc/flexoptix-app/default.nix
rename to pkgs/by-name/fl/flexoptix-app/package.nix
diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/by-name/fl/flink/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/flink/default.nix
rename to pkgs/by-name/fl/flink/package.nix
diff --git a/pkgs/applications/virtualization/flintlock/default.nix b/pkgs/by-name/fl/flintlock/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/flintlock/default.nix
rename to pkgs/by-name/fl/flintlock/package.nix
diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/by-name/fl/flips/package.nix
similarity index 100%
rename from pkgs/tools/compression/flips/default.nix
rename to pkgs/by-name/fl/flips/package.nix
diff --git a/pkgs/tools/compression/flips/use-system-libdivsufsort.patch b/pkgs/by-name/fl/flips/use-system-libdivsufsort.patch
similarity index 100%
rename from pkgs/tools/compression/flips/use-system-libdivsufsort.patch
rename to pkgs/by-name/fl/flips/use-system-libdivsufsort.patch
diff --git a/pkgs/tools/misc/flitter/default.nix b/pkgs/by-name/fl/flitter/package.nix
similarity index 100%
rename from pkgs/tools/misc/flitter/default.nix
rename to pkgs/by-name/fl/flitter/package.nix
diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/by-name/fl/flix/package.nix
similarity index 100%
rename from pkgs/development/compilers/flix/default.nix
rename to pkgs/by-name/fl/flix/package.nix
diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/by-name/fl/fllog/package.nix
similarity index 100%
rename from pkgs/applications/radio/fllog/default.nix
rename to pkgs/by-name/fl/fllog/package.nix
diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/by-name/fl/flmsg/package.nix
similarity index 100%
rename from pkgs/applications/radio/flmsg/default.nix
rename to pkgs/by-name/fl/flmsg/package.nix
diff --git a/pkgs/development/tools/flock/default.nix b/pkgs/by-name/fl/flock/package.nix
similarity index 100%
rename from pkgs/development/tools/flock/default.nix
rename to pkgs/by-name/fl/flock/package.nix
diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/by-name/fl/flockit/package.nix
similarity index 100%
rename from pkgs/tools/backup/flockit/default.nix
rename to pkgs/by-name/fl/flockit/package.nix
diff --git a/pkgs/applications/networking/p2p/flood-for-transmission/default.nix b/pkgs/by-name/fl/flood-for-transmission/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/flood-for-transmission/default.nix
rename to pkgs/by-name/fl/flood-for-transmission/package.nix
diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/by-name/fl/flood/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/flood/default.nix
rename to pkgs/by-name/fl/flood/package.nix
diff --git a/pkgs/development/tools/flootty/default.nix b/pkgs/by-name/fl/flootty/package.nix
similarity index 100%
rename from pkgs/development/tools/flootty/default.nix
rename to pkgs/by-name/fl/flootty/package.nix
diff --git a/pkgs/applications/science/electronics/flopoco/default.nix b/pkgs/by-name/fl/flopoco/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/flopoco/default.nix
rename to pkgs/by-name/fl/flopoco/package.nix
diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/by-name/fl/flowblade/package.nix
similarity index 100%
rename from pkgs/applications/video/flowblade/default.nix
rename to pkgs/by-name/fl/flowblade/package.nix
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/by-name/fl/flpsed/package.nix
similarity index 100%
rename from pkgs/applications/editors/flpsed/default.nix
rename to pkgs/by-name/fl/flpsed/package.nix
diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/by-name/fl/flrig/package.nix
similarity index 100%
rename from pkgs/applications/radio/flrig/default.nix
rename to pkgs/by-name/fl/flrig/package.nix
diff --git a/pkgs/data/icons/fluent-icon-theme/default.nix b/pkgs/by-name/fl/fluent-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/fluent-icon-theme/default.nix
rename to pkgs/by-name/fl/fluent-icon-theme/package.nix
diff --git a/pkgs/applications/networking/feedreaders/fluent-reader/default.nix b/pkgs/by-name/fl/fluent-reader/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/fluent-reader/default.nix
rename to pkgs/by-name/fl/fluent-reader/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/by-name/fl/fluffychat/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/fluffychat/default.nix
rename to pkgs/by-name/fl/fluffychat/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json b/pkgs/by-name/fl/fluffychat/pubspec.lock.json
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json
rename to pkgs/by-name/fl/fluffychat/pubspec.lock.json
diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/by-name/fl/fluidd/package.nix
similarity index 100%
rename from pkgs/applications/misc/fluidd/default.nix
rename to pkgs/by-name/fl/fluidd/package.nix
diff --git a/pkgs/development/compilers/flux/default.nix b/pkgs/by-name/fl/flux/package.nix
similarity index 100%
rename from pkgs/development/compilers/flux/default.nix
rename to pkgs/by-name/fl/flux/package.nix
diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/by-name/fl/fluxboxlauncher/package.nix
similarity index 100%
rename from pkgs/applications/misc/fluxboxlauncher/default.nix
rename to pkgs/by-name/fl/fluxboxlauncher/package.nix
diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/by-name/fl/fluxctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/fluxctl/default.nix
rename to pkgs/by-name/fl/fluxctl/package.nix
diff --git a/pkgs/applications/graphics/fluxus/fix-build.patch b/pkgs/by-name/fl/fluxus/fix-build.patch
similarity index 100%
rename from pkgs/applications/graphics/fluxus/fix-build.patch
rename to pkgs/by-name/fl/fluxus/fix-build.patch
diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/by-name/fl/fluxus/package.nix
similarity index 100%
rename from pkgs/applications/graphics/fluxus/default.nix
rename to pkgs/by-name/fl/fluxus/package.nix
diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/by-name/fl/flvstreamer/package.nix
similarity index 100%
rename from pkgs/tools/networking/flvstreamer/default.nix
rename to pkgs/by-name/fl/flvstreamer/package.nix
diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/by-name/fl/flwrap/package.nix
similarity index 100%
rename from pkgs/applications/radio/flwrap/default.nix
rename to pkgs/by-name/fl/flwrap/package.nix
diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/by-name/fl/fly/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/fly/default.nix
rename to pkgs/by-name/fl/fly/package.nix
diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/by-name/fl/flycast/package.nix
similarity index 100%
rename from pkgs/applications/emulators/flycast/default.nix
rename to pkgs/by-name/fl/flycast/package.nix
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/by-name/fl/flyway/package.nix
similarity index 100%
rename from pkgs/development/tools/flyway/default.nix
rename to pkgs/by-name/fl/flyway/package.nix
diff --git a/pkgs/applications/science/biology/flywheel-cli/default.nix b/pkgs/by-name/fl/flywheel-cli/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/flywheel-cli/default.nix
rename to pkgs/by-name/fl/flywheel-cli/package.nix
diff --git a/pkgs/applications/file-managers/fm/default.nix b/pkgs/by-name/fm/fm/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/fm/default.nix
rename to pkgs/by-name/fm/fm/package.nix
diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/by-name/fm/fmsynth/package.nix
similarity index 100%
rename from pkgs/applications/audio/fmsynth/default.nix
rename to pkgs/by-name/fm/fmsynth/package.nix
diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/by-name/fn/fn-cli/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/fn-cli/default.nix
rename to pkgs/by-name/fn/fn-cli/package.nix
diff --git a/pkgs/development/tools/fnlfmt/default.nix b/pkgs/by-name/fn/fnlfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/fnlfmt/default.nix
rename to pkgs/by-name/fn/fnlfmt/package.nix
diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/by-name/fn/fnotifystat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/fnotifystat/default.nix
rename to pkgs/by-name/fn/fnotifystat/package.nix
diff --git a/pkgs/tools/misc/fntsample/default.nix b/pkgs/by-name/fn/fntsample/package.nix
similarity index 100%
rename from pkgs/tools/misc/fntsample/default.nix
rename to pkgs/by-name/fn/fntsample/package.nix
diff --git a/pkgs/applications/graphics/focus-stack/default.nix b/pkgs/by-name/fo/focus-stack/package.nix
similarity index 100%
rename from pkgs/applications/graphics/focus-stack/default.nix
rename to pkgs/by-name/fo/focus-stack/package.nix
diff --git a/pkgs/tools/X11/focus/default.nix b/pkgs/by-name/fo/focus/package.nix
similarity index 100%
rename from pkgs/tools/X11/focus/default.nix
rename to pkgs/by-name/fo/focus/package.nix
diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/by-name/fo/foliate/package.nix
similarity index 100%
rename from pkgs/applications/office/foliate/default.nix
rename to pkgs/by-name/fo/foliate/package.nix
diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/by-name/fo/folks/package.nix
similarity index 100%
rename from pkgs/development/libraries/folks/default.nix
rename to pkgs/by-name/fo/folks/package.nix
diff --git a/pkgs/tools/misc/foma/default.nix b/pkgs/by-name/fo/foma/package.nix
similarity index 100%
rename from pkgs/tools/misc/foma/default.nix
rename to pkgs/by-name/fo/foma/package.nix
diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/by-name/fo/fomp/package.nix
similarity index 100%
rename from pkgs/applications/audio/fomp/default.nix
rename to pkgs/by-name/fo/fomp/package.nix
diff --git a/pkgs/tools/misc/font-config-info/default.nix b/pkgs/by-name/fo/font-config-info/package.nix
similarity index 100%
rename from pkgs/tools/misc/font-config-info/default.nix
rename to pkgs/by-name/fo/font-config-info/package.nix
diff --git a/pkgs/applications/misc/fontfinder/default.nix b/pkgs/by-name/fo/fontfinder/package.nix
similarity index 100%
rename from pkgs/applications/misc/fontfinder/default.nix
rename to pkgs/by-name/fo/fontfinder/package.nix
diff --git a/pkgs/applications/misc/fontpreview/default.nix b/pkgs/by-name/fo/fontpreview/package.nix
similarity index 100%
rename from pkgs/applications/misc/fontpreview/default.nix
rename to pkgs/by-name/fo/fontpreview/package.nix
diff --git a/pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch b/pkgs/by-name/fo/foo2zjs/dell1250c-color-fix.patch
similarity index 100%
rename from pkgs/misc/drivers/foo2zjs/dell1250c-color-fix.patch
rename to pkgs/by-name/fo/foo2zjs/dell1250c-color-fix.patch
diff --git a/pkgs/misc/drivers/foo2zjs/hbpl1.patch b/pkgs/by-name/fo/foo2zjs/hbpl1.patch
similarity index 100%
rename from pkgs/misc/drivers/foo2zjs/hbpl1.patch
rename to pkgs/by-name/fo/foo2zjs/hbpl1.patch
diff --git a/pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff b/pkgs/by-name/fo/foo2zjs/no-hardcode-fw.diff
similarity index 100%
rename from pkgs/misc/drivers/foo2zjs/no-hardcode-fw.diff
rename to pkgs/by-name/fo/foo2zjs/no-hardcode-fw.diff
diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/by-name/fo/foo2zjs/package.nix
similarity index 100%
rename from pkgs/misc/drivers/foo2zjs/default.nix
rename to pkgs/by-name/fo/foo2zjs/package.nix
diff --git a/pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch b/pkgs/by-name/fo/foo2zjs/papercode-format-fix.patch
similarity index 100%
rename from pkgs/misc/drivers/foo2zjs/papercode-format-fix.patch
rename to pkgs/by-name/fo/foo2zjs/papercode-format-fix.patch
diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/by-name/fo/foomatic-filters/package.nix
similarity index 100%
rename from pkgs/misc/drivers/foomatic-filters/default.nix
rename to pkgs/by-name/fo/foomatic-filters/package.nix
diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/by-name/fo/foot/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/foot/default.nix
rename to pkgs/by-name/fo/foot/package.nix
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/by-name/fo/fop/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/fop/default.nix
rename to pkgs/by-name/fo/fop/package.nix
diff --git a/pkgs/tools/system/foremost/makefile.patch b/pkgs/by-name/fo/foremost/makefile.patch
similarity index 100%
rename from pkgs/tools/system/foremost/makefile.patch
rename to pkgs/by-name/fo/foremost/makefile.patch
diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/by-name/fo/foremost/package.nix
similarity index 100%
rename from pkgs/tools/system/foremost/default.nix
rename to pkgs/by-name/fo/foremost/package.nix
diff --git a/pkgs/games/forge-mtg/no-launch4j.patch b/pkgs/by-name/fo/forge-mtg/no-launch4j.patch
similarity index 100%
rename from pkgs/games/forge-mtg/no-launch4j.patch
rename to pkgs/by-name/fo/forge-mtg/no-launch4j.patch
diff --git a/pkgs/games/forge-mtg/default.nix b/pkgs/by-name/fo/forge-mtg/package.nix
similarity index 100%
rename from pkgs/games/forge-mtg/default.nix
rename to pkgs/by-name/fo/forge-mtg/package.nix
diff --git a/pkgs/development/libraries/forge/no-download-glad.patch b/pkgs/by-name/fo/forge/no-download-glad.patch
similarity index 100%
rename from pkgs/development/libraries/forge/no-download-glad.patch
rename to pkgs/by-name/fo/forge/no-download-glad.patch
diff --git a/pkgs/development/libraries/forge/default.nix b/pkgs/by-name/fo/forge/package.nix
similarity index 100%
rename from pkgs/development/libraries/forge/default.nix
rename to pkgs/by-name/fo/forge/package.nix
diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/by-name/fo/forkstat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/forkstat/default.nix
rename to pkgs/by-name/fo/forkstat/package.nix
diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/by-name/fo/forktty/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/forktty/default.nix
rename to pkgs/by-name/fo/forktty/package.nix
diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/by-name/fo/form/package.nix
similarity index 100%
rename from pkgs/applications/science/math/form/default.nix
rename to pkgs/by-name/fo/form/package.nix
diff --git a/pkgs/applications/misc/formatter/fix-paths.patch b/pkgs/by-name/fo/formatter/fix-paths.patch
similarity index 100%
rename from pkgs/applications/misc/formatter/fix-paths.patch
rename to pkgs/by-name/fo/formatter/fix-paths.patch
diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/by-name/fo/formatter/package.nix
similarity index 100%
rename from pkgs/applications/misc/formatter/default.nix
rename to pkgs/by-name/fo/formatter/package.nix
diff --git a/pkgs/applications/science/logic/formula/nuget.nix b/pkgs/by-name/fo/formula/nuget.nix
similarity index 100%
rename from pkgs/applications/science/logic/formula/nuget.nix
rename to pkgs/by-name/fo/formula/nuget.nix
diff --git a/pkgs/applications/science/logic/formula/default.nix b/pkgs/by-name/fo/formula/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/formula/default.nix
rename to pkgs/by-name/fo/formula/package.nix
diff --git a/pkgs/applications/version-management/fornalder/default.nix b/pkgs/by-name/fo/fornalder/package.nix
similarity index 100%
rename from pkgs/applications/version-management/fornalder/default.nix
rename to pkgs/by-name/fo/fornalder/package.nix
diff --git a/pkgs/development/libraries/fortify-headers/default.nix b/pkgs/by-name/fo/fortify-headers/package.nix
similarity index 100%
rename from pkgs/development/libraries/fortify-headers/default.nix
rename to pkgs/by-name/fo/fortify-headers/package.nix
diff --git a/pkgs/development/libraries/fortify-headers/restore-macros.patch b/pkgs/by-name/fo/fortify-headers/restore-macros.patch
similarity index 100%
rename from pkgs/development/libraries/fortify-headers/restore-macros.patch
rename to pkgs/by-name/fo/fortify-headers/restore-macros.patch
diff --git a/pkgs/development/libraries/fortify-headers/wchar-imports-skip.patch b/pkgs/by-name/fo/fortify-headers/wchar-imports-skip.patch
similarity index 100%
rename from pkgs/development/libraries/fortify-headers/wchar-imports-skip.patch
rename to pkgs/by-name/fo/fortify-headers/wchar-imports-skip.patch
diff --git a/pkgs/tools/package-management/fortran-fpm/default.nix b/pkgs/by-name/fo/fortran-fpm/package.nix
similarity index 100%
rename from pkgs/tools/package-management/fortran-fpm/default.nix
rename to pkgs/by-name/fo/fortran-fpm/package.nix
diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/by-name/fo/fortune/package.nix
similarity index 100%
rename from pkgs/tools/misc/fortune/default.nix
rename to pkgs/by-name/fo/fortune/package.nix
diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/by-name/fo/foxtrotgps/package.nix
similarity index 100%
rename from pkgs/applications/misc/foxtrotgps/default.nix
rename to pkgs/by-name/fo/foxtrotgps/package.nix
diff --git a/pkgs/applications/science/electronics/fparser/default.nix b/pkgs/by-name/fp/fparser/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/fparser/default.nix
rename to pkgs/by-name/fp/fparser/package.nix
diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/by-name/fp/fpart/package.nix
similarity index 100%
rename from pkgs/tools/misc/fpart/default.nix
rename to pkgs/by-name/fp/fpart/package.nix
diff --git a/pkgs/development/libraries/fpattern/default.nix b/pkgs/by-name/fp/fpattern/package.nix
similarity index 100%
rename from pkgs/development/libraries/fpattern/default.nix
rename to pkgs/by-name/fp/fpattern/package.nix
diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/by-name/fp/fped/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/fped/default.nix
rename to pkgs/by-name/fp/fped/package.nix
diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/by-name/fp/fping/package.nix
similarity index 100%
rename from pkgs/tools/networking/fping/default.nix
rename to pkgs/by-name/fp/fping/package.nix
diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/by-name/fp/fpm2/package.nix
similarity index 100%
rename from pkgs/tools/security/fpm2/default.nix
rename to pkgs/by-name/fp/fpm2/package.nix
diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/by-name/fp/fpp/package.nix
similarity index 100%
rename from pkgs/tools/misc/fpp/default.nix
rename to pkgs/by-name/fp/fpp/package.nix
diff --git a/pkgs/development/tools/fprettify/default.nix b/pkgs/by-name/fp/fprettify/package.nix
similarity index 100%
rename from pkgs/development/tools/fprettify/default.nix
rename to pkgs/by-name/fp/fprettify/package.nix
diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/by-name/fq/fq/package.nix
similarity index 100%
rename from pkgs/development/tools/fq/default.nix
rename to pkgs/by-name/fq/fq/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock b/pkgs/by-name/fr/fractal/Cargo.lock
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/fractal/Cargo.lock
rename to pkgs/by-name/fr/fractal/Cargo.lock
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/by-name/fr/fractal/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/fractal/default.nix
rename to pkgs/by-name/fr/fractal/package.nix
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/by-name/fr/framac/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/frama-c/default.nix
rename to pkgs/by-name/fr/framac/package.nix
diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/by-name/fr/frame/package.nix
similarity index 100%
rename from pkgs/development/libraries/frame/default.nix
rename to pkgs/by-name/fr/frame/package.nix
diff --git a/pkgs/applications/blockchains/framesh/default.nix b/pkgs/by-name/fr/framesh/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/framesh/default.nix
rename to pkgs/by-name/fr/framesh/package.nix
diff --git a/pkgs/tools/text/frangipanni/default.nix b/pkgs/by-name/fr/frangipanni/package.nix
similarity index 100%
rename from pkgs/tools/text/frangipanni/default.nix
rename to pkgs/by-name/fr/frangipanni/package.nix
diff --git a/pkgs/data/fonts/fraunces/default.nix b/pkgs/by-name/fr/fraunces/package.nix
similarity index 100%
rename from pkgs/data/fonts/fraunces/default.nix
rename to pkgs/by-name/fr/fraunces/package.nix
diff --git a/pkgs/tools/text/frawk/default.nix b/pkgs/by-name/fr/frawk/package.nix
similarity index 100%
rename from pkgs/tools/text/frawk/default.nix
rename to pkgs/by-name/fr/frawk/package.nix
diff --git a/pkgs/tools/misc/fre/default.nix b/pkgs/by-name/fr/fre/package.nix
similarity index 100%
rename from pkgs/tools/misc/fre/default.nix
rename to pkgs/by-name/fr/fre/package.nix
diff --git a/pkgs/applications/audio/freac/default.nix b/pkgs/by-name/fr/freac/package.nix
similarity index 100%
rename from pkgs/applications/audio/freac/default.nix
rename to pkgs/by-name/fr/freac/package.nix
diff --git a/pkgs/development/tools/frece/default.nix b/pkgs/by-name/fr/frece/package.nix
similarity index 100%
rename from pkgs/development/tools/frece/default.nix
rename to pkgs/by-name/fr/frece/package.nix
diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/by-name/fr/freealut/package.nix
similarity index 100%
rename from pkgs/development/libraries/freealut/default.nix
rename to pkgs/by-name/fr/freealut/package.nix
diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/by-name/fr/freebayes/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/freebayes/default.nix
rename to pkgs/by-name/fr/freebayes/package.nix
diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/by-name/fr/freebind/package.nix
similarity index 100%
rename from pkgs/tools/networking/freebind/default.nix
rename to pkgs/by-name/fr/freebind/package.nix
diff --git a/pkgs/games/freedink/default.nix b/pkgs/by-name/fr/freedink/package.nix
similarity index 100%
rename from pkgs/games/freedink/default.nix
rename to pkgs/by-name/fr/freedink/package.nix
diff --git a/pkgs/games/freedroid/default.nix b/pkgs/by-name/fr/freedroid/package.nix
similarity index 100%
rename from pkgs/games/freedroid/default.nix
rename to pkgs/by-name/fr/freedroid/package.nix
diff --git a/pkgs/games/freedroidrpg/drop-build-deps.patch b/pkgs/by-name/fr/freedroidrpg/drop-build-deps.patch
similarity index 100%
rename from pkgs/games/freedroidrpg/drop-build-deps.patch
rename to pkgs/by-name/fr/freedroidrpg/drop-build-deps.patch
diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/by-name/fr/freedroidrpg/package.nix
similarity index 100%
rename from pkgs/games/freedroidrpg/default.nix
rename to pkgs/by-name/fr/freedroidrpg/package.nix
diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/by-name/fr/freefont_ttf/package.nix
similarity index 100%
rename from pkgs/data/fonts/freefont-ttf/default.nix
rename to pkgs/by-name/fr/freefont_ttf/package.nix
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/by-name/fr/freeglut/package.nix
similarity index 100%
rename from pkgs/development/libraries/freeglut/default.nix
rename to pkgs/by-name/fr/freeglut/package.nix
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/by-name/fr/freeipmi/package.nix
similarity index 100%
rename from pkgs/tools/system/freeipmi/default.nix
rename to pkgs/by-name/fr/freeipmi/package.nix
diff --git a/pkgs/games/freenukum/default.nix b/pkgs/by-name/fr/freenukum/package.nix
similarity index 100%
rename from pkgs/games/freenukum/default.nix
rename to pkgs/by-name/fr/freenukum/package.nix
diff --git a/pkgs/games/freeorion/fix-paths.sh b/pkgs/by-name/fr/freeorion/fix-paths.sh
similarity index 100%
rename from pkgs/games/freeorion/fix-paths.sh
rename to pkgs/by-name/fr/freeorion/fix-paths.sh
diff --git a/pkgs/games/freeorion/fix-paths.xslt b/pkgs/by-name/fr/freeorion/fix-paths.xslt
similarity index 100%
rename from pkgs/games/freeorion/fix-paths.xslt
rename to pkgs/by-name/fr/freeorion/fix-paths.xslt
diff --git a/pkgs/games/freeorion/default.nix b/pkgs/by-name/fr/freeorion/package.nix
similarity index 100%
rename from pkgs/games/freeorion/default.nix
rename to pkgs/by-name/fr/freeorion/package.nix
diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/by-name/fr/freepats/package.nix
similarity index 100%
rename from pkgs/data/misc/freepats/default.nix
rename to pkgs/by-name/fr/freepats/package.nix
diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/by-name/fr/freepv/package.nix
similarity index 100%
rename from pkgs/applications/graphics/freepv/default.nix
rename to pkgs/by-name/fr/freepv/package.nix
diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/by-name/fr/freeradius/package.nix
similarity index 100%
rename from pkgs/servers/freeradius/default.nix
rename to pkgs/by-name/fr/freeradius/package.nix
diff --git a/pkgs/games/freesweep/default.nix b/pkgs/by-name/fr/freesweep/package.nix
similarity index 100%
rename from pkgs/games/freesweep/default.nix
rename to pkgs/by-name/fr/freesweep/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/by-name/fr/freetalk/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/freetalk/default.nix
rename to pkgs/by-name/fr/freetalk/package.nix
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/by-name/fr/freetds/package.nix
similarity index 100%
rename from pkgs/development/libraries/freetds/default.nix
rename to pkgs/by-name/fr/freetds/package.nix
diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/by-name/fr/freetts/package.nix
similarity index 100%
rename from pkgs/development/libraries/freetts/default.nix
rename to pkgs/by-name/fr/freetts/package.nix
diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/by-name/fr/freetube/package.nix
similarity index 100%
rename from pkgs/applications/video/freetube/default.nix
rename to pkgs/by-name/fr/freetube/package.nix
diff --git a/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch b/pkgs/by-name/fr/freetype/enable-subpixel-rendering.patch
similarity index 100%
rename from pkgs/development/libraries/freetype/enable-subpixel-rendering.patch
rename to pkgs/by-name/fr/freetype/enable-subpixel-rendering.patch
diff --git a/pkgs/development/libraries/freetype/enable-table-validation.patch b/pkgs/by-name/fr/freetype/enable-table-validation.patch
similarity index 100%
rename from pkgs/development/libraries/freetype/enable-table-validation.patch
rename to pkgs/by-name/fr/freetype/enable-table-validation.patch
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/by-name/fr/freetype/package.nix
similarity index 100%
rename from pkgs/development/libraries/freetype/default.nix
rename to pkgs/by-name/fr/freetype/package.nix
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/by-name/fr/freewheeling/package.nix
similarity index 100%
rename from pkgs/applications/audio/freewheeling/default.nix
rename to pkgs/by-name/fr/freewheeling/package.nix
diff --git a/pkgs/development/libraries/freexl/default.nix b/pkgs/by-name/fr/freexl/package.nix
similarity index 100%
rename from pkgs/development/libraries/freexl/default.nix
rename to pkgs/by-name/fr/freexl/package.nix
diff --git a/pkgs/tools/security/freeze/default.nix b/pkgs/by-name/fr/freeze/package.nix
similarity index 100%
rename from pkgs/tools/security/freeze/default.nix
rename to pkgs/by-name/fr/freeze/package.nix
diff --git a/pkgs/tools/misc/frei/default.nix b/pkgs/by-name/fr/frei/package.nix
similarity index 100%
rename from pkgs/tools/misc/frei/default.nix
rename to pkgs/by-name/fr/frei/package.nix
diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/by-name/fr/frei0r/package.nix
similarity index 100%
rename from pkgs/development/libraries/frei0r/default.nix
rename to pkgs/by-name/fr/frei0r/package.nix
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/by-name/fr/frescobaldi/package.nix
similarity index 100%
rename from pkgs/misc/frescobaldi/default.nix
rename to pkgs/by-name/fr/frescobaldi/package.nix
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/by-name/fr/fribidi/package.nix
similarity index 100%
rename from pkgs/development/libraries/fribidi/default.nix
rename to pkgs/by-name/fr/fribidi/package.nix
diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/by-name/fr/fricas/package.nix
similarity index 100%
rename from pkgs/applications/science/math/fricas/default.nix
rename to pkgs/by-name/fr/fricas/package.nix
diff --git a/pkgs/tools/security/frida-tools/default.nix b/pkgs/by-name/fr/frida-tools/package.nix
similarity index 100%
rename from pkgs/tools/security/frida-tools/default.nix
rename to pkgs/by-name/fr/frida-tools/package.nix
diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/by-name/fr/frigate/package.nix
similarity index 100%
rename from pkgs/applications/video/frigate/default.nix
rename to pkgs/by-name/fr/frigate/package.nix
diff --git a/pkgs/applications/video/frigate/web.nix b/pkgs/by-name/fr/frigate/web.nix
similarity index 100%
rename from pkgs/applications/video/frigate/web.nix
rename to pkgs/by-name/fr/frigate/web.nix
diff --git a/pkgs/development/tools/frink/default.nix b/pkgs/by-name/fr/frink/package.nix
similarity index 100%
rename from pkgs/development/tools/frink/default.nix
rename to pkgs/by-name/fr/frink/package.nix
diff --git a/pkgs/games/frogatto/data.nix b/pkgs/by-name/fr/frogatto/data.nix
similarity index 100%
rename from pkgs/games/frogatto/data.nix
rename to pkgs/by-name/fr/frogatto/data.nix
diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/by-name/fr/frogatto/engine.nix
similarity index 100%
rename from pkgs/games/frogatto/engine.nix
rename to pkgs/by-name/fr/frogatto/engine.nix
diff --git a/pkgs/games/frogatto/default.nix b/pkgs/by-name/fr/frogatto/package.nix
similarity index 100%
rename from pkgs/games/frogatto/default.nix
rename to pkgs/by-name/fr/frogatto/package.nix
diff --git a/pkgs/tools/text/frogmouth/default.nix b/pkgs/by-name/fr/frogmouth/package.nix
similarity index 100%
rename from pkgs/tools/text/frogmouth/default.nix
rename to pkgs/by-name/fr/frogmouth/package.nix
diff --git a/pkgs/games/frotz/default.nix b/pkgs/by-name/fr/frotz/package.nix
similarity index 100%
rename from pkgs/games/frotz/default.nix
rename to pkgs/by-name/fr/frotz/package.nix
diff --git a/pkgs/development/libraries/frozen/meson.build b/pkgs/by-name/fr/frozen/meson.build
similarity index 100%
rename from pkgs/development/libraries/frozen/meson.build
rename to pkgs/by-name/fr/frozen/meson.build
diff --git a/pkgs/development/libraries/frozen/default.nix b/pkgs/by-name/fr/frozen/package.nix
similarity index 100%
rename from pkgs/development/libraries/frozen/default.nix
rename to pkgs/by-name/fr/frozen/package.nix
diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/by-name/fr/frp/package.nix
similarity index 100%
rename from pkgs/tools/networking/frp/default.nix
rename to pkgs/by-name/fr/frp/package.nix
diff --git a/pkgs/servers/frr/clippy-helper.nix b/pkgs/by-name/fr/frr/clippy-helper.nix
similarity index 100%
rename from pkgs/servers/frr/clippy-helper.nix
rename to pkgs/by-name/fr/frr/clippy-helper.nix
diff --git a/pkgs/servers/frr/default.nix b/pkgs/by-name/fr/frr/package.nix
similarity index 100%
rename from pkgs/servers/frr/default.nix
rename to pkgs/by-name/fr/frr/package.nix
diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/by-name/fr/frugal/package.nix
similarity index 100%
rename from pkgs/development/tools/frugal/default.nix
rename to pkgs/by-name/fr/frugal/package.nix
diff --git a/pkgs/development/libraries/frugally-deep/default.nix b/pkgs/by-name/fr/frugally-deep/package.nix
similarity index 100%
rename from pkgs/development/libraries/frugally-deep/default.nix
rename to pkgs/by-name/fr/frugally-deep/package.nix
diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/by-name/fs/fsarchiver/package.nix
similarity index 100%
rename from pkgs/tools/archivers/fsarchiver/default.nix
rename to pkgs/by-name/fs/fsarchiver/package.nix
diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/by-name/fs/fsatrace/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/fsatrace/default.nix
rename to pkgs/by-name/fs/fsatrace/package.nix
diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/by-name/fs/fsautocomplete/deps.nix
similarity index 100%
rename from pkgs/development/tools/fsautocomplete/deps.nix
rename to pkgs/by-name/fs/fsautocomplete/deps.nix
diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
similarity index 100%
rename from pkgs/development/tools/fsautocomplete/default.nix
rename to pkgs/by-name/fs/fsautocomplete/package.nix
diff --git a/pkgs/tools/security/fscan/default.nix b/pkgs/by-name/fs/fscan/package.nix
similarity index 100%
rename from pkgs/tools/security/fscan/default.nix
rename to pkgs/by-name/fs/fscan/package.nix
diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/by-name/fs/fscrypt-experimental/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/fscrypt/default.nix
rename to pkgs/by-name/fs/fscrypt-experimental/package.nix
diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/by-name/fs/fsearch/package.nix
similarity index 100%
rename from pkgs/tools/misc/fsearch/default.nix
rename to pkgs/by-name/fs/fsearch/package.nix
diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/by-name/fs/fselect/package.nix
similarity index 100%
rename from pkgs/tools/misc/fselect/default.nix
rename to pkgs/by-name/fs/fselect/package.nix
diff --git a/pkgs/games/fsg/default.nix b/pkgs/by-name/fs/fsg/package.nix
similarity index 100%
rename from pkgs/games/fsg/default.nix
rename to pkgs/by-name/fs/fsg/package.nix
diff --git a/pkgs/games/fsg/wxgtk-3.2.patch b/pkgs/by-name/fs/fsg/wxgtk-3.2.patch
similarity index 100%
rename from pkgs/games/fsg/wxgtk-3.2.patch
rename to pkgs/by-name/fs/fsg/wxgtk-3.2.patch
diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/by-name/fs/fsharp/package.nix
similarity index 100%
rename from pkgs/development/compilers/fsharp/default.nix
rename to pkgs/by-name/fs/fsharp/package.nix
diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/by-name/fs/fsmark/package.nix
similarity index 100%
rename from pkgs/tools/misc/fsmark/default.nix
rename to pkgs/by-name/fs/fsmark/package.nix
diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/by-name/fs/fsmon/package.nix
similarity index 100%
rename from pkgs/tools/misc/fsmon/default.nix
rename to pkgs/by-name/fs/fsmon/package.nix
diff --git a/pkgs/applications/misc/fspy/default.nix b/pkgs/by-name/fs/fspy/package.nix
similarity index 100%
rename from pkgs/applications/misc/fspy/default.nix
rename to pkgs/by-name/fs/fspy/package.nix
diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/by-name/fs/fsql/package.nix
similarity index 100%
rename from pkgs/tools/misc/fsql/default.nix
rename to pkgs/by-name/fs/fsql/package.nix
diff --git a/pkgs/tools/misc/fsrx/default.nix b/pkgs/by-name/fs/fsrx/package.nix
similarity index 100%
rename from pkgs/tools/misc/fsrx/default.nix
rename to pkgs/by-name/fs/fsrx/package.nix
diff --git a/pkgs/tools/text/fst/default.nix b/pkgs/by-name/fs/fst/package.nix
similarity index 100%
rename from pkgs/tools/text/fst/default.nix
rename to pkgs/by-name/fs/fst/package.nix
diff --git a/pkgs/development/libraries/fstrcmp/cross.patch b/pkgs/by-name/fs/fstrcmp/cross.patch
similarity index 100%
rename from pkgs/development/libraries/fstrcmp/cross.patch
rename to pkgs/by-name/fs/fstrcmp/cross.patch
diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/by-name/fs/fstrcmp/package.nix
similarity index 100%
rename from pkgs/development/libraries/fstrcmp/default.nix
rename to pkgs/by-name/fs/fstrcmp/package.nix
diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/by-name/fs/fstrm/package.nix
similarity index 100%
rename from pkgs/development/libraries/fstrm/default.nix
rename to pkgs/by-name/fs/fstrm/package.nix
diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/by-name/fs/fsv/package.nix
similarity index 100%
rename from pkgs/applications/misc/fsv/default.nix
rename to pkgs/by-name/fs/fsv/package.nix
diff --git a/pkgs/os-specific/linux/fsverity-utils/default.nix b/pkgs/by-name/fs/fsverity-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/fsverity-utils/default.nix
rename to pkgs/by-name/fs/fsverity-utils/package.nix
diff --git a/pkgs/os-specific/linux/fsverity-utils/remove-dynamic-libs.patch b/pkgs/by-name/fs/fsverity-utils/remove-dynamic-libs.patch
similarity index 100%
rename from pkgs/os-specific/linux/fsverity-utils/remove-dynamic-libs.patch
rename to pkgs/by-name/fs/fsverity-utils/remove-dynamic-libs.patch
diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/by-name/fs/fswebcam/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/fswebcam/default.nix
rename to pkgs/by-name/fs/fswebcam/package.nix
diff --git a/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch b/pkgs/by-name/ft/ftop/ftop-fix_buffer_overflow.patch
similarity index 100%
rename from pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch
rename to pkgs/by-name/ft/ftop/ftop-fix_buffer_overflow.patch
diff --git a/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch b/pkgs/by-name/ft/ftop/ftop-fix_printf_format.patch
similarity index 100%
rename from pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch
rename to pkgs/by-name/ft/ftop/ftop-fix_printf_format.patch
diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/by-name/ft/ftop/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ftop/default.nix
rename to pkgs/by-name/ft/ftop/package.nix
diff --git a/pkgs/development/libraries/ftxui/default.nix b/pkgs/by-name/ft/ftxui/package.nix
similarity index 100%
rename from pkgs/development/libraries/ftxui/default.nix
rename to pkgs/by-name/ft/ftxui/package.nix
diff --git a/pkgs/tools/misc/fuc/default.nix b/pkgs/by-name/fu/fuc/package.nix
similarity index 100%
rename from pkgs/tools/misc/fuc/default.nix
rename to pkgs/by-name/fu/fuc/package.nix
diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/by-name/fu/funambol/package.nix
similarity index 100%
rename from pkgs/development/libraries/funambol/default.nix
rename to pkgs/by-name/fu/funambol/package.nix
diff --git a/pkgs/applications/networking/cluster/func/default.nix b/pkgs/by-name/fu/func/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/func/default.nix
rename to pkgs/by-name/fu/func/package.nix
diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/by-name/fu/function-runner/package.nix
similarity index 100%
rename from pkgs/development/web/function-runner/default.nix
rename to pkgs/by-name/fu/function-runner/package.nix
diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/by-name/fu/functionalplus/package.nix
similarity index 100%
rename from pkgs/development/libraries/functionalplus/default.nix
rename to pkgs/by-name/fu/functionalplus/package.nix
diff --git a/pkgs/development/tools/functiontrace-server/default.nix b/pkgs/by-name/fu/functiontrace-server/package.nix
similarity index 100%
rename from pkgs/development/tools/functiontrace-server/default.nix
rename to pkgs/by-name/fu/functiontrace-server/package.nix
diff --git a/pkgs/development/tools/fundoc/default.nix b/pkgs/by-name/fu/fundoc/package.nix
similarity index 100%
rename from pkgs/development/tools/fundoc/default.nix
rename to pkgs/by-name/fu/fundoc/package.nix
diff --git a/pkgs/development/tools/misc/funzzy/default.nix b/pkgs/by-name/fu/funzzy/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/funzzy/default.nix
rename to pkgs/by-name/fu/funzzy/package.nix
diff --git a/pkgs/applications/misc/furtherance/default.nix b/pkgs/by-name/fu/furtherance/package.nix
similarity index 100%
rename from pkgs/applications/misc/furtherance/default.nix
rename to pkgs/by-name/fu/furtherance/package.nix
diff --git a/pkgs/tools/filesystems/fuse-7z-ng/no-pthread.patch b/pkgs/by-name/fu/fuse-7z-ng/no-pthread.patch
similarity index 100%
rename from pkgs/tools/filesystems/fuse-7z-ng/no-pthread.patch
rename to pkgs/by-name/fu/fuse-7z-ng/no-pthread.patch
diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/by-name/fu/fuse-7z-ng/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/fuse-7z-ng/default.nix
rename to pkgs/by-name/fu/fuse-7z-ng/package.nix
diff --git a/pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch b/pkgs/by-name/fu/fuse-7z-ng/zero-init-fuse-operations.patch
similarity index 100%
rename from pkgs/tools/filesystems/fuse-7z-ng/zero-init-fuse-operations.patch
rename to pkgs/by-name/fu/fuse-7z-ng/zero-init-fuse-operations.patch
diff --git a/pkgs/tools/filesystems/fuse-archive/default.nix b/pkgs/by-name/fu/fuse-archive/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/fuse-archive/default.nix
rename to pkgs/by-name/fu/fuse-archive/package.nix
diff --git a/pkgs/applications/emulators/fuse-emulator/default.nix b/pkgs/by-name/fu/fuse-emulator/package.nix
similarity index 100%
rename from pkgs/applications/emulators/fuse-emulator/default.nix
rename to pkgs/by-name/fu/fuse-emulator/package.nix
diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/by-name/fu/fuse-overlayfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/fuse-overlayfs/default.nix
rename to pkgs/by-name/fu/fuse-overlayfs/package.nix
diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/by-name/fu/fusee-interfacee-tk/package.nix
similarity index 100%
rename from pkgs/applications/misc/fusee-interfacee-tk/default.nix
rename to pkgs/by-name/fu/fusee-interfacee-tk/package.nix
diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/by-name/fu/fusee-launcher/package.nix
similarity index 100%
rename from pkgs/development/tools/fusee-launcher/default.nix
rename to pkgs/by-name/fu/fusee-launcher/package.nix
diff --git a/pkgs/development/tools/fusee-nano/default.nix b/pkgs/by-name/fu/fusee-nano/package.nix
similarity index 100%
rename from pkgs/development/tools/fusee-nano/default.nix
rename to pkgs/by-name/fu/fusee-nano/package.nix
diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/by-name/fu/fuseiso/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/fuseiso/default.nix
rename to pkgs/by-name/fu/fuseiso/package.nix
diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/by-name/fu/fusionInventory/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/fusion-inventory/default.nix
rename to pkgs/by-name/fu/fusionInventory/package.nix
diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/by-name/fu/fuzzel/package.nix
similarity index 100%
rename from pkgs/applications/misc/fuzzel/default.nix
rename to pkgs/by-name/fu/fuzzel/package.nix
diff --git a/pkgs/development/libraries/fuzzylite/default.nix b/pkgs/by-name/fu/fuzzylite/package.nix
similarity index 100%
rename from pkgs/development/libraries/fuzzylite/default.nix
rename to pkgs/by-name/fu/fuzzylite/package.nix
diff --git a/pkgs/applications/audio/fverb/default.nix b/pkgs/by-name/fv/fverb/package.nix
similarity index 100%
rename from pkgs/applications/audio/fverb/default.nix
rename to pkgs/by-name/fv/fverb/package.nix
diff --git a/pkgs/os-specific/linux/fw-ectool/default.nix b/pkgs/by-name/fw/fw-ectool/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/fw-ectool/default.nix
rename to pkgs/by-name/fw/fw-ectool/package.nix
diff --git a/pkgs/tools/misc/fw/default.nix b/pkgs/by-name/fw/fw/package.nix
similarity index 100%
rename from pkgs/tools/misc/fw/default.nix
rename to pkgs/by-name/fw/fw/package.nix
diff --git a/pkgs/tools/filesystems/fwanalyzer/default.nix b/pkgs/by-name/fw/fwanalyzer/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/fwanalyzer/default.nix
rename to pkgs/by-name/fw/fwanalyzer/package.nix
diff --git a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/pkgs/by-name/fw/fwupd-efi/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/fwupd-efi/default.nix
rename to pkgs/by-name/fw/fwupd-efi/package.nix
diff --git a/pkgs/tools/misc/fx-cast-bridge/default.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix
similarity index 100%
rename from pkgs/tools/misc/fx-cast-bridge/default.nix
rename to pkgs/by-name/fx/fx-cast-bridge/package.nix
diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/by-name/fx/fxlinuxprint/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/fxlinuxprint/default.nix
rename to pkgs/by-name/fx/fxlinuxprint/package.nix
diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch b/pkgs/by-name/fx/fxlinuxprintutil/fxlocalechk.tcl.patch
similarity index 100%
rename from pkgs/tools/misc/fxlinuxprintutil/fxlocalechk.tcl.patch
rename to pkgs/by-name/fx/fxlinuxprintutil/fxlocalechk.tcl.patch
diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch b/pkgs/by-name/fx/fxlinuxprintutil/fxlputil.patch
similarity index 100%
rename from pkgs/tools/misc/fxlinuxprintutil/fxlputil.patch
rename to pkgs/by-name/fx/fxlinuxprintutil/fxlputil.patch
diff --git a/pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch b/pkgs/by-name/fx/fxlinuxprintutil/fxlputil.tcl.patch
similarity index 100%
rename from pkgs/tools/misc/fxlinuxprintutil/fxlputil.tcl.patch
rename to pkgs/by-name/fx/fxlinuxprintutil/fxlputil.tcl.patch
diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/by-name/fx/fxlinuxprintutil/package.nix
similarity index 100%
rename from pkgs/tools/misc/fxlinuxprintutil/default.nix
rename to pkgs/by-name/fx/fxlinuxprintutil/package.nix
diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/by-name/fx/fxload/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/fxload/default.nix
rename to pkgs/by-name/fx/fxload/package.nix
diff --git a/pkgs/shells/fzf-git-sh/default.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix
similarity index 100%
rename from pkgs/shells/fzf-git-sh/default.nix
rename to pkgs/by-name/fz/fzf-git-sh/package.nix
diff --git a/pkgs/shells/bash/fzf-obc/default.nix b/pkgs/by-name/fz/fzf-obc/package.nix
similarity index 100%
rename from pkgs/shells/bash/fzf-obc/default.nix
rename to pkgs/by-name/fz/fzf-obc/package.nix
diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/by-name/fz/fzf-zsh/package.nix
similarity index 100%
rename from pkgs/shells/zsh/fzf-zsh/default.nix
rename to pkgs/by-name/fz/fzf-zsh/package.nix
diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/by-name/fz/fzy/package.nix
similarity index 100%
rename from pkgs/tools/misc/fzy/default.nix
rename to pkgs/by-name/fz/fzy/package.nix
diff --git a/pkgs/os-specific/linux/g15daemon/default.nix b/pkgs/by-name/g1/g15daemon/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/g15daemon/default.nix
rename to pkgs/by-name/g1/g15daemon/package.nix
diff --git a/pkgs/os-specific/linux/g15daemon/pid_location.patch b/pkgs/by-name/g1/g15daemon/pid_location.patch
similarity index 100%
rename from pkgs/os-specific/linux/g15daemon/pid_location.patch
rename to pkgs/by-name/g1/g15daemon/pid_location.patch
diff --git a/pkgs/tools/misc/g203-led/default.nix b/pkgs/by-name/g2/g203-led/package.nix
similarity index 100%
rename from pkgs/tools/misc/g203-led/default.nix
rename to pkgs/by-name/g2/g203-led/package.nix
diff --git a/pkgs/misc/g810-led/default.nix b/pkgs/by-name/g8/g810-led/package.nix
similarity index 100%
rename from pkgs/misc/g810-led/default.nix
rename to pkgs/by-name/g8/g810-led/package.nix
diff --git a/pkgs/tools/misc/g933-utils/default.nix b/pkgs/by-name/g9/g933-utils/package.nix
similarity index 100%
rename from pkgs/tools/misc/g933-utils/default.nix
rename to pkgs/by-name/g9/g933-utils/package.nix
diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/by-name/ga/galario/package.nix
similarity index 100%
rename from pkgs/development/libraries/galario/default.nix
rename to pkgs/by-name/ga/galario/package.nix
diff --git a/pkgs/data/fonts/galatia-sil/default.nix b/pkgs/by-name/ga/galatia-sil/package.nix
similarity index 100%
rename from pkgs/data/fonts/galatia-sil/default.nix
rename to pkgs/by-name/ga/galatia-sil/package.nix
diff --git a/pkgs/applications/audio/galaxy-buds-client/deps.nix b/pkgs/by-name/ga/galaxy-buds-client/deps.nix
similarity index 100%
rename from pkgs/applications/audio/galaxy-buds-client/deps.nix
rename to pkgs/by-name/ga/galaxy-buds-client/deps.nix
diff --git a/pkgs/applications/audio/galaxy-buds-client/default.nix b/pkgs/by-name/ga/galaxy-buds-client/package.nix
similarity index 100%
rename from pkgs/applications/audio/galaxy-buds-client/default.nix
rename to pkgs/by-name/ga/galaxy-buds-client/package.nix
diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/by-name/ga/galen/package.nix
similarity index 100%
rename from pkgs/development/tools/galen/default.nix
rename to pkgs/by-name/ga/galen/package.nix
diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/by-name/ga/galene/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/galene/default.nix
rename to pkgs/by-name/ga/galene/package.nix
diff --git a/pkgs/tools/security/galer/default.nix b/pkgs/by-name/ga/galer/package.nix
similarity index 100%
rename from pkgs/tools/security/galer/default.nix
rename to pkgs/by-name/ga/galer/package.nix
diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/by-name/ga/gallia/package.nix
similarity index 100%
rename from pkgs/tools/security/gallia/default.nix
rename to pkgs/by-name/ga/gallia/package.nix
diff --git a/pkgs/tools/admin/gam/default.nix b/pkgs/by-name/ga/gam/package.nix
similarity index 100%
rename from pkgs/tools/admin/gam/default.nix
rename to pkgs/by-name/ga/gam/package.nix
diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/by-name/ga/gama/package.nix
similarity index 100%
rename from pkgs/applications/science/geometry/gama/default.nix
rename to pkgs/by-name/ga/gama/package.nix
diff --git a/pkgs/games/gambit/default.nix b/pkgs/by-name/ga/gambit-chess/package.nix
similarity index 100%
rename from pkgs/games/gambit/default.nix
rename to pkgs/by-name/ga/gambit-chess/package.nix
diff --git a/pkgs/os-specific/linux/game-devices-udev-rules/default.nix b/pkgs/by-name/ga/game-devices-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/game-devices-udev-rules/default.nix
rename to pkgs/by-name/ga/game-devices-udev-rules/package.nix
diff --git a/pkgs/development/libraries/audio/game-music-emu/default.nix b/pkgs/by-name/ga/game-music-emu/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/game-music-emu/default.nix
rename to pkgs/by-name/ga/game-music-emu/package.nix
diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/by-name/ga/gamecube-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/gamecube-tools/default.nix
rename to pkgs/by-name/ga/gamecube-tools/package.nix
diff --git a/pkgs/games/gamehub/default.nix b/pkgs/by-name/ga/gamehub/package.nix
similarity index 100%
rename from pkgs/games/gamehub/default.nix
rename to pkgs/by-name/ga/gamehub/package.nix
diff --git a/pkgs/games/gamepad-tool/default.nix b/pkgs/by-name/ga/gamepad-tool/package.nix
similarity index 100%
rename from pkgs/games/gamepad-tool/default.nix
rename to pkgs/by-name/ga/gamepad-tool/package.nix
diff --git a/pkgs/applications/misc/gammu/bashcomp-dir.patch b/pkgs/by-name/ga/gammu/bashcomp-dir.patch
similarity index 100%
rename from pkgs/applications/misc/gammu/bashcomp-dir.patch
rename to pkgs/by-name/ga/gammu/bashcomp-dir.patch
diff --git a/pkgs/applications/misc/gammu/gammu-config-dialog.patch b/pkgs/by-name/ga/gammu/gammu-config-dialog.patch
similarity index 100%
rename from pkgs/applications/misc/gammu/gammu-config-dialog.patch
rename to pkgs/by-name/ga/gammu/gammu-config-dialog.patch
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/by-name/ga/gammu/package.nix
similarity index 100%
rename from pkgs/applications/misc/gammu/default.nix
rename to pkgs/by-name/ga/gammu/package.nix
diff --git a/pkgs/applications/misc/gammu/systemd.patch b/pkgs/by-name/ga/gammu/systemd.patch
similarity index 100%
rename from pkgs/applications/misc/gammu/systemd.patch
rename to pkgs/by-name/ga/gammu/systemd.patch
diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/pkgs/by-name/ga/gandom-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/gandom-fonts/default.nix
rename to pkgs/by-name/ga/gandom-fonts/package.nix
diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/by-name/ga/ganv/package.nix
similarity index 100%
rename from pkgs/development/libraries/ganv/default.nix
rename to pkgs/by-name/ga/ganv/package.nix
diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/by-name/ga/gap/package.nix
similarity index 100%
rename from pkgs/applications/science/math/gap/default.nix
rename to pkgs/by-name/ga/gap/package.nix
diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/by-name/ga/gappa/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/gappa/default.nix
rename to pkgs/by-name/ga/gappa/package.nix
diff --git a/pkgs/data/fonts/garamond-libre/default.nix b/pkgs/by-name/ga/garamond-libre/package.nix
similarity index 100%
rename from pkgs/data/fonts/garamond-libre/default.nix
rename to pkgs/by-name/ga/garamond-libre/package.nix
diff --git a/pkgs/games/gargoyle/darwin.sh b/pkgs/by-name/ga/gargoyle/darwin.sh
similarity index 100%
rename from pkgs/games/gargoyle/darwin.sh
rename to pkgs/by-name/ga/gargoyle/darwin.sh
diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/by-name/ga/gargoyle/package.nix
similarity index 100%
rename from pkgs/games/gargoyle/default.nix
rename to pkgs/by-name/ga/gargoyle/package.nix
diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/by-name/ga/garmintools/package.nix
similarity index 100%
rename from pkgs/development/libraries/garmintools/default.nix
rename to pkgs/by-name/ga/garmintools/package.nix
diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/by-name/ga/gatekeeper/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/gatekeeper/default.nix
rename to pkgs/by-name/ga/gatekeeper/package.nix
diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/by-name/ga/gatk/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/gatk/default.nix
rename to pkgs/by-name/ga/gatk/package.nix
diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/by-name/ga/gatling/package.nix
similarity index 100%
rename from pkgs/servers/http/gatling/default.nix
rename to pkgs/by-name/ga/gatling/package.nix
diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/by-name/ga/gau/package.nix
similarity index 100%
rename from pkgs/tools/security/gau/default.nix
rename to pkgs/by-name/ga/gau/package.nix
diff --git a/pkgs/games/gav/gcc.patch b/pkgs/by-name/ga/gav/gcc.patch
similarity index 100%
rename from pkgs/games/gav/gcc.patch
rename to pkgs/by-name/ga/gav/gcc.patch
diff --git a/pkgs/games/gav/default.nix b/pkgs/by-name/ga/gav/package.nix
similarity index 100%
rename from pkgs/games/gav/default.nix
rename to pkgs/by-name/ga/gav/package.nix
diff --git a/pkgs/development/compilers/gavrasm/default.nix b/pkgs/by-name/ga/gavrasm/package.nix
similarity index 100%
rename from pkgs/development/compilers/gavrasm/default.nix
rename to pkgs/by-name/ga/gavrasm/package.nix
diff --git a/pkgs/applications/science/electronics/gaw/default.nix b/pkgs/by-name/ga/gaw/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/gaw/default.nix
rename to pkgs/by-name/ga/gaw/package.nix
diff --git a/pkgs/tools/backup/gamerbackup/default.nix b/pkgs/by-name/gb/gb-backup/package.nix
similarity index 100%
rename from pkgs/tools/backup/gamerbackup/default.nix
rename to pkgs/by-name/gb/gb-backup/package.nix
diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/by-name/gb/gbenchmark/package.nix
similarity index 100%
rename from pkgs/development/libraries/gbenchmark/default.nix
rename to pkgs/by-name/gb/gbenchmark/package.nix
diff --git a/pkgs/development/compilers/gbforth/default.nix b/pkgs/by-name/gb/gbforth/package.nix
similarity index 100%
rename from pkgs/development/compilers/gbforth/default.nix
rename to pkgs/by-name/gb/gbforth/package.nix
diff --git a/pkgs/development/libraries/gcab/installed-tests-path.patch b/pkgs/by-name/gc/gcab/installed-tests-path.patch
similarity index 100%
rename from pkgs/development/libraries/gcab/installed-tests-path.patch
rename to pkgs/by-name/gc/gcab/installed-tests-path.patch
diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/by-name/gc/gcab/package.nix
similarity index 100%
rename from pkgs/development/libraries/gcab/default.nix
rename to pkgs/by-name/gc/gcab/package.nix
diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/by-name/gc/gcal/package.nix
similarity index 100%
rename from pkgs/applications/misc/gcal/default.nix
rename to pkgs/by-name/gc/gcal/package.nix
diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/by-name/gc/gcalcli/package.nix
similarity index 100%
rename from pkgs/applications/misc/gcalcli/default.nix
rename to pkgs/by-name/gc/gcalcli/package.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-10/package.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-arm-embedded/10/default.nix
rename to pkgs/by-name/gc/gcc-arm-embedded-10/package.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-11/package.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-arm-embedded/11/default.nix
rename to pkgs/by-name/gc/gcc-arm-embedded-11/package.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-12/package.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-arm-embedded/12/default.nix
rename to pkgs/by-name/gc/gcc-arm-embedded-12/package.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-arm-embedded/13/default.nix
rename to pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-6/package.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-arm-embedded/6/default.nix
rename to pkgs/by-name/gc/gcc-arm-embedded-6/package.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-7/package.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-arm-embedded/7/default.nix
rename to pkgs/by-name/gc/gcc-arm-embedded-7/package.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-8/package.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-arm-embedded/8/default.nix
rename to pkgs/by-name/gc/gcc-arm-embedded-8/package.nix
diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/by-name/gc/gcc-arm-embedded-9/package.nix
similarity index 100%
rename from pkgs/development/compilers/gcc-arm-embedded/9/default.nix
rename to pkgs/by-name/gc/gcc-arm-embedded-9/package.nix
diff --git a/pkgs/applications/misc/gcfflasher/default.nix b/pkgs/by-name/gc/gcfflasher/package.nix
similarity index 100%
rename from pkgs/applications/misc/gcfflasher/default.nix
rename to pkgs/by-name/gc/gcfflasher/package.nix
diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/by-name/gc/gci/package.nix
similarity index 100%
rename from pkgs/development/tools/gci/default.nix
rename to pkgs/by-name/gc/gci/package.nix
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/by-name/gc/gcolor3/package.nix
similarity index 100%
rename from pkgs/applications/graphics/gcolor3/default.nix
rename to pkgs/by-name/gc/gcolor3/package.nix
diff --git a/pkgs/development/tools/gcov2lcov/default.nix b/pkgs/by-name/gc/gcov2lcov/package.nix
similarity index 100%
rename from pkgs/development/tools/gcov2lcov/default.nix
rename to pkgs/by-name/gc/gcov2lcov/package.nix
diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/by-name/gc/gcsfuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/gcsfuse/default.nix
rename to pkgs/by-name/gc/gcsfuse/package.nix
diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/by-name/gc/gcstar/package.nix
similarity index 100%
rename from pkgs/applications/misc/gcstar/default.nix
rename to pkgs/by-name/gc/gcstar/package.nix
diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/by-name/gd/gdl/package.nix
similarity index 100%
rename from pkgs/development/libraries/gdl/default.nix
rename to pkgs/by-name/gd/gdl/package.nix
diff --git a/pkgs/tools/system/gdmap/get_sensitive.patch b/pkgs/by-name/gd/gdmap/get_sensitive.patch
similarity index 100%
rename from pkgs/tools/system/gdmap/get_sensitive.patch
rename to pkgs/by-name/gd/gdmap/get_sensitive.patch
diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/by-name/gd/gdmap/package.nix
similarity index 100%
rename from pkgs/tools/system/gdmap/default.nix
rename to pkgs/by-name/gd/gdmap/package.nix
diff --git a/pkgs/tools/system/gdmap/set_flags.patch b/pkgs/by-name/gd/gdmap/set_flags.patch
similarity index 100%
rename from pkgs/tools/system/gdmap/set_flags.patch
rename to pkgs/by-name/gd/gdmap/set_flags.patch
diff --git a/pkgs/development/libraries/gdome2/fno-common.patch b/pkgs/by-name/gd/gdome2/fno-common.patch
similarity index 100%
rename from pkgs/development/libraries/gdome2/fno-common.patch
rename to pkgs/by-name/gd/gdome2/fno-common.patch
diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/by-name/gd/gdome2/package.nix
similarity index 100%
rename from pkgs/development/libraries/gdome2/default.nix
rename to pkgs/by-name/gd/gdome2/package.nix
diff --git a/pkgs/development/libraries/gdome2/xml-document.patch b/pkgs/by-name/gd/gdome2/xml-document.patch
similarity index 100%
rename from pkgs/development/libraries/gdome2/xml-document.patch
rename to pkgs/by-name/gd/gdome2/xml-document.patch
diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/by-name/gd/gdrive/package.nix
similarity index 100%
rename from pkgs/applications/networking/gdrive/default.nix
rename to pkgs/by-name/gd/gdrive/package.nix
diff --git a/pkgs/applications/networking/gdrive3/Cargo.lock b/pkgs/by-name/gd/gdrive3/Cargo.lock
similarity index 100%
rename from pkgs/applications/networking/gdrive3/Cargo.lock
rename to pkgs/by-name/gd/gdrive3/Cargo.lock
diff --git a/pkgs/applications/networking/gdrive3/default.nix b/pkgs/by-name/gd/gdrive3/package.nix
similarity index 100%
rename from pkgs/applications/networking/gdrive3/default.nix
rename to pkgs/by-name/gd/gdrive3/package.nix
diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/by-name/gd/gdu/package.nix
similarity index 100%
rename from pkgs/tools/system/gdu/default.nix
rename to pkgs/by-name/gd/gdu/package.nix
diff --git a/pkgs/tools/inputmethods/gebaar-libinput/default.nix b/pkgs/by-name/ge/gebaar-libinput/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/gebaar-libinput/default.nix
rename to pkgs/by-name/ge/gebaar-libinput/package.nix
diff --git a/pkgs/applications/editors/gedit/correct-gir-lib-path.patch b/pkgs/by-name/ge/gedit/correct-gir-lib-path.patch
similarity index 100%
rename from pkgs/applications/editors/gedit/correct-gir-lib-path.patch
rename to pkgs/by-name/ge/gedit/correct-gir-lib-path.patch
diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/by-name/ge/gedit/package.nix
similarity index 100%
rename from pkgs/applications/editors/gedit/default.nix
rename to pkgs/by-name/ge/gedit/package.nix
diff --git a/pkgs/applications/misc/geek-life/default.nix b/pkgs/by-name/ge/geek-life/package.nix
similarity index 100%
rename from pkgs/applications/misc/geek-life/default.nix
rename to pkgs/by-name/ge/geek-life/package.nix
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/by-name/ge/geeqie/package.nix
similarity index 100%
rename from pkgs/applications/graphics/geeqie/default.nix
rename to pkgs/by-name/ge/geeqie/package.nix
diff --git a/pkgs/development/tools/misc/gef/default.nix b/pkgs/by-name/ge/gef/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/gef/default.nix
rename to pkgs/by-name/ge/gef/package.nix
diff --git a/pkgs/data/fonts/gelasio/default.nix b/pkgs/by-name/ge/gelasio/package.nix
similarity index 100%
rename from pkgs/data/fonts/gelasio/default.nix
rename to pkgs/by-name/ge/gelasio/package.nix
diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/by-name/ge/gem/package.nix
similarity index 100%
rename from pkgs/applications/audio/pd-plugins/gem/default.nix
rename to pkgs/by-name/ge/gem/package.nix
diff --git a/pkgs/tools/networking/gemget/default.nix b/pkgs/by-name/ge/gemget/package.nix
similarity index 100%
rename from pkgs/tools/networking/gemget/default.nix
rename to pkgs/by-name/ge/gemget/package.nix
diff --git a/pkgs/games/gemrb/default.nix b/pkgs/by-name/ge/gemrb/package.nix
similarity index 100%
rename from pkgs/games/gemrb/default.nix
rename to pkgs/by-name/ge/gemrb/package.nix
diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/by-name/ge/gen-oath-safe/package.nix
similarity index 100%
rename from pkgs/tools/security/gen-oath-safe/default.nix
rename to pkgs/by-name/ge/gen-oath-safe/package.nix
diff --git a/pkgs/tools/networking/gen6dns/default.nix b/pkgs/by-name/ge/gen6dns/package.nix
similarity index 100%
rename from pkgs/tools/networking/gen6dns/default.nix
rename to pkgs/by-name/ge/gen6dns/package.nix
diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/by-name/ge/genact/package.nix
similarity index 100%
rename from pkgs/applications/misc/genact/default.nix
rename to pkgs/by-name/ge/genact/package.nix
diff --git a/pkgs/development/libraries/genann/default.nix b/pkgs/by-name/ge/genann/package.nix
similarity index 100%
rename from pkgs/development/libraries/genann/default.nix
rename to pkgs/by-name/ge/genann/package.nix
diff --git a/pkgs/tools/security/gencfsm/makefile-mkdir.patch b/pkgs/by-name/ge/gencfsm/makefile-mkdir.patch
similarity index 100%
rename from pkgs/tools/security/gencfsm/makefile-mkdir.patch
rename to pkgs/by-name/ge/gencfsm/makefile-mkdir.patch
diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/by-name/ge/gencfsm/package.nix
similarity index 100%
rename from pkgs/tools/security/gencfsm/default.nix
rename to pkgs/by-name/ge/gencfsm/package.nix
diff --git a/pkgs/development/tools/gendef/default.nix b/pkgs/by-name/ge/gendef/package.nix
similarity index 100%
rename from pkgs/development/tools/gendef/default.nix
rename to pkgs/by-name/ge/gendef/package.nix
diff --git a/pkgs/development/tools/rust/genemichaels/Cargo.lock b/pkgs/by-name/ge/genemichaels/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/rust/genemichaels/Cargo.lock
rename to pkgs/by-name/ge/genemichaels/Cargo.lock
diff --git a/pkgs/development/tools/rust/genemichaels/default.nix b/pkgs/by-name/ge/genemichaels/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/genemichaels/default.nix
rename to pkgs/by-name/ge/genemichaels/package.nix
diff --git a/pkgs/applications/misc/genesys/default.nix b/pkgs/by-name/ge/genesys/package.nix
similarity index 100%
rename from pkgs/applications/misc/genesys/default.nix
rename to pkgs/by-name/ge/genesys/package.nix
diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/by-name/ge/genext2fs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/genext2fs/default.nix
rename to pkgs/by-name/ge/genext2fs/package.nix
diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/by-name/ge/gengetopt/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/gengetopt/default.nix
rename to pkgs/by-name/ge/gengetopt/package.nix
diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/by-name/ge/genimage/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/genimage/default.nix
rename to pkgs/by-name/ge/genimage/package.nix
diff --git a/pkgs/applications/science/biology/genmap/gtest.patch b/pkgs/by-name/ge/genmap/gtest.patch
similarity index 100%
rename from pkgs/applications/science/biology/genmap/gtest.patch
rename to pkgs/by-name/ge/genmap/gtest.patch
diff --git a/pkgs/applications/science/biology/genmap/default.nix b/pkgs/by-name/ge/genmap/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/genmap/default.nix
rename to pkgs/by-name/ge/genmap/package.nix
diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/by-name/ge/genromfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/genromfs/default.nix
rename to pkgs/by-name/ge/genromfs/package.nix
diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/by-name/ge/gentium-book-basic/package.nix
similarity index 100%
rename from pkgs/data/fonts/gentium-book-basic/default.nix
rename to pkgs/by-name/ge/gentium-book-basic/package.nix
diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/by-name/ge/gentium/package.nix
similarity index 100%
rename from pkgs/data/fonts/gentium/default.nix
rename to pkgs/by-name/ge/gentium/package.nix
diff --git a/pkgs/applications/misc/genxword/default.nix b/pkgs/by-name/ge/genxword/package.nix
similarity index 100%
rename from pkgs/applications/misc/genxword/default.nix
rename to pkgs/by-name/ge/genxword/package.nix
diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/by-name/ge/genymotion/package.nix
similarity index 100%
rename from pkgs/development/mobile/genymotion/default.nix
rename to pkgs/by-name/ge/genymotion/package.nix
diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch
similarity index 100%
rename from pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
rename to pkgs/by-name/ge/geoclue2/add-option-for-installation-sysconfdir.patch
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/by-name/ge/geoclue2/package.nix
similarity index 100%
rename from pkgs/development/libraries/geoclue/default.nix
rename to pkgs/by-name/ge/geoclue2/package.nix
diff --git a/pkgs/development/libraries/geocode-glib/installed-tests-path.patch b/pkgs/by-name/ge/geocode-glib/installed-tests-path.patch
similarity index 100%
rename from pkgs/development/libraries/geocode-glib/installed-tests-path.patch
rename to pkgs/by-name/ge/geocode-glib/installed-tests-path.patch
diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/by-name/ge/geocode-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/geocode-glib/default.nix
rename to pkgs/by-name/ge/geocode-glib/package.nix
diff --git a/pkgs/development/libraries/geogram/default.nix b/pkgs/by-name/ge/geogram/package.nix
similarity index 100%
rename from pkgs/development/libraries/geogram/default.nix
rename to pkgs/by-name/ge/geogram/package.nix
diff --git a/pkgs/development/libraries/geogram/replace-bundled-zlib.patch b/pkgs/by-name/ge/geogram/replace-bundled-zlib.patch
similarity index 100%
rename from pkgs/development/libraries/geogram/replace-bundled-zlib.patch
rename to pkgs/by-name/ge/geogram/replace-bundled-zlib.patch
diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/by-name/ge/geoipjava/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/geoipjava/default.nix
rename to pkgs/by-name/ge/geoipjava/package.nix
diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/by-name/ge/geoipupdate/package.nix
similarity index 100%
rename from pkgs/applications/misc/geoipupdate/default.nix
rename to pkgs/by-name/ge/geoipupdate/package.nix
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/by-name/ge/geolite-legacy/package.nix
similarity index 100%
rename from pkgs/data/misc/geolite-legacy/default.nix
rename to pkgs/by-name/ge/geolite-legacy/package.nix
diff --git a/pkgs/applications/networking/gopher/geomyidae/default.nix b/pkgs/by-name/ge/geomyidae/package.nix
similarity index 100%
rename from pkgs/applications/networking/gopher/geomyidae/default.nix
rename to pkgs/by-name/ge/geomyidae/package.nix
diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/by-name/ge/geonkick/package.nix
similarity index 100%
rename from pkgs/applications/audio/geonkick/default.nix
rename to pkgs/by-name/ge/geonkick/package.nix
diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/by-name/ge/gephi/package.nix
similarity index 100%
rename from pkgs/applications/science/misc/gephi/default.nix
rename to pkgs/by-name/ge/gephi/package.nix
diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/by-name/ge/gerbera/package.nix
similarity index 100%
rename from pkgs/servers/gerbera/default.nix
rename to pkgs/by-name/ge/gerbera/package.nix
diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/by-name/ge/get_iplayer/package.nix
similarity index 100%
rename from pkgs/applications/misc/get_iplayer/default.nix
rename to pkgs/by-name/ge/get_iplayer/package.nix
diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/by-name/ge/getdata/package.nix
similarity index 100%
rename from pkgs/development/libraries/getdata/default.nix
rename to pkgs/by-name/ge/getdata/package.nix
diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/by-name/ge/getdp/package.nix
similarity index 100%
rename from pkgs/applications/science/math/getdp/default.nix
rename to pkgs/by-name/ge/getdp/package.nix
diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/by-name/ge/geteltorito/package.nix
similarity index 100%
rename from pkgs/tools/misc/geteltorito/default.nix
rename to pkgs/by-name/ge/geteltorito/package.nix
diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/by-name/ge/getopt/package.nix
similarity index 100%
rename from pkgs/tools/misc/getopt/default.nix
rename to pkgs/by-name/ge/getopt/package.nix
diff --git a/pkgs/tools/misc/getoptions/default.nix b/pkgs/by-name/ge/getoptions/package.nix
similarity index 100%
rename from pkgs/tools/misc/getoptions/default.nix
rename to pkgs/by-name/ge/getoptions/package.nix
diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/by-name/ge/getxbook/package.nix
similarity index 100%
rename from pkgs/applications/misc/getxbook/default.nix
rename to pkgs/by-name/ge/getxbook/package.nix
diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/by-name/ge/gexiv2/package.nix
similarity index 100%
rename from pkgs/development/libraries/gexiv2/default.nix
rename to pkgs/by-name/ge/gexiv2/package.nix
diff --git a/pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch b/pkgs/by-name/gf/gf/build-use-optional-freetype-with-pkg-config.patch
similarity index 100%
rename from pkgs/development/tools/misc/gf/build-use-optional-freetype-with-pkg-config.patch
rename to pkgs/by-name/gf/gf/build-use-optional-freetype-with-pkg-config.patch
diff --git a/pkgs/development/tools/misc/gf/default.nix b/pkgs/by-name/gf/gf/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/gf/default.nix
rename to pkgs/by-name/gf/gf/package.nix
diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/by-name/gf/gf2x/package.nix
similarity index 100%
rename from pkgs/development/libraries/gf2x/default.nix
rename to pkgs/by-name/gf/gf2x/package.nix
diff --git a/pkgs/applications/science/math/gfan/gfan-0.6.2-cddlib-prefix.patch b/pkgs/by-name/gf/gfan/gfan-0.6.2-cddlib-prefix.patch
similarity index 100%
rename from pkgs/applications/science/math/gfan/gfan-0.6.2-cddlib-prefix.patch
rename to pkgs/by-name/gf/gfan/gfan-0.6.2-cddlib-prefix.patch
diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/by-name/gf/gfan/package.nix
similarity index 100%
rename from pkgs/applications/science/math/gfan/default.nix
rename to pkgs/by-name/gf/gfan/package.nix
diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/by-name/gf/gfbgraph/package.nix
similarity index 100%
rename from pkgs/development/libraries/gfbgraph/default.nix
rename to pkgs/by-name/gf/gfbgraph/package.nix
diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/by-name/gf/gflags/package.nix
similarity index 100%
rename from pkgs/development/libraries/gflags/default.nix
rename to pkgs/by-name/gf/gflags/package.nix
diff --git a/pkgs/development/compilers/gforth/boot-forth.nix b/pkgs/by-name/gf/gforth/boot-forth.nix
similarity index 100%
rename from pkgs/development/compilers/gforth/boot-forth.nix
rename to pkgs/by-name/gf/gforth/boot-forth.nix
diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/by-name/gf/gforth/package.nix
similarity index 100%
rename from pkgs/development/compilers/gforth/default.nix
rename to pkgs/by-name/gf/gforth/package.nix
diff --git a/pkgs/development/compilers/gforth/swig.nix b/pkgs/by-name/gf/gforth/swig.nix
similarity index 100%
rename from pkgs/development/compilers/gforth/swig.nix
rename to pkgs/by-name/gf/gforth/swig.nix
diff --git a/pkgs/tools/filesystems/gfs2-utils/default.nix b/pkgs/by-name/gf/gfs2-utils/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/gfs2-utils/default.nix
rename to pkgs/by-name/gf/gfs2-utils/package.nix
diff --git a/pkgs/tools/security/gfshare/default.nix b/pkgs/by-name/gf/gfshare/package.nix
similarity index 100%
rename from pkgs/tools/security/gfshare/default.nix
rename to pkgs/by-name/gf/gfshare/package.nix
diff --git a/pkgs/tools/graphics/gfxreconstruct/default.nix b/pkgs/by-name/gf/gfxreconstruct/package.nix
similarity index 100%
rename from pkgs/tools/graphics/gfxreconstruct/default.nix
rename to pkgs/by-name/gf/gfxreconstruct/package.nix
diff --git a/pkgs/development/libraries/gfxstream/default.nix b/pkgs/by-name/gf/gfxstream/package.nix
similarity index 100%
rename from pkgs/development/libraries/gfxstream/default.nix
rename to pkgs/by-name/gf/gfxstream/package.nix
diff --git a/pkgs/os-specific/linux/gfxtablet/default.nix b/pkgs/by-name/gf/gfxtablet/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/gfxtablet/default.nix
rename to pkgs/by-name/gf/gfxtablet/package.nix
diff --git a/pkgs/applications/version-management/gg/default.nix b/pkgs/by-name/gg/gg-scm/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gg/default.nix
rename to pkgs/by-name/gg/gg-scm/package.nix
diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/by-name/gg/ggobi/package.nix
similarity index 100%
rename from pkgs/tools/graphics/ggobi/default.nix
rename to pkgs/by-name/gg/ggobi/package.nix
diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/pkgs/by-name/gg/ggz_base_libs/package.nix
similarity index 100%
rename from pkgs/development/libraries/ggz_base_libs/default.nix
rename to pkgs/by-name/gg/ggz_base_libs/package.nix
diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/by-name/gh/gh-ost/package.nix
similarity index 100%
rename from pkgs/tools/misc/gh-ost/default.nix
rename to pkgs/by-name/gh/gh-ost/package.nix
diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/by-name/gh/gh/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gh/default.nix
rename to pkgs/by-name/gh/gh/package.nix
diff --git a/pkgs/tools/backup/gh2md/default.nix b/pkgs/by-name/gh/gh2md/package.nix
similarity index 100%
rename from pkgs/tools/backup/gh2md/default.nix
rename to pkgs/by-name/gh/gh2md/package.nix
diff --git a/pkgs/tools/security/ghauri/default.nix b/pkgs/by-name/gh/ghauri/package.nix
similarity index 100%
rename from pkgs/tools/security/ghauri/default.nix
rename to pkgs/by-name/gh/ghauri/package.nix
diff --git a/pkgs/development/libraries/ghc_filesystem/default.nix b/pkgs/by-name/gh/ghc_filesystem/package.nix
similarity index 100%
rename from pkgs/development/libraries/ghc_filesystem/default.nix
rename to pkgs/by-name/gh/ghc_filesystem/package.nix
diff --git a/pkgs/tools/security/ghdorker/default.nix b/pkgs/by-name/gh/ghdorker/package.nix
similarity index 100%
rename from pkgs/tools/security/ghdorker/default.nix
rename to pkgs/by-name/gh/ghdorker/package.nix
diff --git a/pkgs/applications/version-management/ghorg/default.nix b/pkgs/by-name/gh/ghorg/package.nix
similarity index 100%
rename from pkgs/applications/version-management/ghorg/default.nix
rename to pkgs/by-name/gh/ghorg/package.nix
diff --git a/pkgs/tools/security/ghost/default.nix b/pkgs/by-name/gh/ghost/package.nix
similarity index 100%
rename from pkgs/tools/security/ghost/default.nix
rename to pkgs/by-name/gh/ghost/package.nix
diff --git a/pkgs/tools/misc/ghostie/Cargo.lock b/pkgs/by-name/gh/ghostie/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/ghostie/Cargo.lock
rename to pkgs/by-name/gh/ghostie/Cargo.lock
diff --git a/pkgs/tools/misc/ghostie/default.nix b/pkgs/by-name/gh/ghostie/package.nix
similarity index 100%
rename from pkgs/tools/misc/ghostie/default.nix
rename to pkgs/by-name/gh/ghostie/package.nix
diff --git a/pkgs/misc/ghostscript/doc-no-ref.diff b/pkgs/by-name/gh/ghostscript/doc-no-ref.diff
similarity index 100%
rename from pkgs/misc/ghostscript/doc-no-ref.diff
rename to pkgs/by-name/gh/ghostscript/doc-no-ref.diff
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/by-name/gh/ghostscript/package.nix
similarity index 100%
rename from pkgs/misc/ghostscript/default.nix
rename to pkgs/by-name/gh/ghostscript/package.nix
diff --git a/pkgs/misc/ghostscript/test-corpus-render.nix b/pkgs/by-name/gh/ghostscript/test-corpus-render.nix
similarity index 100%
rename from pkgs/misc/ghostscript/test-corpus-render.nix
rename to pkgs/by-name/gh/ghostscript/test-corpus-render.nix
diff --git a/pkgs/misc/ghostscript/urw-font-files.patch b/pkgs/by-name/gh/ghostscript/urw-font-files.patch
similarity index 100%
rename from pkgs/misc/ghostscript/urw-font-files.patch
rename to pkgs/by-name/gh/ghostscript/urw-font-files.patch
diff --git a/pkgs/applications/misc/ghosttohugo/default.nix b/pkgs/by-name/gh/ghosttohugo/package.nix
similarity index 100%
rename from pkgs/applications/misc/ghosttohugo/default.nix
rename to pkgs/by-name/gh/ghosttohugo/package.nix
diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/by-name/gh/ghostunnel/package.nix
similarity index 100%
rename from pkgs/tools/networking/ghostunnel/default.nix
rename to pkgs/by-name/gh/ghostunnel/package.nix
diff --git a/pkgs/applications/version-management/ghq/default.nix b/pkgs/by-name/gh/ghq/package.nix
similarity index 100%
rename from pkgs/applications/version-management/ghq/default.nix
rename to pkgs/by-name/gh/ghq/package.nix
diff --git a/pkgs/applications/version-management/ghr/default.nix b/pkgs/by-name/gh/ghr/package.nix
similarity index 100%
rename from pkgs/applications/version-management/ghr/default.nix
rename to pkgs/by-name/gh/ghr/package.nix
diff --git a/pkgs/tools/networking/ghz/default.nix b/pkgs/by-name/gh/ghz/package.nix
similarity index 100%
rename from pkgs/tools/networking/ghz/default.nix
rename to pkgs/by-name/gh/ghz/package.nix
diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/by-name/gi/gImageReader/package.nix
similarity index 100%
rename from pkgs/applications/misc/gImageReader/default.nix
rename to pkgs/by-name/gi/gImageReader/package.nix
diff --git a/pkgs/development/tools/gi-crystal/default.nix b/pkgs/by-name/gi/gi-crystal/package.nix
similarity index 100%
rename from pkgs/development/tools/gi-crystal/default.nix
rename to pkgs/by-name/gi/gi-crystal/package.nix
diff --git a/pkgs/development/tools/gi-crystal/src.patch b/pkgs/by-name/gi/gi-crystal/src.patch
similarity index 100%
rename from pkgs/development/tools/gi-crystal/src.patch
rename to pkgs/by-name/gi/gi-crystal/src.patch
diff --git a/pkgs/development/tools/gi-crystal/store-friendly-library-name.patch b/pkgs/by-name/gi/gi-crystal/store-friendly-library-name.patch
similarity index 100%
rename from pkgs/development/tools/gi-crystal/store-friendly-library-name.patch
rename to pkgs/by-name/gi/gi-crystal/store-friendly-library-name.patch
diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/by-name/gi/gi-docgen/package.nix
similarity index 100%
rename from pkgs/development/tools/documentation/gi-docgen/default.nix
rename to pkgs/by-name/gi/gi-docgen/package.nix
diff --git a/pkgs/applications/science/math/giac/fix-fltk-guard.patch b/pkgs/by-name/gi/giac/fix-fltk-guard.patch
similarity index 100%
rename from pkgs/applications/science/math/giac/fix-fltk-guard.patch
rename to pkgs/by-name/gi/giac/fix-fltk-guard.patch
diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/by-name/gi/giac/package.nix
similarity index 100%
rename from pkgs/applications/science/math/giac/default.nix
rename to pkgs/by-name/gi/giac/package.nix
diff --git a/pkgs/applications/science/math/giac/remove-old-functional-patterns.patch b/pkgs/by-name/gi/giac/remove-old-functional-patterns.patch
similarity index 100%
rename from pkgs/applications/science/math/giac/remove-old-functional-patterns.patch
rename to pkgs/by-name/gi/giac/remove-old-functional-patterns.patch
diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/by-name/gi/giada/package.nix
similarity index 100%
rename from pkgs/applications/audio/giada/default.nix
rename to pkgs/by-name/gi/giada/package.nix
diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/by-name/gi/giara/package.nix
similarity index 100%
rename from pkgs/applications/networking/giara/default.nix
rename to pkgs/by-name/gi/giara/package.nix
diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/by-name/gi/gibo/package.nix
similarity index 100%
rename from pkgs/tools/misc/gibo/default.nix
rename to pkgs/by-name/gi/gibo/package.nix
diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/by-name/gi/gif-for-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/gif-for-cli/default.nix
rename to pkgs/by-name/gi/gif-for-cli/package.nix
diff --git a/pkgs/tools/graphics/gif2apng/default.nix b/pkgs/by-name/gi/gif2apng/package.nix
similarity index 100%
rename from pkgs/tools/graphics/gif2apng/default.nix
rename to pkgs/by-name/gi/gif2apng/package.nix
diff --git a/pkgs/development/libraries/giflib/CVE-2021-40633.patch b/pkgs/by-name/gi/giflib/CVE-2021-40633.patch
similarity index 100%
rename from pkgs/development/libraries/giflib/CVE-2021-40633.patch
rename to pkgs/by-name/gi/giflib/CVE-2021-40633.patch
diff --git a/pkgs/development/libraries/giflib/mingw-install-exes.patch b/pkgs/by-name/gi/giflib/mingw-install-exes.patch
similarity index 100%
rename from pkgs/development/libraries/giflib/mingw-install-exes.patch
rename to pkgs/by-name/gi/giflib/mingw-install-exes.patch
diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/by-name/gi/giflib/package.nix
similarity index 100%
rename from pkgs/development/libraries/giflib/default.nix
rename to pkgs/by-name/gi/giflib/package.nix
diff --git a/pkgs/development/libraries/science/biology/gifticlib/default.nix b/pkgs/by-name/gi/gifticlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/gifticlib/default.nix
rename to pkgs/by-name/gi/gifticlib/package.nix
diff --git a/pkgs/tools/misc/gigalixir/default.nix b/pkgs/by-name/gi/gigalixir/package.nix
similarity index 100%
rename from pkgs/tools/misc/gigalixir/default.nix
rename to pkgs/by-name/gi/gigalixir/package.nix
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/by-name/gi/gigedit/package.nix
similarity index 100%
rename from pkgs/applications/audio/gigedit/default.nix
rename to pkgs/by-name/gi/gigedit/package.nix
diff --git a/pkgs/applications/science/astronomy/gildas/clang.patch b/pkgs/by-name/gi/gildas/clang.patch
similarity index 100%
rename from pkgs/applications/science/astronomy/gildas/clang.patch
rename to pkgs/by-name/gi/gildas/clang.patch
diff --git a/pkgs/applications/science/astronomy/gildas/cpp-darwin.patch b/pkgs/by-name/gi/gildas/cpp-darwin.patch
similarity index 100%
rename from pkgs/applications/science/astronomy/gildas/cpp-darwin.patch
rename to pkgs/by-name/gi/gildas/cpp-darwin.patch
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/by-name/gi/gildas/package.nix
similarity index 100%
rename from pkgs/applications/science/astronomy/gildas/default.nix
rename to pkgs/by-name/gi/gildas/package.nix
diff --git a/pkgs/applications/science/astronomy/gildas/wrapper.patch b/pkgs/by-name/gi/gildas/wrapper.patch
similarity index 100%
rename from pkgs/applications/science/astronomy/gildas/wrapper.patch
rename to pkgs/by-name/gi/gildas/wrapper.patch
diff --git a/pkgs/tools/admin/gimme-aws-creds/default.nix b/pkgs/by-name/gi/gimme-aws-creds/package.nix
similarity index 100%
rename from pkgs/tools/admin/gimme-aws-creds/default.nix
rename to pkgs/by-name/gi/gimme-aws-creds/package.nix
diff --git a/pkgs/games/gimx/conf.patch b/pkgs/by-name/gi/gimx/conf.patch
similarity index 100%
rename from pkgs/games/gimx/conf.patch
rename to pkgs/by-name/gi/gimx/conf.patch
diff --git a/pkgs/games/gimx/gcc14.patch b/pkgs/by-name/gi/gimx/gcc14.patch
similarity index 100%
rename from pkgs/games/gimx/gcc14.patch
rename to pkgs/by-name/gi/gimx/gcc14.patch
diff --git a/pkgs/games/gimx/default.nix b/pkgs/by-name/gi/gimx/package.nix
similarity index 100%
rename from pkgs/games/gimx/default.nix
rename to pkgs/by-name/gi/gimx/package.nix
diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/by-name/gi/ginac/package.nix
similarity index 100%
rename from pkgs/applications/science/math/ginac/default.nix
rename to pkgs/by-name/gi/ginac/package.nix
diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/by-name/gi/ginkgo/package.nix
similarity index 100%
rename from pkgs/development/tools/ginkgo/default.nix
rename to pkgs/by-name/gi/ginkgo/package.nix
diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/by-name/gi/gio-sharp/package.nix
similarity index 100%
rename from pkgs/development/libraries/gio-sharp/default.nix
rename to pkgs/by-name/gi/gio-sharp/package.nix
diff --git a/pkgs/applications/video/giph/default.nix b/pkgs/by-name/gi/giph/package.nix
similarity index 100%
rename from pkgs/applications/video/giph/default.nix
rename to pkgs/by-name/gi/giph/package.nix
diff --git a/pkgs/development/tools/gir/Cargo.lock b/pkgs/by-name/gi/gir-rs/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/gir/Cargo.lock
rename to pkgs/by-name/gi/gir-rs/Cargo.lock
diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/by-name/gi/gir-rs/package.nix
similarity index 100%
rename from pkgs/development/tools/gir/default.nix
rename to pkgs/by-name/gi/gir-rs/package.nix
diff --git a/pkgs/tools/networking/girsh/default.nix b/pkgs/by-name/gi/girsh/package.nix
similarity index 100%
rename from pkgs/tools/networking/girsh/default.nix
rename to pkgs/by-name/gi/girsh/package.nix
diff --git a/pkgs/applications/version-management/git-aggregator/default.nix b/pkgs/by-name/gi/git-aggregator/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-aggregator/default.nix
rename to pkgs/by-name/gi/git-aggregator/package.nix
diff --git a/pkgs/applications/version-management/git-annex-remote-rclone/default.nix b/pkgs/by-name/gi/git-annex-remote-rclone/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-annex-remote-rclone/default.nix
rename to pkgs/by-name/gi/git-annex-remote-rclone/package.nix
diff --git a/pkgs/applications/version-management/git-annex-utils/default.nix b/pkgs/by-name/gi/git-annex-utils/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-annex-utils/default.nix
rename to pkgs/by-name/gi/git-annex-utils/package.nix
diff --git a/pkgs/applications/version-management/git-appraise/default.nix b/pkgs/by-name/gi/git-appraise/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-appraise/default.nix
rename to pkgs/by-name/gi/git-appraise/package.nix
diff --git a/pkgs/applications/version-management/git-backdate/default.nix b/pkgs/by-name/gi/git-backdate/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-backdate/default.nix
rename to pkgs/by-name/gi/git-backdate/package.nix
diff --git a/pkgs/applications/version-management/git-bars/default.nix b/pkgs/by-name/gi/git-bars/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-bars/default.nix
rename to pkgs/by-name/gi/git-bars/package.nix
diff --git a/pkgs/applications/version-management/git-big-picture/default.nix b/pkgs/by-name/gi/git-big-picture/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-big-picture/default.nix
rename to pkgs/by-name/gi/git-big-picture/package.nix
diff --git a/pkgs/applications/version-management/git-bug-migration/default.nix b/pkgs/by-name/gi/git-bug-migration/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-bug-migration/default.nix
rename to pkgs/by-name/gi/git-bug-migration/package.nix
diff --git a/pkgs/applications/version-management/git-bug/default.nix b/pkgs/by-name/gi/git-bug/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-bug/default.nix
rename to pkgs/by-name/gi/git-bug/package.nix
diff --git a/pkgs/applications/version-management/git-cache/default.nix b/pkgs/by-name/gi/git-cache/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-cache/default.nix
rename to pkgs/by-name/gi/git-cache/package.nix
diff --git a/pkgs/applications/version-management/git-chglog/default.nix b/pkgs/by-name/gi/git-chglog/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-chglog/default.nix
rename to pkgs/by-name/gi/git-chglog/package.nix
diff --git a/pkgs/applications/version-management/git-codereview/default.nix b/pkgs/by-name/gi/git-codereview/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-codereview/default.nix
rename to pkgs/by-name/gi/git-codereview/package.nix
diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/by-name/gi/git-cola/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-cola/default.nix
rename to pkgs/by-name/gi/git-cola/package.nix
diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/by-name/gi/git-crecord/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-crecord/default.nix
rename to pkgs/by-name/gi/git-crecord/package.nix
diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/by-name/gi/git-credential-oauth/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-credential-oauth/default.nix
rename to pkgs/by-name/gi/git-credential-oauth/package.nix
diff --git a/pkgs/applications/version-management/git-crypt/default.nix b/pkgs/by-name/gi/git-crypt/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-crypt/default.nix
rename to pkgs/by-name/gi/git-crypt/package.nix
diff --git a/pkgs/applications/version-management/git-delete-merged-branches/default.nix b/pkgs/by-name/gi/git-delete-merged-branches/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-delete-merged-branches/default.nix
rename to pkgs/by-name/gi/git-delete-merged-branches/package.nix
diff --git a/pkgs/applications/version-management/git-dive/default.nix b/pkgs/by-name/gi/git-dive/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-dive/default.nix
rename to pkgs/by-name/gi/git-dive/package.nix
diff --git a/pkgs/applications/version-management/git-extras/default.nix b/pkgs/by-name/gi/git-extras/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-extras/default.nix
rename to pkgs/by-name/gi/git-extras/package.nix
diff --git a/pkgs/applications/version-management/git-fire/default.nix b/pkgs/by-name/gi/git-fire/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-fire/default.nix
rename to pkgs/by-name/gi/git-fire/package.nix
diff --git a/pkgs/applications/version-management/git-ftp/default.nix b/pkgs/by-name/gi/git-ftp/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-ftp/default.nix
rename to pkgs/by-name/gi/git-ftp/package.nix
diff --git a/pkgs/applications/version-management/git-graph/default.nix b/pkgs/by-name/gi/git-graph/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-graph/default.nix
rename to pkgs/by-name/gi/git-graph/package.nix
diff --git a/pkgs/applications/version-management/git-hound/default.nix b/pkgs/by-name/gi/git-hound/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-hound/default.nix
rename to pkgs/by-name/gi/git-hound/package.nix
diff --git a/pkgs/applications/version-management/git-hub/default.nix b/pkgs/by-name/gi/git-hub/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-hub/default.nix
rename to pkgs/by-name/gi/git-hub/package.nix
diff --git a/pkgs/applications/version-management/git-ignore/default.nix b/pkgs/by-name/gi/git-ignore/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-ignore/default.nix
rename to pkgs/by-name/gi/git-ignore/package.nix
diff --git a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-interactive-rebase-tool/default.nix
rename to pkgs/by-name/gi/git-interactive-rebase-tool/package.nix
diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/by-name/gi/git-latexdiff/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/git-latexdiff/default.nix
rename to pkgs/by-name/gi/git-latexdiff/package.nix
diff --git a/pkgs/tools/typesetting/git-latexdiff/version-test.patch b/pkgs/by-name/gi/git-latexdiff/version-test.patch
similarity index 100%
rename from pkgs/tools/typesetting/git-latexdiff/version-test.patch
rename to pkgs/by-name/gi/git-latexdiff/version-test.patch
diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/by-name/gi/git-mit/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-mit/default.nix
rename to pkgs/by-name/gi/git-mit/package.nix
diff --git a/pkgs/applications/version-management/git-octopus/default.nix b/pkgs/by-name/gi/git-octopus/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-octopus/default.nix
rename to pkgs/by-name/gi/git-octopus/package.nix
diff --git a/pkgs/applications/version-management/git-open/default.nix b/pkgs/by-name/gi/git-open/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-open/default.nix
rename to pkgs/by-name/gi/git-open/package.nix
diff --git a/pkgs/applications/version-management/git-privacy/default.nix b/pkgs/by-name/gi/git-privacy/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-privacy/default.nix
rename to pkgs/by-name/gi/git-privacy/package.nix
diff --git a/pkgs/applications/version-management/git-quick-stats/default.nix b/pkgs/by-name/gi/git-quick-stats/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-quick-stats/default.nix
rename to pkgs/by-name/gi/git-quick-stats/package.nix
diff --git a/pkgs/applications/version-management/git-radar/default.nix b/pkgs/by-name/gi/git-radar/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-radar/default.nix
rename to pkgs/by-name/gi/git-radar/package.nix
diff --git a/pkgs/applications/version-management/git-relevant-history/default.nix b/pkgs/by-name/gi/git-relevant-history/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-relevant-history/default.nix
rename to pkgs/by-name/gi/git-relevant-history/package.nix
diff --git a/pkgs/applications/version-management/git-remote-gcrypt/default.nix b/pkgs/by-name/gi/git-remote-gcrypt/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-remote-gcrypt/default.nix
rename to pkgs/by-name/gi/git-remote-gcrypt/package.nix
diff --git a/pkgs/applications/version-management/git-remote-hg/default.nix b/pkgs/by-name/gi/git-remote-hg/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-remote-hg/default.nix
rename to pkgs/by-name/gi/git-remote-hg/package.nix
diff --git a/pkgs/applications/version-management/git-reparent/default.nix b/pkgs/by-name/gi/git-reparent/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-reparent/default.nix
rename to pkgs/by-name/gi/git-reparent/package.nix
diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/by-name/gi/git-repo/import-ssl-module.patch
similarity index 100%
rename from pkgs/applications/version-management/git-repo/import-ssl-module.patch
rename to pkgs/by-name/gi/git-repo/import-ssl-module.patch
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/by-name/gi/git-repo/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-repo/default.nix
rename to pkgs/by-name/gi/git-repo/package.nix
diff --git a/pkgs/applications/version-management/git-secret/default.nix b/pkgs/by-name/gi/git-secret/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-secret/default.nix
rename to pkgs/by-name/gi/git-secret/package.nix
diff --git a/pkgs/applications/version-management/git-secrets/default.nix b/pkgs/by-name/gi/git-secrets/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-secrets/default.nix
rename to pkgs/by-name/gi/git-secrets/package.nix
diff --git a/pkgs/applications/version-management/git-series/default.nix b/pkgs/by-name/gi/git-series/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-series/default.nix
rename to pkgs/by-name/gi/git-series/package.nix
diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/by-name/gi/git-sizer/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-sizer/default.nix
rename to pkgs/by-name/gi/git-sizer/package.nix
diff --git a/pkgs/applications/version-management/git-stree/default.nix b/pkgs/by-name/gi/git-stree/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-stree/default.nix
rename to pkgs/by-name/gi/git-stree/package.nix
diff --git a/pkgs/applications/version-management/git-subrepo/default.nix b/pkgs/by-name/gi/git-subrepo/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-subrepo/default.nix
rename to pkgs/by-name/gi/git-subrepo/package.nix
diff --git a/pkgs/applications/version-management/git-subtrac/default.nix b/pkgs/by-name/gi/git-subtrac/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-subtrac/default.nix
rename to pkgs/by-name/gi/git-subtrac/package.nix
diff --git a/pkgs/applications/version-management/git-sync/default.nix b/pkgs/by-name/gi/git-sync/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-sync/default.nix
rename to pkgs/by-name/gi/git-sync/package.nix
diff --git a/pkgs/applications/version-management/git-team/default.nix b/pkgs/by-name/gi/git-team/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-team/default.nix
rename to pkgs/by-name/gi/git-team/package.nix
diff --git a/pkgs/applications/version-management/git-test/default.nix b/pkgs/by-name/gi/git-test/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-test/default.nix
rename to pkgs/by-name/gi/git-test/package.nix
diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/by-name/gi/git-town/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-town/default.nix
rename to pkgs/by-name/gi/git-town/package.nix
diff --git a/pkgs/applications/version-management/git-vanity-hash/default.nix b/pkgs/by-name/gi/git-vanity-hash/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-vanity-hash/default.nix
rename to pkgs/by-name/gi/git-vanity-hash/package.nix
diff --git a/pkgs/applications/version-management/git-vendor/default.nix b/pkgs/by-name/gi/git-vendor/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-vendor/default.nix
rename to pkgs/by-name/gi/git-vendor/package.nix
diff --git a/pkgs/applications/version-management/git-when-merged/default.nix b/pkgs/by-name/gi/git-when-merged/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git-when-merged/default.nix
rename to pkgs/by-name/gi/git-when-merged/package.nix
diff --git a/pkgs/development/libraries/git2-cpp/default.nix b/pkgs/by-name/gi/git2-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/git2-cpp/default.nix
rename to pkgs/by-name/gi/git2-cpp/package.nix
diff --git a/pkgs/applications/version-management/git2cl/default.nix b/pkgs/by-name/gi/git2cl/package.nix
similarity index 100%
rename from pkgs/applications/version-management/git2cl/default.nix
rename to pkgs/by-name/gi/git2cl/package.nix
diff --git a/pkgs/applications/version-management/gitlab/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix
similarity index 100%
rename from pkgs/applications/version-management/gitlab/gitaly/git.nix
rename to pkgs/by-name/gi/gitaly/git.nix
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/by-name/gi/gitaly/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitlab/gitaly/default.nix
rename to pkgs/by-name/gi/gitaly/package.nix
diff --git a/pkgs/applications/version-management/gitbatch/default.nix b/pkgs/by-name/gi/gitbatch/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitbatch/default.nix
rename to pkgs/by-name/gi/gitbatch/package.nix
diff --git a/pkgs/applications/version-management/gitflow/default.nix b/pkgs/by-name/gi/gitflow/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitflow/default.nix
rename to pkgs/by-name/gi/gitflow/package.nix
diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/by-name/gi/gitfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/gitfs/default.nix
rename to pkgs/by-name/gi/gitfs/package.nix
diff --git a/pkgs/tools/misc/github-backup/default.nix b/pkgs/by-name/gi/github-backup/package.nix
similarity index 100%
rename from pkgs/tools/misc/github-backup/default.nix
rename to pkgs/by-name/gi/github-backup/package.nix
diff --git a/pkgs/development/tools/github-commenter/default.nix b/pkgs/by-name/gi/github-commenter/package.nix
similarity index 100%
rename from pkgs/development/tools/github-commenter/default.nix
rename to pkgs/by-name/gi/github-commenter/package.nix
diff --git a/pkgs/tools/misc/github-copilot-cli/package-lock.json b/pkgs/by-name/gi/github-copilot-cli/package-lock.json
similarity index 100%
rename from pkgs/tools/misc/github-copilot-cli/package-lock.json
rename to pkgs/by-name/gi/github-copilot-cli/package-lock.json
diff --git a/pkgs/tools/misc/github-copilot-cli/default.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/github-copilot-cli/default.nix
rename to pkgs/by-name/gi/github-copilot-cli/package.nix
diff --git a/pkgs/development/tools/github-copilot-intellij-agent/default.nix b/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix
similarity index 100%
rename from pkgs/development/tools/github-copilot-intellij-agent/default.nix
rename to pkgs/by-name/gi/github-copilot-intellij-agent/package.nix
diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/by-name/gi/github-release/package.nix
similarity index 100%
rename from pkgs/development/tools/github/github-release/default.nix
rename to pkgs/by-name/gi/github-release/package.nix
diff --git a/pkgs/applications/misc/gitit/default.nix b/pkgs/by-name/gi/gitit/package.nix
similarity index 100%
rename from pkgs/applications/misc/gitit/default.nix
rename to pkgs/by-name/gi/gitit/package.nix
diff --git a/pkgs/tools/security/gitjacker/default.nix b/pkgs/by-name/gi/gitjacker/package.nix
similarity index 100%
rename from pkgs/tools/security/gitjacker/default.nix
rename to pkgs/by-name/gi/gitjacker/package.nix
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/by-name/gi/gitkraken/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitkraken/default.nix
rename to pkgs/by-name/gi/gitkraken/package.nix
diff --git a/pkgs/development/tools/rust/gitlab-clippy/default.nix b/pkgs/by-name/gi/gitlab-clippy/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/gitlab-clippy/default.nix
rename to pkgs/by-name/gi/gitlab-clippy/package.nix
diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
rename to pkgs/by-name/gi/gitlab-container-registry/package.nix
diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix
rename to pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
rename to pkgs/by-name/gi/gitlab-pages/package.nix
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/by-name/gi/gitlab-shell/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
rename to pkgs/by-name/gi/gitlab-shell/package.nix
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/by-name/gi/gitlab-shell/remove-hardcoded-locations.patch
similarity index 100%
rename from pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
rename to pkgs/by-name/gi/gitlab-shell/remove-hardcoded-locations.patch
diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/by-name/gi/gitleaks/package.nix
similarity index 100%
rename from pkgs/tools/security/gitleaks/default.nix
rename to pkgs/by-name/gi/gitleaks/package.nix
diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/by-name/gi/gitless/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitless/default.nix
rename to pkgs/by-name/gi/gitless/package.nix
diff --git a/pkgs/applications/version-management/gitls/default.nix b/pkgs/by-name/gi/gitls/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitls/default.nix
rename to pkgs/by-name/gi/gitls/package.nix
diff --git a/pkgs/applications/version-management/gitnr/default.nix b/pkgs/by-name/gi/gitnr/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitnr/default.nix
rename to pkgs/by-name/gi/gitnr/package.nix
diff --git a/pkgs/applications/version-management/gitnuro/default.nix b/pkgs/by-name/gi/gitnuro/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitnuro/default.nix
rename to pkgs/by-name/gi/gitnuro/package.nix
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/by-name/gi/gitolite/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitolite/default.nix
rename to pkgs/by-name/gi/gitolite/package.nix
diff --git a/pkgs/tools/misc/gitrs/default.nix b/pkgs/by-name/gi/gitrs/package.nix
similarity index 100%
rename from pkgs/tools/misc/gitrs/default.nix
rename to pkgs/by-name/gi/gitrs/package.nix
diff --git a/pkgs/applications/version-management/gitsign/default.nix b/pkgs/by-name/gi/gitsign/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitsign/default.nix
rename to pkgs/by-name/gi/gitsign/package.nix
diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/by-name/gi/gitstats/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitstats/default.nix
rename to pkgs/by-name/gi/gitstats/package.nix
diff --git a/pkgs/applications/version-management/gitstatus/default.nix b/pkgs/by-name/gi/gitstatus/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitstatus/default.nix
rename to pkgs/by-name/gi/gitstatus/package.nix
diff --git a/pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix b/pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix
similarity index 100%
rename from pkgs/applications/version-management/gitstatus/romkatv_libgit2.nix
rename to pkgs/by-name/gi/gitstatus/romkatv_libgit2.nix
diff --git a/pkgs/applications/version-management/gitty/default.nix b/pkgs/by-name/gi/gitty/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitty/default.nix
rename to pkgs/by-name/gi/gitty/package.nix
diff --git a/pkgs/applications/version-management/gitweb/default.nix b/pkgs/by-name/gi/gitweb/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitweb/default.nix
rename to pkgs/by-name/gi/gitweb/package.nix
diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/by-name/gi/gixy/package.nix
similarity index 100%
rename from pkgs/tools/admin/gixy/default.nix
rename to pkgs/by-name/gi/gixy/package.nix
diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/by-name/gj/gjay/package.nix
similarity index 100%
rename from pkgs/applications/audio/gjay/default.nix
rename to pkgs/by-name/gj/gjay/package.nix
diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/by-name/gj/gjo/package.nix
similarity index 100%
rename from pkgs/tools/text/gjo/default.nix
rename to pkgs/by-name/gj/gjo/package.nix
diff --git a/pkgs/development/libraries/gjs/disable-introspection-test.patch b/pkgs/by-name/gj/gjs/disable-introspection-test.patch
similarity index 100%
rename from pkgs/development/libraries/gjs/disable-introspection-test.patch
rename to pkgs/by-name/gj/gjs/disable-introspection-test.patch
diff --git a/pkgs/development/libraries/gjs/fix-paths.patch b/pkgs/by-name/gj/gjs/fix-paths.patch
similarity index 100%
rename from pkgs/development/libraries/gjs/fix-paths.patch
rename to pkgs/by-name/gj/gjs/fix-paths.patch
diff --git a/pkgs/development/libraries/gjs/installed-tests-path.patch b/pkgs/by-name/gj/gjs/installed-tests-path.patch
similarity index 100%
rename from pkgs/development/libraries/gjs/installed-tests-path.patch
rename to pkgs/by-name/gj/gjs/installed-tests-path.patch
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/by-name/gj/gjs/package.nix
similarity index 100%
rename from pkgs/development/libraries/gjs/default.nix
rename to pkgs/by-name/gj/gjs/package.nix
diff --git a/pkgs/tools/system/gkraken/default.nix b/pkgs/by-name/gk/gkraken/package.nix
similarity index 100%
rename from pkgs/tools/system/gkraken/default.nix
rename to pkgs/by-name/gk/gkraken/package.nix
diff --git a/pkgs/games/gl-117/default.nix b/pkgs/by-name/gl/gl117/package.nix
similarity index 100%
rename from pkgs/games/gl-117/default.nix
rename to pkgs/by-name/gl/gl117/package.nix
diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/by-name/gl/gl2ps/package.nix
similarity index 100%
rename from pkgs/development/libraries/gl2ps/default.nix
rename to pkgs/by-name/gl/gl2ps/package.nix
diff --git a/pkgs/development/libraries/gl3w/default.nix b/pkgs/by-name/gl/gl3w/package.nix
similarity index 100%
rename from pkgs/development/libraries/gl3w/default.nix
rename to pkgs/by-name/gl/gl3w/package.nix
diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/by-name/gl/glabels/package.nix
similarity index 100%
rename from pkgs/applications/graphics/glabels/default.nix
rename to pkgs/by-name/gl/glabels/package.nix
diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/by-name/gl/glade/package.nix
similarity index 100%
rename from pkgs/development/tools/glade/default.nix
rename to pkgs/by-name/gl/glade/package.nix
diff --git a/pkgs/tools/typesetting/tex/gladtex/default.nix b/pkgs/by-name/gl/gladtex/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/tex/gladtex/default.nix
rename to pkgs/by-name/gl/gladtex/package.nix
diff --git a/pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage b/pkgs/by-name/gl/glamoroustoolkit/GlamorousToolkit-GetImage
similarity index 100%
rename from pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage
rename to pkgs/by-name/gl/glamoroustoolkit/GlamorousToolkit-GetImage
diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix
similarity index 100%
rename from pkgs/development/tools/glamoroustoolkit/default.nix
rename to pkgs/by-name/gl/glamoroustoolkit/package.nix
diff --git a/pkgs/tools/misc/glasgow/default.nix b/pkgs/by-name/gl/glasgow/package.nix
similarity index 100%
rename from pkgs/tools/misc/glasgow/default.nix
rename to pkgs/by-name/gl/glasgow/package.nix
diff --git a/pkgs/data/fonts/glasstty-ttf/default.nix b/pkgs/by-name/gl/glasstty-ttf/package.nix
similarity index 100%
rename from pkgs/data/fonts/glasstty-ttf/default.nix
rename to pkgs/by-name/gl/glasstty-ttf/package.nix
diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/by-name/gl/glava/package.nix
similarity index 100%
rename from pkgs/applications/misc/glava/default.nix
rename to pkgs/by-name/gl/glava/package.nix
diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/by-name/gl/glbinding/package.nix
similarity index 100%
rename from pkgs/development/libraries/glbinding/default.nix
rename to pkgs/by-name/gl/glbinding/package.nix
diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/by-name/gl/gle/package.nix
similarity index 100%
rename from pkgs/development/libraries/gle/default.nix
rename to pkgs/by-name/gl/gle/package.nix
diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/by-name/gl/glee/package.nix
similarity index 100%
rename from pkgs/tools/graphics/glee/default.nix
rename to pkgs/by-name/gl/glee/package.nix
diff --git a/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch b/pkgs/by-name/gl/glib-networking/disable-pkcs11-tests.patch
similarity index 100%
rename from pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch
rename to pkgs/by-name/gl/glib-networking/disable-pkcs11-tests.patch
diff --git a/pkgs/development/libraries/glib-networking/hardcode-gsettings.patch b/pkgs/by-name/gl/glib-networking/hardcode-gsettings.patch
similarity index 100%
rename from pkgs/development/libraries/glib-networking/hardcode-gsettings.patch
rename to pkgs/by-name/gl/glib-networking/hardcode-gsettings.patch
diff --git a/pkgs/development/libraries/glib-networking/installed-tests-path.patch b/pkgs/by-name/gl/glib-networking/installed-tests-path.patch
similarity index 100%
rename from pkgs/development/libraries/glib-networking/installed-tests-path.patch
rename to pkgs/by-name/gl/glib-networking/installed-tests-path.patch
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/by-name/gl/glib-networking/package.nix
similarity index 100%
rename from pkgs/development/libraries/glib-networking/default.nix
rename to pkgs/by-name/gl/glib-networking/package.nix
diff --git a/pkgs/development/libraries/glib-testing/installed-tests-path.patch b/pkgs/by-name/gl/glib-testing/installed-tests-path.patch
similarity index 100%
rename from pkgs/development/libraries/glib-testing/installed-tests-path.patch
rename to pkgs/by-name/gl/glib-testing/installed-tests-path.patch
diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/by-name/gl/glib-testing/package.nix
similarity index 100%
rename from pkgs/development/libraries/glib-testing/default.nix
rename to pkgs/by-name/gl/glib-testing/package.nix
diff --git a/pkgs/applications/audio/glicol-cli/default.nix b/pkgs/by-name/gl/glicol-cli/package.nix
similarity index 100%
rename from pkgs/applications/audio/glicol-cli/default.nix
rename to pkgs/by-name/gl/glicol-cli/package.nix
diff --git a/pkgs/applications/version-management/glitter/default.nix b/pkgs/by-name/gl/glitter/package.nix
similarity index 100%
rename from pkgs/applications/version-management/glitter/default.nix
rename to pkgs/by-name/gl/glitter/package.nix
diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/by-name/gl/gllvm/package.nix
similarity index 100%
rename from pkgs/development/tools/gllvm/default.nix
rename to pkgs/by-name/gl/gllvm/package.nix
diff --git a/pkgs/development/libraries/glm/glm.pc.in b/pkgs/by-name/gl/glm/glm.pc.in
similarity index 100%
rename from pkgs/development/libraries/glm/glm.pc.in
rename to pkgs/by-name/gl/glm/glm.pc.in
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/by-name/gl/glm/package.nix
similarity index 100%
rename from pkgs/development/libraries/glm/default.nix
rename to pkgs/by-name/gl/glm/package.nix
diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/by-name/gl/glmark2/package.nix
similarity index 100%
rename from pkgs/tools/graphics/glmark2/default.nix
rename to pkgs/by-name/gl/glmark2/package.nix
diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/by-name/gl/global-platform-pro/package.nix
similarity index 100%
rename from pkgs/development/tools/global-platform-pro/default.nix
rename to pkgs/by-name/gl/global-platform-pro/package.nix
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/by-name/gl/global/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/global/default.nix
rename to pkgs/by-name/gl/global/package.nix
diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/by-name/gl/globalarrays/package.nix
similarity index 100%
rename from pkgs/development/libraries/globalarrays/default.nix
rename to pkgs/by-name/gl/globalarrays/package.nix
diff --git a/pkgs/tools/networking/globalping-cli/default.nix b/pkgs/by-name/gl/globalping-cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/globalping-cli/default.nix
rename to pkgs/by-name/gl/globalping-cli/package.nix
diff --git a/pkgs/applications/misc/globe-cli/default.nix b/pkgs/by-name/gl/globe-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/globe-cli/default.nix
rename to pkgs/by-name/gl/globe-cli/package.nix
diff --git a/pkgs/games/globulation/header-order.patch b/pkgs/by-name/gl/globulation2/header-order.patch
similarity index 100%
rename from pkgs/games/globulation/header-order.patch
rename to pkgs/by-name/gl/globulation2/header-order.patch
diff --git a/pkgs/games/globulation/default.nix b/pkgs/by-name/gl/globulation2/package.nix
similarity index 100%
rename from pkgs/games/globulation/default.nix
rename to pkgs/by-name/gl/globulation2/package.nix
diff --git a/pkgs/games/globulation/public-buildproject.patch b/pkgs/by-name/gl/globulation2/public-buildproject.patch
similarity index 100%
rename from pkgs/games/globulation/public-buildproject.patch
rename to pkgs/by-name/gl/globulation2/public-buildproject.patch
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/by-name/gl/glog/package.nix
similarity index 100%
rename from pkgs/development/libraries/glog/default.nix
rename to pkgs/by-name/gl/glog/package.nix
diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/by-name/gl/glooctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/glooctl/default.nix
rename to pkgs/by-name/gl/glooctl/package.nix
diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/by-name/gl/gloox/package.nix
similarity index 100%
rename from pkgs/development/libraries/gloox/default.nix
rename to pkgs/by-name/gl/gloox/package.nix
diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/by-name/gl/glow/package.nix
similarity index 100%
rename from pkgs/applications/editors/glow/default.nix
rename to pkgs/by-name/gl/glow/package.nix
diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/by-name/gl/glowing-bear/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/glowing-bear/default.nix
rename to pkgs/by-name/gl/glowing-bear/package.nix
diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/by-name/gl/glpaper/package.nix
similarity index 100%
rename from pkgs/development/tools/glpaper/default.nix
rename to pkgs/by-name/gl/glpaper/package.nix
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/by-name/gl/glpk/package.nix
similarity index 100%
rename from pkgs/development/libraries/glpk/default.nix
rename to pkgs/by-name/gl/glpk/package.nix
diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/by-name/gl/glslang/package.nix
similarity index 100%
rename from pkgs/development/compilers/glslang/default.nix
rename to pkgs/by-name/gl/glslang/package.nix
diff --git a/pkgs/development/tools/language-servers/glslls/default.nix b/pkgs/by-name/gl/glslls/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/glslls/default.nix
rename to pkgs/by-name/gl/glslls/package.nix
diff --git a/pkgs/games/gltron/gentoo-prototypes.patch b/pkgs/by-name/gl/gltron/gentoo-prototypes.patch
similarity index 100%
rename from pkgs/games/gltron/gentoo-prototypes.patch
rename to pkgs/by-name/gl/gltron/gentoo-prototypes.patch
diff --git a/pkgs/games/gltron/default.nix b/pkgs/by-name/gl/gltron/package.nix
similarity index 100%
rename from pkgs/games/gltron/default.nix
rename to pkgs/by-name/gl/gltron/package.nix
diff --git a/pkgs/servers/sql/gluesql/default.nix b/pkgs/by-name/gl/gluesql/package.nix
similarity index 100%
rename from pkgs/servers/sql/gluesql/default.nix
rename to pkgs/by-name/gl/gluesql/package.nix
diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/by-name/gl/glui/package.nix
similarity index 100%
rename from pkgs/development/libraries/glui/default.nix
rename to pkgs/by-name/gl/glui/package.nix
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/by-name/gl/glusterfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/glusterfs/default.nix
rename to pkgs/by-name/gl/glusterfs/package.nix
diff --git a/pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch b/pkgs/by-name/gl/glusterfs/ssl_cert_path.patch
similarity index 100%
rename from pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch
rename to pkgs/by-name/gl/glusterfs/ssl_cert_path.patch
diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/by-name/gl/glyr/package.nix
similarity index 100%
rename from pkgs/tools/audio/glyr/default.nix
rename to pkgs/by-name/gl/glyr/package.nix
diff --git a/pkgs/games/gmad/default.nix b/pkgs/by-name/gm/gmad/package.nix
similarity index 100%
rename from pkgs/games/gmad/default.nix
rename to pkgs/by-name/gm/gmad/package.nix
diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/by-name/gm/gmailctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/gmailctl/default.nix
rename to pkgs/by-name/gm/gmailctl/package.nix
diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/by-name/gm/gmm/package.nix
similarity index 100%
rename from pkgs/development/libraries/gmm/default.nix
rename to pkgs/by-name/gm/gmm/package.nix
diff --git a/pkgs/applications/networking/browsers/gmni/default.nix b/pkgs/by-name/gm/gmni/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/gmni/default.nix
rename to pkgs/by-name/gm/gmni/package.nix
diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/by-name/gm/gmnisrv/package.nix
similarity index 100%
rename from pkgs/servers/gemini/gmnisrv/default.nix
rename to pkgs/by-name/gm/gmnisrv/package.nix
diff --git a/pkgs/applications/misc/gmnitohtml/default.nix b/pkgs/by-name/gm/gmnitohtml/package.nix
similarity index 100%
rename from pkgs/applications/misc/gmnitohtml/default.nix
rename to pkgs/by-name/gm/gmnitohtml/package.nix
diff --git a/pkgs/development/compilers/gmqcc/default.nix b/pkgs/by-name/gm/gmqcc/package.nix
similarity index 100%
rename from pkgs/development/compilers/gmqcc/default.nix
rename to pkgs/by-name/gm/gmqcc/package.nix
diff --git a/pkgs/applications/science/math/gmsh/fix-python.patch b/pkgs/by-name/gm/gmsh/fix-python.patch
similarity index 100%
rename from pkgs/applications/science/math/gmsh/fix-python.patch
rename to pkgs/by-name/gm/gmsh/fix-python.patch
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/by-name/gm/gmsh/package.nix
similarity index 100%
rename from pkgs/applications/science/math/gmsh/default.nix
rename to pkgs/by-name/gm/gmsh/package.nix
diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/by-name/gm/gmu/package.nix
similarity index 100%
rename from pkgs/applications/audio/gmu/default.nix
rename to pkgs/by-name/gm/gmu/package.nix
diff --git a/pkgs/development/tools/build-managers/gn/generic.nix b/pkgs/by-name/gn/gn/generic.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/gn/generic.nix
rename to pkgs/by-name/gn/gn/generic.nix
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/by-name/gn/gn/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/gn/default.nix
rename to pkgs/by-name/gn/gn/package.nix
diff --git a/pkgs/development/tools/build-managers/gn/setup-hook.sh b/pkgs/by-name/gn/gn/setup-hook.sh
similarity index 100%
rename from pkgs/development/tools/build-managers/gn/setup-hook.sh
rename to pkgs/by-name/gn/gn/setup-hook.sh
diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/by-name/gn/gnaural/package.nix
similarity index 100%
rename from pkgs/applications/audio/gnaural/default.nix
rename to pkgs/by-name/gn/gnaural/package.nix
diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/by-name/gn/gnet/package.nix
similarity index 100%
rename from pkgs/development/libraries/gnet/default.nix
rename to pkgs/by-name/gn/gnet/package.nix
diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/by-name/gn/gnirehtet/package.nix
similarity index 100%
rename from pkgs/tools/networking/gnirehtet/default.nix
rename to pkgs/by-name/gn/gnirehtet/package.nix
diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/by-name/gn/gnmic/package.nix
similarity index 100%
rename from pkgs/applications/networking/gnmic/default.nix
rename to pkgs/by-name/gn/gnmic/package.nix
diff --git a/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix b/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix
similarity index 100%
rename from pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix
rename to pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix
diff --git a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/pkgs/by-name/gn/gnome-browser-connector/package.nix
similarity index 100%
rename from pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix
rename to pkgs/by-name/gn/gnome-browser-connector/package.nix
diff --git a/pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch b/pkgs/by-name/gn/gnome-builder/fix-finding-test-typelibs.patch
similarity index 100%
rename from pkgs/applications/editors/gnome-builder/fix-finding-test-typelibs.patch
rename to pkgs/by-name/gn/gnome-builder/fix-finding-test-typelibs.patch
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/by-name/gn/gnome-builder/package.nix
similarity index 100%
rename from pkgs/applications/editors/gnome-builder/default.nix
rename to pkgs/by-name/gn/gnome-builder/package.nix
diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/by-name/gn/gnome-console/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/gnome-console/default.nix
rename to pkgs/by-name/gn/gnome-console/package.nix
diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/by-name/gn/gnome-desktop-testing/package.nix
similarity index 100%
rename from pkgs/development/tools/gnome-desktop-testing/default.nix
rename to pkgs/by-name/gn/gnome-desktop-testing/package.nix
diff --git a/pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch b/pkgs/by-name/gn/gnome-desktop/bubblewrap-paths.patch
similarity index 100%
rename from pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch
rename to pkgs/by-name/gn/gnome-desktop/bubblewrap-paths.patch
diff --git a/pkgs/development/libraries/gnome-desktop/default.nix b/pkgs/by-name/gn/gnome-desktop/package.nix
similarity index 100%
rename from pkgs/development/libraries/gnome-desktop/default.nix
rename to pkgs/by-name/gn/gnome-desktop/package.nix
diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/by-name/gn/gnome-doc-utils/package.nix
similarity index 100%
rename from pkgs/development/tools/documentation/gnome-doc-utils/default.nix
rename to pkgs/by-name/gn/gnome-doc-utils/package.nix
diff --git a/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix b/pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix
similarity index 100%
rename from pkgs/applications/misc/gnome-epub-thumbnailer/default.nix
rename to pkgs/by-name/gn/gnome-epub-thumbnailer/package.nix
diff --git a/pkgs/applications/misc/gnome-extension-manager/default.nix b/pkgs/by-name/gn/gnome-extension-manager/package.nix
similarity index 100%
rename from pkgs/applications/misc/gnome-extension-manager/default.nix
rename to pkgs/by-name/gn/gnome-extension-manager/package.nix
diff --git a/pkgs/applications/misc/gnome-frog/default.nix b/pkgs/by-name/gn/gnome-frog/package.nix
similarity index 100%
rename from pkgs/applications/misc/gnome-frog/default.nix
rename to pkgs/by-name/gn/gnome-frog/package.nix
diff --git a/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch b/pkgs/by-name/gn/gnome-frog/update-compatible-with-non-flatpak-env.patch
similarity index 100%
rename from pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch
rename to pkgs/by-name/gn/gnome-frog/update-compatible-with-non-flatpak-env.patch
diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/by-name/gn/gnome-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/gnome-icon-theme/default.nix
rename to pkgs/by-name/gn/gnome-icon-theme/package.nix
diff --git a/pkgs/applications/editors/gnome-inform7/default.nix b/pkgs/by-name/gn/gnome-inform7/package.nix
similarity index 100%
rename from pkgs/applications/editors/gnome-inform7/default.nix
rename to pkgs/by-name/gn/gnome-inform7/package.nix
diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/by-name/gn/gnome-keysign/package.nix
similarity index 100%
rename from pkgs/tools/security/gnome-keysign/default.nix
rename to pkgs/by-name/gn/gnome-keysign/package.nix
diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/by-name/gn/gnome-menus/package.nix
similarity index 100%
rename from pkgs/development/libraries/gnome-menus/default.nix
rename to pkgs/by-name/gn/gnome-menus/package.nix
diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/by-name/gn/gnome-multi-writer/package.nix
similarity index 100%
rename from pkgs/applications/misc/gnome-multi-writer/default.nix
rename to pkgs/by-name/gn/gnome-multi-writer/package.nix
diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/by-name/gn/gnome-network-displays/package.nix
similarity index 100%
rename from pkgs/applications/networking/gnome-network-displays/default.nix
rename to pkgs/by-name/gn/gnome-network-displays/package.nix
diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix
similarity index 100%
rename from pkgs/development/libraries/gnome-online-accounts/default.nix
rename to pkgs/by-name/gn/gnome-online-accounts/package.nix
diff --git a/pkgs/applications/graphics/gnome-photos/installed-tests-path.patch b/pkgs/by-name/gn/gnome-photos/installed-tests-path.patch
similarity index 100%
rename from pkgs/applications/graphics/gnome-photos/installed-tests-path.patch
rename to pkgs/by-name/gn/gnome-photos/installed-tests-path.patch
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/by-name/gn/gnome-photos/package.nix
similarity index 100%
rename from pkgs/applications/graphics/gnome-photos/default.nix
rename to pkgs/by-name/gn/gnome-photos/package.nix
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/by-name/gn/gnome-podcasts/package.nix
similarity index 100%
rename from pkgs/applications/audio/gnome-podcasts/default.nix
rename to pkgs/by-name/gn/gnome-podcasts/package.nix
diff --git a/pkgs/tools/wayland/gnome-randr/default.nix b/pkgs/by-name/gn/gnome-randr/package.nix
similarity index 100%
rename from pkgs/tools/wayland/gnome-randr/default.nix
rename to pkgs/by-name/gn/gnome-randr/package.nix
diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/by-name/gn/gnome-recipes/package.nix
similarity index 100%
rename from pkgs/applications/misc/gnome-recipes/default.nix
rename to pkgs/by-name/gn/gnome-recipes/package.nix
diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/by-name/gn/gnome-secrets/package.nix
similarity index 100%
rename from pkgs/applications/misc/gnome-secrets/default.nix
rename to pkgs/by-name/gn/gnome-secrets/package.nix
diff --git a/pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch b/pkgs/by-name/gn/gnome-settings-daemon43/fix-paths.patch
similarity index 100%
rename from pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch
rename to pkgs/by-name/gn/gnome-settings-daemon43/fix-paths.patch
diff --git a/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix b/pkgs/by-name/gn/gnome-settings-daemon43/package.nix
similarity index 100%
rename from pkgs/by-name/gn/gnome-settings-daemon/43/default.nix
rename to pkgs/by-name/gn/gnome-settings-daemon43/package.nix
diff --git a/pkgs/applications/misc/gnome-solanum/default.nix b/pkgs/by-name/gn/gnome-solanum/package.nix
similarity index 100%
rename from pkgs/applications/misc/gnome-solanum/default.nix
rename to pkgs/by-name/gn/gnome-solanum/package.nix
diff --git a/pkgs/applications/misc/gnome-tecla/default.nix b/pkgs/by-name/gn/gnome-tecla/package.nix
similarity index 100%
rename from pkgs/applications/misc/gnome-tecla/default.nix
rename to pkgs/by-name/gn/gnome-tecla/package.nix
diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/by-name/gn/gnome-usage/package.nix
similarity index 100%
rename from pkgs/applications/misc/gnome-usage/default.nix
rename to pkgs/by-name/gn/gnome-usage/package.nix
diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix
similarity index 100%
rename from pkgs/data/documentation/gnome-user-docs/default.nix
rename to pkgs/by-name/gn/gnome-user-docs/package.nix
diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/by-name/gn/gnome-video-effects/package.nix
similarity index 100%
rename from pkgs/development/libraries/gnome-video-effects/default.nix
rename to pkgs/by-name/gn/gnome-video-effects/package.nix
diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/by-name/gn/gnomecast/package.nix
similarity index 100%
rename from pkgs/applications/video/gnomecast/default.nix
rename to pkgs/by-name/gn/gnomecast/package.nix
diff --git a/pkgs/games/gnonograms/default.nix b/pkgs/by-name/gn/gnonograms/package.nix
similarity index 100%
rename from pkgs/games/gnonograms/default.nix
rename to pkgs/by-name/gn/gnonograms/package.nix
diff --git a/pkgs/development/compilers/gnostic/default.nix b/pkgs/by-name/gn/gnostic/package.nix
similarity index 100%
rename from pkgs/development/compilers/gnostic/default.nix
rename to pkgs/by-name/gn/gnostic/package.nix
diff --git a/pkgs/applications/office/gnote/default.nix b/pkgs/by-name/gn/gnote/package.nix
similarity index 100%
rename from pkgs/applications/office/gnote/default.nix
rename to pkgs/by-name/gn/gnote/package.nix
diff --git a/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch b/pkgs/by-name/gn/gnss-sdr/fix_libcpu_features_install_path.patch
similarity index 100%
rename from pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch
rename to pkgs/by-name/gn/gnss-sdr/fix_libcpu_features_install_path.patch
diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/by-name/gn/gnss-sdr/package.nix
similarity index 100%
rename from pkgs/applications/radio/gnss-sdr/default.nix
rename to pkgs/by-name/gn/gnss-sdr/package.nix
diff --git a/pkgs/servers/gnss-share/default.nix b/pkgs/by-name/gn/gnss-share/package.nix
similarity index 100%
rename from pkgs/servers/gnss-share/default.nix
rename to pkgs/by-name/gn/gnss-share/package.nix
diff --git a/pkgs/development/compilers/gnu-cim/default.nix b/pkgs/by-name/gn/gnu-cim/package.nix
similarity index 100%
rename from pkgs/development/compilers/gnu-cim/default.nix
rename to pkgs/by-name/gn/gnu-cim/package.nix
diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/by-name/gn/gnu-config/package.nix
similarity index 100%
rename from pkgs/development/libraries/gnu-config/default.nix
rename to pkgs/by-name/gn/gnu-config/package.nix
diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/by-name/gn/gnu-pw-mgr/package.nix
similarity index 100%
rename from pkgs/tools/security/gnu-pw-mgr/default.nix
rename to pkgs/by-name/gn/gnu-pw-mgr/package.nix
diff --git a/pkgs/misc/gnu-shepherd/default.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix
similarity index 100%
rename from pkgs/misc/gnu-shepherd/default.nix
rename to pkgs/by-name/gn/gnu-shepherd/package.nix
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/by-name/gn/gnuapl/package.nix
similarity index 100%
rename from pkgs/development/interpreters/gnu-apl/default.nix
rename to pkgs/by-name/gn/gnuapl/package.nix
diff --git a/pkgs/games/gnubg/default.nix b/pkgs/by-name/gn/gnubg/package.nix
similarity index 100%
rename from pkgs/games/gnubg/default.nix
rename to pkgs/by-name/gn/gnubg/package.nix
diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/by-name/gn/gnuchess/package.nix
similarity index 100%
rename from pkgs/games/gnuchess/default.nix
rename to pkgs/by-name/gn/gnuchess/package.nix
diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/by-name/gn/gnuclad/package.nix
similarity index 100%
rename from pkgs/applications/graphics/gnuclad/default.nix
rename to pkgs/by-name/gn/gnuclad/package.nix
diff --git a/pkgs/games/gnugo/default.nix b/pkgs/by-name/gn/gnugo/package.nix
similarity index 100%
rename from pkgs/games/gnugo/default.nix
rename to pkgs/by-name/gn/gnugo/package.nix
diff --git a/pkgs/games/gnujump/gnujump.xpm b/pkgs/by-name/gn/gnujump/gnujump.xpm
similarity index 100%
rename from pkgs/games/gnujump/gnujump.xpm
rename to pkgs/by-name/gn/gnujump/gnujump.xpm
diff --git a/pkgs/games/gnujump/default.nix b/pkgs/by-name/gn/gnujump/package.nix
similarity index 100%
rename from pkgs/games/gnujump/default.nix
rename to pkgs/by-name/gn/gnujump/package.nix
diff --git a/pkgs/development/tools/gnulib/gnulib-longdouble-redirect.patch b/pkgs/by-name/gn/gnulib/gnulib-longdouble-redirect.patch
similarity index 100%
rename from pkgs/development/tools/gnulib/gnulib-longdouble-redirect.patch
rename to pkgs/by-name/gn/gnulib/gnulib-longdouble-redirect.patch
diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/by-name/gn/gnulib/package.nix
similarity index 100%
rename from pkgs/development/tools/gnulib/default.nix
rename to pkgs/by-name/gn/gnulib/package.nix
diff --git a/pkgs/development/tools/misc/gnum4/loong-fix-build.patch b/pkgs/by-name/gn/gnum4/loong-fix-build.patch
similarity index 100%
rename from pkgs/development/tools/misc/gnum4/loong-fix-build.patch
rename to pkgs/by-name/gn/gnum4/loong-fix-build.patch
diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/by-name/gn/gnum4/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/gnum4/default.nix
rename to pkgs/by-name/gn/gnum4/package.nix
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch b/pkgs/by-name/gn/gnumake42/glibc-2.27-glob.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.27-glob.patch
rename to pkgs/by-name/gn/gnumake42/glibc-2.27-glob.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch b/pkgs/by-name/gn/gnumake42/glibc-2.33-glob.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/4.2/glibc-2.33-glob.patch
rename to pkgs/by-name/gn/gnumake42/glibc-2.33-glob.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch b/pkgs/by-name/gn/gnumake42/impure-dirs.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs.patch
rename to pkgs/by-name/gn/gnumake42/impure-dirs.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/by-name/gn/gnumake42/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/4.2/default.nix
rename to pkgs/by-name/gn/gnumake42/package.nix
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch b/pkgs/by-name/gn/gnumake42/pselect.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/gnumake/4.2/pselect.patch
rename to pkgs/by-name/gn/gnumake42/pselect.patch
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/by-name/gn/gnumeric/package.nix
similarity index 100%
rename from pkgs/applications/office/gnumeric/default.nix
rename to pkgs/by-name/gn/gnumeric/package.nix
diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix
similarity index 100%
rename from pkgs/tools/security/gnupg-pkcs11-scd/default.nix
rename to pkgs/by-name/gn/gnupg-pkcs11-scd/package.nix
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/by-name/gn/gnupth/package.nix
similarity index 100%
rename from pkgs/development/libraries/pth/default.nix
rename to pkgs/by-name/gn/gnupth/package.nix
diff --git a/pkgs/games/gnushogi/default.nix b/pkgs/by-name/gn/gnushogi/package.nix
similarity index 100%
rename from pkgs/games/gnushogi/default.nix
rename to pkgs/by-name/gn/gnushogi/package.nix
diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/by-name/go/go-2fa/package.nix
similarity index 100%
rename from pkgs/tools/security/2fa/default.nix
rename to pkgs/by-name/go/go-2fa/package.nix
diff --git a/pkgs/tools/system/go-audit/default.nix b/pkgs/by-name/go/go-audit/package.nix
similarity index 100%
rename from pkgs/tools/system/go-audit/default.nix
rename to pkgs/by-name/go/go-audit/package.nix
diff --git a/pkgs/servers/go-autoconfig/default.nix b/pkgs/by-name/go/go-autoconfig/package.nix
similarity index 100%
rename from pkgs/servers/go-autoconfig/default.nix
rename to pkgs/by-name/go/go-autoconfig/package.nix
diff --git a/pkgs/development/tools/go-bindata-assetfs/default.nix b/pkgs/by-name/go/go-bindata-assetfs/package.nix
similarity index 100%
rename from pkgs/development/tools/go-bindata-assetfs/default.nix
rename to pkgs/by-name/go/go-bindata-assetfs/package.nix
diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/by-name/go/go-bindata/package.nix
similarity index 100%
rename from pkgs/development/tools/go-bindata/default.nix
rename to pkgs/by-name/go/go-bindata/package.nix
diff --git a/pkgs/development/tools/go-callvis/default.nix b/pkgs/by-name/go/go-callvis/package.nix
similarity index 100%
rename from pkgs/development/tools/go-callvis/default.nix
rename to pkgs/by-name/go/go-callvis/package.nix
diff --git a/pkgs/development/tools/check/default.nix b/pkgs/by-name/go/go-check/package.nix
similarity index 100%
rename from pkgs/development/tools/check/default.nix
rename to pkgs/by-name/go/go-check/package.nix
diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/by-name/go/go-containerregistry/package.nix
similarity index 100%
rename from pkgs/development/tools/go-containerregistry/default.nix
rename to pkgs/by-name/go/go-containerregistry/package.nix
diff --git a/pkgs/servers/go-cqhttp/default.nix b/pkgs/by-name/go/go-cqhttp/package.nix
similarity index 100%
rename from pkgs/servers/go-cqhttp/default.nix
rename to pkgs/by-name/go/go-cqhttp/package.nix
diff --git a/pkgs/tools/security/go-cve-search/default.nix b/pkgs/by-name/go/go-cve-search/package.nix
similarity index 100%
rename from pkgs/tools/security/go-cve-search/default.nix
rename to pkgs/by-name/go/go-cve-search/package.nix
diff --git a/pkgs/tools/security/go-dork/default.nix b/pkgs/by-name/go/go-dork/package.nix
similarity index 100%
rename from pkgs/tools/security/go-dork/default.nix
rename to pkgs/by-name/go/go-dork/package.nix
diff --git a/pkgs/tools/security/go-exploitdb/default.nix b/pkgs/by-name/go/go-exploitdb/package.nix
similarity index 100%
rename from pkgs/tools/security/go-exploitdb/default.nix
rename to pkgs/by-name/go/go-exploitdb/package.nix
diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/by-name/go/go-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/go-font/default.nix
rename to pkgs/by-name/go/go-font/package.nix
diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/by-name/go/go-graft/package.nix
similarity index 100%
rename from pkgs/applications/networking/go-graft/default.nix
rename to pkgs/by-name/go/go-graft/package.nix
diff --git a/pkgs/tools/misc/go-ios/default.nix b/pkgs/by-name/go/go-ios/package.nix
similarity index 100%
rename from pkgs/tools/misc/go-ios/default.nix
rename to pkgs/by-name/go/go-ios/package.nix
diff --git a/pkgs/development/tools/go-jet/default.nix b/pkgs/by-name/go/go-jet/package.nix
similarity index 100%
rename from pkgs/development/tools/go-jet/default.nix
rename to pkgs/by-name/go/go-jet/package.nix
diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/by-name/go/go-jira/package.nix
similarity index 100%
rename from pkgs/applications/misc/go-jira/default.nix
rename to pkgs/by-name/go/go-jira/package.nix
diff --git a/pkgs/development/tools/go-junit-report/default.nix b/pkgs/by-name/go/go-junit-report/package.nix
similarity index 100%
rename from pkgs/development/tools/go-junit-report/default.nix
rename to pkgs/by-name/go/go-junit-report/package.nix
diff --git a/pkgs/servers/go-libp2p-daemon/default.nix b/pkgs/by-name/go/go-libp2p-daemon/package.nix
similarity index 100%
rename from pkgs/servers/go-libp2p-daemon/default.nix
rename to pkgs/by-name/go/go-libp2p-daemon/package.nix
diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/by-name/go/go-license-detector/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/go-license-detector/default.nix
rename to pkgs/by-name/go/go-license-detector/package.nix
diff --git a/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch b/pkgs/by-name/go/go-licenses/fix-go-version-error.patch
similarity index 100%
rename from pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch
rename to pkgs/by-name/go/go-licenses/fix-go-version-error.patch
diff --git a/pkgs/development/tools/misc/go-licenses/default.nix b/pkgs/by-name/go/go-licenses/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/go-licenses/default.nix
rename to pkgs/by-name/go/go-licenses/package.nix
diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/by-name/go/go-md2man/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/go-md2man/default.nix
rename to pkgs/by-name/go/go-md2man/package.nix
diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/by-name/go/go-migrate/package.nix
similarity index 100%
rename from pkgs/development/tools/go-migrate/default.nix
rename to pkgs/by-name/go/go-migrate/package.nix
diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/by-name/go/go-minimock/package.nix
similarity index 100%
rename from pkgs/development/tools/go-minimock/default.nix
rename to pkgs/by-name/go/go-minimock/package.nix
diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/by-name/go/go-mockery/package.nix
similarity index 100%
rename from pkgs/development/tools/go-mockery/default.nix
rename to pkgs/by-name/go/go-mockery/package.nix
diff --git a/pkgs/development/tools/go-mod-graph-chart/default.nix b/pkgs/by-name/go/go-mod-graph-chart/package.nix
similarity index 100%
rename from pkgs/development/tools/go-mod-graph-chart/default.nix
rename to pkgs/by-name/go/go-mod-graph-chart/package.nix
diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/by-name/go/go-motion/package.nix
similarity index 100%
rename from pkgs/development/tools/go-motion/default.nix
rename to pkgs/by-name/go/go-motion/package.nix
diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/by-name/go/go-mtpfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/go-mtpfs/default.nix
rename to pkgs/by-name/go/go-mtpfs/package.nix
diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/by-name/go/go-musicfox/package.nix
similarity index 100%
rename from pkgs/applications/audio/go-musicfox/default.nix
rename to pkgs/by-name/go/go-musicfox/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/pkgs/by-name/go/go-neb/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/go-neb/default.nix
rename to pkgs/by-name/go/go-neb/package.nix
diff --git a/pkgs/applications/misc/go-org/default.nix b/pkgs/by-name/go/go-org/package.nix
similarity index 100%
rename from pkgs/applications/misc/go-org/default.nix
rename to pkgs/by-name/go/go-org/package.nix
diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/by-name/go/go-outline/package.nix
similarity index 100%
rename from pkgs/development/tools/go-outline/default.nix
rename to pkgs/by-name/go/go-outline/package.nix
diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/by-name/go/go-protobuf/package.nix
similarity index 100%
rename from pkgs/development/tools/go-protobuf/default.nix
rename to pkgs/by-name/go/go-protobuf/package.nix
diff --git a/pkgs/tools/misc/go.rice/default.nix b/pkgs/by-name/go/go-rice/package.nix
similarity index 100%
rename from pkgs/tools/misc/go.rice/default.nix
rename to pkgs/by-name/go/go-rice/package.nix
diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/by-name/go/go-sct/package.nix
similarity index 100%
rename from pkgs/tools/X11/go-sct/default.nix
rename to pkgs/by-name/go/go-sct/package.nix
diff --git a/pkgs/tools/networking/go-shadowsocks2/default.nix b/pkgs/by-name/go/go-shadowsocks2/package.nix
similarity index 100%
rename from pkgs/tools/networking/go-shadowsocks2/default.nix
rename to pkgs/by-name/go/go-shadowsocks2/package.nix
diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/by-name/go/go-swag/package.nix
similarity index 100%
rename from pkgs/development/tools/go-swag/default.nix
rename to pkgs/by-name/go/go-swag/package.nix
diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/by-name/go/go-swagger/package.nix
similarity index 100%
rename from pkgs/development/tools/go-swagger/default.nix
rename to pkgs/by-name/go/go-swagger/package.nix
diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/by-name/go/go-task/package.nix
similarity index 100%
rename from pkgs/development/tools/go-task/default.nix
rename to pkgs/by-name/go/go-task/package.nix
diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/by-name/go/go-toml/package.nix
similarity index 100%
rename from pkgs/development/tools/go-toml/default.nix
rename to pkgs/by-name/go/go-toml/package.nix
diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/by-name/go/go-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/go-tools/default.nix
rename to pkgs/by-name/go/go-tools/package.nix
diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/by-name/go/go2rtc/package.nix
similarity index 100%
rename from pkgs/tools/video/go2rtc/default.nix
rename to pkgs/by-name/go/go2rtc/package.nix
diff --git a/pkgs/tools/security/go365/default.nix b/pkgs/by-name/go/go365/package.nix
similarity index 100%
rename from pkgs/tools/security/go365/default.nix
rename to pkgs/by-name/go/go365/package.nix
diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/by-name/go/goa/package.nix
similarity index 100%
rename from pkgs/development/tools/goa/default.nix
rename to pkgs/by-name/go/goa/package.nix
diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/by-name/go/goaccess/package.nix
similarity index 100%
rename from pkgs/tools/misc/goaccess/default.nix
rename to pkgs/by-name/go/goaccess/package.nix
diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/by-name/go/goawk/package.nix
similarity index 100%
rename from pkgs/tools/text/goawk/default.nix
rename to pkgs/by-name/go/goawk/package.nix
diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/by-name/go/gob2/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/gob2/default.nix
rename to pkgs/by-name/go/gob2/package.nix
diff --git a/pkgs/tools/X11/gobble/default.nix b/pkgs/by-name/go/gobble/package.nix
similarity index 100%
rename from pkgs/tools/X11/gobble/default.nix
rename to pkgs/by-name/go/gobble/package.nix
diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/by-name/go/gobby/package.nix
similarity index 100%
rename from pkgs/applications/editors/gobby/default.nix
rename to pkgs/by-name/go/gobby/package.nix
diff --git a/pkgs/servers/gobetween/gomod.patch b/pkgs/by-name/go/gobetween/gomod.patch
similarity index 100%
rename from pkgs/servers/gobetween/gomod.patch
rename to pkgs/by-name/go/gobetween/gomod.patch
diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/by-name/go/gobetween/package.nix
similarity index 100%
rename from pkgs/servers/gobetween/default.nix
rename to pkgs/by-name/go/gobetween/package.nix
diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/by-name/go/gobgp/package.nix
similarity index 100%
rename from pkgs/tools/networking/gobgp/default.nix
rename to pkgs/by-name/go/gobgp/package.nix
diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/by-name/go/gobgpd/package.nix
similarity index 100%
rename from pkgs/servers/misc/gobgpd/default.nix
rename to pkgs/by-name/go/gobgpd/package.nix
diff --git a/pkgs/os-specific/linux/gobi_loader/default.nix b/pkgs/by-name/go/gobi_loader/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/gobi_loader/default.nix
rename to pkgs/by-name/go/gobi_loader/package.nix
diff --git a/pkgs/tools/security/goblob/default.nix b/pkgs/by-name/go/goblob/package.nix
similarity index 100%
rename from pkgs/tools/security/goblob/default.nix
rename to pkgs/by-name/go/goblob/package.nix
diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/by-name/go/gobuster/package.nix
similarity index 100%
rename from pkgs/tools/security/gobuster/default.nix
rename to pkgs/by-name/go/gobuster/package.nix
diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/by-name/go/gocd-agent/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/gocd-agent/default.nix
rename to pkgs/by-name/go/gocd-agent/package.nix
diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/by-name/go/gocd-server/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/gocd-server/default.nix
rename to pkgs/by-name/go/gocd-server/package.nix
diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/by-name/go/gocode-gomod/package.nix
similarity index 100%
rename from pkgs/development/tools/gocode-gomod/default.nix
rename to pkgs/by-name/go/gocode-gomod/package.nix
diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/by-name/go/goconst/package.nix
similarity index 100%
rename from pkgs/development/tools/goconst/default.nix
rename to pkgs/by-name/go/goconst/package.nix
diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/by-name/go/goconvey/package.nix
similarity index 100%
rename from pkgs/development/tools/goconvey/default.nix
rename to pkgs/by-name/go/goconvey/package.nix
diff --git a/pkgs/development/tools/gocover-cobertura/default.nix b/pkgs/by-name/go/gocover-cobertura/package.nix
similarity index 100%
rename from pkgs/development/tools/gocover-cobertura/default.nix
rename to pkgs/by-name/go/gocover-cobertura/package.nix
diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/by-name/go/gocr/package.nix
similarity index 100%
rename from pkgs/applications/graphics/gocr/default.nix
rename to pkgs/by-name/go/gocr/package.nix
diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/by-name/go/gocryptfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/gocryptfs/default.nix
rename to pkgs/by-name/go/gocryptfs/package.nix
diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/by-name/go/gocyclo/package.nix
similarity index 100%
rename from pkgs/development/tools/gocyclo/default.nix
rename to pkgs/by-name/go/gocyclo/package.nix
diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/by-name/go/godef/package.nix
similarity index 100%
rename from pkgs/development/tools/godef/default.nix
rename to pkgs/by-name/go/godef/package.nix
diff --git a/pkgs/tools/networking/godspeed/default.nix b/pkgs/by-name/go/godspeed/package.nix
similarity index 100%
rename from pkgs/tools/networking/godspeed/default.nix
rename to pkgs/by-name/go/godspeed/package.nix
diff --git a/pkgs/tools/misc/godu/default.nix b/pkgs/by-name/go/godu/package.nix
similarity index 100%
rename from pkgs/tools/misc/godu/default.nix
rename to pkgs/by-name/go/godu/package.nix
diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/by-name/go/goeland/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/goeland/default.nix
rename to pkgs/by-name/go/goeland/package.nix
diff --git a/pkgs/tools/networking/gof5/default.nix b/pkgs/by-name/go/gof5/package.nix
similarity index 100%
rename from pkgs/tools/networking/gof5/default.nix
rename to pkgs/by-name/go/gof5/package.nix
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/by-name/go/goffice/package.nix
similarity index 100%
rename from pkgs/development/libraries/goffice/default.nix
rename to pkgs/by-name/go/goffice/package.nix
diff --git a/pkgs/tools/networking/goflow/default.nix b/pkgs/by-name/go/goflow/package.nix
similarity index 100%
rename from pkgs/tools/networking/goflow/default.nix
rename to pkgs/by-name/go/goflow/package.nix
diff --git a/pkgs/applications/misc/gofu/default.nix b/pkgs/by-name/go/gofu/package.nix
similarity index 100%
rename from pkgs/applications/misc/gofu/default.nix
rename to pkgs/by-name/go/gofu/package.nix
diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/by-name/go/gogetdoc/package.nix
similarity index 100%
rename from pkgs/development/tools/gogetdoc/default.nix
rename to pkgs/by-name/go/gogetdoc/package.nix
diff --git a/pkgs/games/gogui/default.nix b/pkgs/by-name/go/gogui/package.nix
similarity index 100%
rename from pkgs/games/gogui/default.nix
rename to pkgs/by-name/go/gogui/package.nix
diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/by-name/go/gohai/package.nix
similarity index 100%
rename from pkgs/tools/system/gohai/default.nix
rename to pkgs/by-name/go/gohai/package.nix
diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/by-name/go/gohufont/package.nix
similarity index 100%
rename from pkgs/data/fonts/gohufont/default.nix
rename to pkgs/by-name/go/gohufont/package.nix
diff --git a/pkgs/tools/networking/goimapnotify/default.nix b/pkgs/by-name/go/goimapnotify/package.nix
similarity index 100%
rename from pkgs/tools/networking/goimapnotify/default.nix
rename to pkgs/by-name/go/goimapnotify/package.nix
diff --git a/pkgs/development/tools/goimports-reviser/default.nix b/pkgs/by-name/go/goimports-reviser/package.nix
similarity index 100%
rename from pkgs/development/tools/goimports-reviser/default.nix
rename to pkgs/by-name/go/goimports-reviser/package.nix
diff --git a/pkgs/development/tools/gojsontoyaml/default.nix b/pkgs/by-name/go/gojsontoyaml/package.nix
similarity index 100%
rename from pkgs/development/tools/gojsontoyaml/default.nix
rename to pkgs/by-name/go/gojsontoyaml/package.nix
diff --git a/pkgs/development/tools/gokart/default.nix b/pkgs/by-name/go/gokart/package.nix
similarity index 100%
rename from pkgs/development/tools/gokart/default.nix
rename to pkgs/by-name/go/gokart/package.nix
diff --git a/pkgs/development/misc/gokrazy/default.nix b/pkgs/by-name/go/gokrazy/package.nix
similarity index 100%
rename from pkgs/development/misc/gokrazy/default.nix
rename to pkgs/by-name/go/gokrazy/package.nix
diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/by-name/go/goku/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/goku/default.nix
rename to pkgs/by-name/go/goku/package.nix
diff --git a/pkgs/development/tools/golangci-lint-langserver/default.nix b/pkgs/by-name/go/golangci-lint-langserver/package.nix
similarity index 100%
rename from pkgs/development/tools/golangci-lint-langserver/default.nix
rename to pkgs/by-name/go/golangci-lint-langserver/package.nix
diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/by-name/go/golangci-lint/package.nix
similarity index 100%
rename from pkgs/development/tools/golangci-lint/default.nix
rename to pkgs/by-name/go/golangci-lint/package.nix
diff --git a/pkgs/applications/misc/golden-cheetah-bin/default.nix b/pkgs/by-name/go/golden-cheetah-bin/package.nix
similarity index 100%
rename from pkgs/applications/misc/golden-cheetah-bin/default.nix
rename to pkgs/by-name/go/golden-cheetah-bin/package.nix
diff --git a/pkgs/development/tools/golines/default.nix b/pkgs/by-name/go/golines/package.nix
similarity index 100%
rename from pkgs/development/tools/golines/default.nix
rename to pkgs/by-name/go/golines/package.nix
diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/by-name/go/golint/package.nix
similarity index 100%
rename from pkgs/development/tools/golint/default.nix
rename to pkgs/by-name/go/golint/package.nix
diff --git a/pkgs/development/libraries/gom/longer-stress-timeout.patch b/pkgs/by-name/go/gom/longer-stress-timeout.patch
similarity index 100%
rename from pkgs/development/libraries/gom/longer-stress-timeout.patch
rename to pkgs/by-name/go/gom/longer-stress-timeout.patch
diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/by-name/go/gom/package.nix
similarity index 100%
rename from pkgs/development/libraries/gom/default.nix
rename to pkgs/by-name/go/gom/package.nix
diff --git a/pkgs/development/tools/gomacro/default.nix b/pkgs/by-name/go/gomacro/package.nix
similarity index 100%
rename from pkgs/development/tools/gomacro/default.nix
rename to pkgs/by-name/go/gomacro/package.nix
diff --git a/pkgs/tools/security/gomapenum/default.nix b/pkgs/by-name/go/gomapenum/package.nix
similarity index 100%
rename from pkgs/tools/security/gomapenum/default.nix
rename to pkgs/by-name/go/gomapenum/package.nix
diff --git a/pkgs/applications/misc/gomatrix/default.nix b/pkgs/by-name/go/gomatrix/package.nix
similarity index 100%
rename from pkgs/applications/misc/gomatrix/default.nix
rename to pkgs/by-name/go/gomatrix/package.nix
diff --git a/pkgs/tools/misc/gomi/default.nix b/pkgs/by-name/go/gomi/package.nix
similarity index 100%
rename from pkgs/tools/misc/gomi/default.nix
rename to pkgs/by-name/go/gomi/package.nix
diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/by-name/go/gomodifytags/package.nix
similarity index 100%
rename from pkgs/development/tools/gomodifytags/default.nix
rename to pkgs/by-name/go/gomodifytags/package.nix
diff --git a/pkgs/applications/version-management/gomp/default.nix b/pkgs/by-name/go/gomp/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gomp/default.nix
rename to pkgs/by-name/go/gomp/package.nix
diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/by-name/go/gomplate/package.nix
similarity index 100%
rename from pkgs/development/tools/gomplate/default.nix
rename to pkgs/by-name/go/gomplate/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/by-name/go/gomuks/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/gomuks/default.nix
rename to pkgs/by-name/go/gomuks/package.nix
diff --git a/pkgs/servers/gonic/default.nix b/pkgs/by-name/go/gonic/package.nix
similarity index 100%
rename from pkgs/servers/gonic/default.nix
rename to pkgs/by-name/go/gonic/package.nix
diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/by-name/go/goocanvasmm2/package.nix
similarity index 100%
rename from pkgs/development/libraries/goocanvasmm/default.nix
rename to pkgs/by-name/go/goocanvasmm2/package.nix
diff --git a/pkgs/tools/networking/goodhosts/default.nix b/pkgs/by-name/go/goodhosts/package.nix
similarity index 100%
rename from pkgs/tools/networking/goodhosts/default.nix
rename to pkgs/by-name/go/goodhosts/package.nix
diff --git a/pkgs/applications/audio/goodvibes/default.nix b/pkgs/by-name/go/goodvibes/package.nix
similarity index 100%
rename from pkgs/applications/audio/goodvibes/default.nix
rename to pkgs/by-name/go/goodvibes/package.nix
diff --git a/pkgs/tools/filesystems/goofys/default.nix b/pkgs/by-name/go/goofys/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/goofys/default.nix
rename to pkgs/by-name/go/goofys/package.nix
diff --git a/pkgs/tools/graphics/amber/default.nix b/pkgs/by-name/go/google-amber/package.nix
similarity index 100%
rename from pkgs/tools/graphics/amber/default.nix
rename to pkgs/by-name/go/google-amber/package.nix
diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix
similarity index 100%
rename from pkgs/development/tools/google-app-engine-go-sdk/default.nix
rename to pkgs/by-name/go/google-app-engine-go-sdk/package.nix
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/by-name/go/google-authenticator/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/google-authenticator/default.nix
rename to pkgs/by-name/go/google-authenticator/package.nix
diff --git a/pkgs/development/tools/google-clasp/default.nix b/pkgs/by-name/go/google-clasp/package.nix
similarity index 100%
rename from pkgs/development/tools/google-clasp/default.nix
rename to pkgs/by-name/go/google-clasp/package.nix
diff --git a/pkgs/tools/misc/google-cloud-bigtable-tool/default.nix b/pkgs/by-name/go/google-cloud-bigtable-tool/package.nix
similarity index 100%
rename from pkgs/tools/misc/google-cloud-bigtable-tool/default.nix
rename to pkgs/by-name/go/google-cloud-bigtable-tool/package.nix
diff --git a/pkgs/development/libraries/google-cloud-cpp/hardcode-googleapis-path.patch b/pkgs/by-name/go/google-cloud-cpp/hardcode-googleapis-path.patch
similarity index 100%
rename from pkgs/development/libraries/google-cloud-cpp/hardcode-googleapis-path.patch
rename to pkgs/by-name/go/google-cloud-cpp/hardcode-googleapis-path.patch
diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/google-cloud-cpp/default.nix
rename to pkgs/by-name/go/google-cloud-cpp/package.nix
diff --git a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
similarity index 100%
rename from pkgs/tools/misc/google-cloud-sql-proxy/default.nix
rename to pkgs/by-name/go/google-cloud-sql-proxy/package.nix
diff --git a/pkgs/data/icons/google-cursor/default.nix b/pkgs/by-name/go/google-cursor/package.nix
similarity index 100%
rename from pkgs/data/icons/google-cursor/default.nix
rename to pkgs/by-name/go/google-cursor/package.nix
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/by-name/go/google-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/google-fonts/default.nix
rename to pkgs/by-name/go/google-fonts/package.nix
diff --git a/pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch b/pkgs/by-name/go/google-guest-agent/disable-etc-mutation.patch
similarity index 100%
rename from pkgs/tools/virtualization/google-guest-agent/disable-etc-mutation.patch
rename to pkgs/by-name/go/google-guest-agent/disable-etc-mutation.patch
diff --git a/pkgs/tools/virtualization/google-guest-agent/fix-paths.patch b/pkgs/by-name/go/google-guest-agent/fix-paths.patch
similarity index 100%
rename from pkgs/tools/virtualization/google-guest-agent/fix-paths.patch
rename to pkgs/by-name/go/google-guest-agent/fix-paths.patch
diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/by-name/go/google-guest-agent/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/google-guest-agent/default.nix
rename to pkgs/by-name/go/google-guest-agent/package.nix
diff --git a/pkgs/tools/virtualization/google-guest-configs/fix-paths.patch b/pkgs/by-name/go/google-guest-configs/fix-paths.patch
similarity index 100%
rename from pkgs/tools/virtualization/google-guest-configs/fix-paths.patch
rename to pkgs/by-name/go/google-guest-configs/fix-paths.patch
diff --git a/pkgs/tools/virtualization/google-guest-configs/default.nix b/pkgs/by-name/go/google-guest-configs/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/google-guest-configs/default.nix
rename to pkgs/by-name/go/google-guest-configs/package.nix
diff --git a/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/pkgs/by-name/go/google-guest-oslogin/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/google-guest-oslogin/default.nix
rename to pkgs/by-name/go/google-guest-oslogin/package.nix
diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/by-name/go/google-java-format/package.nix
similarity index 100%
rename from pkgs/development/tools/google-java-format/default.nix
rename to pkgs/by-name/go/google-java-format/package.nix
diff --git a/pkgs/tools/misc/goose/default.nix b/pkgs/by-name/go/goose/package.nix
similarity index 100%
rename from pkgs/tools/misc/goose/default.nix
rename to pkgs/by-name/go/goose/package.nix
diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/by-name/go/gopacked/package.nix
similarity index 100%
rename from pkgs/applications/misc/gopacked/default.nix
rename to pkgs/by-name/go/gopacked/package.nix
diff --git a/pkgs/development/tools/misc/gopatch/default.nix b/pkgs/by-name/go/gopatch/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/gopatch/default.nix
rename to pkgs/by-name/go/gopatch/package.nix
diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/by-name/go/goperf/package.nix
similarity index 100%
rename from pkgs/development/tools/goperf/default.nix
rename to pkgs/by-name/go/goperf/package.nix
diff --git a/pkgs/applications/networking/gopher/gopher/default.nix b/pkgs/by-name/go/gopher/package.nix
similarity index 100%
rename from pkgs/applications/networking/gopher/gopher/default.nix
rename to pkgs/by-name/go/gopher/package.nix
diff --git a/pkgs/applications/editors/gophernotes/default.nix b/pkgs/by-name/go/gophernotes/package.nix
similarity index 100%
rename from pkgs/applications/editors/gophernotes/default.nix
rename to pkgs/by-name/go/gophernotes/package.nix
diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/by-name/go/gopkgs/package.nix
similarity index 100%
rename from pkgs/development/tools/gopkgs/default.nix
rename to pkgs/by-name/go/gopkgs/package.nix
diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/by-name/go/gopro/package.nix
similarity index 100%
rename from pkgs/tools/video/gopro/default.nix
rename to pkgs/by-name/go/gopro/package.nix
diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/by-name/go/gops/package.nix
similarity index 100%
rename from pkgs/development/tools/gops/default.nix
rename to pkgs/by-name/go/gops/package.nix
diff --git a/pkgs/tools/system/gopsuinfo/no_bin_install.patch b/pkgs/by-name/go/gopsuinfo/no_bin_install.patch
similarity index 100%
rename from pkgs/tools/system/gopsuinfo/no_bin_install.patch
rename to pkgs/by-name/go/gopsuinfo/no_bin_install.patch
diff --git a/pkgs/tools/system/gopsuinfo/default.nix b/pkgs/by-name/go/gopsuinfo/package.nix
similarity index 100%
rename from pkgs/tools/system/gopsuinfo/default.nix
rename to pkgs/by-name/go/gopsuinfo/package.nix
diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/by-name/go/gore/package.nix
similarity index 100%
rename from pkgs/development/tools/gore/default.nix
rename to pkgs/by-name/go/gore/package.nix
diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/by-name/go/goreplay/package.nix
similarity index 100%
rename from pkgs/tools/networking/goreplay/default.nix
rename to pkgs/by-name/go/goreplay/package.nix
diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/by-name/go/goresym/package.nix
similarity index 100%
rename from pkgs/development/tools/goresym/default.nix
rename to pkgs/by-name/go/goresym/package.nix
diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/by-name/go/gorilla-bin/package.nix
similarity index 100%
rename from pkgs/tools/security/gorilla-bin/default.nix
rename to pkgs/by-name/go/gorilla-bin/package.nix
diff --git a/pkgs/tools/llm/gorilla-cli/default.nix b/pkgs/by-name/go/gorilla-cli/package.nix
similarity index 100%
rename from pkgs/tools/llm/gorilla-cli/default.nix
rename to pkgs/by-name/go/gorilla-cli/package.nix
diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/by-name/go/gosec/package.nix
similarity index 100%
rename from pkgs/development/tools/gosec/default.nix
rename to pkgs/by-name/go/gosec/package.nix
diff --git a/pkgs/tools/security/gosh/default.nix b/pkgs/by-name/go/gosh/package.nix
similarity index 100%
rename from pkgs/tools/security/gosh/default.nix
rename to pkgs/by-name/go/gosh/package.nix
diff --git a/pkgs/tools/security/gospider/default.nix b/pkgs/by-name/go/gospider/package.nix
similarity index 100%
rename from pkgs/tools/security/gospider/default.nix
rename to pkgs/by-name/go/gospider/package.nix
diff --git a/pkgs/applications/networking/gossa/default.nix b/pkgs/by-name/go/gossa/package.nix
similarity index 100%
rename from pkgs/applications/networking/gossa/default.nix
rename to pkgs/by-name/go/gossa/package.nix
diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/by-name/go/gost/package.nix
similarity index 100%
rename from pkgs/tools/networking/gost/default.nix
rename to pkgs/by-name/go/gost/package.nix
diff --git a/pkgs/applications/misc/gostatic/default.nix b/pkgs/by-name/go/gostatic/package.nix
similarity index 100%
rename from pkgs/applications/misc/gostatic/default.nix
rename to pkgs/by-name/go/gostatic/package.nix
diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/by-name/go/gosu/package.nix
similarity index 100%
rename from pkgs/tools/misc/gosu/default.nix
rename to pkgs/by-name/go/gosu/package.nix
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/by-name/go/gotags/package.nix
similarity index 100%
rename from pkgs/development/tools/gotags/default.nix
rename to pkgs/by-name/go/gotags/package.nix
diff --git a/pkgs/development/tools/gotemplate/default.nix b/pkgs/by-name/go/gotemplate/package.nix
similarity index 100%
rename from pkgs/development/tools/gotemplate/default.nix
rename to pkgs/by-name/go/gotemplate/package.nix
diff --git a/pkgs/development/tools/gotest/default.nix b/pkgs/by-name/go/gotest/package.nix
similarity index 100%
rename from pkgs/development/tools/gotest/default.nix
rename to pkgs/by-name/go/gotest/package.nix
diff --git a/pkgs/development/tools/gotestfmt/default.nix b/pkgs/by-name/go/gotestfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/gotestfmt/default.nix
rename to pkgs/by-name/go/gotestfmt/package.nix
diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/by-name/go/gotests/package.nix
similarity index 100%
rename from pkgs/development/tools/gotests/default.nix
rename to pkgs/by-name/go/gotests/package.nix
diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/by-name/go/gotify-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/gotify-cli/default.nix
rename to pkgs/by-name/go/gotify-cli/package.nix
diff --git a/pkgs/tools/misc/gotify-desktop/default.nix b/pkgs/by-name/go/gotify-desktop/package.nix
similarity index 100%
rename from pkgs/tools/misc/gotify-desktop/default.nix
rename to pkgs/by-name/go/gotify-desktop/package.nix
diff --git a/pkgs/servers/gotify/default.nix b/pkgs/by-name/go/gotify-server/package.nix
similarity index 100%
rename from pkgs/servers/gotify/default.nix
rename to pkgs/by-name/go/gotify-server/package.nix
diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/by-name/go/gotify-server/ui.nix
similarity index 100%
rename from pkgs/servers/gotify/ui.nix
rename to pkgs/by-name/go/gotify-server/ui.nix
diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/by-name/go/gotosocial/package.nix
similarity index 100%
rename from pkgs/servers/gotosocial/default.nix
rename to pkgs/by-name/go/gotosocial/package.nix
diff --git a/pkgs/development/tools/gotraceui/default.nix b/pkgs/by-name/go/gotraceui/package.nix
similarity index 100%
rename from pkgs/development/tools/gotraceui/default.nix
rename to pkgs/by-name/go/gotraceui/package.nix
diff --git a/pkgs/servers/gotty/default.nix b/pkgs/by-name/go/gotty/package.nix
similarity index 100%
rename from pkgs/servers/gotty/default.nix
rename to pkgs/by-name/go/gotty/package.nix
diff --git a/pkgs/games/gotypist/default.nix b/pkgs/by-name/go/gotypist/package.nix
similarity index 100%
rename from pkgs/games/gotypist/default.nix
rename to pkgs/by-name/go/gotypist/package.nix
diff --git a/pkgs/data/fonts/goudy-bookletter-1911/default.nix b/pkgs/by-name/go/goudy-bookletter-1911/package.nix
similarity index 100%
rename from pkgs/data/fonts/goudy-bookletter-1911/default.nix
rename to pkgs/by-name/go/goudy-bookletter-1911/package.nix
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/by-name/go/gource/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gource/default.nix
rename to pkgs/by-name/go/gource/package.nix
diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/by-name/go/govc/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/govc/default.nix
rename to pkgs/by-name/go/govc/package.nix
diff --git a/pkgs/tools/security/goverview/default.nix b/pkgs/by-name/go/goverview/package.nix
similarity index 100%
rename from pkgs/tools/security/goverview/default.nix
rename to pkgs/by-name/go/goverview/package.nix
diff --git a/pkgs/tools/security/govulncheck/default.nix b/pkgs/by-name/go/govulncheck/package.nix
similarity index 100%
rename from pkgs/tools/security/govulncheck/default.nix
rename to pkgs/by-name/go/govulncheck/package.nix
diff --git a/pkgs/tools/security/govulncheck/version.patch b/pkgs/by-name/go/govulncheck/version.patch
similarity index 100%
rename from pkgs/tools/security/govulncheck/version.patch
rename to pkgs/by-name/go/govulncheck/version.patch
diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/by-name/go/gox/package.nix
similarity index 100%
rename from pkgs/development/tools/gox/default.nix
rename to pkgs/by-name/go/gox/package.nix
diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/by-name/go/goxel/package.nix
similarity index 100%
rename from pkgs/applications/graphics/goxel/default.nix
rename to pkgs/by-name/go/goxel/package.nix
diff --git a/pkgs/tools/audio/goxlr-utility/Cargo.lock b/pkgs/by-name/go/goxlr-utility/Cargo.lock
similarity index 100%
rename from pkgs/tools/audio/goxlr-utility/Cargo.lock
rename to pkgs/by-name/go/goxlr-utility/Cargo.lock
diff --git a/pkgs/tools/audio/goxlr-utility/default.nix b/pkgs/by-name/go/goxlr-utility/package.nix
similarity index 100%
rename from pkgs/tools/audio/goxlr-utility/default.nix
rename to pkgs/by-name/go/goxlr-utility/package.nix
diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/by-name/gp/gpa/package.nix
similarity index 100%
rename from pkgs/applications/misc/gpa/default.nix
rename to pkgs/by-name/gp/gpa/package.nix
diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/by-name/gp/gpart/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/gpart/default.nix
rename to pkgs/by-name/gp/gpart/package.nix
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/by-name/gp/gparted/package.nix
similarity index 100%
rename from pkgs/tools/misc/gparted/default.nix
rename to pkgs/by-name/gp/gparted/package.nix
diff --git a/pkgs/tools/misc/gparted/polkit.patch b/pkgs/by-name/gp/gparted/polkit.patch
similarity index 100%
rename from pkgs/tools/misc/gparted/polkit.patch
rename to pkgs/by-name/gp/gparted/polkit.patch
diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/by-name/gp/gperftools/package.nix
similarity index 100%
rename from pkgs/development/libraries/gperftools/default.nix
rename to pkgs/by-name/gp/gperftools/package.nix
diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/by-name/gp/gpg-mdp/package.nix
similarity index 100%
rename from pkgs/applications/misc/gpg-mdp/default.nix
rename to pkgs/by-name/gp/gpg-mdp/package.nix
diff --git a/pkgs/tools/backup/gphotos-sync/default.nix b/pkgs/by-name/gp/gphotos-sync/package.nix
similarity index 100%
rename from pkgs/tools/backup/gphotos-sync/default.nix
rename to pkgs/by-name/gp/gphotos-sync/package.nix
diff --git a/pkgs/tools/backup/gphotos-sync/skip-network-tests.patch b/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch
similarity index 100%
rename from pkgs/tools/backup/gphotos-sync/skip-network-tests.patch
rename to pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch
diff --git a/pkgs/tools/misc/gpick/dot-version.patch b/pkgs/by-name/gp/gpick/dot-version.patch
similarity index 100%
rename from pkgs/tools/misc/gpick/dot-version.patch
rename to pkgs/by-name/gp/gpick/dot-version.patch
diff --git a/pkgs/tools/misc/gpick/default.nix b/pkgs/by-name/gp/gpick/package.nix
similarity index 100%
rename from pkgs/tools/misc/gpick/default.nix
rename to pkgs/by-name/gp/gpick/package.nix
diff --git a/pkgs/applications/audio/gpodder/disable-autoupdate.patch b/pkgs/by-name/gp/gpodder/disable-autoupdate.patch
similarity index 100%
rename from pkgs/applications/audio/gpodder/disable-autoupdate.patch
rename to pkgs/by-name/gp/gpodder/disable-autoupdate.patch
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/by-name/gp/gpodder/package.nix
similarity index 100%
rename from pkgs/applications/audio/gpodder/default.nix
rename to pkgs/by-name/gp/gpodder/package.nix
diff --git a/pkgs/development/tools/gpp/default.nix b/pkgs/by-name/gp/gpp/package.nix
similarity index 100%
rename from pkgs/development/tools/gpp/default.nix
rename to pkgs/by-name/gp/gpp/package.nix
diff --git a/pkgs/applications/science/astronomy/gprojector/default.nix b/pkgs/by-name/gp/gprojector/package.nix
similarity index 100%
rename from pkgs/applications/science/astronomy/gprojector/default.nix
rename to pkgs/by-name/gp/gprojector/package.nix
diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/by-name/gp/gprolog/package.nix
similarity index 100%
rename from pkgs/development/compilers/gprolog/default.nix
rename to pkgs/by-name/gp/gprolog/package.nix
diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/by-name/gp/gpsd/package.nix
similarity index 100%
rename from pkgs/servers/gpsd/default.nix
rename to pkgs/by-name/gp/gpsd/package.nix
diff --git a/pkgs/servers/gpsd/sconstruct-env-fixes.patch b/pkgs/by-name/gp/gpsd/sconstruct-env-fixes.patch
similarity index 100%
rename from pkgs/servers/gpsd/sconstruct-env-fixes.patch
rename to pkgs/by-name/gp/gpsd/sconstruct-env-fixes.patch
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/by-name/gp/gptfdisk/package.nix
similarity index 100%
rename from pkgs/tools/system/gptfdisk/default.nix
rename to pkgs/by-name/gp/gptfdisk/package.nix
diff --git a/pkgs/tools/system/gptman/default.nix b/pkgs/by-name/gp/gptman/package.nix
similarity index 100%
rename from pkgs/tools/system/gptman/default.nix
rename to pkgs/by-name/gp/gptman/package.nix
diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/by-name/gp/gpu-switch/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/gpu-switch/default.nix
rename to pkgs/by-name/gp/gpu-switch/package.nix
diff --git a/pkgs/development/embedded/gputils/default.nix b/pkgs/by-name/gp/gputils/package.nix
similarity index 100%
rename from pkgs/development/embedded/gputils/default.nix
rename to pkgs/by-name/gp/gputils/package.nix
diff --git a/pkgs/development/tools/misc/gpuvis/default.nix b/pkgs/by-name/gp/gpuvis/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/gpuvis/default.nix
rename to pkgs/by-name/gp/gpuvis/package.nix
diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/by-name/gp/gpx-viewer/package.nix
similarity index 100%
rename from pkgs/applications/misc/gpx-viewer/default.nix
rename to pkgs/by-name/gp/gpx-viewer/package.nix
diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/by-name/gp/gpx/package.nix
similarity index 100%
rename from pkgs/applications/misc/gpx/default.nix
rename to pkgs/by-name/gp/gpx/package.nix
diff --git a/pkgs/development/interpreters/gpython/default.nix b/pkgs/by-name/gp/gpython/package.nix
similarity index 100%
rename from pkgs/development/interpreters/gpython/default.nix
rename to pkgs/by-name/gp/gpython/package.nix
diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/by-name/gq/gql/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gql/default.nix
rename to pkgs/by-name/gq/gql/package.nix
diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/by-name/gq/gqlgenc/package.nix
similarity index 100%
rename from pkgs/development/tools/gqlgenc/default.nix
rename to pkgs/by-name/gq/gqlgenc/package.nix
diff --git a/pkgs/development/tools/gqlint/default.nix b/pkgs/by-name/gq/gqlint/package.nix
similarity index 100%
rename from pkgs/development/tools/gqlint/default.nix
rename to pkgs/by-name/gq/gqlint/package.nix
diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/by-name/gr/grabserial/package.nix
similarity index 100%
rename from pkgs/development/tools/grabserial/default.nix
rename to pkgs/by-name/gr/grabserial/package.nix
diff --git a/pkgs/tools/misc/gradescope-submit/default.nix b/pkgs/by-name/gr/gradescope-submit/package.nix
similarity index 100%
rename from pkgs/tools/misc/gradescope-submit/default.nix
rename to pkgs/by-name/gr/gradescope-submit/package.nix
diff --git a/pkgs/applications/misc/gradience/default.nix b/pkgs/by-name/gr/gradience/package.nix
similarity index 100%
rename from pkgs/applications/misc/gradience/default.nix
rename to pkgs/by-name/gr/gradience/package.nix
diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/by-name/gr/gradle-completion/package.nix
similarity index 100%
rename from pkgs/shells/zsh/gradle-completion/default.nix
rename to pkgs/by-name/gr/gradle-completion/package.nix
diff --git a/pkgs/os-specific/linux/gradm/default.nix b/pkgs/by-name/gr/gradm/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/gradm/default.nix
rename to pkgs/by-name/gr/gradm/package.nix
diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/by-name/gr/grafana-agent/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/grafana-agent/default.nix
rename to pkgs/by-name/gr/grafana-agent/package.nix
diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
rename to pkgs/by-name/gr/grafana-dash-n-grab/package.nix
diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/by-name/gr/grafana-image-renderer/package.json
similarity index 100%
rename from pkgs/servers/monitoring/grafana-image-renderer/package.json
rename to pkgs/by-name/gr/grafana-image-renderer/package.json
diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/grafana-image-renderer/default.nix
rename to pkgs/by-name/gr/grafana-image-renderer/package.nix
diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/by-name/gr/grail/package.nix
similarity index 100%
rename from pkgs/development/libraries/grail/default.nix
rename to pkgs/by-name/gr/grail/package.nix
diff --git a/pkgs/os-specific/darwin/grandperspective/default.nix b/pkgs/by-name/gr/grandperspective/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/grandperspective/default.nix
rename to pkgs/by-name/gr/grandperspective/package.nix
diff --git a/pkgs/tools/graphics/graph-cli/default.nix b/pkgs/by-name/gr/graph-cli/package.nix
similarity index 100%
rename from pkgs/tools/graphics/graph-cli/default.nix
rename to pkgs/by-name/gr/graph-cli/package.nix
diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/by-name/gr/graph-easy/package.nix
similarity index 100%
rename from pkgs/tools/graphics/graph-easy/default.nix
rename to pkgs/by-name/gr/graph-easy/package.nix
diff --git a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/pkgs/by-name/gr/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
similarity index 100%
rename from pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
rename to pkgs/by-name/gr/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/by-name/gr/graphene/package.nix
similarity index 100%
rename from pkgs/development/libraries/graphene/default.nix
rename to pkgs/by-name/gr/graphene/package.nix
diff --git a/pkgs/tools/security/graphinder/default.nix b/pkgs/by-name/gr/graphinder/package.nix
similarity index 100%
rename from pkgs/tools/security/graphinder/default.nix
rename to pkgs/by-name/gr/graphinder/package.nix
diff --git a/pkgs/data/icons/graphite-cursors/default.nix b/pkgs/by-name/gr/graphite-cursors/package.nix
similarity index 100%
rename from pkgs/data/icons/graphite-cursors/default.nix
rename to pkgs/by-name/gr/graphite-cursors/package.nix
diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/by-name/gr/graphite-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/graphite-gtk-theme/default.nix
rename to pkgs/by-name/gr/graphite-gtk-theme/package.nix
diff --git a/pkgs/tools/security/graphqlmap/default.nix b/pkgs/by-name/gr/graphqlmap/package.nix
similarity index 100%
rename from pkgs/tools/security/graphqlmap/default.nix
rename to pkgs/by-name/gr/graphqlmap/package.nix
diff --git a/pkgs/tools/networking/graphqurl/default.nix b/pkgs/by-name/gr/graphqurl/package.nix
similarity index 100%
rename from pkgs/tools/networking/graphqurl/default.nix
rename to pkgs/by-name/gr/graphqurl/package.nix
diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/by-name/gr/graphs/package.nix
similarity index 100%
rename from pkgs/data/misc/graphs/default.nix
rename to pkgs/by-name/gr/graphs/package.nix
diff --git a/pkgs/tools/security/graphw00f/default.nix b/pkgs/by-name/gr/graphw00f/package.nix
similarity index 100%
rename from pkgs/tools/security/graphw00f/default.nix
rename to pkgs/by-name/gr/graphw00f/package.nix
diff --git a/pkgs/games/graphwar/default.nix b/pkgs/by-name/gr/graphwar/package.nix
similarity index 100%
rename from pkgs/games/graphwar/default.nix
rename to pkgs/by-name/gr/graphwar/package.nix
diff --git a/pkgs/tools/misc/grass-sass/default.nix b/pkgs/by-name/gr/grass-sass/package.nix
similarity index 100%
rename from pkgs/tools/misc/grass-sass/default.nix
rename to pkgs/by-name/gr/grass-sass/package.nix
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/by-name/gr/gravit/package.nix
similarity index 100%
rename from pkgs/applications/science/astronomy/gravit/default.nix
rename to pkgs/by-name/gr/gravit/package.nix
diff --git a/pkgs/applications/misc/grb/default.nix b/pkgs/by-name/gr/grb/package.nix
similarity index 100%
rename from pkgs/applications/misc/grb/default.nix
rename to pkgs/by-name/gr/grb/package.nix
diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/by-name/gr/grepcidr/package.nix
similarity index 100%
rename from pkgs/applications/search/grepcidr/default.nix
rename to pkgs/by-name/gr/grepcidr/package.nix
diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/by-name/gr/grepm/package.nix
similarity index 100%
rename from pkgs/applications/search/grepm/default.nix
rename to pkgs/by-name/gr/grepm/package.nix
diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/by-name/gr/greybird/package.nix
similarity index 100%
rename from pkgs/data/themes/greybird/default.nix
rename to pkgs/by-name/gr/greybird/package.nix
diff --git a/pkgs/tools/nix/gridlock/default.nix b/pkgs/by-name/gr/gridlock/package.nix
similarity index 100%
rename from pkgs/tools/nix/gridlock/default.nix
rename to pkgs/by-name/gr/gridlock/package.nix
diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/by-name/gr/gridtracker/package.nix
similarity index 100%
rename from pkgs/applications/radio/gridtracker/default.nix
rename to pkgs/by-name/gr/gridtracker/package.nix
diff --git a/pkgs/applications/radio/grig/default.nix b/pkgs/by-name/gr/grig/package.nix
similarity index 100%
rename from pkgs/applications/radio/grig/default.nix
rename to pkgs/by-name/gr/grig/package.nix
diff --git a/pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch b/pkgs/by-name/gr/grilo-plugins/chromaprint-gst-plugins.patch
similarity index 100%
rename from pkgs/development/libraries/grilo-plugins/chromaprint-gst-plugins.patch
rename to pkgs/by-name/gr/grilo-plugins/chromaprint-gst-plugins.patch
diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/by-name/gr/grilo-plugins/package.nix
similarity index 100%
rename from pkgs/development/libraries/grilo-plugins/default.nix
rename to pkgs/by-name/gr/grilo-plugins/package.nix
diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/by-name/gr/grilo/package.nix
similarity index 100%
rename from pkgs/development/libraries/grilo/default.nix
rename to pkgs/by-name/gr/grilo/package.nix
diff --git a/pkgs/development/libraries/grilo/setup-hook.sh b/pkgs/by-name/gr/grilo/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/grilo/setup-hook.sh
rename to pkgs/by-name/gr/grilo/setup-hook.sh
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/by-name/gr/grin/package.nix
similarity index 100%
rename from pkgs/tools/text/grin/default.nix
rename to pkgs/by-name/gr/grin/package.nix
diff --git a/pkgs/tools/text/grip-search/default.nix b/pkgs/by-name/gr/grip-search/package.nix
similarity index 100%
rename from pkgs/tools/text/grip-search/default.nix
rename to pkgs/by-name/gr/grip-search/package.nix
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/by-name/gr/grip/package.nix
similarity index 100%
rename from pkgs/applications/misc/grip/default.nix
rename to pkgs/by-name/gr/grip/package.nix
diff --git a/pkgs/tools/misc/grit/default.nix b/pkgs/by-name/gr/grit/package.nix
similarity index 100%
rename from pkgs/tools/misc/grit/default.nix
rename to pkgs/by-name/gr/grit/package.nix
diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/by-name/gr/grive2/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/grive2/default.nix
rename to pkgs/by-name/gr/grive2/package.nix
diff --git a/pkgs/tools/misc/grizzly/default.nix b/pkgs/by-name/gr/grizzly/package.nix
similarity index 100%
rename from pkgs/tools/misc/grizzly/default.nix
rename to pkgs/by-name/gr/grizzly/package.nix
diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix
similarity index 100%
rename from pkgs/shells/zsh/grml-zsh-config/default.nix
rename to pkgs/by-name/gr/grml-zsh-config/package.nix
diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/by-name/gr/grobi/package.nix
similarity index 100%
rename from pkgs/tools/X11/grobi/default.nix
rename to pkgs/by-name/gr/grobi/package.nix
diff --git a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch b/pkgs/by-name/gr/grocy/0001-Define-configs-with-env-vars.patch
similarity index 100%
rename from pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
rename to pkgs/by-name/gr/grocy/0001-Define-configs-with-env-vars.patch
diff --git a/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch b/pkgs/by-name/gr/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
similarity index 100%
rename from pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
rename to pkgs/by-name/gr/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch
diff --git a/pkgs/servers/grocy/default.nix b/pkgs/by-name/gr/grocy/package.nix
similarity index 100%
rename from pkgs/servers/grocy/default.nix
rename to pkgs/by-name/gr/grocy/package.nix
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/by-name/gr/groff/package.nix
similarity index 100%
rename from pkgs/tools/text/groff/default.nix
rename to pkgs/by-name/gr/groff/package.nix
diff --git a/pkgs/tools/text/groff/site.tmac b/pkgs/by-name/gr/groff/site.tmac
similarity index 100%
rename from pkgs/tools/text/groff/site.tmac
rename to pkgs/by-name/gr/groff/site.tmac
diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/by-name/gr/gron/package.nix
similarity index 100%
rename from pkgs/development/tools/gron/default.nix
rename to pkgs/by-name/gr/gron/package.nix
diff --git a/pkgs/servers/search/groonga/do-not-use-vendored-libraries.patch b/pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch
similarity index 100%
rename from pkgs/servers/search/groonga/do-not-use-vendored-libraries.patch
rename to pkgs/by-name/gr/groonga/do-not-use-vendored-libraries.patch
diff --git a/pkgs/servers/search/groonga/fix-cmake-install-path.patch b/pkgs/by-name/gr/groonga/fix-cmake-install-path.patch
similarity index 100%
rename from pkgs/servers/search/groonga/fix-cmake-install-path.patch
rename to pkgs/by-name/gr/groonga/fix-cmake-install-path.patch
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/by-name/gr/groonga/package.nix
similarity index 100%
rename from pkgs/servers/search/groonga/default.nix
rename to pkgs/by-name/gr/groonga/package.nix
diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/by-name/gr/groove/package.nix
similarity index 100%
rename from pkgs/applications/science/programming/groove/default.nix
rename to pkgs/by-name/gr/groove/package.nix
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/by-name/gr/groovy/package.nix
similarity index 100%
rename from pkgs/development/interpreters/groovy/default.nix
rename to pkgs/by-name/gr/groovy/package.nix
diff --git a/pkgs/development/tools/misc/grpc-client-cli/default.nix b/pkgs/by-name/gr/grpc-client-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/grpc-client-cli/default.nix
rename to pkgs/by-name/gr/grpc-client-cli/package.nix
diff --git a/pkgs/development/tools/grpc-gateway/default.nix b/pkgs/by-name/gr/grpc-gateway/package.nix
similarity index 100%
rename from pkgs/development/tools/grpc-gateway/default.nix
rename to pkgs/by-name/gr/grpc-gateway/package.nix
diff --git a/pkgs/development/tools/misc/grpc-tools/default.nix b/pkgs/by-name/gr/grpc-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/grpc-tools/default.nix
rename to pkgs/by-name/gr/grpc-tools/package.nix
diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/by-name/gr/grpc_cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/grpc_cli/default.nix
rename to pkgs/by-name/gr/grpc_cli/package.nix
diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/by-name/gr/grpcui/package.nix
similarity index 100%
rename from pkgs/tools/networking/grpcui/default.nix
rename to pkgs/by-name/gr/grpcui/package.nix
diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/by-name/gr/grpcurl/package.nix
similarity index 100%
rename from pkgs/tools/networking/grpcurl/default.nix
rename to pkgs/by-name/gr/grpcurl/package.nix
diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/by-name/gr/grsync/package.nix
similarity index 100%
rename from pkgs/applications/misc/grsync/default.nix
rename to pkgs/by-name/gr/grsync/package.nix
diff --git a/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg b/pkgs/by-name/gr/grub2_pvgrub_image/configs/grub-bootstrap.cfg
similarity index 100%
rename from pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg
rename to pkgs/by-name/gr/grub2_pvgrub_image/configs/grub-bootstrap.cfg
diff --git a/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg b/pkgs/by-name/gr/grub2_pvgrub_image/configs/grub.cfg
similarity index 100%
rename from pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg
rename to pkgs/by-name/gr/grub2_pvgrub_image/configs/grub.cfg
diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/by-name/gr/grub2_pvgrub_image/package.nix
similarity index 100%
rename from pkgs/tools/misc/grub/pvgrub_image/default.nix
rename to pkgs/by-name/gr/grub2_pvgrub_image/package.nix
diff --git a/pkgs/data/themes/gruvbox-dark-gtk/default.nix b/pkgs/by-name/gr/gruvbox-dark-gtk/package.nix
similarity index 100%
rename from pkgs/data/themes/gruvbox-dark-gtk/default.nix
rename to pkgs/by-name/gr/gruvbox-dark-gtk/package.nix
diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/by-name/gs/gsasl/package.nix
similarity index 100%
rename from pkgs/development/libraries/gsasl/default.nix
rename to pkgs/by-name/gs/gsasl/package.nix
diff --git a/pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch b/pkgs/by-name/gs/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch
similarity index 100%
rename from pkgs/applications/graphics/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch
rename to pkgs/by-name/gs/gscreenshot/0001-Changing-paths-to-be-nix-compatible.patch
diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/by-name/gs/gscreenshot/package.nix
similarity index 100%
rename from pkgs/applications/graphics/gscreenshot/default.nix
rename to pkgs/by-name/gs/gscreenshot/package.nix
diff --git a/pkgs/applications/misc/gsctl/go120-compatibility.patch b/pkgs/by-name/gs/gsctl/go120-compatibility.patch
similarity index 100%
rename from pkgs/applications/misc/gsctl/go120-compatibility.patch
rename to pkgs/by-name/gs/gsctl/go120-compatibility.patch
diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/by-name/gs/gsctl/package.nix
similarity index 100%
rename from pkgs/applications/misc/gsctl/default.nix
rename to pkgs/by-name/gs/gsctl/package.nix
diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
similarity index 100%
rename from pkgs/development/libraries/gsettings-desktop-schemas/default.nix
rename to pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/by-name/gs/gsimplecal/package.nix
similarity index 100%
rename from pkgs/applications/misc/gsimplecal/default.nix
rename to pkgs/by-name/gs/gsimplecal/package.nix
diff --git a/pkgs/development/libraries/gsl-lite/default.nix b/pkgs/by-name/gs/gsl-lite/package.nix
similarity index 100%
rename from pkgs/development/libraries/gsl-lite/default.nix
rename to pkgs/by-name/gs/gsl-lite/package.nix
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/by-name/gs/gsl/package.nix
similarity index 100%
rename from pkgs/development/libraries/gsl/default.nix
rename to pkgs/by-name/gs/gsl/package.nix
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/by-name/gs/gsm/package.nix
similarity index 100%
rename from pkgs/development/libraries/gsm/default.nix
rename to pkgs/by-name/gs/gsm/package.nix
diff --git a/pkgs/tools/misc/gsmartcontrol/fix-paths.patch b/pkgs/by-name/gs/gsmartcontrol/fix-paths.patch
similarity index 100%
rename from pkgs/tools/misc/gsmartcontrol/fix-paths.patch
rename to pkgs/by-name/gs/gsmartcontrol/fix-paths.patch
diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/by-name/gs/gsmartcontrol/package.nix
similarity index 100%
rename from pkgs/tools/misc/gsmartcontrol/default.nix
rename to pkgs/by-name/gs/gsmartcontrol/package.nix
diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/by-name/gs/gsoap/package.nix
similarity index 100%
rename from pkgs/development/libraries/gsoap/default.nix
rename to pkgs/by-name/gs/gsoap/package.nix
diff --git a/pkgs/tools/networking/gsocket/default.nix b/pkgs/by-name/gs/gsocket/package.nix
similarity index 100%
rename from pkgs/tools/networking/gsocket/default.nix
rename to pkgs/by-name/gs/gsocket/package.nix
diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/by-name/gs/gsound/package.nix
similarity index 100%
rename from pkgs/development/libraries/gsound/default.nix
rename to pkgs/by-name/gs/gsound/package.nix
diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/by-name/gs/gspeech/package.nix
similarity index 100%
rename from pkgs/applications/audio/gspeech/default.nix
rename to pkgs/by-name/gs/gspeech/package.nix
diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/by-name/gs/gspell/package.nix
similarity index 100%
rename from pkgs/development/libraries/gspell/default.nix
rename to pkgs/by-name/gs/gspell/package.nix
diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/by-name/gs/gss/package.nix
similarity index 100%
rename from pkgs/development/libraries/gss/default.nix
rename to pkgs/by-name/gs/gss/package.nix
diff --git a/pkgs/applications/version-management/gst/default.nix b/pkgs/by-name/gs/gst/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gst/default.nix
rename to pkgs/by-name/gs/gst/package.nix
diff --git a/pkgs/applications/audio/gst123/default.nix b/pkgs/by-name/gs/gst123/package.nix
similarity index 100%
rename from pkgs/applications/audio/gst123/default.nix
rename to pkgs/by-name/gs/gst123/package.nix
diff --git a/pkgs/os-specific/linux/gt/default.nix b/pkgs/by-name/gt/gt/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/gt/default.nix
rename to pkgs/by-name/gt/gt/package.nix
diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/by-name/gt/gt5/package.nix
similarity index 100%
rename from pkgs/tools/system/gt5/default.nix
rename to pkgs/by-name/gt/gt5/package.nix
diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/by-name/gt/gtdialog/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtdialog/default.nix
rename to pkgs/by-name/gt/gtdialog/package.nix
diff --git a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/pkgs/by-name/gt/gtest/fix-cmake-config-includedir.patch
similarity index 100%
rename from pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch
rename to pkgs/by-name/gt/gtest/fix-cmake-config-includedir.patch
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/by-name/gt/gtest/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtest/default.nix
rename to pkgs/by-name/gt/gtest/package.nix
diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/by-name/gt/gtg/package.nix
similarity index 100%
rename from pkgs/applications/office/gtg/default.nix
rename to pkgs/by-name/gt/gtg/package.nix
diff --git a/pkgs/development/libraries/gthree/default.nix b/pkgs/by-name/gt/gthree/package.nix
similarity index 100%
rename from pkgs/development/libraries/gthree/default.nix
rename to pkgs/by-name/gt/gthree/package.nix
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/by-name/gt/gthumb/package.nix
similarity index 100%
rename from pkgs/applications/graphics/gthumb/default.nix
rename to pkgs/by-name/gt/gthumb/package.nix
diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/by-name/gt/gti/package.nix
similarity index 100%
rename from pkgs/tools/misc/gti/default.nix
rename to pkgs/by-name/gt/gti/package.nix
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/by-name/gt/gtk-doc/package.nix
similarity index 100%
rename from pkgs/development/tools/documentation/gtk-doc/default.nix
rename to pkgs/by-name/gt/gtk-doc/package.nix
diff --git a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch b/pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch
similarity index 100%
rename from pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch
rename to pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch
diff --git a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/pkgs/by-name/gt/gtk-engine-bluecurve/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-engine-bluecurve/default.nix
rename to pkgs/by-name/gt/gtk-engine-bluecurve/package.nix
diff --git a/pkgs/development/libraries/gtk-engine-murrine/default.nix b/pkgs/by-name/gt/gtk-engine-murrine/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-engine-murrine/default.nix
rename to pkgs/by-name/gt/gtk-engine-murrine/package.nix
diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/by-name/gt/gtk-frdp/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-frdp/default.nix
rename to pkgs/by-name/gt/gtk-frdp/package.nix
diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/by-name/gt/gtk-layer-shell/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-layer-shell/default.nix
rename to pkgs/by-name/gt/gtk-layer-shell/package.nix
diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/by-name/gt/gtk-mac-bundler/package.nix
similarity index 100%
rename from pkgs/development/tools/gtk-mac-bundler/default.nix
rename to pkgs/by-name/gt/gtk-mac-bundler/package.nix
diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/by-name/gt/gtk-server/package.nix
similarity index 100%
rename from pkgs/development/interpreters/gtk-server/default.nix
rename to pkgs/by-name/gt/gtk-server/package.nix
diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/by-name/gt/gtk-sharp-beans/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-sharp-beans/default.nix
rename to pkgs/by-name/gt/gtk-sharp-beans/package.nix
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/by-name/gt/gtk-vnc/package.nix
similarity index 100%
rename from pkgs/tools/admin/gtk-vnc/default.nix
rename to pkgs/by-name/gt/gtk-vnc/package.nix
diff --git a/pkgs/development/libraries/gtk4-layer-shell/default.nix b/pkgs/by-name/gt/gtk4-layer-shell/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtk4-layer-shell/default.nix
rename to pkgs/by-name/gt/gtk4-layer-shell/package.nix
diff --git a/pkgs/development/libraries/gtk-engines/default.nix b/pkgs/by-name/gt/gtk_engines/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtk-engines/default.nix
rename to pkgs/by-name/gt/gtk_engines/package.nix
diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/by-name/gt/gtkdatabox/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtkdatabox/default.nix
rename to pkgs/by-name/gt/gtkdatabox/package.nix
diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/by-name/gt/gtkdialog/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/gtkdialog/default.nix
rename to pkgs/by-name/gt/gtkdialog/package.nix
diff --git a/pkgs/development/libraries/gtkextra/default.nix b/pkgs/by-name/gt/gtkextra/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtkextra/default.nix
rename to pkgs/by-name/gt/gtkextra/package.nix
diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/by-name/gt/gtkgnutella/package.nix
similarity index 100%
rename from pkgs/tools/networking/p2p/gtk-gnutella/default.nix
rename to pkgs/by-name/gt/gtkgnutella/package.nix
diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/by-name/gt/gtkimageview/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtkimageview/default.nix
rename to pkgs/by-name/gt/gtkimageview/package.nix
diff --git a/pkgs/applications/misc/gtkradiant/default.nix b/pkgs/by-name/gt/gtkradiant/package.nix
similarity index 100%
rename from pkgs/applications/misc/gtkradiant/default.nix
rename to pkgs/by-name/gt/gtkradiant/package.nix
diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/by-name/gt/gtkspellmm/package.nix
similarity index 100%
rename from pkgs/development/libraries/gtkspellmm/default.nix
rename to pkgs/by-name/gt/gtkspellmm/package.nix
diff --git a/pkgs/tools/misc/gtkterm/default.nix b/pkgs/by-name/gt/gtkterm/package.nix
similarity index 100%
rename from pkgs/tools/misc/gtkterm/default.nix
rename to pkgs/by-name/gt/gtkterm/package.nix
diff --git a/pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch b/pkgs/by-name/gt/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
similarity index 100%
rename from pkgs/applications/science/electronics/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
rename to pkgs/by-name/gt/gtkwave/0001-Fix-detection-of-quartz-in-gdk-3.0-target.patch
diff --git a/pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch b/pkgs/by-name/gt/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
similarity index 100%
rename from pkgs/applications/science/electronics/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
rename to pkgs/by-name/gt/gtkwave/0002-Check-GDK_WINDOWING_X11-macro-when-using-GtkPlug.patch
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/by-name/gt/gtkwave/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/gtkwave/default.nix
rename to pkgs/by-name/gt/gtkwave/package.nix
diff --git a/pkgs/tools/system/gtop/default.nix b/pkgs/by-name/gt/gtop/package.nix
similarity index 100%
rename from pkgs/tools/system/gtop/default.nix
rename to pkgs/by-name/gt/gtop/package.nix
diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/by-name/gt/gtranslator/package.nix
similarity index 100%
rename from pkgs/tools/text/gtranslator/default.nix
rename to pkgs/by-name/gt/gtranslator/package.nix
diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/by-name/gt/gtree/package.nix
similarity index 100%
rename from pkgs/tools/text/gtree/default.nix
rename to pkgs/by-name/gt/gtree/package.nix
diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/by-name/gt/gts/package.nix
similarity index 100%
rename from pkgs/development/libraries/gts/default.nix
rename to pkgs/by-name/gt/gts/package.nix
diff --git a/pkgs/games/gtypist/default.nix b/pkgs/by-name/gt/gtypist/package.nix
similarity index 100%
rename from pkgs/games/gtypist/default.nix
rename to pkgs/by-name/gt/gtypist/package.nix
diff --git a/pkgs/servers/guacamole-client/default.nix b/pkgs/by-name/gu/guacamole-client/package.nix
similarity index 100%
rename from pkgs/servers/guacamole-client/default.nix
rename to pkgs/by-name/gu/guacamole-client/package.nix
diff --git a/pkgs/servers/guacamole-server/default.nix b/pkgs/by-name/gu/guacamole-server/package.nix
similarity index 100%
rename from pkgs/servers/guacamole-server/default.nix
rename to pkgs/by-name/gu/guacamole-server/package.nix
diff --git a/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch b/pkgs/by-name/gu/guake/no-compile-schemas.patch
similarity index 100%
rename from pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch
rename to pkgs/by-name/gu/guake/no-compile-schemas.patch
diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/by-name/gu/guake/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/guake/default.nix
rename to pkgs/by-name/gu/guake/package.nix
diff --git a/pkgs/data/fonts/gubbi/default.nix b/pkgs/by-name/gu/gubbi-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/gubbi/default.nix
rename to pkgs/by-name/gu/gubbi-font/package.nix
diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/by-name/gu/gucci/package.nix
similarity index 100%
rename from pkgs/tools/text/gucci/default.nix
rename to pkgs/by-name/gu/gucci/package.nix
diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/by-name/gu/guetzli/package.nix
similarity index 100%
rename from pkgs/applications/graphics/guetzli/default.nix
rename to pkgs/by-name/gu/guetzli/package.nix
diff --git a/pkgs/tools/graphics/guff/default.nix b/pkgs/by-name/gu/guff/package.nix
similarity index 100%
rename from pkgs/tools/graphics/guff/default.nix
rename to pkgs/by-name/gu/guff/package.nix
diff --git a/pkgs/applications/version-management/guilt/darwin-fix.patch b/pkgs/by-name/gu/guilt/darwin-fix.patch
similarity index 100%
rename from pkgs/applications/version-management/guilt/darwin-fix.patch
rename to pkgs/by-name/gu/guilt/darwin-fix.patch
diff --git a/pkgs/applications/version-management/guilt/guilt-help-mandir.patch b/pkgs/by-name/gu/guilt/guilt-help-mandir.patch
similarity index 100%
rename from pkgs/applications/version-management/guilt/guilt-help-mandir.patch
rename to pkgs/by-name/gu/guilt/guilt-help-mandir.patch
diff --git a/pkgs/applications/version-management/guilt/default.nix b/pkgs/by-name/gu/guilt/package.nix
similarity index 100%
rename from pkgs/applications/version-management/guilt/default.nix
rename to pkgs/by-name/gu/guilt/package.nix
diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/by-name/gu/gum/package.nix
similarity index 100%
rename from pkgs/applications/misc/gum/default.nix
rename to pkgs/by-name/gu/gum/package.nix
diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/by-name/gu/gumbo/package.nix
similarity index 100%
rename from pkgs/development/libraries/gumbo/default.nix
rename to pkgs/by-name/gu/gumbo/package.nix
diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/by-name/gu/gummi/package.nix
similarity index 100%
rename from pkgs/applications/misc/gummi/default.nix
rename to pkgs/by-name/gu/gummi/package.nix
diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/by-name/gu/gupnp-av/package.nix
similarity index 100%
rename from pkgs/development/libraries/gupnp-av/default.nix
rename to pkgs/by-name/gu/gupnp-av/package.nix
diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/by-name/gu/gupnp-dlna/package.nix
similarity index 100%
rename from pkgs/development/libraries/gupnp-dlna/default.nix
rename to pkgs/by-name/gu/gupnp-dlna/package.nix
diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/by-name/gu/gupnp-igd/package.nix
similarity index 100%
rename from pkgs/development/libraries/gupnp-igd/default.nix
rename to pkgs/by-name/gu/gupnp-igd/package.nix
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/by-name/gu/gupnp-tools/package.nix
similarity index 100%
rename from pkgs/tools/networking/gupnp-tools/default.nix
rename to pkgs/by-name/gu/gupnp-tools/package.nix
diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/by-name/gu/gurobi/package.nix
similarity index 100%
rename from pkgs/applications/science/math/gurobi/default.nix
rename to pkgs/by-name/gu/gurobi/package.nix
diff --git a/pkgs/development/libraries/gusb/fix-python-path.patch b/pkgs/by-name/gu/gusb/fix-python-path.patch
similarity index 100%
rename from pkgs/development/libraries/gusb/fix-python-path.patch
rename to pkgs/by-name/gu/gusb/fix-python-path.patch
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/by-name/gu/gusb/package.nix
similarity index 100%
rename from pkgs/development/libraries/gusb/default.nix
rename to pkgs/by-name/gu/gusb/package.nix
diff --git a/pkgs/applications/version-management/gut/default.nix b/pkgs/by-name/gu/gut/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gut/default.nix
rename to pkgs/by-name/gu/gut/package.nix
diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/by-name/gv/gv/package.nix
similarity index 100%
rename from pkgs/applications/misc/gv/default.nix
rename to pkgs/by-name/gv/gv/package.nix
diff --git a/pkgs/development/libraries/gvfs/hardcode-ssh-path.patch b/pkgs/by-name/gv/gvfs/hardcode-ssh-path.patch
similarity index 100%
rename from pkgs/development/libraries/gvfs/hardcode-ssh-path.patch
rename to pkgs/by-name/gv/gvfs/hardcode-ssh-path.patch
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/by-name/gv/gvfs/package.nix
similarity index 100%
rename from pkgs/development/libraries/gvfs/default.nix
rename to pkgs/by-name/gv/gvfs/package.nix
diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/by-name/gv/gvm-libs/package.nix
similarity index 100%
rename from pkgs/development/libraries/gvm-libs/default.nix
rename to pkgs/by-name/gv/gvm-libs/package.nix
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/by-name/gv/gvolicon/package.nix
similarity index 100%
rename from pkgs/tools/audio/gvolicon/default.nix
rename to pkgs/by-name/gv/gvolicon/package.nix
diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/by-name/gv/gvpe/package.nix
similarity index 100%
rename from pkgs/tools/networking/gvpe/default.nix
rename to pkgs/by-name/gv/gvpe/package.nix
diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/by-name/gv/gvproxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/gvproxy/default.nix
rename to pkgs/by-name/gv/gvproxy/package.nix
diff --git a/pkgs/applications/audio/gwc/default.nix b/pkgs/by-name/gw/gwc/package.nix
similarity index 100%
rename from pkgs/applications/audio/gwc/default.nix
rename to pkgs/by-name/gw/gwc/package.nix
diff --git a/pkgs/applications/science/chemistry/gwyddion/codegen.patch b/pkgs/by-name/gw/gwyddion/codegen.patch
similarity index 100%
rename from pkgs/applications/science/chemistry/gwyddion/codegen.patch
rename to pkgs/by-name/gw/gwyddion/codegen.patch
diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/by-name/gw/gwyddion/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/gwyddion/default.nix
rename to pkgs/by-name/gw/gwyddion/package.nix
diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/by-name/gx/gx-go/package.nix
similarity index 100%
rename from pkgs/tools/package-management/gx/go/default.nix
rename to pkgs/by-name/gx/gx-go/package.nix
diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/by-name/gx/gxkb/package.nix
similarity index 100%
rename from pkgs/applications/misc/gxkb/default.nix
rename to pkgs/by-name/gx/gxkb/package.nix
diff --git a/pkgs/applications/audio/gxmatcheq-lv2/default.nix b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/gxmatcheq-lv2/default.nix
rename to pkgs/by-name/gx/gxmatcheq-lv2/package.nix
diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/by-name/gx/gxmessage/package.nix
similarity index 100%
rename from pkgs/applications/misc/gxmessage/default.nix
rename to pkgs/by-name/gx/gxmessage/package.nix
diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/by-name/gx/gxplugins-lv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/gxplugins-lv2/default.nix
rename to pkgs/by-name/gx/gxplugins-lv2/package.nix
diff --git a/pkgs/tools/backup/gyb/default.nix b/pkgs/by-name/gy/gyb/package.nix
similarity index 100%
rename from pkgs/tools/backup/gyb/default.nix
rename to pkgs/by-name/gy/gyb/package.nix
diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/by-name/gy/gyre-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/gyre/default.nix
rename to pkgs/by-name/gy/gyre-fonts/package.nix
diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/by-name/gz/gzrt/package.nix
similarity index 100%
rename from pkgs/tools/compression/gzrt/default.nix
rename to pkgs/by-name/gz/gzrt/package.nix
diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/by-name/h2/h2o/package.nix
similarity index 100%
rename from pkgs/servers/http/h2o/default.nix
rename to pkgs/by-name/h2/h2o/package.nix
diff --git a/pkgs/applications/networking/cluster/habitat/Cargo.lock b/pkgs/by-name/ha/habitat/Cargo.lock
similarity index 100%
rename from pkgs/applications/networking/cluster/habitat/Cargo.lock
rename to pkgs/by-name/ha/habitat/Cargo.lock
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/by-name/ha/habitat/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/habitat/default.nix
rename to pkgs/by-name/ha/habitat/package.nix
diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/by-name/ha/hack-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/hack/default.nix
rename to pkgs/by-name/ha/hack-font/package.nix
diff --git a/pkgs/tools/misc/hackertyper/default.nix b/pkgs/by-name/ha/hackertyper/package.nix
similarity index 100%
rename from pkgs/tools/misc/hackertyper/default.nix
rename to pkgs/by-name/ha/hackertyper/package.nix
diff --git a/pkgs/data/icons/hackneyed/default.nix b/pkgs/by-name/ha/hackneyed/package.nix
similarity index 100%
rename from pkgs/data/icons/hackneyed/default.nix
rename to pkgs/by-name/ha/hackneyed/package.nix
diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/by-name/ha/hackrf/package.nix
similarity index 100%
rename from pkgs/applications/radio/hackrf/default.nix
rename to pkgs/by-name/ha/hackrf/package.nix
diff --git a/pkgs/tools/misc/hacksaw/default.nix b/pkgs/by-name/ha/hacksaw/package.nix
similarity index 100%
rename from pkgs/tools/misc/hacksaw/default.nix
rename to pkgs/by-name/ha/hacksaw/package.nix
diff --git a/pkgs/tools/compression/hacpack/default.nix b/pkgs/by-name/ha/hacpack/package.nix
similarity index 100%
rename from pkgs/tools/compression/hacpack/default.nix
rename to pkgs/by-name/ha/hacpack/package.nix
diff --git a/pkgs/tools/compression/hactool/musl-compat.patch b/pkgs/by-name/ha/hactool/musl-compat.patch
similarity index 100%
rename from pkgs/tools/compression/hactool/musl-compat.patch
rename to pkgs/by-name/ha/hactool/musl-compat.patch
diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/by-name/ha/hactool/package.nix
similarity index 100%
rename from pkgs/tools/compression/hactool/default.nix
rename to pkgs/by-name/ha/hactool/package.nix
diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/by-name/ha/haka/package.nix
similarity index 100%
rename from pkgs/tools/security/haka/default.nix
rename to pkgs/by-name/ha/haka/package.nix
diff --git a/pkgs/tools/security/hakrawler/default.nix b/pkgs/by-name/ha/hakrawler/package.nix
similarity index 100%
rename from pkgs/tools/security/hakrawler/default.nix
rename to pkgs/by-name/ha/hakrawler/package.nix
diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/by-name/ha/hakuneko/package.nix
similarity index 100%
rename from pkgs/tools/misc/hakuneko/default.nix
rename to pkgs/by-name/ha/hakuneko/package.nix
diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/by-name/ha/half/package.nix
similarity index 100%
rename from pkgs/development/libraries/half/default.nix
rename to pkgs/by-name/ha/half/package.nix
diff --git a/pkgs/development/tools/halfempty/default.nix b/pkgs/by-name/ha/halfempty/package.nix
similarity index 100%
rename from pkgs/development/tools/halfempty/default.nix
rename to pkgs/by-name/ha/halfempty/package.nix
diff --git a/pkgs/applications/graphics/halftone/default.nix b/pkgs/by-name/ha/halftone/package.nix
similarity index 100%
rename from pkgs/applications/graphics/halftone/default.nix
rename to pkgs/by-name/ha/halftone/package.nix
diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/by-name/ha/halibut/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/halibut/default.nix
rename to pkgs/by-name/ha/halibut/package.nix
diff --git a/pkgs/tools/misc/halp/fix-target-dir.patch b/pkgs/by-name/ha/halp/fix-target-dir.patch
similarity index 100%
rename from pkgs/tools/misc/halp/fix-target-dir.patch
rename to pkgs/by-name/ha/halp/fix-target-dir.patch
diff --git a/pkgs/tools/misc/halp/default.nix b/pkgs/by-name/ha/halp/package.nix
similarity index 100%
rename from pkgs/tools/misc/halp/default.nix
rename to pkgs/by-name/ha/halp/package.nix
diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/by-name/ha/hammer/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/hammer/default.nix
rename to pkgs/by-name/ha/hammer/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/hamsket/default.nix b/pkgs/by-name/ha/hamsket/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/hamsket/default.nix
rename to pkgs/by-name/ha/hamsket/package.nix
diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/by-name/ha/hamster/package.nix
similarity index 100%
rename from pkgs/applications/misc/hamster/default.nix
rename to pkgs/by-name/ha/hamster/package.nix
diff --git a/pkgs/data/fonts/hanazono/default.nix b/pkgs/by-name/ha/hanazono/package.nix
similarity index 100%
rename from pkgs/data/fonts/hanazono/default.nix
rename to pkgs/by-name/ha/hanazono/package.nix
diff --git a/pkgs/tools/misc/handlr/default.nix b/pkgs/by-name/ha/handlr/package.nix
similarity index 100%
rename from pkgs/tools/misc/handlr/default.nix
rename to pkgs/by-name/ha/handlr/package.nix
diff --git a/pkgs/data/fonts/hannom/default.nix b/pkgs/by-name/ha/hannom/package.nix
similarity index 100%
rename from pkgs/data/fonts/hannom/default.nix
rename to pkgs/by-name/ha/hannom/package.nix
diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/by-name/ha/hans/package.nix
similarity index 100%
rename from pkgs/tools/networking/hans/default.nix
rename to pkgs/by-name/ha/hans/package.nix
diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/by-name/ha/haproxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/haproxy/default.nix
rename to pkgs/by-name/ha/haproxy/package.nix
diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/by-name/ha/hardinfo/package.nix
similarity index 100%
rename from pkgs/tools/system/hardinfo/default.nix
rename to pkgs/by-name/ha/hardinfo/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/harminv/default.nix b/pkgs/by-name/ha/harminv/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/harminv/default.nix
rename to pkgs/by-name/ha/harminv/package.nix
diff --git a/pkgs/games/harmonist/default.nix b/pkgs/by-name/ha/harmonist/package.nix
similarity index 100%
rename from pkgs/games/harmonist/default.nix
rename to pkgs/by-name/ha/harmonist/package.nix
diff --git a/pkgs/applications/misc/harsh/default.nix b/pkgs/by-name/ha/harsh/package.nix
similarity index 100%
rename from pkgs/applications/misc/harsh/default.nix
rename to pkgs/by-name/ha/harsh/package.nix
diff --git a/pkgs/applications/misc/has/default.nix b/pkgs/by-name/ha/has/package.nix
similarity index 100%
rename from pkgs/applications/misc/has/default.nix
rename to pkgs/by-name/ha/has/package.nix
diff --git a/pkgs/games/hase/default.nix b/pkgs/by-name/ha/hase/package.nix
similarity index 100%
rename from pkgs/games/hase/default.nix
rename to pkgs/by-name/ha/hase/package.nix
diff --git a/pkgs/games/hase/prefer-dynamic.patch b/pkgs/by-name/ha/hase/prefer-dynamic.patch
similarity index 100%
rename from pkgs/games/hase/prefer-dynamic.patch
rename to pkgs/by-name/ha/hase/prefer-dynamic.patch
diff --git a/pkgs/tools/security/hash-identifier/default.nix b/pkgs/by-name/ha/hash-identifier/package.nix
similarity index 100%
rename from pkgs/tools/security/hash-identifier/default.nix
rename to pkgs/by-name/ha/hash-identifier/package.nix
diff --git a/pkgs/tools/security/hash-slinger/default.nix b/pkgs/by-name/ha/hash-slinger/package.nix
similarity index 100%
rename from pkgs/tools/security/hash-slinger/default.nix
rename to pkgs/by-name/ha/hash-slinger/package.nix
diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/by-name/ha/hash_extender/package.nix
similarity index 100%
rename from pkgs/tools/security/hash_extender/default.nix
rename to pkgs/by-name/ha/hash_extender/package.nix
diff --git a/pkgs/tools/security/hashcash/default.nix b/pkgs/by-name/ha/hashcash/package.nix
similarity index 100%
rename from pkgs/tools/security/hashcash/default.nix
rename to pkgs/by-name/ha/hashcash/package.nix
diff --git a/pkgs/tools/security/hashcat-utils/default.nix b/pkgs/by-name/ha/hashcat-utils/package.nix
similarity index 100%
rename from pkgs/tools/security/hashcat-utils/default.nix
rename to pkgs/by-name/ha/hashcat-utils/package.nix
diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/by-name/ha/hashdeep/package.nix
similarity index 100%
rename from pkgs/tools/security/hashdeep/default.nix
rename to pkgs/by-name/ha/hashdeep/package.nix
diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/by-name/ha/hashi-ui/package.nix
similarity index 100%
rename from pkgs/servers/hashi-ui/default.nix
rename to pkgs/by-name/ha/hashi-ui/package.nix
diff --git a/pkgs/applications/networking/cluster/hashi-up/default.nix b/pkgs/by-name/ha/hashi-up/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/hashi-up/default.nix
rename to pkgs/by-name/ha/hashi-up/package.nix
diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/by-name/ha/hashit/package.nix
similarity index 100%
rename from pkgs/tools/misc/hashit/default.nix
rename to pkgs/by-name/ha/hashit/package.nix
diff --git a/pkgs/development/interpreters/hashlink/default.nix b/pkgs/by-name/ha/hashlink/package.nix
similarity index 100%
rename from pkgs/development/interpreters/hashlink/default.nix
rename to pkgs/by-name/ha/hashlink/package.nix
diff --git a/pkgs/tools/misc/hashpump/default.nix b/pkgs/by-name/ha/hashpump/package.nix
similarity index 100%
rename from pkgs/tools/misc/hashpump/default.nix
rename to pkgs/by-name/ha/hashpump/package.nix
diff --git a/pkgs/tools/security/hashrat/default.nix b/pkgs/by-name/ha/hashrat/package.nix
similarity index 100%
rename from pkgs/tools/security/hashrat/default.nix
rename to pkgs/by-name/ha/hashrat/package.nix
diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/by-name/ha/hasklig/package.nix
similarity index 100%
rename from pkgs/data/fonts/hasklig/default.nix
rename to pkgs/by-name/ha/hasklig/package.nix
diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/by-name/ha/hasmail/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/hasmail/default.nix
rename to pkgs/by-name/ha/hasmail/package.nix
diff --git a/pkgs/servers/haste-server/default.nix b/pkgs/by-name/ha/haste-server/package.nix
similarity index 100%
rename from pkgs/servers/haste-server/default.nix
rename to pkgs/by-name/ha/haste-server/package.nix
diff --git a/pkgs/applications/emulators/hatari/default.nix b/pkgs/by-name/ha/hatari/package.nix
similarity index 100%
rename from pkgs/applications/emulators/hatari/default.nix
rename to pkgs/by-name/ha/hatari/package.nix
diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/by-name/ha/haveged/package.nix
similarity index 100%
rename from pkgs/tools/security/haveged/default.nix
rename to pkgs/by-name/ha/haveged/package.nix
diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/by-name/ha/hawknl/package.nix
similarity index 100%
rename from pkgs/development/libraries/hawknl/default.nix
rename to pkgs/by-name/ha/hawknl/package.nix
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/by-name/ha/haxor-news/package.nix
similarity index 100%
rename from pkgs/applications/misc/haxor-news/default.nix
rename to pkgs/by-name/ha/haxor-news/package.nix
diff --git a/pkgs/tools/typesetting/hayagriva/default.nix b/pkgs/by-name/ha/hayagriva/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/hayagriva/default.nix
rename to pkgs/by-name/ha/hayagriva/package.nix
diff --git a/pkgs/tools/networking/hblock/default.nix b/pkgs/by-name/hb/hblock/package.nix
similarity index 100%
rename from pkgs/tools/networking/hblock/default.nix
rename to pkgs/by-name/hb/hblock/package.nix
diff --git a/pkgs/tools/text/hck/default.nix b/pkgs/by-name/hc/hck/package.nix
similarity index 100%
rename from pkgs/tools/text/hck/default.nix
rename to pkgs/by-name/hc/hck/package.nix
diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/by-name/hc/hcl2json/package.nix
similarity index 100%
rename from pkgs/applications/misc/hcl2json/default.nix
rename to pkgs/by-name/hc/hcl2json/package.nix
diff --git a/pkgs/tools/text/hcledit/default.nix b/pkgs/by-name/hc/hcledit/package.nix
similarity index 100%
rename from pkgs/tools/text/hcledit/default.nix
rename to pkgs/by-name/hc/hcledit/package.nix
diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/by-name/hc/hcloud/package.nix
similarity index 100%
rename from pkgs/development/tools/hcloud/default.nix
rename to pkgs/by-name/hc/hcloud/package.nix
diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/by-name/hc/hcxdumptool/package.nix
similarity index 100%
rename from pkgs/tools/security/hcxdumptool/default.nix
rename to pkgs/by-name/hc/hcxdumptool/package.nix
diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/by-name/hc/hcxtools/package.nix
similarity index 100%
rename from pkgs/tools/security/hcxtools/default.nix
rename to pkgs/by-name/hc/hcxtools/package.nix
diff --git a/pkgs/os-specific/linux/hd-idle/default.nix b/pkgs/by-name/hd/hd-idle/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/hd-idle/default.nix
rename to pkgs/by-name/hd/hd-idle/package.nix
diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/by-name/hd/hdaps-gl/package.nix
similarity index 100%
rename from pkgs/tools/misc/hdaps-gl/default.nix
rename to pkgs/by-name/hd/hdaps-gl/package.nix
diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/by-name/hd/hdapsd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/hdapsd/default.nix
rename to pkgs/by-name/hd/hdapsd/package.nix
diff --git a/pkgs/os-specific/linux/hdapsd/postInstall.sh b/pkgs/by-name/hd/hdapsd/postInstall.sh
similarity index 100%
rename from pkgs/os-specific/linux/hdapsd/postInstall.sh
rename to pkgs/by-name/hd/hdapsd/postInstall.sh
diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/by-name/hd/hdate/package.nix
similarity index 100%
rename from pkgs/applications/misc/hdate/default.nix
rename to pkgs/by-name/hd/hdate/package.nix
diff --git a/pkgs/tools/system/hddfancontrol/default.nix b/pkgs/by-name/hd/hddfancontrol/package.nix
similarity index 100%
rename from pkgs/tools/system/hddfancontrol/default.nix
rename to pkgs/by-name/hd/hddfancontrol/package.nix
diff --git a/pkgs/tools/misc/hddtemp/byteswap.patch b/pkgs/by-name/hd/hddtemp/byteswap.patch
similarity index 100%
rename from pkgs/tools/misc/hddtemp/byteswap.patch
rename to pkgs/by-name/hd/hddtemp/byteswap.patch
diff --git a/pkgs/tools/misc/hddtemp/dontwake.patch b/pkgs/by-name/hd/hddtemp/dontwake.patch
similarity index 100%
rename from pkgs/tools/misc/hddtemp/dontwake.patch
rename to pkgs/by-name/hd/hddtemp/dontwake.patch
diff --git a/pkgs/tools/misc/hddtemp/execinfo.patch b/pkgs/by-name/hd/hddtemp/execinfo.patch
similarity index 100%
rename from pkgs/tools/misc/hddtemp/execinfo.patch
rename to pkgs/by-name/hd/hddtemp/execinfo.patch
diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/by-name/hd/hddtemp/package.nix
similarity index 100%
rename from pkgs/tools/misc/hddtemp/default.nix
rename to pkgs/by-name/hd/hddtemp/package.nix
diff --git a/pkgs/tools/misc/hddtemp/satacmds.patch b/pkgs/by-name/hd/hddtemp/satacmds.patch
similarity index 100%
rename from pkgs/tools/misc/hddtemp/satacmds.patch
rename to pkgs/by-name/hd/hddtemp/satacmds.patch
diff --git a/pkgs/tools/misc/hdf4/darwin-aarch64.patch b/pkgs/by-name/hd/hdf4/darwin-aarch64.patch
similarity index 100%
rename from pkgs/tools/misc/hdf4/darwin-aarch64.patch
rename to pkgs/by-name/hd/hdf4/darwin-aarch64.patch
diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/by-name/hd/hdf4/package.nix
similarity index 100%
rename from pkgs/tools/misc/hdf4/default.nix
rename to pkgs/by-name/hd/hdf4/package.nix
diff --git a/pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in b/pkgs/by-name/hd/hdf5-blosc/blosc_filter.pc.in
similarity index 100%
rename from pkgs/development/libraries/hdf5-blosc/blosc_filter.pc.in
rename to pkgs/by-name/hd/hdf5-blosc/blosc_filter.pc.in
diff --git a/pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch b/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch
similarity index 100%
rename from pkgs/development/libraries/hdf5-blosc/no-external-blosc.patch
rename to pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch
diff --git a/pkgs/development/libraries/hdf5-blosc/default.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix
similarity index 100%
rename from pkgs/development/libraries/hdf5-blosc/default.nix
rename to pkgs/by-name/hd/hdf5-blosc/package.nix
diff --git a/pkgs/tools/misc/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch b/pkgs/by-name/hd/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch
similarity index 100%
rename from pkgs/tools/misc/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch
rename to pkgs/by-name/hd/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch
diff --git a/pkgs/tools/misc/hdfview/disable-mac-signing.patch b/pkgs/by-name/hd/hdfview/disable-mac-signing.patch
similarity index 100%
rename from pkgs/tools/misc/hdfview/disable-mac-signing.patch
rename to pkgs/by-name/hd/hdfview/disable-mac-signing.patch
diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/by-name/hd/hdfview/package.nix
similarity index 100%
rename from pkgs/tools/misc/hdfview/default.nix
rename to pkgs/by-name/hd/hdfview/package.nix
diff --git a/pkgs/tools/misc/hdfview/remove-properties-timestamp.patch b/pkgs/by-name/hd/hdfview/remove-properties-timestamp.patch
similarity index 100%
rename from pkgs/tools/misc/hdfview/remove-properties-timestamp.patch
rename to pkgs/by-name/hd/hdfview/remove-properties-timestamp.patch
diff --git a/pkgs/applications/video/hdhomerun-config-gui/default.nix b/pkgs/by-name/hd/hdhomerun-config-gui/package.nix
similarity index 100%
rename from pkgs/applications/video/hdhomerun-config-gui/default.nix
rename to pkgs/by-name/hd/hdhomerun-config-gui/package.nix
diff --git a/pkgs/tools/misc/hdl-dump/default.nix b/pkgs/by-name/hd/hdl-dump/package.nix
similarity index 100%
rename from pkgs/tools/misc/hdl-dump/default.nix
rename to pkgs/by-name/hd/hdl-dump/package.nix
diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/by-name/hd/hdparm/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/hdparm/default.nix
rename to pkgs/by-name/hd/hdparm/package.nix
diff --git a/pkgs/misc/hdt/default.nix b/pkgs/by-name/hd/hdt/package.nix
similarity index 100%
rename from pkgs/misc/hdt/default.nix
rename to pkgs/by-name/hd/hdt/package.nix
diff --git a/pkgs/development/tools/headache/default.nix b/pkgs/by-name/he/headache/package.nix
similarity index 100%
rename from pkgs/development/tools/headache/default.nix
rename to pkgs/by-name/he/headache/package.nix
diff --git a/pkgs/applications/networking/headlines/default.nix b/pkgs/by-name/he/headlines/package.nix
similarity index 100%
rename from pkgs/applications/networking/headlines/default.nix
rename to pkgs/by-name/he/headlines/package.nix
diff --git a/pkgs/servers/headphones/default.nix b/pkgs/by-name/he/headphones/package.nix
similarity index 100%
rename from pkgs/servers/headphones/default.nix
rename to pkgs/by-name/he/headphones/package.nix
diff --git a/pkgs/tools/audio/headset-charge-indicator/default.nix b/pkgs/by-name/he/headset-charge-indicator/package.nix
similarity index 100%
rename from pkgs/tools/audio/headset-charge-indicator/default.nix
rename to pkgs/by-name/he/headset-charge-indicator/package.nix
diff --git a/pkgs/applications/audio/headset/default.nix b/pkgs/by-name/he/headset/package.nix
similarity index 100%
rename from pkgs/applications/audio/headset/default.nix
rename to pkgs/by-name/he/headset/package.nix
diff --git a/pkgs/tools/audio/headsetcontrol/default.nix b/pkgs/by-name/he/headsetcontrol/package.nix
similarity index 100%
rename from pkgs/tools/audio/headsetcontrol/default.nix
rename to pkgs/by-name/he/headsetcontrol/package.nix
diff --git a/pkgs/os-specific/linux/health-check/default.nix b/pkgs/by-name/he/health-check/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/health-check/default.nix
rename to pkgs/by-name/he/health-check/package.nix
diff --git a/pkgs/applications/misc/health/default.nix b/pkgs/by-name/he/health/package.nix
similarity index 100%
rename from pkgs/applications/misc/health/default.nix
rename to pkgs/by-name/he/health/package.nix
diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/by-name/he/healthchecks/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/healthchecks/default.nix
rename to pkgs/by-name/he/healthchecks/package.nix
diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/by-name/he/heatseeker/package.nix
similarity index 100%
rename from pkgs/tools/misc/heatseeker/default.nix
rename to pkgs/by-name/he/heatseeker/package.nix
diff --git a/pkgs/tools/compression/heatshrink/default.nix b/pkgs/by-name/he/heatshrink/package.nix
similarity index 100%
rename from pkgs/tools/compression/heatshrink/default.nix
rename to pkgs/by-name/he/heatshrink/package.nix
diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/by-name/he/hebcal/package.nix
similarity index 100%
rename from pkgs/tools/misc/hebcal/default.nix
rename to pkgs/by-name/he/hebcal/package.nix
diff --git a/pkgs/applications/editors/hecate/default.nix b/pkgs/by-name/he/hecate/package.nix
similarity index 100%
rename from pkgs/applications/editors/hecate/default.nix
rename to pkgs/by-name/he/hecate/package.nix
diff --git a/pkgs/tools/admin/hedgedoc-cli/default.nix b/pkgs/by-name/he/hedgedoc-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/hedgedoc-cli/default.nix
rename to pkgs/by-name/he/hedgedoc-cli/package.nix
diff --git a/pkgs/servers/web-apps/hedgedoc/default.nix b/pkgs/by-name/he/hedgedoc/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/hedgedoc/default.nix
rename to pkgs/by-name/he/hedgedoc/package.nix
diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/by-name/he/heisenbridge/package.nix
similarity index 100%
rename from pkgs/servers/heisenbridge/default.nix
rename to pkgs/by-name/he/heisenbridge/package.nix
diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/by-name/he/helio-workstation/package.nix
similarity index 100%
rename from pkgs/applications/audio/helio-workstation/default.nix
rename to pkgs/by-name/he/helio-workstation/package.nix
diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/by-name/he/helix/package.nix
similarity index 100%
rename from pkgs/applications/editors/helix/default.nix
rename to pkgs/by-name/he/helix/package.nix
diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/by-name/he/hello-unfree/package.nix
similarity index 100%
rename from pkgs/applications/misc/hello-unfree/default.nix
rename to pkgs/by-name/he/hello-unfree/package.nix
diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/by-name/he/hello-wayland/package.nix
similarity index 100%
rename from pkgs/applications/graphics/hello-wayland/default.nix
rename to pkgs/by-name/he/hello-wayland/package.nix
diff --git a/pkgs/applications/networking/cluster/helm-dashboard/default.nix b/pkgs/by-name/he/helm-dashboard/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/helm-dashboard/default.nix
rename to pkgs/by-name/he/helm-dashboard/package.nix
diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/by-name/he/helm-docs/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/helm-docs/default.nix
rename to pkgs/by-name/he/helm-docs/package.nix
diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/by-name/he/helm-ls/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/helm-ls/default.nix
rename to pkgs/by-name/he/helm-ls/package.nix
diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/by-name/he/helmholtz/package.nix
similarity index 100%
rename from pkgs/applications/audio/pd-plugins/helmholtz/default.nix
rename to pkgs/by-name/he/helmholtz/package.nix
diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/by-name/he/helmsman/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/helmsman/default.nix
rename to pkgs/by-name/he/helmsman/package.nix
diff --git a/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch b/pkgs/by-name/he/help2man/1.40.4-cygwin-nls.patch
similarity index 100%
rename from pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch
rename to pkgs/by-name/he/help2man/1.40.4-cygwin-nls.patch
diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/by-name/he/help2man/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/help2man/default.nix
rename to pkgs/by-name/he/help2man/package.nix
diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/by-name/he/helvetica-neue-lt-std/package.nix
similarity index 100%
rename from pkgs/data/fonts/helvetica-neue-lt-std/default.nix
rename to pkgs/by-name/he/helvetica-neue-lt-std/package.nix
diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/by-name/he/helvum/package.nix
similarity index 100%
rename from pkgs/applications/audio/helvum/default.nix
rename to pkgs/by-name/he/helvum/package.nix
diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/by-name/he/hepmc2/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/hepmc2/default.nix
rename to pkgs/by-name/he/hepmc2/package.nix
diff --git a/pkgs/applications/misc/herbe/default.nix b/pkgs/by-name/he/herbe/package.nix
similarity index 100%
rename from pkgs/applications/misc/herbe/default.nix
rename to pkgs/by-name/he/herbe/package.nix
diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/by-name/he/herbstluftwm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/herbstluftwm/default.nix
rename to pkgs/by-name/he/herbstluftwm/package.nix
diff --git a/pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch b/pkgs/by-name/he/herbstluftwm/test-path-environment.patch
similarity index 100%
rename from pkgs/applications/window-managers/herbstluftwm/test-path-environment.patch
rename to pkgs/by-name/he/herbstluftwm/test-path-environment.patch
diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/by-name/he/hermit/package.nix
similarity index 100%
rename from pkgs/data/fonts/hermit/default.nix
rename to pkgs/by-name/he/hermit/package.nix
diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/by-name/he/heroku/package.nix
similarity index 100%
rename from pkgs/development/tools/heroku/default.nix
rename to pkgs/by-name/he/heroku/package.nix
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/by-name/he/herwig/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/herwig/default.nix
rename to pkgs/by-name/he/herwig/package.nix
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch b/pkgs/by-name/he/hetzner-kube/fix-home.patch
similarity index 100%
rename from pkgs/applications/networking/cluster/hetzner-kube/fix-home.patch
rename to pkgs/by-name/he/hetzner-kube/fix-home.patch
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/by-name/he/hetzner-kube/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/hetzner-kube/default.nix
rename to pkgs/by-name/he/hetzner-kube/package.nix
diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/by-name/he/hevea/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/hevea/default.nix
rename to pkgs/by-name/he/hevea/package.nix
diff --git a/pkgs/games/hex-a-hop/default.nix b/pkgs/by-name/he/hex-a-hop/package.nix
similarity index 100%
rename from pkgs/games/hex-a-hop/default.nix
rename to pkgs/by-name/he/hex-a-hop/package.nix
diff --git a/pkgs/tools/misc/hex/default.nix b/pkgs/by-name/he/hex/package.nix
similarity index 100%
rename from pkgs/tools/misc/hex/default.nix
rename to pkgs/by-name/he/hex/package.nix
diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/by-name/he/hexcurse/package.nix
similarity index 100%
rename from pkgs/applications/editors/hexcurse/default.nix
rename to pkgs/by-name/he/hexcurse/package.nix
diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/by-name/he/hexd/package.nix
similarity index 100%
rename from pkgs/tools/misc/hexd/default.nix
rename to pkgs/by-name/he/hexd/package.nix
diff --git a/pkgs/tools/misc/hexdiff/default.nix b/pkgs/by-name/he/hexdiff/package.nix
similarity index 100%
rename from pkgs/tools/misc/hexdiff/default.nix
rename to pkgs/by-name/he/hexdiff/package.nix
diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/by-name/he/hexdino/package.nix
similarity index 100%
rename from pkgs/applications/editors/hexdino/default.nix
rename to pkgs/by-name/he/hexdino/package.nix
diff --git a/pkgs/os-specific/darwin/hexfiend/default.nix b/pkgs/by-name/he/hexfiend/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/hexfiend/default.nix
rename to pkgs/by-name/he/hexfiend/package.nix
diff --git a/pkgs/games/hexgui/default.nix b/pkgs/by-name/he/hexgui/package.nix
similarity index 100%
rename from pkgs/games/hexgui/default.nix
rename to pkgs/by-name/he/hexgui/package.nix
diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/by-name/he/hexio/package.nix
similarity index 100%
rename from pkgs/development/tools/hexio/default.nix
rename to pkgs/by-name/he/hexio/package.nix
diff --git a/pkgs/development/tools/hexo-cli/default.nix b/pkgs/by-name/he/hexo-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/hexo-cli/default.nix
rename to pkgs/by-name/he/hexo-cli/package.nix
diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/by-name/he/hey/package.nix
similarity index 100%
rename from pkgs/tools/networking/hey/default.nix
rename to pkgs/by-name/he/hey/package.nix
diff --git a/pkgs/tools/llm/heygpt/default.nix b/pkgs/by-name/he/heygpt/package.nix
similarity index 100%
rename from pkgs/tools/llm/heygpt/default.nix
rename to pkgs/by-name/he/heygpt/package.nix
diff --git a/pkgs/tools/security/hfinger/default.nix b/pkgs/by-name/hf/hfinger/package.nix
similarity index 100%
rename from pkgs/tools/security/hfinger/default.nix
rename to pkgs/by-name/hf/hfinger/package.nix
diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/by-name/hf/hfsprogs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/hfsprogs/default.nix
rename to pkgs/by-name/hf/hfsprogs/package.nix
diff --git a/pkgs/development/libraries/hfst-ospell/default.nix b/pkgs/by-name/hf/hfst-ospell/package.nix
similarity index 100%
rename from pkgs/development/libraries/hfst-ospell/default.nix
rename to pkgs/by-name/hf/hfst-ospell/package.nix
diff --git a/pkgs/development/libraries/hfst/default.nix b/pkgs/by-name/hf/hfst/package.nix
similarity index 100%
rename from pkgs/development/libraries/hfst/default.nix
rename to pkgs/by-name/hf/hfst/package.nix
diff --git a/pkgs/games/hheretic/default.nix b/pkgs/by-name/hh/hheretic/package.nix
similarity index 100%
rename from pkgs/games/hheretic/default.nix
rename to pkgs/by-name/hh/hheretic/package.nix
diff --git a/pkgs/games/hhexen/default.nix b/pkgs/by-name/hh/hhexen/package.nix
similarity index 100%
rename from pkgs/games/hhexen/default.nix
rename to pkgs/by-name/hh/hhexen/package.nix
diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/by-name/hh/hhpc/package.nix
similarity index 100%
rename from pkgs/tools/misc/hhpc/default.nix
rename to pkgs/by-name/hh/hhpc/package.nix
diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/by-name/hi/hiawatha/package.nix
similarity index 100%
rename from pkgs/servers/http/hiawatha/default.nix
rename to pkgs/by-name/hi/hiawatha/package.nix
diff --git a/pkgs/servers/http/hiawatha/test.nix b/pkgs/by-name/hi/hiawatha/test.nix
similarity index 100%
rename from pkgs/servers/http/hiawatha/test.nix
rename to pkgs/by-name/hi/hiawatha/test.nix
diff --git a/pkgs/os-specific/linux/hibernate/gen-manpages.patch b/pkgs/by-name/hi/hibernate/gen-manpages.patch
similarity index 100%
rename from pkgs/os-specific/linux/hibernate/gen-manpages.patch
rename to pkgs/by-name/hi/hibernate/gen-manpages.patch
diff --git a/pkgs/os-specific/linux/hibernate/hibernate.patch b/pkgs/by-name/hi/hibernate/hibernate.patch
similarity index 100%
rename from pkgs/os-specific/linux/hibernate/hibernate.patch
rename to pkgs/by-name/hi/hibernate/hibernate.patch
diff --git a/pkgs/os-specific/linux/hibernate/install.patch b/pkgs/by-name/hi/hibernate/install.patch
similarity index 100%
rename from pkgs/os-specific/linux/hibernate/install.patch
rename to pkgs/by-name/hi/hibernate/install.patch
diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/by-name/hi/hibernate/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/hibernate/default.nix
rename to pkgs/by-name/hi/hibernate/package.nix
diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/by-name/hi/hicolor-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/hicolor-icon-theme/default.nix
rename to pkgs/by-name/hi/hicolor-icon-theme/package.nix
diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/by-name/hi/hicolor-icon-theme/setup-hook.sh
similarity index 100%
rename from pkgs/data/icons/hicolor-icon-theme/setup-hook.sh
rename to pkgs/by-name/hi/hicolor-icon-theme/setup-hook.sh
diff --git a/pkgs/tools/misc/hid-listen/default.nix b/pkgs/by-name/hi/hid-listen/package.nix
similarity index 100%
rename from pkgs/tools/misc/hid-listen/default.nix
rename to pkgs/by-name/hi/hid-listen/package.nix
diff --git a/pkgs/tools/misc/hid-tools/default.nix b/pkgs/by-name/hi/hid-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/hid-tools/default.nix
rename to pkgs/by-name/hi/hid-tools/package.nix
diff --git a/pkgs/tools/misc/hidrd/default.nix b/pkgs/by-name/hi/hidrd/package.nix
similarity index 100%
rename from pkgs/tools/misc/hidrd/default.nix
rename to pkgs/by-name/hi/hidrd/package.nix
diff --git a/pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch b/pkgs/by-name/hi/higan/001-include-cmath.patch
similarity index 100%
rename from pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch
rename to pkgs/by-name/hi/higan/001-include-cmath.patch
diff --git a/pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch b/pkgs/by-name/hi/higan/002-sips-to-png2icns.patch
similarity index 100%
rename from pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch
rename to pkgs/by-name/hi/higan/002-sips-to-png2icns.patch
diff --git a/pkgs/applications/emulators/bsnes/higan/default.nix b/pkgs/by-name/hi/higan/package.nix
similarity index 100%
rename from pkgs/applications/emulators/bsnes/higan/default.nix
rename to pkgs/by-name/hi/higan/package.nix
diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/by-name/hi/highfive/package.nix
similarity index 100%
rename from pkgs/development/libraries/highfive/default.nix
rename to pkgs/by-name/hi/highfive/package.nix
diff --git a/pkgs/development/tools/misc/highlight-assertions/default.nix b/pkgs/by-name/hi/highlight-assertions/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/highlight-assertions/default.nix
rename to pkgs/by-name/hi/highlight-assertions/package.nix
diff --git a/pkgs/games/hikounomizu/default.nix b/pkgs/by-name/hi/hikounomizu/package.nix
similarity index 100%
rename from pkgs/games/hikounomizu/default.nix
rename to pkgs/by-name/hi/hikounomizu/package.nix
diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/by-name/hi/hilbish/package.nix
similarity index 100%
rename from pkgs/shells/hilbish/default.nix
rename to pkgs/by-name/hi/hilbish/package.nix
diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/by-name/hi/hime/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/hime/default.nix
rename to pkgs/by-name/hi/hime/package.nix
diff --git a/pkgs/tools/security/himitsu-firefox/default.nix b/pkgs/by-name/hi/himitsu-firefox/package.nix
similarity index 100%
rename from pkgs/tools/security/himitsu-firefox/default.nix
rename to pkgs/by-name/hi/himitsu-firefox/package.nix
diff --git a/pkgs/tools/security/himitsu/default.nix b/pkgs/by-name/hi/himitsu/package.nix
similarity index 100%
rename from pkgs/tools/security/himitsu/default.nix
rename to pkgs/by-name/hi/himitsu/package.nix
diff --git a/pkgs/servers/hiraeth/default.nix b/pkgs/by-name/hi/hiraeth/package.nix
similarity index 100%
rename from pkgs/servers/hiraeth/default.nix
rename to pkgs/by-name/hi/hiraeth/package.nix
diff --git a/pkgs/development/libraries/hiredis-vip/default.nix b/pkgs/by-name/hi/hiredis-vip/package.nix
similarity index 100%
rename from pkgs/development/libraries/hiredis-vip/default.nix
rename to pkgs/by-name/hi/hiredis-vip/package.nix
diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/by-name/hi/hiredis/package.nix
similarity index 100%
rename from pkgs/development/libraries/hiredis/default.nix
rename to pkgs/by-name/hi/hiredis/package.nix
diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/by-name/hi/hisat2/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/hisat2/default.nix
rename to pkgs/by-name/hi/hisat2/package.nix
diff --git a/pkgs/shells/hishtory/default.nix b/pkgs/by-name/hi/hishtory/package.nix
similarity index 100%
rename from pkgs/shells/hishtory/default.nix
rename to pkgs/by-name/hi/hishtory/package.nix
diff --git a/pkgs/servers/hitch/default.nix b/pkgs/by-name/hi/hitch/package.nix
similarity index 100%
rename from pkgs/servers/hitch/default.nix
rename to pkgs/by-name/hi/hitch/package.nix
diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/by-name/hi/hivelytracker/package.nix
similarity index 100%
rename from pkgs/applications/audio/hivelytracker/default.nix
rename to pkgs/by-name/hi/hivelytracker/package.nix
diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/by-name/hi/hivemind/package.nix
similarity index 100%
rename from pkgs/applications/misc/hivemind/default.nix
rename to pkgs/by-name/hi/hivemind/package.nix
diff --git a/pkgs/applications/office/hledger-check-fancyassertions/default.nix b/pkgs/by-name/hl/hledger-check-fancyassertions/package.nix
similarity index 100%
rename from pkgs/applications/office/hledger-check-fancyassertions/default.nix
rename to pkgs/by-name/hl/hledger-check-fancyassertions/package.nix
diff --git a/pkgs/development/libraries/hmat-oss/default.nix b/pkgs/by-name/hm/hmat-oss/package.nix
similarity index 100%
rename from pkgs/development/libraries/hmat-oss/default.nix
rename to pkgs/by-name/hm/hmat-oss/package.nix
diff --git a/pkgs/games/hmcl/default.nix b/pkgs/by-name/hm/hmcl/package.nix
similarity index 100%
rename from pkgs/games/hmcl/default.nix
rename to pkgs/by-name/hm/hmcl/package.nix
diff --git a/pkgs/applications/misc/hmm/default.nix b/pkgs/by-name/hm/hmm/package.nix
similarity index 100%
rename from pkgs/applications/misc/hmm/default.nix
rename to pkgs/by-name/hm/hmm/package.nix
diff --git a/pkgs/tools/wayland/aw-watcher-window-wayland/rustc-serialize-fix.patch b/pkgs/by-name/hm/hmm/rustc-serialize-fix.patch
similarity index 100%
rename from pkgs/tools/wayland/aw-watcher-window-wayland/rustc-serialize-fix.patch
rename to pkgs/by-name/hm/hmm/rustc-serialize-fix.patch
diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/by-name/hm/hmmer/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/hmmer/default.nix
rename to pkgs/by-name/hm/hmmer/package.nix
diff --git a/pkgs/development/libraries/hnswlib/default.nix b/pkgs/by-name/hn/hnswlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/hnswlib/default.nix
rename to pkgs/by-name/hn/hnswlib/package.nix
diff --git a/pkgs/tools/misc/hoard/default.nix b/pkgs/by-name/ho/hoard/package.nix
similarity index 100%
rename from pkgs/tools/misc/hoard/default.nix
rename to pkgs/by-name/ho/hoard/package.nix
diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/by-name/ho/hobbes/package.nix
similarity index 100%
rename from pkgs/development/tools/hobbes/default.nix
rename to pkgs/by-name/ho/hobbes/package.nix
diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/by-name/ho/hol/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/hol/default.nix
rename to pkgs/by-name/ho/hol/package.nix
diff --git a/pkgs/tools/security/holehe/default.nix b/pkgs/by-name/ho/holehe/package.nix
similarity index 100%
rename from pkgs/tools/security/holehe/default.nix
rename to pkgs/by-name/ho/holehe/package.nix
diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/by-name/ho/holo-build/package.nix
similarity index 100%
rename from pkgs/tools/package-management/holo-build/default.nix
rename to pkgs/by-name/ho/holo-build/package.nix
diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/by-name/ho/holochain-launcher/package.nix
similarity index 100%
rename from pkgs/applications/misc/holochain-launcher/default.nix
rename to pkgs/by-name/ho/holochain-launcher/package.nix
diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/by-name/ho/hologram/package.nix
similarity index 100%
rename from pkgs/tools/security/hologram/default.nix
rename to pkgs/by-name/ho/hologram/package.nix
diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/by-name/ho/honcho/package.nix
similarity index 100%
rename from pkgs/tools/system/honcho/default.nix
rename to pkgs/by-name/ho/honcho/package.nix
diff --git a/pkgs/servers/tracing/honeycomb/refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch b/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
similarity index 100%
rename from pkgs/servers/tracing/honeycomb/refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
rename to pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
diff --git a/pkgs/servers/tracing/honeycomb/refinery/default.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix
similarity index 100%
rename from pkgs/servers/tracing/honeycomb/refinery/default.nix
rename to pkgs/by-name/ho/honeycomb-refinery/package.nix
diff --git a/pkgs/tools/security/honeytrap/default.nix b/pkgs/by-name/ho/honeytrap/package.nix
similarity index 100%
rename from pkgs/tools/security/honeytrap/default.nix
rename to pkgs/by-name/ho/honeytrap/package.nix
diff --git a/pkgs/servers/honk/default.nix b/pkgs/by-name/ho/honk/package.nix
similarity index 100%
rename from pkgs/servers/honk/default.nix
rename to pkgs/by-name/ho/honk/package.nix
diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/by-name/ho/hop/package.nix
similarity index 100%
rename from pkgs/development/compilers/hop/default.nix
rename to pkgs/by-name/ho/hop/package.nix
diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/by-name/ho/hoppet/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/hoppet/default.nix
rename to pkgs/by-name/ho/hoppet/package.nix
diff --git a/pkgs/applications/science/electronics/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix
similarity index 100%
rename from pkgs/applications/science/electronics/horizon-eda/base.nix
rename to pkgs/by-name/ho/horizon-eda/base.nix
diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/by-name/ho/horizon-eda/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/horizon-eda/default.nix
rename to pkgs/by-name/ho/horizon-eda/package.nix
diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/by-name/ho/horst/package.nix
similarity index 100%
rename from pkgs/tools/networking/horst/default.nix
rename to pkgs/by-name/ho/horst/package.nix
diff --git a/pkgs/tools/networking/hostapd-mana/default.nix b/pkgs/by-name/ho/hostapd-mana/package.nix
similarity index 100%
rename from pkgs/tools/networking/hostapd-mana/default.nix
rename to pkgs/by-name/ho/hostapd-mana/package.nix
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/by-name/ho/hostapd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/hostapd/default.nix
rename to pkgs/by-name/ho/hostapd/package.nix
diff --git a/pkgs/tools/system/hostctl/default.nix b/pkgs/by-name/ho/hostctl/package.nix
similarity index 100%
rename from pkgs/tools/system/hostctl/default.nix
rename to pkgs/by-name/ho/hostctl/package.nix
diff --git a/pkgs/development/tools/hostess/default.nix b/pkgs/by-name/ho/hostess/package.nix
similarity index 100%
rename from pkgs/development/tools/hostess/default.nix
rename to pkgs/by-name/ho/hostess/package.nix
diff --git a/pkgs/tools/misc/hostmux/default.nix b/pkgs/by-name/ho/hostmux/package.nix
similarity index 100%
rename from pkgs/tools/misc/hostmux/default.nix
rename to pkgs/by-name/ho/hostmux/package.nix
diff --git a/pkgs/tools/networking/hostname-debian/default.nix b/pkgs/by-name/ho/hostname-debian/package.nix
similarity index 100%
rename from pkgs/tools/networking/hostname-debian/default.nix
rename to pkgs/by-name/ho/hostname-debian/package.nix
diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/by-name/ho/hostsblock/package.nix
similarity index 100%
rename from pkgs/tools/misc/hostsblock/default.nix
rename to pkgs/by-name/ho/hostsblock/package.nix
diff --git a/pkgs/development/libraries/hotpatch/no-loader-test.patch b/pkgs/by-name/ho/hotpatch/no-loader-test.patch
similarity index 100%
rename from pkgs/development/libraries/hotpatch/no-loader-test.patch
rename to pkgs/by-name/ho/hotpatch/no-loader-test.patch
diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/by-name/ho/hotpatch/package.nix
similarity index 100%
rename from pkgs/development/libraries/hotpatch/default.nix
rename to pkgs/by-name/ho/hotpatch/package.nix
diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/by-name/ho/houdini/package.nix
similarity index 100%
rename from pkgs/applications/misc/houdini/default.nix
rename to pkgs/by-name/ho/houdini/package.nix
diff --git a/pkgs/applications/misc/houdini/runtime-build.nix b/pkgs/by-name/ho/houdini/runtime-build.nix
similarity index 100%
rename from pkgs/applications/misc/houdini/runtime-build.nix
rename to pkgs/by-name/ho/houdini/runtime-build.nix
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/by-name/ho/houdini/runtime.nix
similarity index 100%
rename from pkgs/applications/misc/houdini/runtime.nix
rename to pkgs/by-name/ho/houdini/runtime.nix
diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/by-name/ho/hound/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/hound/default.nix
rename to pkgs/by-name/ho/hound/package.nix
diff --git a/pkgs/development/tools/hover/fix-assets-path.patch b/pkgs/by-name/ho/hover/fix-assets-path.patch
similarity index 100%
rename from pkgs/development/tools/hover/fix-assets-path.patch
rename to pkgs/by-name/ho/hover/fix-assets-path.patch
diff --git a/pkgs/development/tools/hover/default.nix b/pkgs/by-name/ho/hover/package.nix
similarity index 100%
rename from pkgs/development/tools/hover/default.nix
rename to pkgs/by-name/ho/hover/package.nix
diff --git a/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff b/pkgs/by-name/ho/howard-hinnant-date/make-zoneinfo-available.diff
similarity index 100%
rename from pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff
rename to pkgs/by-name/ho/howard-hinnant-date/make-zoneinfo-available.diff
diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/by-name/ho/howard-hinnant-date/package.nix
similarity index 100%
rename from pkgs/development/libraries/howard-hinnant-date/default.nix
rename to pkgs/by-name/ho/howard-hinnant-date/package.nix
diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/by-name/ho/howl/package.nix
similarity index 100%
rename from pkgs/applications/editors/howl/default.nix
rename to pkgs/by-name/ho/howl/package.nix
diff --git a/pkgs/tools/networking/hp2p/default.nix b/pkgs/by-name/hp/hp2p/package.nix
similarity index 100%
rename from pkgs/tools/networking/hp2p/default.nix
rename to pkgs/by-name/hp/hp2p/package.nix
diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/by-name/hp/hpe-ltfs/package.nix
similarity index 100%
rename from pkgs/tools/backup/hpe-ltfs/default.nix
rename to pkgs/by-name/hp/hpe-ltfs/package.nix
diff --git a/pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch b/pkgs/by-name/hp/hpe-ltfs/remove-sysctl.patch
similarity index 100%
rename from pkgs/tools/backup/hpe-ltfs/remove-sysctl.patch
rename to pkgs/by-name/hp/hpe-ltfs/remove-sysctl.patch
diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/by-name/hp/hping/package.nix
similarity index 100%
rename from pkgs/tools/networking/hping/default.nix
rename to pkgs/by-name/hp/hping/package.nix
diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/by-name/hp/hpl/package.nix
similarity index 100%
rename from pkgs/tools/misc/hpl/default.nix
rename to pkgs/by-name/hp/hpl/package.nix
diff --git a/pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch b/pkgs/by-name/hp/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch
similarity index 100%
rename from pkgs/misc/drivers/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch
rename to pkgs/by-name/hp/hplip/hplip-3.20.11-nixos-cups-ppd-search-path.patch
diff --git a/pkgs/misc/drivers/hplip/hplip.state b/pkgs/by-name/hp/hplip/hplip.state
similarity index 100%
rename from pkgs/misc/drivers/hplip/hplip.state
rename to pkgs/by-name/hp/hplip/hplip.state
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/by-name/hp/hplip/package.nix
similarity index 100%
rename from pkgs/misc/drivers/hplip/default.nix
rename to pkgs/by-name/hp/hplip/package.nix
diff --git a/pkgs/servers/hqplayerd/add-option-for-installation-sysconfdir.patch b/pkgs/by-name/hq/hqplayerd/add-option-for-installation-sysconfdir.patch
similarity index 100%
rename from pkgs/servers/hqplayerd/add-option-for-installation-sysconfdir.patch
rename to pkgs/by-name/hq/hqplayerd/add-option-for-installation-sysconfdir.patch
diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/by-name/hq/hqplayerd/package.nix
similarity index 100%
rename from pkgs/servers/hqplayerd/default.nix
rename to pkgs/by-name/hq/hqplayerd/package.nix
diff --git a/pkgs/servers/hqplayerd/rygel.nix b/pkgs/by-name/hq/hqplayerd/rygel.nix
similarity index 100%
rename from pkgs/servers/hqplayerd/rygel.nix
rename to pkgs/by-name/hq/hqplayerd/rygel.nix
diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/by-name/hr/hr/package.nix
similarity index 100%
rename from pkgs/applications/misc/hr/default.nix
rename to pkgs/by-name/hr/hr/package.nix
diff --git a/pkgs/tools/misc/hsd/default.nix b/pkgs/by-name/hs/hsd/package.nix
similarity index 100%
rename from pkgs/tools/misc/hsd/default.nix
rename to pkgs/by-name/hs/hsd/package.nix
diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/by-name/hs/hsetroot/package.nix
similarity index 100%
rename from pkgs/tools/X11/hsetroot/default.nix
rename to pkgs/by-name/hs/hsetroot/package.nix
diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/by-name/hs/hsqldb/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/hsqldb/default.nix
rename to pkgs/by-name/hs/hsqldb/package.nix
diff --git a/pkgs/tools/networking/hss/default.nix b/pkgs/by-name/hs/hss/package.nix
similarity index 100%
rename from pkgs/tools/networking/hss/default.nix
rename to pkgs/by-name/hs/hss/package.nix
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/by-name/hs/hstr/package.nix
similarity index 100%
rename from pkgs/applications/misc/hstr/default.nix
rename to pkgs/by-name/hs/hstr/package.nix
diff --git a/pkgs/tools/security/hstsparser/default.nix b/pkgs/by-name/hs/hstsparser/package.nix
similarity index 100%
rename from pkgs/tools/security/hstsparser/default.nix
rename to pkgs/by-name/hs/hstsparser/package.nix
diff --git a/pkgs/applications/editors/ht/gcc7.patch b/pkgs/by-name/ht/ht/gcc7.patch
similarity index 100%
rename from pkgs/applications/editors/ht/gcc7.patch
rename to pkgs/by-name/ht/ht/gcc7.patch
diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/by-name/ht/ht/package.nix
similarity index 100%
rename from pkgs/applications/editors/ht/default.nix
rename to pkgs/by-name/ht/ht/package.nix
diff --git a/pkgs/development/tools/html-minifier/default.nix b/pkgs/by-name/ht/html-minifier/package.nix
similarity index 100%
rename from pkgs/development/tools/html-minifier/default.nix
rename to pkgs/by-name/ht/html-minifier/package.nix
diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/by-name/ht/html-tidy/package.nix
similarity index 100%
rename from pkgs/tools/text/html-tidy/default.nix
rename to pkgs/by-name/ht/html-tidy/package.nix
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/by-name/ht/html-xml-utils/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/html-xml-utils/default.nix
rename to pkgs/by-name/ht/html-xml-utils/package.nix
diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/by-name/ht/html2text/package.nix
similarity index 100%
rename from pkgs/tools/text/html2text/default.nix
rename to pkgs/by-name/ht/html2text/package.nix
diff --git a/pkgs/development/libraries/htmlcxx/c++17.patch b/pkgs/by-name/ht/htmlcxx/c++17.patch
similarity index 100%
rename from pkgs/development/libraries/htmlcxx/c++17.patch
rename to pkgs/by-name/ht/htmlcxx/c++17.patch
diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/by-name/ht/htmlcxx/package.nix
similarity index 100%
rename from pkgs/development/libraries/htmlcxx/default.nix
rename to pkgs/by-name/ht/htmlcxx/package.nix
diff --git a/pkgs/development/libraries/htmlcxx/ptrdiff.patch b/pkgs/by-name/ht/htmlcxx/ptrdiff.patch
similarity index 100%
rename from pkgs/development/libraries/htmlcxx/ptrdiff.patch
rename to pkgs/by-name/ht/htmlcxx/ptrdiff.patch
diff --git a/pkgs/development/tools/htmlhint/default.nix b/pkgs/by-name/ht/htmlhint/package.nix
similarity index 100%
rename from pkgs/development/tools/htmlhint/default.nix
rename to pkgs/by-name/ht/htmlhint/package.nix
diff --git a/pkgs/development/tools/htmltest/default.nix b/pkgs/by-name/ht/htmltest/package.nix
similarity index 100%
rename from pkgs/development/tools/htmltest/default.nix
rename to pkgs/by-name/ht/htmltest/package.nix
diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/by-name/ht/htmlunit-driver/package.nix
similarity index 100%
rename from pkgs/development/tools/selenium/htmlunit-driver/default.nix
rename to pkgs/by-name/ht/htmlunit-driver/package.nix
diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/by-name/ht/htpdate/package.nix
similarity index 100%
rename from pkgs/tools/networking/htpdate/default.nix
rename to pkgs/by-name/ht/htpdate/package.nix
diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/by-name/ht/htslib/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/htslib/default.nix
rename to pkgs/by-name/ht/htslib/package.nix
diff --git a/pkgs/development/libraries/http-parser/enable-static-shared.patch b/pkgs/by-name/ht/http-parser/enable-static-shared.patch
similarity index 100%
rename from pkgs/development/libraries/http-parser/enable-static-shared.patch
rename to pkgs/by-name/ht/http-parser/enable-static-shared.patch
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/by-name/ht/http-parser/package.nix
similarity index 100%
rename from pkgs/development/libraries/http-parser/default.nix
rename to pkgs/by-name/ht/http-parser/package.nix
diff --git a/pkgs/tools/networking/http2tcp/default.nix b/pkgs/by-name/ht/http2tcp/package.nix
similarity index 100%
rename from pkgs/tools/networking/http2tcp/default.nix
rename to pkgs/by-name/ht/http2tcp/package.nix
diff --git a/pkgs/tools/security/httpdump/default.nix b/pkgs/by-name/ht/httpdump/package.nix
similarity index 100%
rename from pkgs/tools/security/httpdump/default.nix
rename to pkgs/by-name/ht/httpdump/package.nix
diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/by-name/ht/httperf/package.nix
similarity index 100%
rename from pkgs/tools/networking/httperf/default.nix
rename to pkgs/by-name/ht/httperf/package.nix
diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/by-name/ht/httpfs2/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/httpfs/default.nix
rename to pkgs/by-name/ht/httpfs2/package.nix
diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/by-name/ht/httplab/package.nix
similarity index 100%
rename from pkgs/tools/networking/httplab/default.nix
rename to pkgs/by-name/ht/httplab/package.nix
diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/by-name/ht/httplz/package.nix
similarity index 100%
rename from pkgs/tools/networking/httplz/default.nix
rename to pkgs/by-name/ht/httplz/package.nix
diff --git a/pkgs/development/tools/misc/httpref/default.nix b/pkgs/by-name/ht/httpref/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/httpref/default.nix
rename to pkgs/by-name/ht/httpref/package.nix
diff --git a/pkgs/tools/networking/httprobe/default.nix b/pkgs/by-name/ht/httprobe/package.nix
similarity index 100%
rename from pkgs/tools/networking/httprobe/default.nix
rename to pkgs/by-name/ht/httprobe/package.nix
diff --git a/pkgs/servers/dns/https-dns-proxy/default.nix b/pkgs/by-name/ht/https-dns-proxy/package.nix
similarity index 100%
rename from pkgs/servers/dns/https-dns-proxy/default.nix
rename to pkgs/by-name/ht/https-dns-proxy/package.nix
diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/by-name/ht/httpstat/package.nix
similarity index 100%
rename from pkgs/tools/networking/httpstat/default.nix
rename to pkgs/by-name/ht/httpstat/package.nix
diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/by-name/ht/httptunnel/package.nix
similarity index 100%
rename from pkgs/tools/networking/httptunnel/default.nix
rename to pkgs/by-name/ht/httptunnel/package.nix
diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/by-name/ht/httpunit/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/httpunit/default.nix
rename to pkgs/by-name/ht/httpunit/package.nix
diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/by-name/ht/httpx/package.nix
similarity index 100%
rename from pkgs/tools/security/httpx/default.nix
rename to pkgs/by-name/ht/httpx/package.nix
diff --git a/pkgs/applications/version-management/hub/default.nix b/pkgs/by-name/hu/hub/package.nix
similarity index 100%
rename from pkgs/applications/version-management/hub/default.nix
rename to pkgs/by-name/hu/hub/package.nix
diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/by-name/hu/hubble/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/hubble/default.nix
rename to pkgs/by-name/hu/hubble/package.nix
diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/by-name/hu/hubicfuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/hubicfuse/default.nix
rename to pkgs/by-name/hu/hubicfuse/package.nix
diff --git a/pkgs/data/fonts/hubot-sans/default.nix b/pkgs/by-name/hu/hubot-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/hubot-sans/default.nix
rename to pkgs/by-name/hu/hubot-sans/package.nix
diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/by-name/hu/hubstaff/package.nix
similarity index 100%
rename from pkgs/applications/misc/hubstaff/default.nix
rename to pkgs/by-name/hu/hubstaff/package.nix
diff --git a/pkgs/tools/misc/hueadm/default.nix b/pkgs/by-name/hu/hueadm/package.nix
similarity index 100%
rename from pkgs/tools/misc/hueadm/default.nix
rename to pkgs/by-name/hu/hueadm/package.nix
diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/by-name/hu/hugs/package.nix
similarity index 100%
rename from pkgs/development/interpreters/hugs/default.nix
rename to pkgs/by-name/hu/hugs/package.nix
diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/by-name/hu/humanity-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/humanity-icon-theme/default.nix
rename to pkgs/by-name/hu/humanity-icon-theme/package.nix
diff --git a/pkgs/tools/text/huniq/default.nix b/pkgs/by-name/hu/huniq/package.nix
similarity index 100%
rename from pkgs/tools/text/huniq/default.nix
rename to pkgs/by-name/hu/huniq/package.nix
diff --git a/pkgs/tools/misc/hunt/default.nix b/pkgs/by-name/hu/hunt/package.nix
similarity index 100%
rename from pkgs/tools/misc/hunt/default.nix
rename to pkgs/by-name/hu/hunt/package.nix
diff --git a/pkgs/development/tools/misc/husky/default.nix b/pkgs/by-name/hu/husky/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/husky/default.nix
rename to pkgs/by-name/hu/husky/package.nix
diff --git a/pkgs/applications/version-management/hut/default.nix b/pkgs/by-name/hu/hut/package.nix
similarity index 100%
rename from pkgs/applications/version-management/hut/default.nix
rename to pkgs/by-name/hu/hut/package.nix
diff --git a/pkgs/tools/misc/hwatch/default.nix b/pkgs/by-name/hw/hwatch/package.nix
similarity index 100%
rename from pkgs/tools/misc/hwatch/default.nix
rename to pkgs/by-name/hw/hwatch/package.nix
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/by-name/hw/hwdata/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/hwdata/default.nix
rename to pkgs/by-name/hw/hwdata/package.nix
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/by-name/hw/hwloc/package.nix
similarity index 100%
rename from pkgs/development/libraries/hwloc/default.nix
rename to pkgs/by-name/hw/hwloc/package.nix
diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/by-name/hy/hybridreverb2/package.nix
similarity index 100%
rename from pkgs/applications/audio/hybridreverb2/default.nix
rename to pkgs/by-name/hy/hybridreverb2/package.nix
diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/by-name/hy/hydra-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/hydra-cli/default.nix
rename to pkgs/by-name/hy/hydra-cli/package.nix
diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/by-name/hy/hydraAntLogger/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/hydra-ant-logger/default.nix
rename to pkgs/by-name/hy/hydraAntLogger/package.nix
diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/by-name/hy/hydroxide/package.nix
similarity index 100%
rename from pkgs/applications/networking/hydroxide/default.nix
rename to pkgs/by-name/hy/hydroxide/package.nix
diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/by-name/hy/hyena/package.nix
similarity index 100%
rename from pkgs/development/libraries/hyena/default.nix
rename to pkgs/by-name/hy/hyena/package.nix
diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/by-name/hy/hyenae/package.nix
similarity index 100%
rename from pkgs/tools/networking/hyenae/default.nix
rename to pkgs/by-name/hy/hyenae/package.nix
diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/by-name/hy/hyp/package.nix
similarity index 100%
rename from pkgs/servers/http/hyp/default.nix
rename to pkgs/by-name/hy/hyp/package.nix
diff --git a/pkgs/applications/science/electronics/hyp2mat/default.nix b/pkgs/by-name/hy/hyp2mat/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/hyp2mat/default.nix
rename to pkgs/by-name/hy/hyp2mat/package.nix
diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/by-name/hy/hyper/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/hyper/default.nix
rename to pkgs/by-name/hy/hyper/package.nix
diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/by-name/hy/hyperledger-fabric/package.nix
similarity index 100%
rename from pkgs/tools/misc/hyperledger-fabric/default.nix
rename to pkgs/by-name/hy/hyperledger-fabric/package.nix
diff --git a/pkgs/tools/misc/hyperpotamus/default.nix b/pkgs/by-name/hy/hyperpotamus/package.nix
similarity index 100%
rename from pkgs/tools/misc/hyperpotamus/default.nix
rename to pkgs/by-name/hy/hyperpotamus/package.nix
diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/by-name/hy/hyperrogue/package.nix
similarity index 100%
rename from pkgs/games/hyperrogue/default.nix
rename to pkgs/by-name/hy/hyperrogue/package.nix
diff --git a/pkgs/development/libraries/hyperscan/default.nix b/pkgs/by-name/hy/hyperscan/package.nix
similarity index 100%
rename from pkgs/development/libraries/hyperscan/default.nix
rename to pkgs/by-name/hy/hyperscan/package.nix
diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/by-name/hy/hyperscrypt-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/hyperscrypt/default.nix
rename to pkgs/by-name/hy/hyperscrypt-font/package.nix
diff --git a/pkgs/applications/video/hypnotix/libmpv-path.patch b/pkgs/by-name/hy/hypnotix/libmpv-path.patch
similarity index 100%
rename from pkgs/applications/video/hypnotix/libmpv-path.patch
rename to pkgs/by-name/hy/hypnotix/libmpv-path.patch
diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/by-name/hy/hypnotix/package.nix
similarity index 100%
rename from pkgs/applications/video/hypnotix/default.nix
rename to pkgs/by-name/hy/hypnotix/package.nix
diff --git a/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
similarity index 100%
rename from pkgs/applications/misc/hyprland-autoname-workspaces/default.nix
rename to pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix
diff --git a/pkgs/tools/wayland/hyprland-per-window-layout/default.nix b/pkgs/by-name/hy/hyprland-per-window-layout/package.nix
similarity index 100%
rename from pkgs/tools/wayland/hyprland-per-window-layout/default.nix
rename to pkgs/by-name/hy/hyprland-per-window-layout/package.nix
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix b/pkgs/by-name/hy/hyprland-protocols/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix
rename to pkgs/by-name/hy/hyprland-protocols/package.nix
diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/by-name/hy/hyprpaper/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
rename to pkgs/by-name/hy/hyprpaper/package.nix
diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/by-name/hy/hyprpicker/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix
rename to pkgs/by-name/hy/hyprpicker/package.nix
diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/by-name/hy/hysteria/package.nix
similarity index 100%
rename from pkgs/tools/networking/hysteria/default.nix
rename to pkgs/by-name/hy/hysteria/package.nix
diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/by-name/hy/hyx/package.nix
similarity index 100%
rename from pkgs/tools/text/hyx/default.nix
rename to pkgs/by-name/hy/hyx/package.nix
diff --git a/pkgs/data/fonts/i-dot-ming/default.nix b/pkgs/by-name/i-/i-dot-ming/package.nix
similarity index 100%
rename from pkgs/data/fonts/i-dot-ming/default.nix
rename to pkgs/by-name/i-/i-dot-ming/package.nix
diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/by-name/i2/i2c-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/i2c-tools/default.nix
rename to pkgs/by-name/i2/i2c-tools/package.nix
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/by-name/i2/i2pd/package.nix
similarity index 100%
rename from pkgs/tools/networking/i2pd/default.nix
rename to pkgs/by-name/i2/i2pd/package.nix
diff --git a/pkgs/misc/i3a/default.nix b/pkgs/by-name/i3/i3a/package.nix
similarity index 100%
rename from pkgs/misc/i3a/default.nix
rename to pkgs/by-name/i3/i3a/package.nix
diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/by-name/i3/i3lock-pixeled/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/i3lock-pixeled/default.nix
rename to pkgs/by-name/i3/i3lock-pixeled/package.nix
diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/by-name/i3/i3minator/package.nix
similarity index 100%
rename from pkgs/tools/misc/i3minator/default.nix
rename to pkgs/by-name/i3/i3minator/package.nix
diff --git a/pkgs/tools/misc/i3nator/default.nix b/pkgs/by-name/i3/i3nator/package.nix
similarity index 100%
rename from pkgs/tools/misc/i3nator/default.nix
rename to pkgs/by-name/i3/i3nator/package.nix
diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/by-name/i8/i810switch/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/i810switch/default.nix
rename to pkgs/by-name/i8/i810switch/package.nix
diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/pkgs/by-name/ia/ia-writer-duospace/package.nix
similarity index 100%
rename from pkgs/data/fonts/ia-writer-duospace/default.nix
rename to pkgs/by-name/ia/ia-writer-duospace/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/iamb/default.nix b/pkgs/by-name/ia/iamb/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/iamb/default.nix
rename to pkgs/by-name/ia/iamb/package.nix
diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/by-name/ia/iamy/package.nix
similarity index 100%
rename from pkgs/tools/admin/iamy/default.nix
rename to pkgs/by-name/ia/iamy/package.nix
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/by-name/ia/iana-etc/package.nix
similarity index 100%
rename from pkgs/data/misc/iana-etc/default.nix
rename to pkgs/by-name/ia/iana-etc/package.nix
diff --git a/pkgs/tools/cd-dvd/iat/default.nix b/pkgs/by-name/ia/iat/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/iat/default.nix
rename to pkgs/by-name/ia/iat/package.nix
diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/by-name/ib/ibm-plex/package.nix
similarity index 100%
rename from pkgs/data/fonts/ibm-plex/default.nix
rename to pkgs/by-name/ib/ibm-plex/package.nix
diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/by-name/ib/ibm-sw-tpm2/package.nix
similarity index 100%
rename from pkgs/tools/security/ibm-sw-tpm2/default.nix
rename to pkgs/by-name/ib/ibm-sw-tpm2/package.nix
diff --git a/pkgs/tools/graphics/ibniz/default.nix b/pkgs/by-name/ib/ibniz/package.nix
similarity index 100%
rename from pkgs/tools/graphics/ibniz/default.nix
rename to pkgs/by-name/ib/ibniz/package.nix
diff --git a/pkgs/tools/misc/ibus-theme-tools/default.nix b/pkgs/by-name/ib/ibus-theme-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/ibus-theme-tools/default.nix
rename to pkgs/by-name/ib/ibus-theme-tools/package.nix
diff --git a/pkgs/tools/security/ic-keysmith/default.nix b/pkgs/by-name/ic/ic-keysmith/package.nix
similarity index 100%
rename from pkgs/tools/security/ic-keysmith/default.nix
rename to pkgs/by-name/ic/ic-keysmith/package.nix
diff --git a/pkgs/tools/misc/ical2orgpy/default.nix b/pkgs/by-name/ic/ical2orgpy/package.nix
similarity index 100%
rename from pkgs/tools/misc/ical2orgpy/default.nix
rename to pkgs/by-name/ic/ical2orgpy/package.nix
diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/by-name/ic/icbm3d/package.nix
similarity index 100%
rename from pkgs/games/icbm3d/default.nix
rename to pkgs/by-name/ic/icbm3d/package.nix
diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/by-name/ic/icdiff/package.nix
similarity index 100%
rename from pkgs/tools/text/icdiff/default.nix
rename to pkgs/by-name/ic/icdiff/package.nix
diff --git a/pkgs/servers/icebreaker/default.nix b/pkgs/by-name/ic/icebreaker/package.nix
similarity index 100%
rename from pkgs/servers/icebreaker/default.nix
rename to pkgs/by-name/ic/icebreaker/package.nix
diff --git a/pkgs/servers/icecast/default.nix b/pkgs/by-name/ic/icecast/package.nix
similarity index 100%
rename from pkgs/servers/icecast/default.nix
rename to pkgs/by-name/ic/icecast/package.nix
diff --git a/pkgs/servers/icecream/default.nix b/pkgs/by-name/ic/icecream/package.nix
similarity index 100%
rename from pkgs/servers/icecream/default.nix
rename to pkgs/by-name/ic/icecream/package.nix
diff --git a/pkgs/tools/backup/iceshelf/default.nix b/pkgs/by-name/ic/iceshelf/package.nix
similarity index 100%
rename from pkgs/tools/backup/iceshelf/default.nix
rename to pkgs/by-name/ic/iceshelf/package.nix
diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/by-name/ic/icesl/package.nix
similarity index 100%
rename from pkgs/applications/misc/icesl/default.nix
rename to pkgs/by-name/ic/icesl/package.nix
diff --git a/pkgs/development/embedded/fpga/icestorm/default.nix b/pkgs/by-name/ic/icestorm/package.nix
similarity index 100%
rename from pkgs/development/embedded/fpga/icestorm/default.nix
rename to pkgs/by-name/ic/icestorm/package.nix
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/by-name/ic/icmake/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/icmake/default.nix
rename to pkgs/by-name/ic/icmake/package.nix
diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/by-name/ic/icon-lang/package.nix
similarity index 100%
rename from pkgs/development/interpreters/icon-lang/default.nix
rename to pkgs/by-name/ic/icon-lang/package.nix
diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/by-name/ic/icon-library/package.nix
similarity index 100%
rename from pkgs/applications/graphics/icon-library/default.nix
rename to pkgs/by-name/ic/icon-library/package.nix
diff --git a/pkgs/tools/X11/icon-slicer/default.nix b/pkgs/by-name/ic/icon-slicer/package.nix
similarity index 100%
rename from pkgs/tools/X11/icon-slicer/default.nix
rename to pkgs/by-name/ic/icon-slicer/package.nix
diff --git a/pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh
similarity index 100%
rename from pkgs/build-support/icon-conv-tools/bin/extractWinRscIconsToStdFreeDesktopDir.sh
rename to pkgs/by-name/ic/iconConvTools/bin/extractWinRscIconsToStdFreeDesktopDir.sh
diff --git a/pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme b/pkgs/by-name/ic/iconConvTools/bin/icoFileToHiColorTheme
similarity index 100%
rename from pkgs/build-support/icon-conv-tools/bin/icoFileToHiColorTheme
rename to pkgs/by-name/ic/iconConvTools/bin/icoFileToHiColorTheme
diff --git a/pkgs/build-support/icon-conv-tools/default.nix b/pkgs/by-name/ic/iconConvTools/package.nix
similarity index 100%
rename from pkgs/build-support/icon-conv-tools/default.nix
rename to pkgs/by-name/ic/iconConvTools/package.nix
diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/by-name/ic/iconnamingutils/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/icon-naming-utils/default.nix
rename to pkgs/by-name/ic/iconnamingutils/package.nix
diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/by-name/ic/iconpack-jade/package.nix
similarity index 100%
rename from pkgs/data/icons/iconpack-jade/default.nix
rename to pkgs/by-name/ic/iconpack-jade/package.nix
diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/by-name/ic/iconpack-obsidian/package.nix
similarity index 100%
rename from pkgs/data/icons/iconpack-obsidian/default.nix
rename to pkgs/by-name/ic/iconpack-obsidian/package.nix
diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/by-name/ic/icoutils/package.nix
similarity index 100%
rename from pkgs/tools/graphics/icoutils/default.nix
rename to pkgs/by-name/ic/icoutils/package.nix
diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/by-name/ic/icr/package.nix
similarity index 100%
rename from pkgs/development/tools/icr/default.nix
rename to pkgs/by-name/ic/icr/package.nix
diff --git a/pkgs/development/tools/icr/shards.nix b/pkgs/by-name/ic/icr/shards.nix
similarity index 100%
rename from pkgs/development/tools/icr/shards.nix
rename to pkgs/by-name/ic/icr/shards.nix
diff --git a/pkgs/tools/misc/ictree/default.nix b/pkgs/by-name/ic/ictree/package.nix
similarity index 100%
rename from pkgs/tools/misc/ictree/default.nix
rename to pkgs/by-name/ic/ictree/package.nix
diff --git a/pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch b/pkgs/by-name/id/id3lib/id3lib-3.8.3-gcc43-1.patch
similarity index 100%
rename from pkgs/development/libraries/id3lib/id3lib-3.8.3-gcc43-1.patch
rename to pkgs/by-name/id/id3lib/id3lib-3.8.3-gcc43-1.patch
diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/by-name/id/id3lib/package.nix
similarity index 100%
rename from pkgs/development/libraries/id3lib/default.nix
rename to pkgs/by-name/id/id3lib/package.nix
diff --git a/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/pkgs/by-name/id/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
similarity index 100%
rename from pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
rename to pkgs/by-name/id/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/by-name/id/id3v2/package.nix
similarity index 100%
rename from pkgs/applications/audio/id3v2/default.nix
rename to pkgs/by-name/id/id3v2/package.nix
diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/by-name/id/ideogram/package.nix
similarity index 100%
rename from pkgs/applications/graphics/ideogram/default.nix
rename to pkgs/by-name/id/ideogram/package.nix
diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/by-name/id/ideviceinstaller/package.nix
similarity index 100%
rename from pkgs/tools/misc/ideviceinstaller/default.nix
rename to pkgs/by-name/id/ideviceinstaller/package.nix
diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/by-name/id/idevicerestore/package.nix
similarity index 100%
rename from pkgs/tools/misc/idevicerestore/default.nix
rename to pkgs/by-name/id/idevicerestore/package.nix
diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/by-name/id/idle3tools/package.nix
similarity index 100%
rename from pkgs/tools/system/idle3tools/default.nix
rename to pkgs/by-name/id/idle3tools/package.nix
diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/by-name/id/idnkit/package.nix
similarity index 100%
rename from pkgs/development/libraries/idnkit/default.nix
rename to pkgs/by-name/id/idnkit/package.nix
diff --git a/pkgs/tools/misc/idutils/nix-mapping.patch b/pkgs/by-name/id/idutils/nix-mapping.patch
similarity index 100%
rename from pkgs/tools/misc/idutils/nix-mapping.patch
rename to pkgs/by-name/id/idutils/nix-mapping.patch
diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/by-name/id/idutils/package.nix
similarity index 100%
rename from pkgs/tools/misc/idutils/default.nix
rename to pkgs/by-name/id/idutils/package.nix
diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/by-name/if/ifdnfc/package.nix
similarity index 100%
rename from pkgs/tools/security/ifdnfc/default.nix
rename to pkgs/by-name/if/ifdnfc/package.nix
diff --git a/pkgs/os-specific/linux/ifenslave/default.nix b/pkgs/by-name/if/ifenslave/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ifenslave/default.nix
rename to pkgs/by-name/if/ifenslave/package.nix
diff --git a/pkgs/development/tools/iferr/default.nix b/pkgs/by-name/if/iferr/package.nix
similarity index 100%
rename from pkgs/development/tools/iferr/default.nix
rename to pkgs/by-name/if/iferr/package.nix
diff --git a/pkgs/tools/graphics/ifm/default.nix b/pkgs/by-name/if/ifm/package.nix
similarity index 100%
rename from pkgs/tools/graphics/ifm/default.nix
rename to pkgs/by-name/if/ifm/package.nix
diff --git a/pkgs/os-specific/linux/ifmetric/default.nix b/pkgs/by-name/if/ifmetric/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ifmetric/default.nix
rename to pkgs/by-name/if/ifmetric/package.nix
diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/by-name/if/ifstat-legacy/package.nix
similarity index 100%
rename from pkgs/tools/networking/ifstat-legacy/default.nix
rename to pkgs/by-name/if/ifstat-legacy/package.nix
diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/by-name/if/iftop/package.nix
similarity index 100%
rename from pkgs/tools/networking/iftop/default.nix
rename to pkgs/by-name/if/iftop/package.nix
diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/by-name/if/ifuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/ifuse/default.nix
rename to pkgs/by-name/if/ifuse/package.nix
diff --git a/pkgs/tools/networking/igmpproxy/default.nix b/pkgs/by-name/ig/igmpproxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/igmpproxy/default.nix
rename to pkgs/by-name/ig/igmpproxy/package.nix
diff --git a/pkgs/development/tools/misc/igprof/default.nix b/pkgs/by-name/ig/igprof/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/igprof/default.nix
rename to pkgs/by-name/ig/igprof/package.nix
diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/by-name/ig/igraph/package.nix
similarity index 100%
rename from pkgs/development/libraries/igraph/default.nix
rename to pkgs/by-name/ig/igraph/package.nix
diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/by-name/ig/igv/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/igv/default.nix
rename to pkgs/by-name/ig/igv/package.nix
diff --git a/pkgs/development/web/ihp-new/default.nix b/pkgs/by-name/ih/ihp-new/package.nix
similarity index 100%
rename from pkgs/development/web/ihp-new/default.nix
rename to pkgs/by-name/ih/ihp-new/package.nix
diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/by-name/ii/iio-sensor-proxy/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/iio-sensor-proxy/default.nix
rename to pkgs/by-name/ii/iio-sensor-proxy/package.nix
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/by-name/ij/ijs/package.nix
similarity index 100%
rename from pkgs/development/libraries/ijs/default.nix
rename to pkgs/by-name/ij/ijs/package.nix
diff --git a/pkgs/tools/security/ike-scan/default.nix b/pkgs/by-name/ik/ike-scan/package.nix
similarity index 100%
rename from pkgs/tools/security/ike-scan/default.nix
rename to pkgs/by-name/ik/ike-scan/package.nix
diff --git a/pkgs/tools/misc/ikill/default.nix b/pkgs/by-name/ik/ikill/package.nix
similarity index 100%
rename from pkgs/tools/misc/ikill/default.nix
rename to pkgs/by-name/ik/ikill/package.nix
diff --git a/pkgs/development/libraries/ilbc/CMakeLists.txt b/pkgs/by-name/il/ilbc/CMakeLists.txt
similarity index 100%
rename from pkgs/development/libraries/ilbc/CMakeLists.txt
rename to pkgs/by-name/il/ilbc/CMakeLists.txt
diff --git a/pkgs/development/libraries/ilbc/extract-cfile.awk b/pkgs/by-name/il/ilbc/extract-cfile.awk
similarity index 100%
rename from pkgs/development/libraries/ilbc/extract-cfile.awk
rename to pkgs/by-name/il/ilbc/extract-cfile.awk
diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/by-name/il/ilbc/package.nix
similarity index 100%
rename from pkgs/development/libraries/ilbc/default.nix
rename to pkgs/by-name/il/ilbc/package.nix
diff --git a/pkgs/tools/misc/ili2c/dont-use-build-timestamp.patch b/pkgs/by-name/il/ili2c/dont-use-build-timestamp.patch
similarity index 100%
rename from pkgs/tools/misc/ili2c/dont-use-build-timestamp.patch
rename to pkgs/by-name/il/ili2c/dont-use-build-timestamp.patch
diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/by-name/il/ili2c/package.nix
similarity index 100%
rename from pkgs/tools/misc/ili2c/default.nix
rename to pkgs/by-name/il/ili2c/package.nix
diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/by-name/il/illum/package.nix
similarity index 100%
rename from pkgs/tools/system/illum/default.nix
rename to pkgs/by-name/il/illum/package.nix
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/by-name/il/ilmbase/package.nix
similarity index 100%
rename from pkgs/development/libraries/ilmbase/default.nix
rename to pkgs/by-name/il/ilmbase/package.nix
diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/by-name/im/ima-evm-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ima-evm-utils/default.nix
rename to pkgs/by-name/im/ima-evm-utils/package.nix
diff --git a/pkgs/applications/graphics/image-roll/default.nix b/pkgs/by-name/im/image-roll/package.nix
similarity index 100%
rename from pkgs/applications/graphics/image-roll/default.nix
rename to pkgs/by-name/im/image-roll/package.nix
diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/by-name/im/imagej/package.nix
similarity index 100%
rename from pkgs/applications/graphics/imagej/default.nix
rename to pkgs/by-name/im/imagej/package.nix
diff --git a/pkgs/tools/compression/imagelol/default.nix b/pkgs/by-name/im/imagelol/package.nix
similarity index 100%
rename from pkgs/tools/compression/imagelol/default.nix
rename to pkgs/by-name/im/imagelol/package.nix
diff --git a/pkgs/servers/imaginary/default.nix b/pkgs/by-name/im/imaginary/package.nix
similarity index 100%
rename from pkgs/servers/imaginary/default.nix
rename to pkgs/by-name/im/imaginary/package.nix
diff --git a/pkgs/applications/video/imagination/default.nix b/pkgs/by-name/im/imagination/package.nix
similarity index 100%
rename from pkgs/applications/video/imagination/default.nix
rename to pkgs/by-name/im/imagination/package.nix
diff --git a/pkgs/applications/misc/imaginer/default.nix b/pkgs/by-name/im/imaginer/package.nix
similarity index 100%
rename from pkgs/applications/misc/imaginer/default.nix
rename to pkgs/by-name/im/imaginer/package.nix
diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/by-name/im/imapsync/package.nix
similarity index 100%
rename from pkgs/tools/networking/imapsync/default.nix
rename to pkgs/by-name/im/imapsync/package.nix
diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/by-name/im/imath/package.nix
similarity index 100%
rename from pkgs/development/libraries/imath/default.nix
rename to pkgs/by-name/im/imath/package.nix
diff --git a/pkgs/tools/security/imdshift/default.nix b/pkgs/by-name/im/imdshift/package.nix
similarity index 100%
rename from pkgs/tools/security/imdshift/default.nix
rename to pkgs/by-name/im/imdshift/package.nix
diff --git a/pkgs/applications/graphics/img-cat/default.nix b/pkgs/by-name/im/img-cat/package.nix
similarity index 100%
rename from pkgs/applications/graphics/img-cat/default.nix
rename to pkgs/by-name/im/img-cat/package.nix
diff --git a/pkgs/development/tools/img/default.nix b/pkgs/by-name/im/img/package.nix
similarity index 100%
rename from pkgs/development/tools/img/default.nix
rename to pkgs/by-name/im/img/package.nix
diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/by-name/im/imgcat/package.nix
similarity index 100%
rename from pkgs/applications/graphics/imgcat/default.nix
rename to pkgs/by-name/im/imgcat/package.nix
diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/by-name/im/imgcrypt/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/imgcrypt/default.nix
rename to pkgs/by-name/im/imgcrypt/package.nix
diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/by-name/im/imgpatchtools/package.nix
similarity index 100%
rename from pkgs/development/mobile/imgpatchtools/default.nix
rename to pkgs/by-name/im/imgpatchtools/package.nix
diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/by-name/im/imgproxy/package.nix
similarity index 100%
rename from pkgs/servers/imgproxy/default.nix
rename to pkgs/by-name/im/imgproxy/package.nix
diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/by-name/im/imgur-screenshot/package.nix
similarity index 100%
rename from pkgs/tools/graphics/imgur-screenshot/default.nix
rename to pkgs/by-name/im/imgur-screenshot/package.nix
diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/by-name/im/imgurbash2/package.nix
similarity index 100%
rename from pkgs/tools/graphics/imgurbash2/default.nix
rename to pkgs/by-name/im/imgurbash2/package.nix
diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/by-name/im/iml/package.nix
similarity index 100%
rename from pkgs/development/libraries/iml/default.nix
rename to pkgs/by-name/im/iml/package.nix
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/by-name/im/imlib2/package.nix
similarity index 100%
rename from pkgs/development/libraries/imlib2/default.nix
rename to pkgs/by-name/im/imlib2/package.nix
diff --git a/pkgs/development/libraries/immer/default.nix b/pkgs/by-name/im/immer/package.nix
similarity index 100%
rename from pkgs/development/libraries/immer/default.nix
rename to pkgs/by-name/im/immer/package.nix
diff --git a/pkgs/servers/nosql/immudb/default.nix b/pkgs/by-name/im/immudb/package.nix
similarity index 100%
rename from pkgs/servers/nosql/immudb/default.nix
rename to pkgs/by-name/im/immudb/package.nix
diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/by-name/im/impl/package.nix
similarity index 100%
rename from pkgs/development/tools/impl/default.nix
rename to pkgs/by-name/im/impl/package.nix
diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/by-name/im/impy/package.nix
similarity index 100%
rename from pkgs/development/libraries/impy/default.nix
rename to pkgs/by-name/im/impy/package.nix
diff --git a/pkgs/development/libraries/imtui/default.nix b/pkgs/by-name/im/imtui/package.nix
similarity index 100%
rename from pkgs/development/libraries/imtui/default.nix
rename to pkgs/by-name/im/imtui/package.nix
diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/by-name/im/imv/package.nix
similarity index 100%
rename from pkgs/applications/graphics/imv/default.nix
rename to pkgs/by-name/im/imv/package.nix
diff --git a/pkgs/tools/X11/imwheel/default.nix b/pkgs/by-name/im/imwheel/package.nix
similarity index 100%
rename from pkgs/tools/X11/imwheel/default.nix
rename to pkgs/by-name/im/imwheel/package.nix
diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/by-name/in/inadyn/package.nix
similarity index 100%
rename from pkgs/tools/networking/inadyn/default.nix
rename to pkgs/by-name/in/inadyn/package.nix
diff --git a/pkgs/tools/misc/inav-blackbox-tools/default.nix b/pkgs/by-name/in/inav-blackbox-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/inav-blackbox-tools/default.nix
rename to pkgs/by-name/in/inav-blackbox-tools/package.nix
diff --git a/pkgs/applications/science/robotics/inav-configurator/default.nix b/pkgs/by-name/in/inav-configurator/package.nix
similarity index 100%
rename from pkgs/applications/science/robotics/inav-configurator/default.nix
rename to pkgs/by-name/in/inav-configurator/package.nix
diff --git a/pkgs/development/libraries/inchi/default.nix b/pkgs/by-name/in/inchi/package.nix
similarity index 100%
rename from pkgs/development/libraries/inchi/default.nix
rename to pkgs/by-name/in/inchi/package.nix
diff --git a/pkgs/tools/system/incron/default_path.patch b/pkgs/by-name/in/incron/default_path.patch
similarity index 100%
rename from pkgs/tools/system/incron/default_path.patch
rename to pkgs/by-name/in/incron/default_path.patch
diff --git a/pkgs/tools/system/incron/default.nix b/pkgs/by-name/in/incron/package.nix
similarity index 100%
rename from pkgs/tools/system/incron/default.nix
rename to pkgs/by-name/in/incron/package.nix
diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/by-name/in/indent/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/indent/default.nix
rename to pkgs/by-name/in/indent/package.nix
diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/by-name/in/indicator-sound-switcher/package.nix
similarity index 100%
rename from pkgs/applications/audio/indicator-sound-switcher/default.nix
rename to pkgs/by-name/in/indicator-sound-switcher/package.nix
diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/by-name/in/industrializer/package.nix
similarity index 100%
rename from pkgs/applications/audio/industrializer/default.nix
rename to pkgs/by-name/in/industrializer/package.nix
diff --git a/pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch b/pkgs/by-name/in/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch
similarity index 100%
rename from pkgs/tools/networking/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch
rename to pkgs/by-name/in/inetutils/inetutils-1_9-PATH_PROCNET_DEV.patch
diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/by-name/in/inetutils/package.nix
similarity index 100%
rename from pkgs/tools/networking/inetutils/default.nix
rename to pkgs/by-name/in/inetutils/package.nix
diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/by-name/in/infamousPlugins/package.nix
similarity index 100%
rename from pkgs/applications/audio/infamousPlugins/default.nix
rename to pkgs/by-name/in/infamousPlugins/package.nix
diff --git a/pkgs/development/tools/inferno/default.nix b/pkgs/by-name/in/inferno/package.nix
similarity index 100%
rename from pkgs/development/tools/inferno/default.nix
rename to pkgs/by-name/in/inferno/package.nix
diff --git a/pkgs/misc/drivers/infnoise/makefile.patch b/pkgs/by-name/in/infnoise/makefile.patch
similarity index 100%
rename from pkgs/misc/drivers/infnoise/makefile.patch
rename to pkgs/by-name/in/infnoise/makefile.patch
diff --git a/pkgs/misc/drivers/infnoise/default.nix b/pkgs/by-name/in/infnoise/package.nix
similarity index 100%
rename from pkgs/misc/drivers/infnoise/default.nix
rename to pkgs/by-name/in/infnoise/package.nix
diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/by-name/in/inform7/package.nix
similarity index 100%
rename from pkgs/development/compilers/inform7/default.nix
rename to pkgs/by-name/in/inform7/package.nix
diff --git a/pkgs/games/infra-arcana/default.nix b/pkgs/by-name/in/infra-arcana/package.nix
similarity index 100%
rename from pkgs/games/infra-arcana/default.nix
rename to pkgs/by-name/in/infra-arcana/package.nix
diff --git a/pkgs/tools/admin/infra/default.nix b/pkgs/by-name/in/infra/package.nix
similarity index 100%
rename from pkgs/tools/admin/infra/default.nix
rename to pkgs/by-name/in/infra/package.nix
diff --git a/pkgs/applications/networking/cluster/inframap/default.nix b/pkgs/by-name/in/inframap/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/inframap/default.nix
rename to pkgs/by-name/in/inframap/package.nix
diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/by-name/in/ingen/package.nix
similarity index 100%
rename from pkgs/applications/audio/ingen/default.nix
rename to pkgs/by-name/in/ingen/package.nix
diff --git a/pkgs/development/libraries/inih/default.nix b/pkgs/by-name/in/inih/package.nix
similarity index 100%
rename from pkgs/development/libraries/inih/default.nix
rename to pkgs/by-name/in/inih/package.nix
diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/by-name/in/iniparser/package.nix
similarity index 100%
rename from pkgs/development/libraries/iniparser/default.nix
rename to pkgs/by-name/in/iniparser/package.nix
diff --git a/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch b/pkgs/by-name/in/iniparser/remove-fetchcontent-usage.patch
similarity index 100%
rename from pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch
rename to pkgs/by-name/in/iniparser/remove-fetchcontent-usage.patch
diff --git a/pkgs/development/tools/initool/default.nix b/pkgs/by-name/in/initool/package.nix
similarity index 100%
rename from pkgs/development/tools/initool/default.nix
rename to pkgs/by-name/in/initool/package.nix
diff --git a/pkgs/tools/misc/ink/default.nix b/pkgs/by-name/in/ink/package.nix
similarity index 100%
rename from pkgs/tools/misc/ink/default.nix
rename to pkgs/by-name/in/ink/package.nix
diff --git a/pkgs/development/compilers/inklecate/deps.nix b/pkgs/by-name/in/inklecate/deps.nix
similarity index 100%
rename from pkgs/development/compilers/inklecate/deps.nix
rename to pkgs/by-name/in/inklecate/deps.nix
diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/by-name/in/inklecate/package.nix
similarity index 100%
rename from pkgs/development/compilers/inklecate/default.nix
rename to pkgs/by-name/in/inklecate/package.nix
diff --git a/pkgs/tools/misc/inklingreader/default.nix b/pkgs/by-name/in/inklingreader/package.nix
similarity index 100%
rename from pkgs/tools/misc/inklingreader/default.nix
rename to pkgs/by-name/in/inklingreader/package.nix
diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/by-name/in/innoextract/package.nix
similarity index 100%
rename from pkgs/tools/archivers/innoextract/default.nix
rename to pkgs/by-name/in/innoextract/package.nix
diff --git a/pkgs/applications/science/biology/inormalize/lgmask-interp.patch b/pkgs/by-name/in/inormalize/lgmask-interp.patch
similarity index 100%
rename from pkgs/applications/science/biology/inormalize/lgmask-interp.patch
rename to pkgs/by-name/in/inormalize/lgmask-interp.patch
diff --git a/pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch b/pkgs/by-name/in/inormalize/nu_correct_norm-interp.patch
similarity index 100%
rename from pkgs/applications/science/biology/inormalize/nu_correct_norm-interp.patch
rename to pkgs/by-name/in/inormalize/nu_correct_norm-interp.patch
diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/by-name/in/inormalize/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/inormalize/default.nix
rename to pkgs/by-name/in/inormalize/package.nix
diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/by-name/in/inotify-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/inotify-tools/default.nix
rename to pkgs/by-name/in/inotify-tools/package.nix
diff --git a/pkgs/tools/X11/inputplug/default.nix b/pkgs/by-name/in/inputplug/package.nix
similarity index 100%
rename from pkgs/tools/X11/inputplug/default.nix
rename to pkgs/by-name/in/inputplug/package.nix
diff --git a/pkgs/tools/security/inql/default.nix b/pkgs/by-name/in/inql/package.nix
similarity index 100%
rename from pkgs/tools/security/inql/default.nix
rename to pkgs/by-name/in/inql/package.nix
diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/by-name/in/inriafonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/inriafonts/default.nix
rename to pkgs/by-name/in/inriafonts/package.nix
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/by-name/in/insomnia/package.nix
similarity index 100%
rename from pkgs/development/web/insomnia/default.nix
rename to pkgs/by-name/in/insomnia/package.nix
diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/by-name/in/inspectrum/package.nix
similarity index 100%
rename from pkgs/applications/radio/inspectrum/default.nix
rename to pkgs/by-name/in/inspectrum/package.nix
diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/by-name/in/inspircd/package.nix
similarity index 100%
rename from pkgs/servers/irc/inspircd/default.nix
rename to pkgs/by-name/in/inspircd/package.nix
diff --git a/pkgs/games/instead/default.nix b/pkgs/by-name/in/instead/package.nix
similarity index 100%
rename from pkgs/games/instead/default.nix
rename to pkgs/by-name/in/instead/package.nix
diff --git a/pkgs/applications/misc/insulator2/Cargo.lock b/pkgs/by-name/in/insulator2/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/insulator2/Cargo.lock
rename to pkgs/by-name/in/insulator2/Cargo.lock
diff --git a/pkgs/applications/misc/insulator2/fix-rust-1.80.0.patch b/pkgs/by-name/in/insulator2/fix-rust-1.80.0.patch
similarity index 100%
rename from pkgs/applications/misc/insulator2/fix-rust-1.80.0.patch
rename to pkgs/by-name/in/insulator2/fix-rust-1.80.0.patch
diff --git a/pkgs/applications/misc/insulator2/default.nix b/pkgs/by-name/in/insulator2/package.nix
similarity index 100%
rename from pkgs/applications/misc/insulator2/default.nix
rename to pkgs/by-name/in/insulator2/package.nix
diff --git a/pkgs/os-specific/linux/intel-cmt-cat/default.nix b/pkgs/by-name/in/intel-cmt-cat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/intel-cmt-cat/default.nix
rename to pkgs/by-name/in/intel-cmt-cat/package.nix
diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/intel-compute-runtime/default.nix
rename to pkgs/by-name/in/intel-compute-runtime/package.nix
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/by-name/in/intel-gmmlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/intel-gmmlib/default.nix
rename to pkgs/by-name/in/intel-gmmlib/package.nix
diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/intel-gpu-tools/default.nix
rename to pkgs/by-name/in/intel-gpu-tools/package.nix
diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix
similarity index 100%
rename from pkgs/development/compilers/intel-graphics-compiler/default.nix
rename to pkgs/by-name/in/intel-graphics-compiler/package.nix
diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/by-name/in/intel-media-driver/package.nix
similarity index 100%
rename from pkgs/development/libraries/intel-media-driver/default.nix
rename to pkgs/by-name/in/intel-media-driver/package.nix
diff --git a/pkgs/development/libraries/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch b/pkgs/by-name/in/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch
similarity index 100%
rename from pkgs/development/libraries/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch
rename to pkgs/by-name/in/intel-media-sdk/nixos-search-onevplrt-in-run-opengl-driver-lib.patch
diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/by-name/in/intel-media-sdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/intel-media-sdk/default.nix
rename to pkgs/by-name/in/intel-media-sdk/package.nix
diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/by-name/in/intel-ocl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/intel-ocl/default.nix
rename to pkgs/by-name/in/intel-ocl/package.nix
diff --git a/pkgs/data/fonts/intel-one-mono/default.nix b/pkgs/by-name/in/intel-one-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/intel-one-mono/default.nix
rename to pkgs/by-name/in/intel-one-mono/package.nix
diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/by-name/in/intel2200BGFirmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
rename to pkgs/by-name/in/intel2200BGFirmware/package.nix
diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/by-name/in/inter/package.nix
similarity index 100%
rename from pkgs/data/fonts/inter/default.nix
rename to pkgs/by-name/in/inter/package.nix
diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/by-name/in/interactsh/package.nix
similarity index 100%
rename from pkgs/tools/misc/interactsh/default.nix
rename to pkgs/by-name/in/interactsh/package.nix
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/by-name/in/interlock/package.nix
similarity index 100%
rename from pkgs/servers/interlock/default.nix
rename to pkgs/by-name/in/interlock/package.nix
diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/by-name/in/intermodal/package.nix
similarity index 100%
rename from pkgs/tools/misc/intermodal/default.nix
rename to pkgs/by-name/in/intermodal/package.nix
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/by-name/in/intltool/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/intltool/default.nix
rename to pkgs/by-name/in/intltool/package.nix
diff --git a/pkgs/tools/misc/invoice/default.nix b/pkgs/by-name/in/invoice/package.nix
similarity index 100%
rename from pkgs/tools/misc/invoice/default.nix
rename to pkgs/by-name/in/invoice/package.nix
diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/by-name/in/invoice2data/package.nix
similarity index 100%
rename from pkgs/tools/text/invoice2data/default.nix
rename to pkgs/by-name/in/invoice2data/package.nix
diff --git a/pkgs/servers/web-apps/invoiceplane/default.nix b/pkgs/by-name/in/invoiceplane/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/invoiceplane/default.nix
rename to pkgs/by-name/in/invoiceplane/package.nix
diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/by-name/in/inxi/package.nix
similarity index 100%
rename from pkgs/tools/system/inxi/default.nix
rename to pkgs/by-name/in/inxi/package.nix
diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/by-name/io/io/package.nix
similarity index 100%
rename from pkgs/development/interpreters/io/default.nix
rename to pkgs/by-name/io/io/package.nix
diff --git a/pkgs/tools/security/ioc-scan/default.nix b/pkgs/by-name/io/ioc-scan/package.nix
similarity index 100%
rename from pkgs/tools/security/ioc-scan/default.nix
rename to pkgs/by-name/io/ioc-scan/package.nix
diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/by-name/io/ioccheck/package.nix
similarity index 100%
rename from pkgs/tools/security/ioccheck/default.nix
rename to pkgs/by-name/io/ioccheck/package.nix
diff --git a/pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch b/pkgs/by-name/io/iodash/0001-Add-cmake-install-directives.patch
similarity index 100%
rename from pkgs/development/libraries/iodash/0001-Add-cmake-install-directives.patch
rename to pkgs/by-name/io/iodash/0001-Add-cmake-install-directives.patch
diff --git a/pkgs/development/libraries/iodash/default.nix b/pkgs/by-name/io/iodash/package.nix
similarity index 100%
rename from pkgs/development/libraries/iodash/default.nix
rename to pkgs/by-name/io/iodash/package.nix
diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/by-name/io/iodine/package.nix
similarity index 100%
rename from pkgs/tools/networking/iodine/default.nix
rename to pkgs/by-name/io/iodine/package.nix
diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/by-name/io/iomelt/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/iomelt/default.nix
rename to pkgs/by-name/io/iomelt/package.nix
diff --git a/pkgs/shells/ion/Cargo.lock b/pkgs/by-name/io/ion/Cargo.lock
similarity index 100%
rename from pkgs/shells/ion/Cargo.lock
rename to pkgs/by-name/io/ion/Cargo.lock
diff --git a/pkgs/shells/ion/build-script.patch b/pkgs/by-name/io/ion/build-script.patch
similarity index 100%
rename from pkgs/shells/ion/build-script.patch
rename to pkgs/by-name/io/ion/build-script.patch
diff --git a/pkgs/shells/ion/default.nix b/pkgs/by-name/io/ion/package.nix
similarity index 100%
rename from pkgs/shells/ion/default.nix
rename to pkgs/by-name/io/ion/package.nix
diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/by-name/io/ioping/package.nix
similarity index 100%
rename from pkgs/tools/system/ioping/default.nix
rename to pkgs/by-name/io/ioping/package.nix
diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/by-name/io/ioport/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ioport/default.nix
rename to pkgs/by-name/io/ioport/package.nix
diff --git a/pkgs/games/quake3/ioquake/Makefile.local b/pkgs/by-name/io/ioquake3/Makefile.local
similarity index 100%
rename from pkgs/games/quake3/ioquake/Makefile.local
rename to pkgs/by-name/io/ioquake3/Makefile.local
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/by-name/io/ioquake3/package.nix
similarity index 100%
rename from pkgs/games/quake3/ioquake/default.nix
rename to pkgs/by-name/io/ioquake3/package.nix
diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/by-name/io/ior/package.nix
similarity index 100%
rename from pkgs/tools/system/ior/default.nix
rename to pkgs/by-name/io/ior/package.nix
diff --git a/pkgs/applications/office/iotas/default.nix b/pkgs/by-name/io/iotas/package.nix
similarity index 100%
rename from pkgs/applications/office/iotas/default.nix
rename to pkgs/by-name/io/iotas/package.nix
diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/by-name/io/iotop-c/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/iotop-c/default.nix
rename to pkgs/by-name/io/iotop-c/package.nix
diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/by-name/io/iotop/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/iotop/default.nix
rename to pkgs/by-name/io/iotop/package.nix
diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/by-name/io/iozone/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/iozone/default.nix
rename to pkgs/by-name/io/iozone/package.nix
diff --git a/pkgs/tools/filesystems/ioztat/default.nix b/pkgs/by-name/io/ioztat/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/ioztat/default.nix
rename to pkgs/by-name/io/ioztat/package.nix
diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/by-name/ip/ip2location-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/ip2location-c/default.nix
rename to pkgs/by-name/ip/ip2location-c/package.nix
diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/by-name/ip/ip2location/package.nix
similarity index 100%
rename from pkgs/tools/networking/ip2location/default.nix
rename to pkgs/by-name/ip/ip2location/package.nix
diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/by-name/ip/ip2unix/package.nix
similarity index 100%
rename from pkgs/tools/networking/ip2unix/default.nix
rename to pkgs/by-name/ip/ip2unix/package.nix
diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/by-name/ip/ipad_charge/package.nix
similarity index 100%
rename from pkgs/tools/misc/ipad_charge/default.nix
rename to pkgs/by-name/ip/ipad_charge/package.nix
diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/by-name/ip/ipaexfont/package.nix
similarity index 100%
rename from pkgs/data/fonts/ipaexfont/default.nix
rename to pkgs/by-name/ip/ipaexfont/package.nix
diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/by-name/ip/ipafont/package.nix
similarity index 100%
rename from pkgs/data/fonts/ipafont/default.nix
rename to pkgs/by-name/ip/ipafont/package.nix
diff --git a/pkgs/applications/misc/ipatool/default.nix b/pkgs/by-name/ip/ipatool/package.nix
similarity index 100%
rename from pkgs/applications/misc/ipatool/default.nix
rename to pkgs/by-name/ip/ipatool/package.nix
diff --git a/pkgs/tools/misc/ipbt/default.nix b/pkgs/by-name/ip/ipbt/package.nix
similarity index 100%
rename from pkgs/tools/misc/ipbt/default.nix
rename to pkgs/by-name/ip/ipbt/package.nix
diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/by-name/ip/ipcalc/package.nix
similarity index 100%
rename from pkgs/tools/networking/ipcalc/default.nix
rename to pkgs/by-name/ip/ipcalc/package.nix
diff --git a/pkgs/tools/networking/ipcalc/sandbox_tests.patch b/pkgs/by-name/ip/ipcalc/sandbox_tests.patch
similarity index 100%
rename from pkgs/tools/networking/ipcalc/sandbox_tests.patch
rename to pkgs/by-name/ip/ipcalc/sandbox_tests.patch
diff --git a/pkgs/tools/networking/iperf3d/default.nix b/pkgs/by-name/ip/iperf3d/package.nix
similarity index 100%
rename from pkgs/tools/networking/iperf3d/default.nix
rename to pkgs/by-name/ip/iperf3d/package.nix
diff --git a/pkgs/tools/networking/ipfetch/default.nix b/pkgs/by-name/ip/ipfetch/package.nix
similarity index 100%
rename from pkgs/tools/networking/ipfetch/default.nix
rename to pkgs/by-name/ip/ipfetch/package.nix
diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/by-name/ip/ipfs-cluster/package.nix
similarity index 100%
rename from pkgs/applications/networking/ipfs-cluster/default.nix
rename to pkgs/by-name/ip/ipfs-cluster/package.nix
diff --git a/pkgs/applications/networking/ipfs-upload-client/default.nix b/pkgs/by-name/ip/ipfs-upload-client/package.nix
similarity index 100%
rename from pkgs/applications/networking/ipfs-upload-client/default.nix
rename to pkgs/by-name/ip/ipfs-upload-client/package.nix
diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/by-name/ip/ipget/package.nix
similarity index 100%
rename from pkgs/applications/networking/ipget/default.nix
rename to pkgs/by-name/ip/ipget/package.nix
diff --git a/pkgs/tools/networking/ipgrep/default.nix b/pkgs/by-name/ip/ipgrep/package.nix
similarity index 100%
rename from pkgs/tools/networking/ipgrep/default.nix
rename to pkgs/by-name/ip/ipgrep/package.nix
diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/by-name/ip/ipinfo/package.nix
similarity index 100%
rename from pkgs/tools/networking/ipinfo/default.nix
rename to pkgs/by-name/ip/ipinfo/package.nix
diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/by-name/ip/ipmicfg/package.nix
similarity index 100%
rename from pkgs/applications/misc/ipmicfg/default.nix
rename to pkgs/by-name/ip/ipmicfg/package.nix
diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/by-name/ip/ipmitool/package.nix
similarity index 100%
rename from pkgs/tools/system/ipmitool/default.nix
rename to pkgs/by-name/ip/ipmitool/package.nix
diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/by-name/ip/ipmiutil/package.nix
similarity index 100%
rename from pkgs/tools/system/ipmiutil/default.nix
rename to pkgs/by-name/ip/ipmiutil/package.nix
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/by-name/ip/ipmiview/package.nix
similarity index 100%
rename from pkgs/applications/misc/ipmiview/default.nix
rename to pkgs/by-name/ip/ipmiview/package.nix
diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/by-name/ip/ipopt/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/ipopt/default.nix
rename to pkgs/by-name/ip/ipopt/package.nix
diff --git a/pkgs/os-specific/linux/ipp-usb/default.nix b/pkgs/by-name/ip/ipp-usb/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ipp-usb/default.nix
rename to pkgs/by-name/ip/ipp-usb/package.nix
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/by-name/ip/iproute2/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/iproute/default.nix
rename to pkgs/by-name/ip/iproute2/package.nix
diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/by-name/ip/iprover/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/iprover/default.nix
rename to pkgs/by-name/ip/iprover/package.nix
diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/by-name/ip/ipscan/package.nix
similarity index 100%
rename from pkgs/tools/security/ipscan/default.nix
rename to pkgs/by-name/ip/ipscan/package.nix
diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/by-name/ip/ipset/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ipset/default.nix
rename to pkgs/by-name/ip/ipset/package.nix
diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/by-name/ip/iptraf-ng/package.nix
similarity index 100%
rename from pkgs/applications/networking/iptraf-ng/default.nix
rename to pkgs/by-name/ip/iptraf-ng/package.nix
diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/by-name/ip/iptsd/package.nix
similarity index 100%
rename from pkgs/applications/misc/iptsd/default.nix
rename to pkgs/by-name/ip/iptsd/package.nix
diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/by-name/ip/iptstate/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/iptstate/default.nix
rename to pkgs/by-name/ip/iptstate/package.nix
diff --git a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/pkgs/by-name/ip/ipu6-camera-bins/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix
rename to pkgs/by-name/ip/ipu6-camera-bins/package.nix
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/by-name/ip/ipv6calc/package.nix
similarity index 100%
rename from pkgs/tools/networking/ipv6calc/default.nix
rename to pkgs/by-name/ip/ipv6calc/package.nix
diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/by-name/ip/ipvsadm/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ipvsadm/default.nix
rename to pkgs/by-name/ip/ipvsadm/package.nix
diff --git a/pkgs/applications/science/biology/iqtree/default.nix b/pkgs/by-name/iq/iqtree/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/iqtree/default.nix
rename to pkgs/by-name/iq/iqtree/package.nix
diff --git a/pkgs/development/libraries/iqueue/default.nix b/pkgs/by-name/iq/iqueue/package.nix
similarity index 100%
rename from pkgs/development/libraries/iqueue/default.nix
rename to pkgs/by-name/iq/iqueue/package.nix
diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/by-name/ir/ir-standard-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/ir-standard-fonts/default.nix
rename to pkgs/by-name/ir/ir-standard-fonts/package.nix
diff --git a/pkgs/servers/irc/irccat/default.nix b/pkgs/by-name/ir/irccat/package.nix
similarity index 100%
rename from pkgs/servers/irc/irccat/default.nix
rename to pkgs/by-name/ir/irccat/package.nix
diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/by-name/ir/irccloud/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/irccloud/default.nix
rename to pkgs/by-name/ir/irccloud/package.nix
diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/by-name/ir/ircdHybrid/package.nix
similarity index 100%
rename from pkgs/servers/irc/ircd-hybrid/default.nix
rename to pkgs/by-name/ir/ircdHybrid/package.nix
diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/by-name/ir/ircdog/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/ircdog/default.nix
rename to pkgs/by-name/ir/ircdog/package.nix
diff --git a/pkgs/servers/irker/default.nix b/pkgs/by-name/ir/irker/package.nix
similarity index 100%
rename from pkgs/servers/irker/default.nix
rename to pkgs/by-name/ir/irker/package.nix
diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/by-name/ir/iroh/package.nix
similarity index 100%
rename from pkgs/applications/networking/iroh/default.nix
rename to pkgs/by-name/ir/iroh/package.nix
diff --git a/pkgs/games/ironwail/default.nix b/pkgs/by-name/ir/ironwail/package.nix
similarity index 100%
rename from pkgs/games/ironwail/default.nix
rename to pkgs/by-name/ir/ironwail/package.nix
diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/by-name/ir/irqbalance/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/irqbalance/default.nix
rename to pkgs/by-name/ir/irqbalance/package.nix
diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/by-name/is/ised/package.nix
similarity index 100%
rename from pkgs/tools/misc/ised/default.nix
rename to pkgs/by-name/is/ised/package.nix
diff --git a/pkgs/data/icons/iso-flags/default.nix b/pkgs/by-name/is/iso-flags/package.nix
similarity index 100%
rename from pkgs/data/icons/iso-flags/default.nix
rename to pkgs/by-name/is/iso-flags/package.nix
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/by-name/is/isocodes/package.nix
similarity index 100%
rename from pkgs/development/libraries/iso-codes/default.nix
rename to pkgs/by-name/is/isocodes/package.nix
diff --git a/pkgs/tools/security/isolate/default.nix b/pkgs/by-name/is/isolate/package.nix
similarity index 100%
rename from pkgs/tools/security/isolate/default.nix
rename to pkgs/by-name/is/isolate/package.nix
diff --git a/pkgs/tools/security/isolate/take-config-file-from-env.patch b/pkgs/by-name/is/isolate/take-config-file-from-env.patch
similarity index 100%
rename from pkgs/tools/security/isolate/take-config-file-from-env.patch
rename to pkgs/by-name/is/isolate/take-config-file-from-env.patch
diff --git a/pkgs/tools/cd-dvd/isolyzer/default.nix b/pkgs/by-name/is/isolyzer/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/isolyzer/default.nix
rename to pkgs/by-name/is/isolyzer/package.nix
diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/by-name/is/isomd5sum/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/isomd5sum/default.nix
rename to pkgs/by-name/is/isomd5sum/package.nix
diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/by-name/is/ispell/package.nix
similarity index 100%
rename from pkgs/tools/text/ispell/default.nix
rename to pkgs/by-name/is/ispell/package.nix
diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/by-name/is/ispike/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/robotics/ispike/default.nix
rename to pkgs/by-name/is/ispike/package.nix
diff --git a/pkgs/tools/audio/isrcsubmit/default.nix b/pkgs/by-name/is/isrcsubmit/package.nix
similarity index 100%
rename from pkgs/tools/audio/isrcsubmit/default.nix
rename to pkgs/by-name/is/isrcsubmit/package.nix
diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/by-name/is/istioctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/istioctl/default.nix
rename to pkgs/by-name/is/istioctl/package.nix
diff --git a/pkgs/games/itchiodl/default.nix b/pkgs/by-name/it/itchiodl/package.nix
similarity index 100%
rename from pkgs/games/itchiodl/default.nix
rename to pkgs/by-name/it/itchiodl/package.nix
diff --git a/pkgs/applications/misc/itd/default.nix b/pkgs/by-name/it/itd/package.nix
similarity index 100%
rename from pkgs/applications/misc/itd/default.nix
rename to pkgs/by-name/it/itd/package.nix
diff --git a/pkgs/misc/ite-backlight/default.nix b/pkgs/by-name/it/ite-backlight/package.nix
similarity index 100%
rename from pkgs/misc/ite-backlight/default.nix
rename to pkgs/by-name/it/ite-backlight/package.nix
diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/by-name/it/iterm2/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/iterm2/default.nix
rename to pkgs/by-name/it/iterm2/package.nix
diff --git a/pkgs/development/tools/misc/itm-tools/Cargo.lock b/pkgs/by-name/it/itm-tools/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/misc/itm-tools/Cargo.lock
rename to pkgs/by-name/it/itm-tools/Cargo.lock
diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/by-name/it/itm-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/itm-tools/default.nix
rename to pkgs/by-name/it/itm-tools/package.nix
diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/by-name/it/itpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/itpp/default.nix
rename to pkgs/by-name/it/itpp/package.nix
diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/by-name/it/itstool/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/itstool/default.nix
rename to pkgs/by-name/it/itstool/package.nix
diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/by-name/it/itsx/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/itsx/default.nix
rename to pkgs/by-name/it/itsx/package.nix
diff --git a/pkgs/games/ivan/default.nix b/pkgs/by-name/iv/ivan/package.nix
similarity index 100%
rename from pkgs/games/ivan/default.nix
rename to pkgs/by-name/iv/ivan/package.nix
diff --git a/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix b/pkgs/by-name/iv/ivsc-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix
rename to pkgs/by-name/iv/ivsc-firmware/package.nix
diff --git a/pkgs/development/interpreters/ivy/default.nix b/pkgs/by-name/iv/ivy/package.nix
similarity index 100%
rename from pkgs/development/interpreters/ivy/default.nix
rename to pkgs/by-name/iv/ivy/package.nix
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/by-name/iw/iwd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/iwd/default.nix
rename to pkgs/by-name/iw/iwd/package.nix
diff --git a/pkgs/tools/networking/iwgtk/default.nix b/pkgs/by-name/iw/iwgtk/package.nix
similarity index 100%
rename from pkgs/tools/networking/iwgtk/default.nix
rename to pkgs/by-name/iw/iwgtk/package.nix
diff --git a/pkgs/tools/networking/iwgtk/systemd-service.patch b/pkgs/by-name/iw/iwgtk/systemd-service.patch
similarity index 100%
rename from pkgs/tools/networking/iwgtk/systemd-service.patch
rename to pkgs/by-name/iw/iwgtk/systemd-service.patch
diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/by-name/iw/iwona/package.nix
similarity index 100%
rename from pkgs/data/fonts/iwona/default.nix
rename to pkgs/by-name/iw/iwona/package.nix
diff --git a/pkgs/tools/misc/ix/default.nix b/pkgs/by-name/ix/ix/package.nix
similarity index 100%
rename from pkgs/tools/misc/ix/default.nix
rename to pkgs/by-name/ix/ix/package.nix
diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/by-name/j4/j4-dmenu-desktop/package.nix
similarity index 100%
rename from pkgs/applications/misc/j4-dmenu-desktop/default.nix
rename to pkgs/by-name/j4/j4-dmenu-desktop/package.nix
diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/by-name/ja/jaaa/package.nix
similarity index 100%
rename from pkgs/applications/audio/jaaa/default.nix
rename to pkgs/by-name/ja/jaaa/package.nix
diff --git a/pkgs/applications/audio/jack-passthrough/default.nix b/pkgs/by-name/ja/jack-passthrough/package.nix
similarity index 100%
rename from pkgs/applications/audio/jack-passthrough/default.nix
rename to pkgs/by-name/ja/jack-passthrough/package.nix
diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/by-name/ja/jack_capture/package.nix
similarity index 100%
rename from pkgs/applications/audio/jack-capture/default.nix
rename to pkgs/by-name/ja/jack_capture/package.nix
diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/by-name/ja/jack_oscrolloscope/package.nix
similarity index 100%
rename from pkgs/applications/audio/jack-oscrolloscope/default.nix
rename to pkgs/by-name/ja/jack_oscrolloscope/package.nix
diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/by-name/ja/jack_rack/package.nix
similarity index 100%
rename from pkgs/applications/audio/jack-rack/default.nix
rename to pkgs/by-name/ja/jack_rack/package.nix
diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/by-name/ja/jackmeter/package.nix
similarity index 100%
rename from pkgs/applications/audio/jackmeter/default.nix
rename to pkgs/by-name/ja/jackmeter/package.nix
diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/by-name/ja/jacktrip/package.nix
similarity index 100%
rename from pkgs/applications/audio/jacktrip/default.nix
rename to pkgs/by-name/ja/jacktrip/package.nix
diff --git a/pkgs/development/tools/analysis/jacoco/default.nix b/pkgs/by-name/ja/jacoco/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/jacoco/default.nix
rename to pkgs/by-name/ja/jacoco/package.nix
diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/by-name/ja/jade/package.nix
similarity index 100%
rename from pkgs/tools/text/sgml/jade/default.nix
rename to pkgs/by-name/ja/jade/package.nix
diff --git a/pkgs/tools/security/jadx/deps.json b/pkgs/by-name/ja/jadx/deps.json
similarity index 100%
rename from pkgs/tools/security/jadx/deps.json
rename to pkgs/by-name/ja/jadx/deps.json
diff --git a/pkgs/tools/security/jadx/no-native-deps.diff b/pkgs/by-name/ja/jadx/no-native-deps.diff
similarity index 100%
rename from pkgs/tools/security/jadx/no-native-deps.diff
rename to pkgs/by-name/ja/jadx/no-native-deps.diff
diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/by-name/ja/jadx/package.nix
similarity index 100%
rename from pkgs/tools/security/jadx/default.nix
rename to pkgs/by-name/ja/jadx/package.nix
diff --git a/pkgs/tools/security/jaeles/default.nix b/pkgs/by-name/ja/jaeles/package.nix
similarity index 100%
rename from pkgs/tools/security/jaeles/default.nix
rename to pkgs/by-name/ja/jaeles/package.nix
diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/by-name/ja/jags/package.nix
similarity index 100%
rename from pkgs/applications/science/math/jags/default.nix
rename to pkgs/by-name/ja/jags/package.nix
diff --git a/pkgs/development/tools/jake/default.nix b/pkgs/by-name/ja/jake/package.nix
similarity index 100%
rename from pkgs/development/tools/jake/default.nix
rename to pkgs/by-name/ja/jake/package.nix
diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/by-name/ja/jama/package.nix
similarity index 100%
rename from pkgs/development/libraries/jama/default.nix
rename to pkgs/by-name/ja/jama/package.nix
diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/by-name/ja/jamin/package.nix
similarity index 100%
rename from pkgs/applications/audio/jamin/default.nix
rename to pkgs/by-name/ja/jamin/package.nix
diff --git a/pkgs/servers/nosql/janusgraph/default.nix b/pkgs/by-name/ja/janusgraph/package.nix
similarity index 100%
rename from pkgs/servers/nosql/janusgraph/default.nix
rename to pkgs/by-name/ja/janusgraph/package.nix
diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/by-name/ja/japa/package.nix
similarity index 100%
rename from pkgs/applications/audio/japa/default.nix
rename to pkgs/by-name/ja/japa/package.nix
diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/by-name/ja/jaq/package.nix
similarity index 100%
rename from pkgs/development/tools/jaq/default.nix
rename to pkgs/by-name/ja/jaq/package.nix
diff --git a/pkgs/development/libraries/jarowinkler-cpp/default.nix b/pkgs/by-name/ja/jarowinkler-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/jarowinkler-cpp/default.nix
rename to pkgs/by-name/ja/jarowinkler-cpp/package.nix
diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/by-name/ja/jasmin-compiler/package.nix
similarity index 100%
rename from pkgs/development/compilers/jasmin-compiler/default.nix
rename to pkgs/by-name/ja/jasmin-compiler/package.nix
diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/by-name/ja/jasmin/package.nix
similarity index 100%
rename from pkgs/development/compilers/jasmin/default.nix
rename to pkgs/by-name/ja/jasmin/package.nix
diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j b/pkgs/by-name/ja/jasmin/test-assemble-hello-world/HelloWorld.j
similarity index 100%
rename from pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j
rename to pkgs/by-name/ja/jasmin/test-assemble-hello-world/HelloWorld.j
diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix b/pkgs/by-name/ja/jasmin/test-assemble-hello-world/default.nix
similarity index 100%
rename from pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix
rename to pkgs/by-name/ja/jasmin/test-assemble-hello-world/default.nix
diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/by-name/ja/java-language-server/package.nix
similarity index 100%
rename from pkgs/development/tools/java/java-language-server/default.nix
rename to pkgs/by-name/ja/java-language-server/package.nix
diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/by-name/ja/java-service-wrapper/package.nix
similarity index 100%
rename from pkgs/tools/system/java-service-wrapper/default.nix
rename to pkgs/by-name/ja/java-service-wrapper/package.nix
diff --git a/pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix b/pkgs/by-name/ja/javascript-typescript-langserver/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix
rename to pkgs/by-name/ja/javascript-typescript-langserver/package.nix
diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/by-name/ja/jay/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/jay/default.nix
rename to pkgs/by-name/ja/jay/package.nix
diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/by-name/jb/jbake/package.nix
similarity index 100%
rename from pkgs/development/tools/jbake/default.nix
rename to pkgs/by-name/jb/jbake/package.nix
diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/by-name/jb/jbang/package.nix
similarity index 100%
rename from pkgs/development/tools/jbang/default.nix
rename to pkgs/by-name/jb/jbang/package.nix
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/by-name/jb/jbig2dec/package.nix
similarity index 100%
rename from pkgs/development/libraries/jbig2dec/default.nix
rename to pkgs/by-name/jb/jbig2dec/package.nix
diff --git a/pkgs/development/libraries/jbig2enc/default.nix b/pkgs/by-name/jb/jbig2enc/package.nix
similarity index 100%
rename from pkgs/development/libraries/jbig2enc/default.nix
rename to pkgs/by-name/jb/jbig2enc/package.nix
diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/by-name/jb/jbigkit/package.nix
similarity index 100%
rename from pkgs/development/libraries/jbigkit/default.nix
rename to pkgs/by-name/jb/jbigkit/package.nix
diff --git a/pkgs/tools/text/jbofihe/default.nix b/pkgs/by-name/jb/jbofihe/package.nix
similarity index 100%
rename from pkgs/tools/text/jbofihe/default.nix
rename to pkgs/by-name/jb/jbofihe/package.nix
diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/by-name/jb/jboss_mysql_jdbc/package.nix
similarity index 100%
rename from pkgs/servers/http/jboss/jdbc/mysql/default.nix
rename to pkgs/by-name/jb/jboss_mysql_jdbc/package.nix
diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/by-name/jb/jbrowse/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/jbrowse/default.nix
rename to pkgs/by-name/jb/jbrowse/package.nix
diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/by-name/jc/jcal/package.nix
similarity index 100%
rename from pkgs/development/libraries/jcal/default.nix
rename to pkgs/by-name/jc/jcal/package.nix
diff --git a/pkgs/applications/audio/jconvolver/default.nix b/pkgs/by-name/jc/jconvolver/package.nix
similarity index 100%
rename from pkgs/applications/audio/jconvolver/default.nix
rename to pkgs/by-name/jc/jconvolver/package.nix
diff --git a/pkgs/development/tools/jd-diff-patch/default.nix b/pkgs/by-name/jd/jd-diff-patch/package.nix
similarity index 100%
rename from pkgs/development/tools/jd-diff-patch/default.nix
rename to pkgs/by-name/jd/jd-diff-patch/package.nix
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/by-name/jd/jdiskreport/package.nix
similarity index 100%
rename from pkgs/tools/misc/jdiskreport/default.nix
rename to pkgs/by-name/jd/jdiskreport/package.nix
diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/by-name/jd/jdom/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/jdom/default.nix
rename to pkgs/by-name/jd/jdom/package.nix
diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/by-name/jd/jdupes/package.nix
similarity index 100%
rename from pkgs/tools/misc/jdupes/default.nix
rename to pkgs/by-name/jd/jdupes/package.nix
diff --git a/pkgs/applications/editors/jed/default.nix b/pkgs/by-name/je/jed/package.nix
similarity index 100%
rename from pkgs/applications/editors/jed/default.nix
rename to pkgs/by-name/je/jed/package.nix
diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/by-name/je/jedit/package.nix
similarity index 100%
rename from pkgs/applications/editors/jedit/default.nix
rename to pkgs/by-name/je/jedit/package.nix
diff --git a/pkgs/tools/filesystems/jefferson/default.nix b/pkgs/by-name/je/jefferson/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/jefferson/default.nix
rename to pkgs/by-name/je/jefferson/package.nix
diff --git a/pkgs/development/interpreters/jelly/default.nix b/pkgs/by-name/je/jelly/package.nix
similarity index 100%
rename from pkgs/development/interpreters/jelly/default.nix
rename to pkgs/by-name/je/jelly/package.nix
diff --git a/pkgs/applications/audio/jellycli/fix-test-dir.patch b/pkgs/by-name/je/jellycli/fix-test-dir.patch
similarity index 100%
rename from pkgs/applications/audio/jellycli/fix-test-dir.patch
rename to pkgs/by-name/je/jellycli/fix-test-dir.patch
diff --git a/pkgs/applications/audio/jellycli/default.nix b/pkgs/by-name/je/jellycli/package.nix
similarity index 100%
rename from pkgs/applications/audio/jellycli/default.nix
rename to pkgs/by-name/je/jellycli/package.nix
diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix
similarity index 100%
rename from pkgs/development/libraries/jellyfin-ffmpeg/default.nix
rename to pkgs/by-name/je/jellyfin-ffmpeg/package.nix
diff --git a/pkgs/tools/text/jen/default.nix b/pkgs/by-name/je/jen/package.nix
similarity index 100%
rename from pkgs/tools/text/jen/default.nix
rename to pkgs/by-name/je/jen/package.nix
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/by-name/je/jenkins/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/jenkins/default.nix
rename to pkgs/by-name/je/jenkins/package.nix
diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/by-name/je/jet/package.nix
similarity index 100%
rename from pkgs/development/tools/jet/default.nix
rename to pkgs/by-name/je/jet/package.nix
diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/by-name/je/jetbrains-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/jetbrains-mono/default.nix
rename to pkgs/by-name/je/jetbrains-mono/package.nix
diff --git a/pkgs/development/tools/jf/default.nix b/pkgs/by-name/jf/jf/package.nix
similarity index 100%
rename from pkgs/development/tools/jf/default.nix
rename to pkgs/by-name/jf/jf/package.nix
diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/by-name/jf/jffi/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/jffi/default.nix
rename to pkgs/by-name/jf/jffi/package.nix
diff --git a/pkgs/applications/science/engineering/jflap/default.nix b/pkgs/by-name/jf/jflap/package.nix
similarity index 100%
rename from pkgs/applications/science/engineering/jflap/default.nix
rename to pkgs/by-name/jf/jflap/package.nix
diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/by-name/jf/jflex/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/jflex/default.nix
rename to pkgs/by-name/jf/jflex/package.nix
diff --git a/pkgs/development/tools/jfmt/default.nix b/pkgs/by-name/jf/jfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/jfmt/default.nix
rename to pkgs/by-name/jf/jfmt/package.nix
diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/by-name/jf/jfrog-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/jfrog-cli/default.nix
rename to pkgs/by-name/jf/jfrog-cli/package.nix
diff --git a/pkgs/tools/filesystems/jfsutils/ar-fix.patch b/pkgs/by-name/jf/jfsutils/ar-fix.patch
similarity index 100%
rename from pkgs/tools/filesystems/jfsutils/ar-fix.patch
rename to pkgs/by-name/jf/jfsutils/ar-fix.patch
diff --git a/pkgs/tools/filesystems/jfsutils/hardening-format.patch b/pkgs/by-name/jf/jfsutils/hardening-format.patch
similarity index 100%
rename from pkgs/tools/filesystems/jfsutils/hardening-format.patch
rename to pkgs/by-name/jf/jfsutils/hardening-format.patch
diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/by-name/jf/jfsutils/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/jfsutils/default.nix
rename to pkgs/by-name/jf/jfsutils/package.nix
diff --git a/pkgs/tools/filesystems/jfsutils/types.patch b/pkgs/by-name/jf/jfsutils/types.patch
similarity index 100%
rename from pkgs/tools/filesystems/jfsutils/types.patch
rename to pkgs/by-name/jf/jfsutils/types.patch
diff --git a/pkgs/games/jfsw/default.nix b/pkgs/by-name/jf/jfsw/package.nix
similarity index 100%
rename from pkgs/games/jfsw/default.nix
rename to pkgs/by-name/jf/jfsw/package.nix
diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/by-name/jf/jftui/package.nix
similarity index 100%
rename from pkgs/applications/video/jftui/default.nix
rename to pkgs/by-name/jf/jftui/package.nix
diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/by-name/jg/jgmenu/package.nix
similarity index 100%
rename from pkgs/applications/misc/jgmenu/default.nix
rename to pkgs/by-name/jg/jgmenu/package.nix
diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/by-name/jh/jhead/package.nix
similarity index 100%
rename from pkgs/tools/graphics/jhead/default.nix
rename to pkgs/by-name/jh/jhead/package.nix
diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/by-name/jh/jhiccup/package.nix
similarity index 100%
rename from pkgs/development/tools/java/jhiccup/default.nix
rename to pkgs/by-name/jh/jhiccup/package.nix
diff --git a/pkgs/development/tools/jid/go-mod.patch b/pkgs/by-name/ji/jid/go-mod.patch
similarity index 100%
rename from pkgs/development/tools/jid/go-mod.patch
rename to pkgs/by-name/ji/jid/go-mod.patch
diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/by-name/ji/jid/package.nix
similarity index 100%
rename from pkgs/development/tools/jid/default.nix
rename to pkgs/by-name/ji/jid/package.nix
diff --git a/pkgs/servers/jigasi/default.nix b/pkgs/by-name/ji/jigasi/package.nix
similarity index 100%
rename from pkgs/servers/jigasi/default.nix
rename to pkgs/by-name/ji/jigasi/package.nix
diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/by-name/ji/jikespg/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/jikespg/default.nix
rename to pkgs/by-name/ji/jikespg/package.nix
diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/by-name/ji/jimtcl/package.nix
similarity index 100%
rename from pkgs/development/interpreters/jimtcl/default.nix
rename to pkgs/by-name/ji/jimtcl/package.nix
diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/by-name/ji/jiq/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/jiq/default.nix
rename to pkgs/by-name/ji/jiq/package.nix
diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/by-name/ji/jirafeau/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/jirafeau/default.nix
rename to pkgs/by-name/ji/jirafeau/package.nix
diff --git a/pkgs/applications/misc/jiten/cookie-fix.patch b/pkgs/by-name/ji/jiten/cookie-fix.patch
similarity index 100%
rename from pkgs/applications/misc/jiten/cookie-fix.patch
rename to pkgs/by-name/ji/jiten/cookie-fix.patch
diff --git a/pkgs/applications/misc/jiten/default.nix b/pkgs/by-name/ji/jiten/package.nix
similarity index 100%
rename from pkgs/applications/misc/jiten/default.nix
rename to pkgs/by-name/ji/jiten/package.nix
diff --git a/pkgs/servers/jitsi-excalidraw/default.nix b/pkgs/by-name/ji/jitsi-excalidraw/package.nix
similarity index 100%
rename from pkgs/servers/jitsi-excalidraw/default.nix
rename to pkgs/by-name/ji/jitsi-excalidraw/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/by-name/ji/jitsi-meet-electron/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix
rename to pkgs/by-name/ji/jitsi-meet-electron/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/by-name/ji/jitsi/jitsi.patch
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
rename to pkgs/by-name/ji/jitsi/jitsi.patch
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/by-name/ji/jitsi/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/jitsi/default.nix
rename to pkgs/by-name/ji/jitsi/package.nix
diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/by-name/ji/jitterentropy/package.nix
similarity index 100%
rename from pkgs/development/libraries/jitterentropy/default.nix
rename to pkgs/by-name/ji/jitterentropy/package.nix
diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/by-name/jm/jmespath/package.nix
similarity index 100%
rename from pkgs/development/tools/jmespath/default.nix
rename to pkgs/by-name/jm/jmespath/package.nix
diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/by-name/jm/jmeter/package.nix
similarity index 100%
rename from pkgs/applications/networking/jmeter/default.nix
rename to pkgs/by-name/jm/jmeter/package.nix
diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/by-name/jm/jmtpfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/jmtpfs/default.nix
rename to pkgs/by-name/jm/jmtpfs/package.nix
diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/by-name/jm/jmusicbot/package.nix
similarity index 100%
rename from pkgs/applications/audio/jmusicbot/default.nix
rename to pkgs/by-name/jm/jmusicbot/package.nix
diff --git a/pkgs/development/java-modules/jna/default.nix b/pkgs/by-name/jn/jna/package.nix
similarity index 100%
rename from pkgs/development/java-modules/jna/default.nix
rename to pkgs/by-name/jn/jna/package.nix
diff --git a/pkgs/applications/networking/jnetmap/default.nix b/pkgs/by-name/jn/jnetmap/package.nix
similarity index 100%
rename from pkgs/applications/networking/jnetmap/default.nix
rename to pkgs/by-name/jn/jnetmap/package.nix
diff --git a/pkgs/tools/networking/jnettop/no-dns-resolution.patch b/pkgs/by-name/jn/jnettop/no-dns-resolution.patch
similarity index 100%
rename from pkgs/tools/networking/jnettop/no-dns-resolution.patch
rename to pkgs/by-name/jn/jnettop/no-dns-resolution.patch
diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/by-name/jn/jnettop/package.nix
similarity index 100%
rename from pkgs/tools/networking/jnettop/default.nix
rename to pkgs/by-name/jn/jnettop/package.nix
diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/by-name/jo/jo/package.nix
similarity index 100%
rename from pkgs/development/tools/jo/default.nix
rename to pkgs/by-name/jo/jo/package.nix
diff --git a/pkgs/tools/system/jobber/default.nix b/pkgs/by-name/jo/jobber/package.nix
similarity index 100%
rename from pkgs/tools/system/jobber/default.nix
rename to pkgs/by-name/jo/jobber/package.nix
diff --git a/pkgs/tools/security/john/opencl.patch b/pkgs/by-name/jo/john/opencl.patch
similarity index 100%
rename from pkgs/tools/security/john/opencl.patch
rename to pkgs/by-name/jo/john/opencl.patch
diff --git a/pkgs/tools/security/john/default.nix b/pkgs/by-name/jo/john/package.nix
similarity index 100%
rename from pkgs/tools/security/john/default.nix
rename to pkgs/by-name/jo/john/package.nix
diff --git a/pkgs/applications/misc/johnny/default.nix b/pkgs/by-name/jo/johnny/package.nix
similarity index 100%
rename from pkgs/applications/misc/johnny/default.nix
rename to pkgs/by-name/jo/johnny/package.nix
diff --git a/pkgs/tools/security/joincap/default.nix b/pkgs/by-name/jo/joincap/package.nix
similarity index 100%
rename from pkgs/tools/security/joincap/default.nix
rename to pkgs/by-name/jo/joincap/package.nix
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/by-name/jo/joker/package.nix
similarity index 100%
rename from pkgs/development/interpreters/joker/default.nix
rename to pkgs/by-name/jo/joker/package.nix
diff --git a/pkgs/tools/security/joomscan/default.nix b/pkgs/by-name/jo/joomscan/package.nix
similarity index 100%
rename from pkgs/tools/security/joomscan/default.nix
rename to pkgs/by-name/jo/joomscan/package.nix
diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/by-name/jo/joplin-desktop/package.nix
similarity index 100%
rename from pkgs/applications/misc/joplin-desktop/default.nix
rename to pkgs/by-name/jo/joplin-desktop/package.nix
diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/by-name/jo/jose/package.nix
similarity index 100%
rename from pkgs/development/libraries/jose/default.nix
rename to pkgs/by-name/jo/jose/package.nix
diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/by-name/jo/josh/package.nix
similarity index 100%
rename from pkgs/applications/version-management/josh/default.nix
rename to pkgs/by-name/jo/josh/package.nix
diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/by-name/jo/jost/package.nix
similarity index 100%
rename from pkgs/data/fonts/jost/default.nix
rename to pkgs/by-name/jo/jost/package.nix
diff --git a/pkgs/applications/misc/jot/default.nix b/pkgs/by-name/jo/jot/package.nix
similarity index 100%
rename from pkgs/applications/misc/jot/default.nix
rename to pkgs/by-name/jo/jot/package.nix
diff --git a/pkgs/tools/text/jotdown/default.nix b/pkgs/by-name/jo/jotdown/package.nix
similarity index 100%
rename from pkgs/tools/text/jotdown/default.nix
rename to pkgs/by-name/jo/jotdown/package.nix
diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/by-name/jo/jotta-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/jotta-cli/default.nix
rename to pkgs/by-name/jo/jotta-cli/package.nix
diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/by-name/jo/journaldriver/package.nix
similarity index 100%
rename from pkgs/tools/misc/journaldriver/default.nix
rename to pkgs/by-name/jo/journaldriver/package.nix
diff --git a/pkgs/os-specific/linux/joycond/default.nix b/pkgs/by-name/jo/joycond/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/joycond/default.nix
rename to pkgs/by-name/jo/joycond/package.nix
diff --git a/pkgs/tools/games/joystickwake/default.nix b/pkgs/by-name/jo/joystickwake/package.nix
similarity index 100%
rename from pkgs/tools/games/joystickwake/default.nix
rename to pkgs/by-name/jo/joystickwake/package.nix
diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/by-name/jp/jp/package.nix
similarity index 100%
rename from pkgs/development/tools/jp/default.nix
rename to pkgs/by-name/jp/jp/package.nix
diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/by-name/jp/jp2a/package.nix
similarity index 100%
rename from pkgs/applications/misc/jp2a/default.nix
rename to pkgs/by-name/jp/jp2a/package.nix
diff --git a/pkgs/development/libraries/jpcre2/default.nix b/pkgs/by-name/jp/jpcre2/package.nix
similarity index 100%
rename from pkgs/development/libraries/jpcre2/default.nix
rename to pkgs/by-name/jp/jpcre2/package.nix
diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/by-name/jp/jpeg-archive/package.nix
similarity index 100%
rename from pkgs/applications/graphics/jpeg-archive/default.nix
rename to pkgs/by-name/jp/jpeg-archive/package.nix
diff --git a/pkgs/tools/graphics/jpegexiforient/default.nix b/pkgs/by-name/jp/jpegexiforient/package.nix
similarity index 100%
rename from pkgs/tools/graphics/jpegexiforient/default.nix
rename to pkgs/by-name/jp/jpegexiforient/package.nix
diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/by-name/jp/jpeginfo/package.nix
similarity index 100%
rename from pkgs/applications/graphics/jpeginfo/default.nix
rename to pkgs/by-name/jp/jpeginfo/package.nix
diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/by-name/jp/jpegoptim/package.nix
similarity index 100%
rename from pkgs/applications/graphics/jpegoptim/default.nix
rename to pkgs/by-name/jp/jpegoptim/package.nix
diff --git a/pkgs/applications/graphics/jpegrescan/default.nix b/pkgs/by-name/jp/jpegrescan/package.nix
similarity index 100%
rename from pkgs/applications/graphics/jpegrescan/default.nix
rename to pkgs/by-name/jp/jpegrescan/package.nix
diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/by-name/jp/jpexs/package.nix
similarity index 100%
rename from pkgs/development/tools/jpexs/default.nix
rename to pkgs/by-name/jp/jpexs/package.nix
diff --git a/pkgs/tools/games/jpsxdec/default.nix b/pkgs/by-name/jp/jpsxdec/package.nix
similarity index 100%
rename from pkgs/tools/games/jpsxdec/default.nix
rename to pkgs/by-name/jp/jpsxdec/package.nix
diff --git a/pkgs/development/tools/language-servers/jq-lsp/default.nix b/pkgs/by-name/jq/jq-lsp/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/jq-lsp/default.nix
rename to pkgs/by-name/jq/jq-lsp/package.nix
diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/by-name/jq/jql/package.nix
similarity index 100%
rename from pkgs/development/tools/jql/default.nix
rename to pkgs/by-name/jq/jql/package.nix
diff --git a/pkgs/development/tools/jqp/default.nix b/pkgs/by-name/jq/jqp/package.nix
similarity index 100%
rename from pkgs/development/tools/jqp/default.nix
rename to pkgs/by-name/jq/jqp/package.nix
diff --git a/pkgs/applications/misc/jquake/default.nix b/pkgs/by-name/jq/jquake/package.nix
similarity index 100%
rename from pkgs/applications/misc/jquake/default.nix
rename to pkgs/by-name/jq/jquake/package.nix
diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/by-name/jr/jrnl/package.nix
similarity index 100%
rename from pkgs/applications/misc/jrnl/default.nix
rename to pkgs/by-name/jr/jrnl/package.nix
diff --git a/pkgs/development/compilers/jrsonnet/Cargo.lock b/pkgs/by-name/jr/jrsonnet/Cargo.lock
similarity index 100%
rename from pkgs/development/compilers/jrsonnet/Cargo.lock
rename to pkgs/by-name/jr/jrsonnet/Cargo.lock
diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/by-name/jr/jrsonnet/package.nix
similarity index 100%
rename from pkgs/development/compilers/jrsonnet/default.nix
rename to pkgs/by-name/jr/jrsonnet/package.nix
diff --git a/pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch b/pkgs/by-name/js/jscoverage/jsfalse_to_null.patch
similarity index 100%
rename from pkgs/development/tools/misc/jscoverage/jsfalse_to_null.patch
rename to pkgs/by-name/js/jscoverage/jsfalse_to_null.patch
diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/by-name/js/jscoverage/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/jscoverage/default.nix
rename to pkgs/by-name/js/jscoverage/package.nix
diff --git a/pkgs/development/tools/jsduck/Gemfile b/pkgs/by-name/js/jsduck/Gemfile
similarity index 100%
rename from pkgs/development/tools/jsduck/Gemfile
rename to pkgs/by-name/js/jsduck/Gemfile
diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/by-name/js/jsduck/Gemfile.lock
similarity index 100%
rename from pkgs/development/tools/jsduck/Gemfile.lock
rename to pkgs/by-name/js/jsduck/Gemfile.lock
diff --git a/pkgs/development/tools/jsduck/gemset.nix b/pkgs/by-name/js/jsduck/gemset.nix
similarity index 100%
rename from pkgs/development/tools/jsduck/gemset.nix
rename to pkgs/by-name/js/jsduck/gemset.nix
diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/by-name/js/jsduck/package.nix
similarity index 100%
rename from pkgs/development/tools/jsduck/default.nix
rename to pkgs/by-name/js/jsduck/package.nix
diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/by-name/js/jshon/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/jshon/default.nix
rename to pkgs/by-name/js/jshon/package.nix
diff --git a/pkgs/tools/security/jsluice/default.nix b/pkgs/by-name/js/jsluice/package.nix
similarity index 100%
rename from pkgs/tools/security/jsluice/default.nix
rename to pkgs/by-name/js/jsluice/package.nix
diff --git a/pkgs/development/libraries/json-fortran/default.nix b/pkgs/by-name/js/json-fortran/package.nix
similarity index 100%
rename from pkgs/development/libraries/json-fortran/default.nix
rename to pkgs/by-name/js/json-fortran/package.nix
diff --git a/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch b/pkgs/by-name/js/json-glib/meson-add-installed-tests-prefix-option.patch
similarity index 100%
rename from pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch
rename to pkgs/by-name/js/json-glib/meson-add-installed-tests-prefix-option.patch
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/by-name/js/json-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/json-glib/default.nix
rename to pkgs/by-name/js/json-glib/package.nix
diff --git a/pkgs/applications/graphics/json-plot/default.nix b/pkgs/by-name/js/json-plot/package.nix
similarity index 100%
rename from pkgs/applications/graphics/json-plot/default.nix
rename to pkgs/by-name/js/json-plot/package.nix
diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/by-name/js/json2hcl/package.nix
similarity index 100%
rename from pkgs/development/tools/json2hcl/default.nix
rename to pkgs/by-name/js/json2hcl/package.nix
diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/by-name/js/json_c/package.nix
similarity index 100%
rename from pkgs/development/libraries/json-c/default.nix
rename to pkgs/by-name/js/json_c/package.nix
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/by-name/js/jsoncpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/jsoncpp/default.nix
rename to pkgs/by-name/js/jsoncpp/package.nix
diff --git a/pkgs/development/tools/misc/jsonfmt/default.nix b/pkgs/by-name/js/jsonfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/jsonfmt/default.nix
rename to pkgs/by-name/js/jsonfmt/package.nix
diff --git a/pkgs/development/tools/jsonnet-bundler/default.nix b/pkgs/by-name/js/jsonnet-bundler/package.nix
similarity index 100%
rename from pkgs/development/tools/jsonnet-bundler/default.nix
rename to pkgs/by-name/js/jsonnet-bundler/package.nix
diff --git a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/pkgs/by-name/js/jsonnet-language-server/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/jsonnet-language-server/default.nix
rename to pkgs/by-name/js/jsonnet-language-server/package.nix
diff --git a/pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch b/pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch
similarity index 100%
rename from pkgs/development/compilers/jsonnet/fix-cpp-unresolved-symbols.patch
rename to pkgs/by-name/js/jsonnet/fix-cpp-unresolved-symbols.patch
diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/by-name/js/jsonnet/package.nix
similarity index 100%
rename from pkgs/development/compilers/jsonnet/default.nix
rename to pkgs/by-name/js/jsonnet/package.nix
diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/by-name/js/jsonrpc-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/jsonrpc-glib/default.nix
rename to pkgs/by-name/js/jsonrpc-glib/package.nix
diff --git a/pkgs/tools/misc/jstest-gtk/default.nix b/pkgs/by-name/js/jstest-gtk/package.nix
similarity index 100%
rename from pkgs/tools/misc/jstest-gtk/default.nix
rename to pkgs/by-name/js/jstest-gtk/package.nix
diff --git a/pkgs/tools/security/jsubfinder/default.nix b/pkgs/by-name/js/jsubfinder/package.nix
similarity index 100%
rename from pkgs/tools/security/jsubfinder/default.nix
rename to pkgs/by-name/js/jsubfinder/package.nix
diff --git a/pkgs/tools/system/jsvc/default.nix b/pkgs/by-name/js/jsvc/package.nix
similarity index 100%
rename from pkgs/tools/system/jsvc/default.nix
rename to pkgs/by-name/js/jsvc/package.nix
diff --git a/pkgs/development/embedded/jtag-remote-server/default.nix b/pkgs/by-name/jt/jtag-remote-server/package.nix
similarity index 100%
rename from pkgs/development/embedded/jtag-remote-server/default.nix
rename to pkgs/by-name/jt/jtag-remote-server/package.nix
diff --git a/pkgs/development/tools/jtc/default.nix b/pkgs/by-name/jt/jtc/package.nix
similarity index 100%
rename from pkgs/development/tools/jtc/default.nix
rename to pkgs/by-name/jt/jtc/package.nix
diff --git a/pkgs/development/libraries/judy/cross.patch b/pkgs/by-name/ju/judy/cross.patch
similarity index 100%
rename from pkgs/development/libraries/judy/cross.patch
rename to pkgs/by-name/ju/judy/cross.patch
diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/by-name/ju/judy/package.nix
similarity index 100%
rename from pkgs/development/libraries/judy/default.nix
rename to pkgs/by-name/ju/judy/package.nix
diff --git a/pkgs/tools/misc/jugglinglab/fix-default-maven-plugin-versions.patch b/pkgs/by-name/ju/jugglinglab/fix-default-maven-plugin-versions.patch
similarity index 100%
rename from pkgs/tools/misc/jugglinglab/fix-default-maven-plugin-versions.patch
rename to pkgs/by-name/ju/jugglinglab/fix-default-maven-plugin-versions.patch
diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/by-name/ju/jugglinglab/package.nix
similarity index 100%
rename from pkgs/tools/misc/jugglinglab/default.nix
rename to pkgs/by-name/ju/jugglinglab/package.nix
diff --git a/pkgs/tools/networking/juicity/default.nix b/pkgs/by-name/ju/juicity/package.nix
similarity index 100%
rename from pkgs/tools/networking/juicity/default.nix
rename to pkgs/by-name/ju/juicity/package.nix
diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/by-name/ju/juju/package.nix
similarity index 100%
rename from pkgs/applications/networking/juju/default.nix
rename to pkgs/by-name/ju/juju/package.nix
diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/by-name/ju/jujuutils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/jujuutils/default.nix
rename to pkgs/by-name/ju/jujuutils/package.nix
diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/by-name/ju/julia-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/julia-mono/default.nix
rename to pkgs/by-name/ju/julia-mono/package.nix
diff --git a/pkgs/games/julius/darwin-fixes.patch b/pkgs/by-name/ju/julius/darwin-fixes.patch
similarity index 100%
rename from pkgs/games/julius/darwin-fixes.patch
rename to pkgs/by-name/ju/julius/darwin-fixes.patch
diff --git a/pkgs/games/julius/default.nix b/pkgs/by-name/ju/julius/package.nix
similarity index 100%
rename from pkgs/games/julius/default.nix
rename to pkgs/by-name/ju/julius/package.nix
diff --git a/pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch b/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch
similarity index 100%
rename from pkgs/tools/text/jumanpp/0001-Exclude-all-tests-from-the-build.patch
rename to pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch
diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/by-name/ju/jumanpp/package.nix
similarity index 100%
rename from pkgs/tools/text/jumanpp/default.nix
rename to pkgs/by-name/ju/jumanpp/package.nix
diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/by-name/ju/jump/package.nix
similarity index 100%
rename from pkgs/tools/system/jump/default.nix
rename to pkgs/by-name/ju/jump/package.nix
diff --git a/pkgs/tools/X11/jumpapp/default.nix b/pkgs/by-name/ju/jumpapp/package.nix
similarity index 100%
rename from pkgs/tools/X11/jumpapp/default.nix
rename to pkgs/by-name/ju/jumpapp/package.nix
diff --git a/pkgs/games/jumpnbump/default.nix b/pkgs/by-name/ju/jumpnbump/package.nix
similarity index 100%
rename from pkgs/games/jumpnbump/default.nix
rename to pkgs/by-name/ju/jumpnbump/package.nix
diff --git a/pkgs/tools/virtualization/jumppad/default.nix b/pkgs/by-name/ju/jumppad/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/jumppad/default.nix
rename to pkgs/by-name/ju/jumppad/package.nix
diff --git a/pkgs/games/jumpy/Cargo.lock b/pkgs/by-name/ju/jumpy/Cargo.lock
similarity index 100%
rename from pkgs/games/jumpy/Cargo.lock
rename to pkgs/by-name/ju/jumpy/Cargo.lock
diff --git a/pkgs/games/jumpy/default.nix b/pkgs/by-name/ju/jumpy/package.nix
similarity index 100%
rename from pkgs/games/jumpy/default.nix
rename to pkgs/by-name/ju/jumpy/package.nix
diff --git a/pkgs/data/fonts/junction/default.nix b/pkgs/by-name/ju/junction-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/junction/default.nix
rename to pkgs/by-name/ju/junction-font/package.nix
diff --git a/pkgs/applications/misc/junction/default.nix b/pkgs/by-name/ju/junction/package.nix
similarity index 100%
rename from pkgs/applications/misc/junction/default.nix
rename to pkgs/by-name/ju/junction/package.nix
diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/by-name/ju/junicode/package.nix
similarity index 100%
rename from pkgs/data/fonts/junicode/default.nix
rename to pkgs/by-name/ju/junicode/package.nix
diff --git a/pkgs/data/fonts/junicode/test-vf.tex b/pkgs/by-name/ju/junicode/test-vf.tex
similarity index 100%
rename from pkgs/data/fonts/junicode/test-vf.tex
rename to pkgs/by-name/ju/junicode/test-vf.tex
diff --git a/pkgs/data/fonts/junicode/test.tex b/pkgs/by-name/ju/junicode/test.tex
similarity index 100%
rename from pkgs/data/fonts/junicode/test.tex
rename to pkgs/by-name/ju/junicode/test.tex
diff --git a/pkgs/data/fonts/junicode/tests.nix b/pkgs/by-name/ju/junicode/tests.nix
similarity index 100%
rename from pkgs/data/fonts/junicode/tests.nix
rename to pkgs/by-name/ju/junicode/tests.nix
diff --git a/pkgs/data/fonts/junicode/tex-font-path.patch b/pkgs/by-name/ju/junicode/tex-font-path.patch
similarity index 100%
rename from pkgs/data/fonts/junicode/tex-font-path.patch
rename to pkgs/by-name/ju/junicode/tex-font-path.patch
diff --git a/pkgs/development/compilers/juniper/deps.nix b/pkgs/by-name/ju/juniper/deps.nix
similarity index 100%
rename from pkgs/development/compilers/juniper/deps.nix
rename to pkgs/by-name/ju/juniper/deps.nix
diff --git a/pkgs/development/compilers/juniper/default.nix b/pkgs/by-name/ju/juniper/package.nix
similarity index 100%
rename from pkgs/development/compilers/juniper/default.nix
rename to pkgs/by-name/ju/juniper/package.nix
diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/by-name/ju/junkie/package.nix
similarity index 100%
rename from pkgs/tools/networking/junkie/default.nix
rename to pkgs/by-name/ju/junkie/package.nix
diff --git a/pkgs/data/themes/juno/default.nix b/pkgs/by-name/ju/juno-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/juno/default.nix
rename to pkgs/by-name/ju/juno-theme/package.nix
diff --git a/pkgs/tools/text/justify/default.nix b/pkgs/by-name/ju/justify/package.nix
similarity index 100%
rename from pkgs/tools/text/justify/default.nix
rename to pkgs/by-name/ju/justify/package.nix
diff --git a/pkgs/tools/networking/jwhois/connect.patch b/pkgs/by-name/jw/jwhois/connect.patch
similarity index 100%
rename from pkgs/tools/networking/jwhois/connect.patch
rename to pkgs/by-name/jw/jwhois/connect.patch
diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/by-name/jw/jwhois/package.nix
similarity index 100%
rename from pkgs/tools/networking/jwhois/default.nix
rename to pkgs/by-name/jw/jwhois/package.nix
diff --git a/pkgs/tools/networking/jwhois/service-name.patch b/pkgs/by-name/jw/jwhois/service-name.patch
similarity index 100%
rename from pkgs/tools/networking/jwhois/service-name.patch
rename to pkgs/by-name/jw/jwhois/service-name.patch
diff --git a/pkgs/tools/security/jwt-hack/default.nix b/pkgs/by-name/jw/jwt-hack/package.nix
similarity index 100%
rename from pkgs/tools/security/jwt-hack/default.nix
rename to pkgs/by-name/jw/jwt-hack/package.nix
diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/by-name/jw/jwx/package.nix
similarity index 100%
rename from pkgs/tools/security/jwx/default.nix
rename to pkgs/by-name/jw/jwx/package.nix
diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/by-name/jx/jx/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/jx/default.nix
rename to pkgs/by-name/jx/jx/package.nix
diff --git a/pkgs/applications/networking/jxplorer/default.nix b/pkgs/by-name/jx/jxplorer/package.nix
similarity index 100%
rename from pkgs/applications/networking/jxplorer/default.nix
rename to pkgs/by-name/jx/jxplorer/package.nix
diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/by-name/jx/jxrlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/jxrlib/default.nix
rename to pkgs/by-name/jx/jxrlib/package.nix
diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/by-name/jy/jython/package.nix
similarity index 100%
rename from pkgs/development/interpreters/jython/default.nix
rename to pkgs/by-name/jy/jython/package.nix
diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/by-name/k0/k0sctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/k0sctl/default.nix
rename to pkgs/by-name/k0/k0sctl/package.nix
diff --git a/pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch b/pkgs/by-name/k2/k2pdfopt/0001-Fix-CMakeLists.patch
similarity index 100%
rename from pkgs/applications/misc/k2pdfopt/0001-Fix-CMakeLists.patch
rename to pkgs/by-name/k2/k2pdfopt/0001-Fix-CMakeLists.patch
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/by-name/k2/k2pdfopt/package.nix
similarity index 100%
rename from pkgs/applications/misc/k2pdfopt/default.nix
rename to pkgs/by-name/k2/k2pdfopt/package.nix
diff --git a/pkgs/development/tools/misc/k2tf/default.nix b/pkgs/by-name/k2/k2tf/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/k2tf/default.nix
rename to pkgs/by-name/k2/k2tf/package.nix
diff --git a/pkgs/applications/networking/cluster/k3d/default.nix b/pkgs/by-name/k3/k3d/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/k3d/default.nix
rename to pkgs/by-name/k3/k3d/package.nix
diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/by-name/k3/k3sup/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/k3sup/default.nix
rename to pkgs/by-name/k3/k3sup/package.nix
diff --git a/pkgs/applications/misc/k40-whisperer/default.nix b/pkgs/by-name/k4/k40-whisperer/package.nix
similarity index 100%
rename from pkgs/applications/misc/k40-whisperer/default.nix
rename to pkgs/by-name/k4/k40-whisperer/package.nix
diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/by-name/k6/k6/package.nix
similarity index 100%
rename from pkgs/development/tools/k6/default.nix
rename to pkgs/by-name/k6/k6/package.nix
diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/by-name/k9/k9s/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/k9s/default.nix
rename to pkgs/by-name/k9/k9s/package.nix
diff --git a/pkgs/games/kabeljau/default.nix b/pkgs/by-name/ka/kabeljau/package.nix
similarity index 100%
rename from pkgs/games/kabeljau/default.nix
rename to pkgs/by-name/ka/kabeljau/package.nix
diff --git a/pkgs/data/fonts/kacst/default.nix b/pkgs/by-name/ka/kacst/package.nix
similarity index 100%
rename from pkgs/data/fonts/kacst/default.nix
rename to pkgs/by-name/ka/kacst/package.nix
diff --git a/pkgs/development/tools/kaf/default.nix b/pkgs/by-name/ka/kaf/package.nix
similarity index 100%
rename from pkgs/development/tools/kaf/default.nix
rename to pkgs/by-name/ka/kaf/package.nix
diff --git a/pkgs/development/tools/kafka-delta-ingest/Cargo.lock b/pkgs/by-name/ka/kafka-delta-ingest/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/kafka-delta-ingest/Cargo.lock
rename to pkgs/by-name/ka/kafka-delta-ingest/Cargo.lock
diff --git a/pkgs/development/tools/kafka-delta-ingest/default.nix b/pkgs/by-name/ka/kafka-delta-ingest/package.nix
similarity index 100%
rename from pkgs/development/tools/kafka-delta-ingest/default.nix
rename to pkgs/by-name/ka/kafka-delta-ingest/package.nix
diff --git a/pkgs/development/tools/kafkactl/default.nix b/pkgs/by-name/ka/kafkactl/package.nix
similarity index 100%
rename from pkgs/development/tools/kafkactl/default.nix
rename to pkgs/by-name/ka/kafkactl/package.nix
diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/by-name/ka/kail/package.nix
similarity index 100%
rename from pkgs/tools/networking/kail/default.nix
rename to pkgs/by-name/ka/kail/package.nix
diff --git a/pkgs/development/compilers/kaitai-struct-compiler/default.nix b/pkgs/by-name/ka/kaitai-struct-compiler/package.nix
similarity index 100%
rename from pkgs/development/compilers/kaitai-struct-compiler/default.nix
rename to pkgs/by-name/ka/kaitai-struct-compiler/package.nix
diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/by-name/ka/kakasi/package.nix
similarity index 100%
rename from pkgs/tools/text/kakasi/default.nix
rename to pkgs/by-name/ka/kakasi/package.nix
diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/by-name/ka/kalibrate-hackrf/package.nix
similarity index 100%
rename from pkgs/applications/radio/kalibrate-hackrf/default.nix
rename to pkgs/by-name/ka/kalibrate-hackrf/package.nix
diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/by-name/ka/kalibrate-rtl/package.nix
similarity index 100%
rename from pkgs/applications/radio/kalibrate-rtl/default.nix
rename to pkgs/by-name/ka/kalibrate-rtl/package.nix
diff --git a/pkgs/applications/science/biology/kalign/default.nix b/pkgs/by-name/ka/kalign/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/kalign/default.nix
rename to pkgs/by-name/ka/kalign/package.nix
diff --git a/pkgs/tools/misc/kalker/default.nix b/pkgs/by-name/ka/kalker/package.nix
similarity index 100%
rename from pkgs/tools/misc/kalker/default.nix
rename to pkgs/by-name/ka/kalker/package.nix
diff --git a/pkgs/servers/sip/kamailio/default.nix b/pkgs/by-name/ka/kamailio/package.nix
similarity index 100%
rename from pkgs/servers/sip/kamailio/default.nix
rename to pkgs/by-name/ka/kamailio/package.nix
diff --git a/pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix b/pkgs/by-name/ka/kamailio/test-kamailio-bin/default.nix
similarity index 100%
rename from pkgs/servers/sip/kamailio/test-kamailio-bin/default.nix
rename to pkgs/by-name/ka/kamailio/test-kamailio-bin/default.nix
diff --git a/pkgs/servers/ftp/kamid/default.nix b/pkgs/by-name/ka/kamid/package.nix
similarity index 100%
rename from pkgs/servers/ftp/kamid/default.nix
rename to pkgs/by-name/ka/kamid/package.nix
diff --git a/pkgs/development/interpreters/kamilalisp/default.nix b/pkgs/by-name/ka/kamilalisp/package.nix
similarity index 100%
rename from pkgs/development/interpreters/kamilalisp/default.nix
rename to pkgs/by-name/ka/kamilalisp/package.nix
diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/by-name/ka/kanata/package.nix
similarity index 100%
rename from pkgs/tools/system/kanata/default.nix
rename to pkgs/by-name/ka/kanata/package.nix
diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/by-name/ka/kanif/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kanif/default.nix
rename to pkgs/by-name/ka/kanif/package.nix
diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/by-name/ka/kaniko/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kaniko/default.nix
rename to pkgs/by-name/ka/kaniko/package.nix
diff --git a/pkgs/data/fonts/kanit/default.nix b/pkgs/by-name/ka/kanit-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/kanit/default.nix
rename to pkgs/by-name/ka/kanit-font/package.nix
diff --git a/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/kanji-stroke-order-font/default.nix
rename to pkgs/by-name/ka/kanji-stroke-order-font/package.nix
diff --git a/pkgs/applications/misc/kanjidraw/default.nix b/pkgs/by-name/ka/kanjidraw/package.nix
similarity index 100%
rename from pkgs/applications/misc/kanjidraw/default.nix
rename to pkgs/by-name/ka/kanjidraw/package.nix
diff --git a/pkgs/tools/wayland/kanshi/default.nix b/pkgs/by-name/ka/kanshi/package.nix
similarity index 100%
rename from pkgs/tools/wayland/kanshi/default.nix
rename to pkgs/by-name/ka/kanshi/package.nix
diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
similarity index 100%
rename from pkgs/applications/audio/kapitonov-plugins-pack/default.nix
rename to pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/by-name/ka/kapowbang/package.nix
similarity index 100%
rename from pkgs/servers/kapowbang/default.nix
rename to pkgs/by-name/ka/kapowbang/package.nix
diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/by-name/ka/kapp/package.nix
similarity index 100%
rename from pkgs/tools/networking/kapp/default.nix
rename to pkgs/by-name/ka/kapp/package.nix
diff --git a/pkgs/applications/radio/kappanhang/default.nix b/pkgs/by-name/ka/kappanhang/package.nix
similarity index 100%
rename from pkgs/applications/radio/kappanhang/default.nix
rename to pkgs/by-name/ka/kappanhang/package.nix
diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/by-name/ka/karabiner-elements/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/karabiner-elements/default.nix
rename to pkgs/by-name/ka/karabiner-elements/package.nix
diff --git a/pkgs/development/tools/karate/default.nix b/pkgs/by-name/ka/karate/package.nix
similarity index 100%
rename from pkgs/development/tools/karate/default.nix
rename to pkgs/by-name/ka/karate/package.nix
diff --git a/pkgs/development/tools/karma-runner/fix-package-lock.patch b/pkgs/by-name/ka/karma-runner/fix-package-lock.patch
similarity index 100%
rename from pkgs/development/tools/karma-runner/fix-package-lock.patch
rename to pkgs/by-name/ka/karma-runner/fix-package-lock.patch
diff --git a/pkgs/development/tools/karma-runner/default.nix b/pkgs/by-name/ka/karma-runner/package.nix
similarity index 100%
rename from pkgs/development/tools/karma-runner/default.nix
rename to pkgs/by-name/ka/karma-runner/package.nix
diff --git a/pkgs/servers/monitoring/karma/default.nix b/pkgs/by-name/ka/karma/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/karma/default.nix
rename to pkgs/by-name/ka/karma/package.nix
diff --git a/pkgs/servers/web-apps/kasmweb/default.nix b/pkgs/by-name/ka/kasmweb/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/kasmweb/default.nix
rename to pkgs/by-name/ka/kasmweb/package.nix
diff --git a/pkgs/games/katago/default.nix b/pkgs/by-name/ka/katago/package.nix
similarity index 100%
rename from pkgs/games/katago/default.nix
rename to pkgs/by-name/ka/katago/package.nix
diff --git a/pkgs/tools/security/katana/default.nix b/pkgs/by-name/ka/katana/package.nix
similarity index 100%
rename from pkgs/tools/security/katana/default.nix
rename to pkgs/by-name/ka/katana/package.nix
diff --git a/pkgs/games/katawa-shoujo/default.nix b/pkgs/by-name/ka/katawa-shoujo/package.nix
similarity index 100%
rename from pkgs/games/katawa-shoujo/default.nix
rename to pkgs/by-name/ka/katawa-shoujo/package.nix
diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/by-name/ka/kati/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/kati/default.nix
rename to pkgs/by-name/ka/kati/package.nix
diff --git a/pkgs/development/tools/build-managers/kati/version.patch b/pkgs/by-name/ka/kati/version.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/kati/version.patch
rename to pkgs/by-name/ka/kati/version.patch
diff --git a/pkgs/applications/misc/kaufkauflist/default.nix b/pkgs/by-name/ka/kaufkauflist/package.nix
similarity index 100%
rename from pkgs/applications/misc/kaufkauflist/default.nix
rename to pkgs/by-name/ka/kaufkauflist/package.nix
diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/by-name/ka/kawkab-mono-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/kawkab-mono/default.nix
rename to pkgs/by-name/ka/kawkab-mono-font/package.nix
diff --git a/pkgs/applications/video/kazam/fix-paths.patch b/pkgs/by-name/ka/kazam/fix-paths.patch
similarity index 100%
rename from pkgs/applications/video/kazam/fix-paths.patch
rename to pkgs/by-name/ka/kazam/fix-paths.patch
diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/by-name/ka/kazam/package.nix
similarity index 100%
rename from pkgs/applications/video/kazam/default.nix
rename to pkgs/by-name/ka/kazam/package.nix
diff --git a/pkgs/tools/misc/kb/default.nix b/pkgs/by-name/kb/kb/package.nix
similarity index 100%
rename from pkgs/tools/misc/kb/default.nix
rename to pkgs/by-name/kb/kb/package.nix
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/by-name/kb/kbd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/kbd/default.nix
rename to pkgs/by-name/kb/kbd/package.nix
diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/pkgs/by-name/kb/kbd/search-paths.patch
similarity index 100%
rename from pkgs/os-specific/linux/kbd/search-paths.patch
rename to pkgs/by-name/kb/kbd/search-paths.patch
diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/by-name/kb/kbdd/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/kbdd/default.nix
rename to pkgs/by-name/kb/kbdd/package.nix
diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/by-name/kb/kbdlight/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/kbdlight/default.nix
rename to pkgs/by-name/kb/kbdlight/package.nix
diff --git a/pkgs/applications/networking/cluster/kbst/default.nix b/pkgs/by-name/kb/kbst/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kbst/default.nix
rename to pkgs/by-name/kb/kbst/package.nix
diff --git a/pkgs/applications/misc/kbt/default.nix b/pkgs/by-name/kb/kbt/package.nix
similarity index 100%
rename from pkgs/applications/misc/kbt/default.nix
rename to pkgs/by-name/kb/kbt/package.nix
diff --git a/pkgs/development/tools/kcat/default.nix b/pkgs/by-name/kc/kcat/package.nix
similarity index 100%
rename from pkgs/development/tools/kcat/default.nix
rename to pkgs/by-name/kc/kcat/package.nix
diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/by-name/kc/kcgi/package.nix
similarity index 100%
rename from pkgs/development/web/kcgi/default.nix
rename to pkgs/by-name/kc/kcgi/package.nix
diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/by-name/kc/kcli/package.nix
similarity index 100%
rename from pkgs/development/tools/kcli/default.nix
rename to pkgs/by-name/kc/kcli/package.nix
diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/by-name/kc/kcov/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/kcov/default.nix
rename to pkgs/by-name/kc/kcov/package.nix
diff --git a/pkgs/development/libraries/kcp/default.nix b/pkgs/by-name/kc/kcp/package.nix
similarity index 100%
rename from pkgs/development/libraries/kcp/default.nix
rename to pkgs/by-name/kc/kcp/package.nix
diff --git a/pkgs/data/themes/kde-gruvbox/default.nix b/pkgs/by-name/kd/kde-gruvbox/package.nix
similarity index 100%
rename from pkgs/data/themes/kde-gruvbox/default.nix
rename to pkgs/by-name/kd/kde-gruvbox/package.nix
diff --git a/pkgs/tools/security/kdigger/default.nix b/pkgs/by-name/kd/kdigger/package.nix
similarity index 100%
rename from pkgs/tools/security/kdigger/default.nix
rename to pkgs/by-name/kd/kdigger/package.nix
diff --git a/pkgs/development/tools/kdoctor/default.nix b/pkgs/by-name/kd/kdoctor/package.nix
similarity index 100%
rename from pkgs/development/tools/kdoctor/default.nix
rename to pkgs/by-name/kd/kdoctor/package.nix
diff --git a/pkgs/tools/networking/kea/dont-create-var.patch b/pkgs/by-name/ke/kea/dont-create-var.patch
similarity index 100%
rename from pkgs/tools/networking/kea/dont-create-var.patch
rename to pkgs/by-name/ke/kea/dont-create-var.patch
diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/by-name/ke/kea/package.nix
similarity index 100%
rename from pkgs/tools/networking/kea/default.nix
rename to pkgs/by-name/ke/kea/package.nix
diff --git a/pkgs/tools/networking/keama/default.nix b/pkgs/by-name/ke/keama/package.nix
similarity index 100%
rename from pkgs/tools/networking/keama/default.nix
rename to pkgs/by-name/ke/keama/package.nix
diff --git a/pkgs/games/keen4/default.nix b/pkgs/by-name/ke/keen4/package.nix
similarity index 100%
rename from pkgs/games/keen4/default.nix
rename to pkgs/by-name/ke/keen4/package.nix
diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/by-name/ke/keepalived/package.nix
similarity index 100%
rename from pkgs/tools/networking/keepalived/default.nix
rename to pkgs/by-name/ke/keepalived/package.nix
diff --git a/pkgs/applications/misc/keepass-plugins/charactercopy/default.nix b/pkgs/by-name/ke/keepass-charactercopy/package.nix
similarity index 100%
rename from pkgs/applications/misc/keepass-plugins/charactercopy/default.nix
rename to pkgs/by-name/ke/keepass-charactercopy/package.nix
diff --git a/pkgs/applications/misc/keepass-diff/default.nix b/pkgs/by-name/ke/keepass-diff/package.nix
similarity index 100%
rename from pkgs/applications/misc/keepass-diff/default.nix
rename to pkgs/by-name/ke/keepass-diff/package.nix
diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/by-name/ke/keepass-keeagent/package.nix
similarity index 100%
rename from pkgs/applications/misc/keepass-plugins/keeagent/default.nix
rename to pkgs/by-name/ke/keepass-keeagent/package.nix
diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/by-name/ke/keepass-keepasshttp/package.nix
similarity index 100%
rename from pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
rename to pkgs/by-name/ke/keepass-keepasshttp/package.nix
diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/by-name/ke/keepass-keepassrpc/package.nix
similarity index 100%
rename from pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
rename to pkgs/by-name/ke/keepass-keepassrpc/package.nix
diff --git a/pkgs/applications/misc/keepass-plugins/keetraytotp/default.nix b/pkgs/by-name/ke/keepass-keetraytotp/package.nix
similarity index 100%
rename from pkgs/applications/misc/keepass-plugins/keetraytotp/default.nix
rename to pkgs/by-name/ke/keepass-keetraytotp/package.nix
diff --git a/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix b/pkgs/by-name/ke/keepass-otpkeyprov/package.nix
similarity index 100%
rename from pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix
rename to pkgs/by-name/ke/keepass-otpkeyprov/package.nix
diff --git a/pkgs/applications/misc/keepass-plugins/qrcodeview/default.nix b/pkgs/by-name/ke/keepass-qrcodeview/package.nix
similarity index 100%
rename from pkgs/applications/misc/keepass-plugins/qrcodeview/default.nix
rename to pkgs/by-name/ke/keepass-qrcodeview/package.nix
diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/by-name/ke/keeperrl/package.nix
similarity index 100%
rename from pkgs/games/keeperrl/default.nix
rename to pkgs/by-name/ke/keeperrl/package.nix
diff --git a/pkgs/applications/misc/keepmenu/default.nix b/pkgs/by-name/ke/keepmenu/package.nix
similarity index 100%
rename from pkgs/applications/misc/keepmenu/default.nix
rename to pkgs/by-name/ke/keepmenu/package.nix
diff --git a/pkgs/tools/security/keepwn/default.nix b/pkgs/by-name/ke/keepwn/package.nix
similarity index 100%
rename from pkgs/tools/security/keepwn/default.nix
rename to pkgs/by-name/ke/keepwn/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/keet/default.nix b/pkgs/by-name/ke/keet/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/keet/default.nix
rename to pkgs/by-name/ke/keet/package.nix
diff --git a/pkgs/tools/compression/keka/default.nix b/pkgs/by-name/ke/keka/package.nix
similarity index 100%
rename from pkgs/tools/compression/keka/default.nix
rename to pkgs/by-name/ke/keka/package.nix
diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/by-name/ke/kent/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/kent/default.nix
rename to pkgs/by-name/ke/kent/package.nix
diff --git a/pkgs/tools/security/kepler/default.nix b/pkgs/by-name/ke/kepler/package.nix
similarity index 100%
rename from pkgs/tools/security/kepler/default.nix
rename to pkgs/by-name/ke/kepler/package.nix
diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/by-name/ke/kepubify/package.nix
similarity index 100%
rename from pkgs/tools/misc/kepubify/default.nix
rename to pkgs/by-name/ke/kepubify/package.nix
diff --git a/pkgs/tools/security/kerbrute/default.nix b/pkgs/by-name/ke/kerbrute/package.nix
similarity index 100%
rename from pkgs/tools/security/kerbrute/default.nix
rename to pkgs/by-name/ke/kerbrute/package.nix
diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/by-name/ke/kermit/package.nix
similarity index 100%
rename from pkgs/tools/misc/kermit/default.nix
rename to pkgs/by-name/ke/kermit/package.nix
diff --git a/pkgs/tools/security/kestrel/default.nix b/pkgs/by-name/ke/kestrel/package.nix
similarity index 100%
rename from pkgs/tools/security/kestrel/default.nix
rename to pkgs/by-name/ke/kestrel/package.nix
diff --git a/pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch b/pkgs/by-name/ke/kexec-tools/fix-purgatory-llvm-libunwind.patch
similarity index 100%
rename from pkgs/os-specific/linux/kexec-tools/fix-purgatory-llvm-libunwind.patch
rename to pkgs/by-name/ke/kexec-tools/fix-purgatory-llvm-libunwind.patch
diff --git a/pkgs/os-specific/linux/kexec-tools/default.nix b/pkgs/by-name/ke/kexec-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/kexec-tools/default.nix
rename to pkgs/by-name/ke/kexec-tools/package.nix
diff --git a/pkgs/applications/science/logic/key/deps.json b/pkgs/by-name/ke/key/deps.json
similarity index 100%
rename from pkgs/applications/science/logic/key/deps.json
rename to pkgs/by-name/ke/key/deps.json
diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/by-name/ke/key/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/key/default.nix
rename to pkgs/by-name/ke/key/package.nix
diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/by-name/ke/keychain/package.nix
similarity index 100%
rename from pkgs/tools/misc/keychain/default.nix
rename to pkgs/by-name/ke/keychain/package.nix
diff --git a/pkgs/servers/keycloak/all-plugins.nix b/pkgs/by-name/ke/keycloak/all-plugins.nix
similarity index 100%
rename from pkgs/servers/keycloak/all-plugins.nix
rename to pkgs/by-name/ke/keycloak/all-plugins.nix
diff --git a/pkgs/servers/keycloak/config_vars.patch b/pkgs/by-name/ke/keycloak/config_vars.patch
similarity index 100%
rename from pkgs/servers/keycloak/config_vars.patch
rename to pkgs/by-name/ke/keycloak/config_vars.patch
diff --git a/pkgs/servers/keycloak/keycloak-discord/default.nix b/pkgs/by-name/ke/keycloak/keycloak-discord/default.nix
similarity index 100%
rename from pkgs/servers/keycloak/keycloak-discord/default.nix
rename to pkgs/by-name/ke/keycloak/keycloak-discord/default.nix
diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix
similarity index 100%
rename from pkgs/servers/keycloak/keycloak-metrics-spi/default.nix
rename to pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix
diff --git a/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix b/pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
similarity index 100%
rename from pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix
rename to pkgs/by-name/ke/keycloak/keycloak-restrict-client-auth/default.nix
diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/by-name/ke/keycloak/package.nix
similarity index 100%
rename from pkgs/servers/keycloak/default.nix
rename to pkgs/by-name/ke/keycloak/package.nix
diff --git a/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix
similarity index 100%
rename from pkgs/servers/keycloak/scim-for-keycloak/default.nix
rename to pkgs/by-name/ke/keycloak/scim-for-keycloak/default.nix
diff --git a/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix b/pkgs/by-name/ke/keycloak/scim-keycloak-user-storage-spi/default.nix
similarity index 100%
rename from pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix
rename to pkgs/by-name/ke/keycloak/scim-keycloak-user-storage-spi/default.nix
diff --git a/pkgs/tools/inputmethods/keyd/default.nix b/pkgs/by-name/ke/keyd/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/keyd/default.nix
rename to pkgs/by-name/ke/keyd/package.nix
diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/by-name/ke/keyfinder-cli/package.nix
similarity index 100%
rename from pkgs/applications/audio/keyfinder-cli/default.nix
rename to pkgs/by-name/ke/keyfinder-cli/package.nix
diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/by-name/ke/keyfuzz/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/keyfuzz/default.nix
rename to pkgs/by-name/ke/keyfuzz/package.nix
diff --git a/pkgs/applications/misc/keyleds/default.nix b/pkgs/by-name/ke/keyleds/package.nix
similarity index 100%
rename from pkgs/applications/misc/keyleds/default.nix
rename to pkgs/by-name/ke/keyleds/package.nix
diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
similarity index 100%
rename from pkgs/applications/misc/keylight-controller-mschneider82/default.nix
rename to pkgs/by-name/ke/keylight-controller-mschneider82/package.nix
diff --git a/pkgs/tools/inputmethods/keymapper/default.nix b/pkgs/by-name/ke/keymapper/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/keymapper/default.nix
rename to pkgs/by-name/ke/keymapper/package.nix
diff --git a/pkgs/tools/misc/keymapviz/default.nix b/pkgs/by-name/ke/keymapviz/package.nix
similarity index 100%
rename from pkgs/tools/misc/keymapviz/default.nix
rename to pkgs/by-name/ke/keymapviz/package.nix
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/by-name/ke/keynav/package.nix
similarity index 100%
rename from pkgs/tools/X11/keynav/default.nix
rename to pkgs/by-name/ke/keynav/package.nix
diff --git a/pkgs/development/libraries/keystone/default.nix b/pkgs/by-name/ke/keystone/package.nix
similarity index 100%
rename from pkgs/development/libraries/keystone/default.nix
rename to pkgs/by-name/ke/keystone/package.nix
diff --git a/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch b/pkgs/by-name/ke/keyutils/0001-Remove-unused-function-after_eq.patch
similarity index 100%
rename from pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch
rename to pkgs/by-name/ke/keyutils/0001-Remove-unused-function-after_eq.patch
diff --git a/pkgs/os-specific/linux/keyutils/conf-symlink.patch b/pkgs/by-name/ke/keyutils/conf-symlink.patch
similarity index 100%
rename from pkgs/os-specific/linux/keyutils/conf-symlink.patch
rename to pkgs/by-name/ke/keyutils/conf-symlink.patch
diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/by-name/ke/keyutils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/keyutils/default.nix
rename to pkgs/by-name/ke/keyutils/package.nix
diff --git a/pkgs/os-specific/linux/keyutils/pkg-config-static.patch b/pkgs/by-name/ke/keyutils/pkg-config-static.patch
similarity index 100%
rename from pkgs/os-specific/linux/keyutils/pkg-config-static.patch
rename to pkgs/by-name/ke/keyutils/pkg-config-static.patch
diff --git a/pkgs/applications/networking/cluster/kfilt/default.nix b/pkgs/by-name/kf/kfilt/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kfilt/default.nix
rename to pkgs/by-name/kf/kfilt/package.nix
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/by-name/kh/khal/package.nix
similarity index 100%
rename from pkgs/applications/misc/khal/default.nix
rename to pkgs/by-name/kh/khal/package.nix
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/by-name/kh/khard/package.nix
similarity index 100%
rename from pkgs/applications/misc/khard/default.nix
rename to pkgs/by-name/kh/khard/package.nix
diff --git a/pkgs/data/fonts/khmeros/default.nix b/pkgs/by-name/kh/khmeros/package.nix
similarity index 100%
rename from pkgs/data/fonts/khmeros/default.nix
rename to pkgs/by-name/kh/khmeros/package.nix
diff --git a/pkgs/servers/search/khoj/default.nix b/pkgs/by-name/kh/khoj/package.nix
similarity index 100%
rename from pkgs/servers/search/khoj/default.nix
rename to pkgs/by-name/kh/khoj/package.nix
diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
similarity index 100%
rename from pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
rename to pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix
diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/by-name/kh/khronos/package.nix
similarity index 100%
rename from pkgs/applications/office/khronos/default.nix
rename to pkgs/by-name/kh/khronos/package.nix
diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/by-name/ki/kibi/package.nix
similarity index 100%
rename from pkgs/applications/editors/kibi/default.nix
rename to pkgs/by-name/ki/kibi/package.nix
diff --git a/pkgs/applications/misc/kickoff/default.nix b/pkgs/by-name/ki/kickoff/package.nix
similarity index 100%
rename from pkgs/applications/misc/kickoff/default.nix
rename to pkgs/by-name/ki/kickoff/package.nix
diff --git a/pkgs/tools/misc/kicli/default.nix b/pkgs/by-name/ki/kicli/package.nix
similarity index 100%
rename from pkgs/tools/misc/kicli/default.nix
rename to pkgs/by-name/ki/kicli/package.nix
diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/by-name/ki/kics/package.nix
similarity index 100%
rename from pkgs/tools/admin/kics/default.nix
rename to pkgs/by-name/ki/kics/package.nix
diff --git a/pkgs/applications/misc/kile-wl/Cargo.lock b/pkgs/by-name/ki/kile-wl/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/kile-wl/Cargo.lock
rename to pkgs/by-name/ki/kile-wl/Cargo.lock
diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/by-name/ki/kile-wl/package.nix
similarity index 100%
rename from pkgs/applications/misc/kile-wl/default.nix
rename to pkgs/by-name/ki/kile-wl/package.nix
diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/by-name/ki/kile/package.nix
similarity index 100%
rename from pkgs/applications/editors/kile/default.nix
rename to pkgs/by-name/ki/kile/package.nix
diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/by-name/ki/kiln/package.nix
similarity index 100%
rename from pkgs/applications/misc/kiln/default.nix
rename to pkgs/by-name/ki/kiln/package.nix
diff --git a/pkgs/tools/inputmethods/kime/default.nix b/pkgs/by-name/ki/kime/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/kime/default.nix
rename to pkgs/by-name/ki/kime/package.nix
diff --git a/pkgs/development/tools/kind/kernel-module-path.patch b/pkgs/by-name/ki/kind/kernel-module-path.patch
similarity index 100%
rename from pkgs/development/tools/kind/kernel-module-path.patch
rename to pkgs/by-name/ki/kind/kernel-module-path.patch
diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/by-name/ki/kind/package.nix
similarity index 100%
rename from pkgs/development/tools/kind/default.nix
rename to pkgs/by-name/ki/kind/package.nix
diff --git a/pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch b/pkgs/by-name/ki/kinect-audio-setup/libusb-1-import-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch
rename to pkgs/by-name/ki/kinect-audio-setup/libusb-1-import-path.patch
diff --git a/pkgs/os-specific/linux/kinect-audio-setup/default.nix b/pkgs/by-name/ki/kinect-audio-setup/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/kinect-audio-setup/default.nix
rename to pkgs/by-name/ki/kinect-audio-setup/package.nix
diff --git a/pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch b/pkgs/by-name/ki/kinect-audio-setup/udev-rules-extra-devices.patch
similarity index 100%
rename from pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch
rename to pkgs/by-name/ki/kinect-audio-setup/udev-rules-extra-devices.patch
diff --git a/pkgs/applications/science/electronics/kingstvis/default.nix b/pkgs/by-name/ki/kingstvis/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/kingstvis/default.nix
rename to pkgs/by-name/ki/kingstvis/package.nix
diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/by-name/ki/kismet/package.nix
similarity index 100%
rename from pkgs/applications/networking/sniffers/kismet/default.nix
rename to pkgs/by-name/ki/kismet/package.nix
diff --git a/pkgs/applications/science/logic/kissat/default.nix b/pkgs/by-name/ki/kissat/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/kissat/default.nix
rename to pkgs/by-name/ki/kissat/package.nix
diff --git a/pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch b/pkgs/by-name/ki/kissat/writable-passwd-is-ok.patch
similarity index 100%
rename from pkgs/applications/science/logic/kissat/writable-passwd-is-ok.patch
rename to pkgs/by-name/ki/kissat/writable-passwd-is-ok.patch
diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/by-name/ki/kisslicer/package.nix
similarity index 100%
rename from pkgs/tools/misc/kisslicer/default.nix
rename to pkgs/by-name/ki/kisslicer/package.nix
diff --git a/pkgs/tools/security/kiterunner/default.nix b/pkgs/by-name/ki/kiterunner/package.nix
similarity index 100%
rename from pkgs/tools/security/kiterunner/default.nix
rename to pkgs/by-name/ki/kiterunner/package.nix
diff --git a/pkgs/tools/misc/kitty-img/default.nix b/pkgs/by-name/ki/kitty-img/package.nix
similarity index 100%
rename from pkgs/tools/misc/kitty-img/default.nix
rename to pkgs/by-name/ki/kitty-img/package.nix
diff --git a/pkgs/games/klavaro/default.nix b/pkgs/by-name/kl/klavaro/package.nix
similarity index 100%
rename from pkgs/games/klavaro/default.nix
rename to pkgs/by-name/kl/klavaro/package.nix
diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/by-name/kl/klick/package.nix
similarity index 100%
rename from pkgs/applications/audio/klick/default.nix
rename to pkgs/by-name/kl/klick/package.nix
diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/by-name/kl/klipperscreen/package.nix
similarity index 100%
rename from pkgs/applications/misc/klipperscreen/default.nix
rename to pkgs/by-name/kl/klipperscreen/package.nix
diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/by-name/kl/klystrack/package.nix
similarity index 100%
rename from pkgs/applications/audio/klystrack/default.nix
rename to pkgs/by-name/kl/klystrack/package.nix
diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/by-name/km/kmod-debian-aliases/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/kmod-debian-aliases/default.nix
rename to pkgs/by-name/km/kmod-debian-aliases/package.nix
diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/by-name/km/kmon/package.nix
similarity index 100%
rename from pkgs/tools/system/kmon/default.nix
rename to pkgs/by-name/km/kmon/package.nix
diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/by-name/km/kmscon/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/kmscon/default.nix
rename to pkgs/by-name/km/kmscon/package.nix
diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/by-name/km/kmscube/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/kmscube/default.nix
rename to pkgs/by-name/km/kmscube/package.nix
diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/by-name/km/kmsxx/package.nix
similarity index 100%
rename from pkgs/development/libraries/kmsxx/default.nix
rename to pkgs/by-name/km/kmsxx/package.nix
diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/by-name/kn/kn/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kn/default.nix
rename to pkgs/by-name/kn/kn/package.nix
diff --git a/pkgs/data/fonts/knewave/default.nix b/pkgs/by-name/kn/knewave/package.nix
similarity index 100%
rename from pkgs/data/fonts/knewave/default.nix
rename to pkgs/by-name/kn/knewave/package.nix
diff --git a/pkgs/development/tools/knightos/genkfs/default.nix b/pkgs/by-name/kn/knightos-genkfs/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/genkfs/default.nix
rename to pkgs/by-name/kn/knightos-genkfs/package.nix
diff --git a/pkgs/development/tools/knightos/kcc/default.nix b/pkgs/by-name/kn/knightos-kcc/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/kcc/default.nix
rename to pkgs/by-name/kn/knightos-kcc/package.nix
diff --git a/pkgs/development/tools/knightos/kimg/default.nix b/pkgs/by-name/kn/knightos-kimg/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/kimg/default.nix
rename to pkgs/by-name/kn/knightos-kimg/package.nix
diff --git a/pkgs/development/tools/knightos/kpack/default.nix b/pkgs/by-name/kn/knightos-kpack/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/kpack/default.nix
rename to pkgs/by-name/kn/knightos-kpack/package.nix
diff --git a/pkgs/development/tools/knightos/mkrom/default.nix b/pkgs/by-name/kn/knightos-mkrom/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/mkrom/default.nix
rename to pkgs/by-name/kn/knightos-mkrom/package.nix
diff --git a/pkgs/development/tools/knightos/mktiupgrade/default.nix b/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/mktiupgrade/default.nix
rename to pkgs/by-name/kn/knightos-mktiupgrade/package.nix
diff --git a/pkgs/development/tools/knightos/patchrom/default.nix b/pkgs/by-name/kn/knightos-patchrom/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/patchrom/default.nix
rename to pkgs/by-name/kn/knightos-patchrom/package.nix
diff --git a/pkgs/development/tools/knightos/scas/default.nix b/pkgs/by-name/kn/knightos-scas/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/scas/default.nix
rename to pkgs/by-name/kn/knightos-scas/package.nix
diff --git a/pkgs/development/tools/knightos/z80e/default.nix b/pkgs/by-name/kn/knightos-z80e/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/z80e/default.nix
rename to pkgs/by-name/kn/knightos-z80e/package.nix
diff --git a/pkgs/development/tools/build-managers/knit/default.nix b/pkgs/by-name/kn/knit/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/knit/default.nix
rename to pkgs/by-name/kn/knit/package.nix
diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/by-name/kn/knockpy/package.nix
similarity index 100%
rename from pkgs/tools/security/knockpy/default.nix
rename to pkgs/by-name/kn/knockpy/package.nix
diff --git a/pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch b/pkgs/by-name/kn/knot-dns/dont-create-run-time-dirs.patch
similarity index 100%
rename from pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch
rename to pkgs/by-name/kn/knot-dns/dont-create-run-time-dirs.patch
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/by-name/kn/knot-dns/package.nix
similarity index 100%
rename from pkgs/servers/dns/knot-dns/default.nix
rename to pkgs/by-name/kn/knot-dns/package.nix
diff --git a/pkgs/servers/dns/knot-dns/runtime-deps.patch b/pkgs/by-name/kn/knot-dns/runtime-deps.patch
similarity index 100%
rename from pkgs/servers/dns/knot-dns/runtime-deps.patch
rename to pkgs/by-name/kn/knot-dns/runtime-deps.patch
diff --git a/pkgs/tools/security/knowsmore/default.nix b/pkgs/by-name/kn/knowsmore/package.nix
similarity index 100%
rename from pkgs/tools/security/knowsmore/default.nix
rename to pkgs/by-name/kn/knowsmore/package.nix
diff --git a/pkgs/applications/networking/cluster/kns/default.nix b/pkgs/by-name/kn/kns/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kns/default.nix
rename to pkgs/by-name/kn/kns/package.nix
diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/by-name/ko/ko/package.nix
similarity index 100%
rename from pkgs/development/tools/ko/default.nix
rename to pkgs/by-name/ko/ko/package.nix
diff --git a/pkgs/games/kobodeluxe/glibc29.patch b/pkgs/by-name/ko/kobodeluxe/glibc29.patch
similarity index 100%
rename from pkgs/games/kobodeluxe/glibc29.patch
rename to pkgs/by-name/ko/kobodeluxe/glibc29.patch
diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/by-name/ko/kobodeluxe/package.nix
similarity index 100%
rename from pkgs/games/kobodeluxe/default.nix
rename to pkgs/by-name/ko/kobodeluxe/package.nix
diff --git a/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/pkgs/by-name/ko/kochi-substitute-naga10/package.nix
similarity index 100%
rename from pkgs/data/fonts/kochi-substitute-naga10/default.nix
rename to pkgs/by-name/ko/kochi-substitute-naga10/package.nix
diff --git a/pkgs/data/fonts/kochi-substitute/default.nix b/pkgs/by-name/ko/kochi-substitute/package.nix
similarity index 100%
rename from pkgs/data/fonts/kochi-substitute/default.nix
rename to pkgs/by-name/ko/kochi-substitute/package.nix
diff --git a/pkgs/data/fonts/kode-mono/default.nix b/pkgs/by-name/ko/kode-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/kode-mono/default.nix
rename to pkgs/by-name/ko/kode-mono/package.nix
diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/by-name/ko/kodi-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/kodi-cli/default.nix
rename to pkgs/by-name/ko/kodi-cli/package.nix
diff --git a/pkgs/servers/komga/default.nix b/pkgs/by-name/ko/komga/package.nix
similarity index 100%
rename from pkgs/servers/komga/default.nix
rename to pkgs/by-name/ko/komga/package.nix
diff --git a/pkgs/applications/graphics/komorebi/default.nix b/pkgs/by-name/ko/komorebi/package.nix
similarity index 100%
rename from pkgs/applications/graphics/komorebi/default.nix
rename to pkgs/by-name/ko/komorebi/package.nix
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/by-name/ko/kompose/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kompose/default.nix
rename to pkgs/by-name/ko/kompose/package.nix
diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/by-name/ko/kona/package.nix
similarity index 100%
rename from pkgs/development/interpreters/kona/default.nix
rename to pkgs/by-name/ko/kona/package.nix
diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/by-name/ko/kondo/package.nix
similarity index 100%
rename from pkgs/applications/misc/kondo/default.nix
rename to pkgs/by-name/ko/kondo/package.nix
diff --git a/pkgs/applications/misc/konsave/default.nix b/pkgs/by-name/ko/konsave/package.nix
similarity index 100%
rename from pkgs/applications/misc/konsave/default.nix
rename to pkgs/by-name/ko/konsave/package.nix
diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/by-name/ko/konstraint/package.nix
similarity index 100%
rename from pkgs/development/tools/konstraint/default.nix
rename to pkgs/by-name/ko/konstraint/package.nix
diff --git a/pkgs/development/tools/misc/kool/default.nix b/pkgs/by-name/ko/kool/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/kool/default.nix
rename to pkgs/by-name/ko/kool/package.nix
diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/by-name/ko/kopia/package.nix
similarity index 100%
rename from pkgs/tools/backup/kopia/default.nix
rename to pkgs/by-name/ko/kopia/package.nix
diff --git a/pkgs/applications/misc/kord/Cargo.lock b/pkgs/by-name/ko/kord/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/kord/Cargo.lock
rename to pkgs/by-name/ko/kord/Cargo.lock
diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/by-name/ko/kord/package.nix
similarity index 100%
rename from pkgs/applications/misc/kord/default.nix
rename to pkgs/by-name/ko/kord/package.nix
diff --git a/pkgs/development/web/kore/default.nix b/pkgs/by-name/ko/kore/package.nix
similarity index 100%
rename from pkgs/development/web/kore/default.nix
rename to pkgs/by-name/ko/kore/package.nix
diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/by-name/ko/koreader/package.nix
similarity index 100%
rename from pkgs/applications/misc/koreader/default.nix
rename to pkgs/by-name/ko/koreader/package.nix
diff --git a/pkgs/development/tools/language-servers/kotlin-language-server/default.nix b/pkgs/by-name/ko/kotlin-language-server/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/kotlin-language-server/default.nix
rename to pkgs/by-name/ko/kotlin-language-server/package.nix
diff --git a/pkgs/games/koules/default.nix b/pkgs/by-name/ko/koules/package.nix
similarity index 100%
rename from pkgs/games/koules/default.nix
rename to pkgs/by-name/ko/koules/package.nix
diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/by-name/kp/kpcli/package.nix
similarity index 100%
rename from pkgs/tools/security/kpcli/default.nix
rename to pkgs/by-name/kp/kpcli/package.nix
diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/by-name/kp/kpt/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kpt/default.nix
rename to pkgs/by-name/kp/kpt/package.nix
diff --git a/pkgs/applications/misc/krabby/default.nix b/pkgs/by-name/kr/krabby/package.nix
similarity index 100%
rename from pkgs/applications/misc/krabby/default.nix
rename to pkgs/by-name/kr/krabby/package.nix
diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/by-name/kr/kraft/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/kraft/default.nix
rename to pkgs/by-name/kr/kraft/package.nix
diff --git a/pkgs/tools/system/krakenx/default.nix b/pkgs/by-name/kr/krakenx/package.nix
similarity index 100%
rename from pkgs/tools/system/krakenx/default.nix
rename to pkgs/by-name/kr/krakenx/package.nix
diff --git a/pkgs/development/tools/krankerl/default.nix b/pkgs/by-name/kr/krankerl/package.nix
similarity index 100%
rename from pkgs/development/tools/krankerl/default.nix
rename to pkgs/by-name/kr/krankerl/package.nix
diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/by-name/kr/krapslog/package.nix
similarity index 100%
rename from pkgs/tools/misc/krapslog/default.nix
rename to pkgs/by-name/kr/krapslog/package.nix
diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/by-name/kr/kratos/package.nix
similarity index 100%
rename from pkgs/applications/misc/kratos/default.nix
rename to pkgs/by-name/kr/kratos/package.nix
diff --git a/pkgs/data/fonts/kreative-square-fonts/default.nix b/pkgs/by-name/kr/kreative-square-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/kreative-square-fonts/default.nix
rename to pkgs/by-name/kr/kreative-square-fonts/package.nix
diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/by-name/kr/krew/package.nix
similarity index 100%
rename from pkgs/development/tools/krew/default.nix
rename to pkgs/by-name/kr/krew/package.nix
diff --git a/pkgs/development/libraries/kronosnet/default.nix b/pkgs/by-name/kr/kronosnet/package.nix
similarity index 100%
rename from pkgs/development/libraries/kronosnet/default.nix
rename to pkgs/by-name/kr/kronosnet/package.nix
diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/by-name/kr/krop/package.nix
similarity index 100%
rename from pkgs/applications/graphics/krop/default.nix
rename to pkgs/by-name/kr/krop/package.nix
diff --git a/pkgs/shells/ksh/default.nix b/pkgs/by-name/ks/ksh/package.nix
similarity index 100%
rename from pkgs/shells/ksh/default.nix
rename to pkgs/by-name/ks/ksh/package.nix
diff --git a/pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch b/pkgs/by-name/ks/ksmbd-tools/0001-skip-installing-example-configuration.patch
similarity index 100%
rename from pkgs/os-specific/linux/ksmbd-tools/0001-skip-installing-example-configuration.patch
rename to pkgs/by-name/ks/ksmbd-tools/0001-skip-installing-example-configuration.patch
diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/by-name/ks/ksmbd-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ksmbd-tools/default.nix
rename to pkgs/by-name/ks/ksmbd-tools/package.nix
diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/by-name/ks/kssd/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/kssd/default.nix
rename to pkgs/by-name/ks/kssd/package.nix
diff --git a/pkgs/tools/security/kstart/default.nix b/pkgs/by-name/ks/kstart/package.nix
similarity index 100%
rename from pkgs/tools/security/kstart/default.nix
rename to pkgs/by-name/ks/kstart/package.nix
diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/by-name/ks/ksuperkey/package.nix
similarity index 100%
rename from pkgs/tools/X11/ksuperkey/default.nix
rename to pkgs/by-name/ks/ksuperkey/package.nix
diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/by-name/kt/kt/package.nix
similarity index 100%
rename from pkgs/tools/misc/kt/default.nix
rename to pkgs/by-name/kt/kt/package.nix
diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/by-name/kt/ktlint/package.nix
similarity index 100%
rename from pkgs/development/tools/ktlint/default.nix
rename to pkgs/by-name/kt/ktlint/package.nix
diff --git a/pkgs/applications/networking/cluster/ktop/default.nix b/pkgs/by-name/kt/ktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/ktop/default.nix
rename to pkgs/by-name/kt/ktop/package.nix
diff --git a/pkgs/applications/networking/cluster/ktunnel/default.nix b/pkgs/by-name/kt/ktunnel/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/ktunnel/default.nix
rename to pkgs/by-name/kt/ktunnel/package.nix
diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/by-name/ku/kube-bench/package.nix
similarity index 100%
rename from pkgs/tools/security/kube-bench/default.nix
rename to pkgs/by-name/ku/kube-bench/package.nix
diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/by-name/ku/kube-capacity/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kube-capacity/default.nix
rename to pkgs/by-name/ku/kube-capacity/package.nix
diff --git a/pkgs/tools/security/kube-hunter/default.nix b/pkgs/by-name/ku/kube-hunter/package.nix
similarity index 100%
rename from pkgs/tools/security/kube-hunter/default.nix
rename to pkgs/by-name/ku/kube-hunter/package.nix
diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/by-name/ku/kube-linter/package.nix
similarity index 100%
rename from pkgs/development/tools/kube-linter/default.nix
rename to pkgs/by-name/ku/kube-linter/package.nix
diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/by-name/ku/kube-prompt/package.nix
similarity index 100%
rename from pkgs/development/tools/kube-prompt/default.nix
rename to pkgs/by-name/ku/kube-prompt/package.nix
diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/by-name/ku/kube-router/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kube-router/default.nix
rename to pkgs/by-name/ku/kube-router/package.nix
diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/by-name/ku/kube-score/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kube-score/default.nix
rename to pkgs/by-name/ku/kube-score/package.nix
diff --git a/pkgs/tools/security/kubeaudit/default.nix b/pkgs/by-name/ku/kubeaudit/package.nix
similarity index 100%
rename from pkgs/tools/security/kubeaudit/default.nix
rename to pkgs/by-name/ku/kubeaudit/package.nix
diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/by-name/ku/kubebuilder/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubebuilder/default.nix
rename to pkgs/by-name/ku/kubebuilder/package.nix
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/by-name/ku/kubecfg/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubecfg/default.nix
rename to pkgs/by-name/ku/kubecfg/package.nix
diff --git a/pkgs/tools/security/kubeclarity/default.nix b/pkgs/by-name/ku/kubeclarity/package.nix
similarity index 100%
rename from pkgs/tools/security/kubeclarity/default.nix
rename to pkgs/by-name/ku/kubeclarity/package.nix
diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/by-name/ku/kubecm/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubecm/default.nix
rename to pkgs/by-name/ku/kubecm/package.nix
diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/by-name/ku/kubeconform/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubeconform/default.nix
rename to pkgs/by-name/ku/kubeconform/package.nix
diff --git a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
rename to pkgs/by-name/ku/kubectl-cnpg/package.nix
diff --git a/pkgs/applications/networking/cluster/kubectl-example/default.nix b/pkgs/by-name/ku/kubectl-example/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubectl-example/default.nix
rename to pkgs/by-name/ku/kubectl-example/package.nix
diff --git a/pkgs/applications/networking/cluster/kubectl-explore/default.nix b/pkgs/by-name/ku/kubectl-explore/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubectl-explore/default.nix
rename to pkgs/by-name/ku/kubectl-explore/package.nix
diff --git a/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/pkgs/by-name/ku/kubectl-klock/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubectl-klock/default.nix
rename to pkgs/by-name/ku/kubectl-klock/package.nix
diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/by-name/ku/kubectl-node-shell/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubectl-node-shell/default.nix
rename to pkgs/by-name/ku/kubectl-node-shell/package.nix
diff --git a/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix b/pkgs/by-name/ku/kubectl-view-secret/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubectl-view-secret/default.nix
rename to pkgs/by-name/ku/kubectl-view-secret/package.nix
diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/by-name/ku/kubectx/package.nix
similarity index 100%
rename from pkgs/development/tools/kubectx/default.nix
rename to pkgs/by-name/ku/kubectx/package.nix
diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/by-name/ku/kubedb-cli/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubedb-cli/default.nix
rename to pkgs/by-name/ku/kubedb-cli/package.nix
diff --git a/pkgs/development/tools/kubedock/default.nix b/pkgs/by-name/ku/kubedock/package.nix
similarity index 100%
rename from pkgs/development/tools/kubedock/default.nix
rename to pkgs/by-name/ku/kubedock/package.nix
diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/by-name/ku/kubedog/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubedog/default.nix
rename to pkgs/by-name/ku/kubedog/package.nix
diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/by-name/ku/kubefirst/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubefirst/default.nix
rename to pkgs/by-name/ku/kubefirst/package.nix
diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/by-name/ku/kubelogin/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubelogin/default.nix
rename to pkgs/by-name/ku/kubelogin/package.nix
diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/by-name/ku/kubemq-community/package.nix
similarity index 100%
rename from pkgs/servers/kubemq-community/default.nix
rename to pkgs/by-name/ku/kubemq-community/package.nix
diff --git a/pkgs/applications/networking/cluster/kubemqctl/go.sum b/pkgs/by-name/ku/kubemqctl/go.sum
similarity index 100%
rename from pkgs/applications/networking/cluster/kubemqctl/go.sum
rename to pkgs/by-name/ku/kubemqctl/go.sum
diff --git a/pkgs/applications/networking/cluster/kubemqctl/default.nix b/pkgs/by-name/ku/kubemqctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubemqctl/default.nix
rename to pkgs/by-name/ku/kubemqctl/package.nix
diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/by-name/ku/kubeone/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubeone/default.nix
rename to pkgs/by-name/ku/kubeone/package.nix
diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/by-name/ku/kubeprompt/package.nix
similarity index 100%
rename from pkgs/development/tools/kubeprompt/default.nix
rename to pkgs/by-name/ku/kubeprompt/package.nix
diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/by-name/ku/kubepug/package.nix
similarity index 100%
rename from pkgs/development/tools/kubepug/default.nix
rename to pkgs/by-name/ku/kubepug/package.nix
diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/by-name/ku/kubergrunt/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubergrunt/default.nix
rename to pkgs/by-name/ku/kubergrunt/package.nix
diff --git a/pkgs/development/tools/kubernetes-code-generator/default.nix b/pkgs/by-name/ku/kubernetes-code-generator/package.nix
similarity index 100%
rename from pkgs/development/tools/kubernetes-code-generator/default.nix
rename to pkgs/by-name/ku/kubernetes-code-generator/package.nix
diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/kubernetes-controller-tools/default.nix
rename to pkgs/by-name/ku/kubernetes-controller-tools/package.nix
diff --git a/pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix b/pkgs/by-name/ku/kubernetes-metrics-server/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix
rename to pkgs/by-name/ku/kubernetes-metrics-server/package.nix
diff --git a/pkgs/tools/security/kubernetes-polaris/default.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix
similarity index 100%
rename from pkgs/tools/security/kubernetes-polaris/default.nix
rename to pkgs/by-name/ku/kubernetes-polaris/package.nix
diff --git a/pkgs/applications/networking/cluster/kubernix/Cargo.lock b/pkgs/by-name/ku/kubernix/Cargo.lock
similarity index 100%
rename from pkgs/applications/networking/cluster/kubernix/Cargo.lock
rename to pkgs/by-name/ku/kubernix/Cargo.lock
diff --git a/pkgs/applications/networking/cluster/kubernix/default.nix b/pkgs/by-name/ku/kubernix/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubernix/default.nix
rename to pkgs/by-name/ku/kubernix/package.nix
diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/by-name/ku/kubescape/package.nix
similarity index 100%
rename from pkgs/tools/security/kubescape/default.nix
rename to pkgs/by-name/ku/kubescape/package.nix
diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/by-name/ku/kubeseal/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubeseal/default.nix
rename to pkgs/by-name/ku/kubeseal/package.nix
diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/by-name/ku/kubesec/package.nix
similarity index 100%
rename from pkgs/tools/security/kubesec/default.nix
rename to pkgs/by-name/ku/kubesec/package.nix
diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/by-name/ku/kubeshark/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubeshark/default.nix
rename to pkgs/by-name/ku/kubeshark/package.nix
diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/by-name/ku/kubespy/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubespy/default.nix
rename to pkgs/by-name/ku/kubespy/package.nix
diff --git a/pkgs/tools/security/kubestroyer/default.nix b/pkgs/by-name/ku/kubestroyer/package.nix
similarity index 100%
rename from pkgs/tools/security/kubestroyer/default.nix
rename to pkgs/by-name/ku/kubestroyer/package.nix
diff --git a/pkgs/development/tools/kubeswitch/default.nix b/pkgs/by-name/ku/kubeswitch/package.nix
similarity index 100%
rename from pkgs/development/tools/kubeswitch/default.nix
rename to pkgs/by-name/ku/kubeswitch/package.nix
diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/by-name/ku/kubetail/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubetail/default.nix
rename to pkgs/by-name/ku/kubetail/package.nix
diff --git a/pkgs/applications/networking/cluster/kubevela/default.nix b/pkgs/by-name/ku/kubevela/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubevela/default.nix
rename to pkgs/by-name/ku/kubevela/package.nix
diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/by-name/ku/kubevirt/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/kubevirt/default.nix
rename to pkgs/by-name/ku/kubevirt/package.nix
diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/by-name/ku/kubevpn/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubevpn/default.nix
rename to pkgs/by-name/ku/kubevpn/package.nix
diff --git a/pkgs/applications/networking/cluster/kubexit/default.nix b/pkgs/by-name/ku/kubexit/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubexit/default.nix
rename to pkgs/by-name/ku/kubexit/package.nix
diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/by-name/ku/kupfer/package.nix
similarity index 100%
rename from pkgs/applications/misc/kupfer/default.nix
rename to pkgs/by-name/ku/kupfer/package.nix
diff --git a/pkgs/applications/misc/kuro/default.nix b/pkgs/by-name/ku/kuro/package.nix
similarity index 100%
rename from pkgs/applications/misc/kuro/default.nix
rename to pkgs/by-name/ku/kuro/package.nix
diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/by-name/ku/kuttl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kuttl/default.nix
rename to pkgs/by-name/ku/kuttl/package.nix
diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/by-name/kv/kvmtool/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/kvmtool/default.nix
rename to pkgs/by-name/kv/kvmtool/package.nix
diff --git a/pkgs/applications/virtualization/kvmtool/strlcpy-glibc-2.38-fix.patch b/pkgs/by-name/kv/kvmtool/strlcpy-glibc-2.38-fix.patch
similarity index 100%
rename from pkgs/applications/virtualization/kvmtool/strlcpy-glibc-2.38-fix.patch
rename to pkgs/by-name/kv/kvmtool/strlcpy-glibc-2.38-fix.patch
diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/by-name/kw/kwakd/package.nix
similarity index 100%
rename from pkgs/servers/kwakd/default.nix
rename to pkgs/by-name/kw/kwakd/package.nix
diff --git a/pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist b/pkgs/by-name/kw/kwm/org.nixos.kwm.plist
similarity index 100%
rename from pkgs/os-specific/darwin/kwm/org.nixos.kwm.plist
rename to pkgs/by-name/kw/kwm/org.nixos.kwm.plist
diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/by-name/kw/kwm/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/kwm/default.nix
rename to pkgs/by-name/kw/kwm/package.nix
diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/by-name/ky/kyotocabinet/package.nix
similarity index 100%
rename from pkgs/development/libraries/kyotocabinet/default.nix
rename to pkgs/by-name/ky/kyotocabinet/package.nix
diff --git a/pkgs/tools/text/kytea/gcc-O3.patch b/pkgs/by-name/ky/kytea/gcc-O3.patch
similarity index 100%
rename from pkgs/tools/text/kytea/gcc-O3.patch
rename to pkgs/by-name/ky/kytea/gcc-O3.patch
diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/by-name/ky/kytea/package.nix
similarity index 100%
rename from pkgs/tools/text/kytea/default.nix
rename to pkgs/by-name/ky/kytea/package.nix
diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/by-name/ky/kythe/package.nix
similarity index 100%
rename from pkgs/development/tools/kythe/default.nix
rename to pkgs/by-name/ky/kythe/package.nix
diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/by-name/ky/kyverno/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kyverno/default.nix
rename to pkgs/by-name/ky/kyverno/package.nix
diff --git a/pkgs/tools/text/l2md/default.nix b/pkgs/by-name/l2/l2md/package.nix
similarity index 100%
rename from pkgs/tools/text/l2md/default.nix
rename to pkgs/by-name/l2/l2md/package.nix
diff --git a/pkgs/development/libraries/LAStools/drop-64-suffix.patch b/pkgs/by-name/la/LAStools/drop-64-suffix.patch
similarity index 100%
rename from pkgs/development/libraries/LAStools/drop-64-suffix.patch
rename to pkgs/by-name/la/LAStools/drop-64-suffix.patch
diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/by-name/la/LAStools/package.nix
similarity index 100%
rename from pkgs/development/libraries/LAStools/default.nix
rename to pkgs/by-name/la/LAStools/package.nix
diff --git a/pkgs/applications/version-management/lab/default.nix b/pkgs/by-name/la/lab/package.nix
similarity index 100%
rename from pkgs/applications/version-management/lab/default.nix
rename to pkgs/by-name/la/lab/package.nix
diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/by-name/la/labelImg/package.nix
similarity index 100%
rename from pkgs/applications/science/machine-learning/labelimg/default.nix
rename to pkgs/by-name/la/labelImg/package.nix
diff --git a/pkgs/tools/system/lact/default.nix b/pkgs/by-name/la/lact/package.nix
similarity index 100%
rename from pkgs/tools/system/lact/default.nix
rename to pkgs/by-name/la/lact/package.nix
diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/pkgs/by-name/la/lalezar-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/lalezar-fonts/default.nix
rename to pkgs/by-name/la/lalezar-fonts/package.nix
diff --git a/pkgs/development/tools/lalrpop/default.nix b/pkgs/by-name/la/lalrpop/package.nix
similarity index 100%
rename from pkgs/development/tools/lalrpop/default.nix
rename to pkgs/by-name/la/lalrpop/package.nix
diff --git a/pkgs/development/tools/lalrpop/use-correct-binary-path-in-tests.patch b/pkgs/by-name/la/lalrpop/use-correct-binary-path-in-tests.patch
similarity index 100%
rename from pkgs/development/tools/lalrpop/use-correct-binary-path-in-tests.patch
rename to pkgs/by-name/la/lalrpop/use-correct-binary-path-in-tests.patch
diff --git a/pkgs/applications/emulators/lambda-delta/default.nix b/pkgs/by-name/la/lambda-delta/package.nix
similarity index 100%
rename from pkgs/applications/emulators/lambda-delta/default.nix
rename to pkgs/by-name/la/lambda-delta/package.nix
diff --git a/pkgs/development/interpreters/lambda-lisp/default.nix b/pkgs/by-name/la/lambda-lisp/package.nix
similarity index 100%
rename from pkgs/development/interpreters/lambda-lisp/default.nix
rename to pkgs/by-name/la/lambda-lisp/package.nix
diff --git a/pkgs/development/interpreters/lambda-lisp/sources.nix b/pkgs/by-name/la/lambda-lisp/sources.nix
similarity index 100%
rename from pkgs/development/interpreters/lambda-lisp/sources.nix
rename to pkgs/by-name/la/lambda-lisp/sources.nix
diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/by-name/la/lambda-mod-zsh-theme/package.nix
similarity index 100%
rename from pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
rename to pkgs/by-name/la/lambda-mod-zsh-theme/package.nix
diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/by-name/la/lame/package.nix
similarity index 100%
rename from pkgs/development/libraries/lame/default.nix
rename to pkgs/by-name/la/lame/package.nix
diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/by-name/la/laminar/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/laminar/default.nix
rename to pkgs/by-name/la/laminar/package.nix
diff --git a/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/pkgs/by-name/la/laminar/patches/no-network.patch
similarity index 100%
rename from pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch
rename to pkgs/by-name/la/laminar/patches/no-network.patch
diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/by-name/la/languagetool/package.nix
similarity index 100%
rename from pkgs/tools/text/languagetool/default.nix
rename to pkgs/by-name/la/languagetool/package.nix
diff --git a/pkgs/data/fonts/lao/default.nix b/pkgs/by-name/la/lao/package.nix
similarity index 100%
rename from pkgs/data/fonts/lao/default.nix
rename to pkgs/by-name/la/lao/package.nix
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/by-name/la/lapack-reference/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/liblapack/default.nix
rename to pkgs/by-name/la/lapack-reference/package.nix
diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/by-name/la/lapack/package.nix
similarity index 100%
rename from pkgs/build-support/alternatives/lapack/default.nix
rename to pkgs/by-name/la/lapack/package.nix
diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/by-name/la/larswm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/larswm/default.nix
rename to pkgs/by-name/la/larswm/package.nix
diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/by-name/la/lasem/package.nix
similarity index 100%
rename from pkgs/development/libraries/lasem/default.nix
rename to pkgs/by-name/la/lasem/package.nix
diff --git a/pkgs/applications/audio/lash/gcc-47.patch b/pkgs/by-name/la/lash/gcc-47.patch
similarity index 100%
rename from pkgs/applications/audio/lash/gcc-47.patch
rename to pkgs/by-name/la/lash/gcc-47.patch
diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/by-name/la/lash/package.nix
similarity index 100%
rename from pkgs/applications/audio/lash/default.nix
rename to pkgs/by-name/la/lash/package.nix
diff --git a/pkgs/applications/audio/lash/socket.patch b/pkgs/by-name/la/lash/socket.patch
similarity index 100%
rename from pkgs/applications/audio/lash/socket.patch
rename to pkgs/by-name/la/lash/socket.patch
diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/by-name/la/lasso/package.nix
similarity index 100%
rename from pkgs/development/libraries/lasso/default.nix
rename to pkgs/by-name/la/lasso/package.nix
diff --git a/pkgs/data/fonts/last-resort/default.nix b/pkgs/by-name/la/last-resort/package.nix
similarity index 100%
rename from pkgs/data/fonts/last-resort/default.nix
rename to pkgs/by-name/la/last-resort/package.nix
diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/by-name/la/last/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/last/default.nix
rename to pkgs/by-name/la/last/package.nix
diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/by-name/la/lastpass-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/lastpass-cli/default.nix
rename to pkgs/by-name/la/lastpass-cli/package.nix
diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/by-name/la/latencytop/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/latencytop/default.nix
rename to pkgs/by-name/la/latencytop/package.nix
diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/by-name/la/latex2html/package.nix
similarity index 100%
rename from pkgs/tools/misc/latex2html/default.nix
rename to pkgs/by-name/la/latex2html/package.nix
diff --git a/pkgs/tools/typesetting/tex/latexrun/default.nix b/pkgs/by-name/la/latexrun/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/tex/latexrun/default.nix
rename to pkgs/by-name/la/latexrun/package.nix
diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/by-name/la/lato/package.nix
similarity index 100%
rename from pkgs/data/fonts/lato/default.nix
rename to pkgs/by-name/la/lato/package.nix
diff --git a/pkgs/development/embedded/fpga/lattice-diamond/default.nix b/pkgs/by-name/la/lattice-diamond/package.nix
similarity index 100%
rename from pkgs/development/embedded/fpga/lattice-diamond/default.nix
rename to pkgs/by-name/la/lattice-diamond/package.nix
diff --git a/pkgs/tools/misc/lavat/default.nix b/pkgs/by-name/la/lavat/package.nix
similarity index 100%
rename from pkgs/tools/misc/lavat/default.nix
rename to pkgs/by-name/la/lavat/package.nix
diff --git a/pkgs/data/themes/layan-gtk-theme/default.nix b/pkgs/by-name/la/layan-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/layan-gtk-theme/default.nix
rename to pkgs/by-name/la/layan-gtk-theme/package.nix
diff --git a/pkgs/tools/misc/lazycli/default.nix b/pkgs/by-name/la/lazycli/package.nix
similarity index 100%
rename from pkgs/tools/misc/lazycli/default.nix
rename to pkgs/by-name/la/lazycli/package.nix
diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/by-name/la/lazydocker/package.nix
similarity index 100%
rename from pkgs/tools/misc/lazydocker/default.nix
rename to pkgs/by-name/la/lazydocker/package.nix
diff --git a/pkgs/tools/misc/lbdb/add-methods-to-rc.patch b/pkgs/by-name/lb/lbdb/add-methods-to-rc.patch
similarity index 100%
rename from pkgs/tools/misc/lbdb/add-methods-to-rc.patch
rename to pkgs/by-name/lb/lbdb/add-methods-to-rc.patch
diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/by-name/lb/lbdb/package.nix
similarity index 100%
rename from pkgs/tools/misc/lbdb/default.nix
rename to pkgs/by-name/lb/lbdb/package.nix
diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/by-name/lb/lbry/package.nix
similarity index 100%
rename from pkgs/applications/video/lbry/default.nix
rename to pkgs/by-name/lb/lbry/package.nix
diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/by-name/lb/lbzip2/package.nix
similarity index 100%
rename from pkgs/tools/compression/lbzip2/default.nix
rename to pkgs/by-name/lb/lbzip2/package.nix
diff --git a/pkgs/development/tools/lc3tools/0001-mangle-configure.patch b/pkgs/by-name/lc/lc3tools/0001-mangle-configure.patch
similarity index 100%
rename from pkgs/development/tools/lc3tools/0001-mangle-configure.patch
rename to pkgs/by-name/lc/lc3tools/0001-mangle-configure.patch
diff --git a/pkgs/development/tools/lc3tools/0002-lc3os-path.patch b/pkgs/by-name/lc/lc3tools/0002-lc3os-path.patch
similarity index 100%
rename from pkgs/development/tools/lc3tools/0002-lc3os-path.patch
rename to pkgs/by-name/lc/lc3tools/0002-lc3os-path.patch
diff --git a/pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch b/pkgs/by-name/lc/lc3tools/0003-lc3sim-tk-path.patch
similarity index 100%
rename from pkgs/development/tools/lc3tools/0003-lc3sim-tk-path.patch
rename to pkgs/by-name/lc/lc3tools/0003-lc3sim-tk-path.patch
diff --git a/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch b/pkgs/by-name/lc/lc3tools/0004-configure-use-cc.patch
similarity index 100%
rename from pkgs/development/tools/lc3tools/0004-configure-use-cc.patch
rename to pkgs/by-name/lc/lc3tools/0004-configure-use-cc.patch
diff --git a/pkgs/development/tools/lc3tools/default.nix b/pkgs/by-name/lc/lc3tools/package.nix
similarity index 100%
rename from pkgs/development/tools/lc3tools/default.nix
rename to pkgs/by-name/lc/lc3tools/package.nix
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/by-name/lc/lcalc/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/lcalc/default.nix
rename to pkgs/by-name/lc/lcalc/package.nix
diff --git a/pkgs/tools/misc/lcdf-typetools/default.nix b/pkgs/by-name/lc/lcdf-typetools/package.nix
similarity index 100%
rename from pkgs/tools/misc/lcdf-typetools/default.nix
rename to pkgs/by-name/lc/lcdf-typetools/package.nix
diff --git a/pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch b/pkgs/by-name/lc/lcdproc/hardcode_mtab.patch
similarity index 100%
rename from pkgs/servers/monitoring/lcdproc/hardcode_mtab.patch
rename to pkgs/by-name/lc/lcdproc/hardcode_mtab.patch
diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/by-name/lc/lcdproc/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/lcdproc/default.nix
rename to pkgs/by-name/lc/lcdproc/package.nix
diff --git a/pkgs/applications/science/logic/lci/default.nix b/pkgs/by-name/lc/lci/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/lci/default.nix
rename to pkgs/by-name/lc/lci/package.nix
diff --git a/pkgs/development/libraries/lcm/default.nix b/pkgs/by-name/lc/lcm/package.nix
similarity index 100%
rename from pkgs/development/libraries/lcm/default.nix
rename to pkgs/by-name/lc/lcm/package.nix
diff --git a/pkgs/development/libraries/lcms/cve-2013-4276.patch b/pkgs/by-name/lc/lcms1/cve-2013-4276.patch
similarity index 100%
rename from pkgs/development/libraries/lcms/cve-2013-4276.patch
rename to pkgs/by-name/lc/lcms1/cve-2013-4276.patch
diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/by-name/lc/lcms1/package.nix
similarity index 100%
rename from pkgs/development/libraries/lcms/default.nix
rename to pkgs/by-name/lc/lcms1/package.nix
diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/by-name/lc/lcms2/package.nix
similarity index 100%
rename from pkgs/development/libraries/lcms2/default.nix
rename to pkgs/by-name/lc/lcms2/package.nix
diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/by-name/lc/lcov/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/lcov/default.nix
rename to pkgs/by-name/lc/lcov/package.nix
diff --git a/pkgs/development/libraries/lcrq/default.nix b/pkgs/by-name/lc/lcrq/package.nix
similarity index 100%
rename from pkgs/development/libraries/lcrq/default.nix
rename to pkgs/by-name/lc/lcrq/package.nix
diff --git a/pkgs/applications/networking/sync/lcsync/default.nix b/pkgs/by-name/lc/lcsync/package.nix
similarity index 100%
rename from pkgs/applications/networking/sync/lcsync/default.nix
rename to pkgs/by-name/lc/lcsync/package.nix
diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/by-name/ld/ldacbt/package.nix
similarity index 100%
rename from pkgs/development/libraries/ldacbt/default.nix
rename to pkgs/by-name/ld/ldacbt/package.nix
diff --git a/pkgs/tools/security/ldapmonitor/default.nix b/pkgs/by-name/ld/ldapmonitor/package.nix
similarity index 100%
rename from pkgs/tools/security/ldapmonitor/default.nix
rename to pkgs/by-name/ld/ldapmonitor/package.nix
diff --git a/pkgs/tools/security/ldapnomnom/default.nix b/pkgs/by-name/ld/ldapnomnom/package.nix
similarity index 100%
rename from pkgs/tools/security/ldapnomnom/default.nix
rename to pkgs/by-name/ld/ldapnomnom/package.nix
diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/by-name/ld/ldapvi/package.nix
similarity index 100%
rename from pkgs/tools/misc/ldapvi/default.nix
rename to pkgs/by-name/ld/ldapvi/package.nix
diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/by-name/ld/ldb/package.nix
similarity index 100%
rename from pkgs/development/libraries/ldb/default.nix
rename to pkgs/by-name/ld/ldb/package.nix
diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/by-name/ld/ldeep/package.nix
similarity index 100%
rename from pkgs/tools/security/ldeep/default.nix
rename to pkgs/by-name/ld/ldeep/package.nix
diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/by-name/ld/ldm/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ldm/default.nix
rename to pkgs/by-name/ld/ldm/package.nix
diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/by-name/ld/ldmtool/package.nix
similarity index 100%
rename from pkgs/tools/misc/ldmtool/default.nix
rename to pkgs/by-name/ld/ldmtool/package.nix
diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/by-name/ld/ldns/package.nix
similarity index 100%
rename from pkgs/development/libraries/ldns/default.nix
rename to pkgs/by-name/ld/ldns/package.nix
diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/by-name/ld/ldtk/package.nix
similarity index 100%
rename from pkgs/applications/editors/ldtk/default.nix
rename to pkgs/by-name/ld/ldtk/package.nix
diff --git a/pkgs/data/fonts/league-gothic/default.nix b/pkgs/by-name/le/league-gothic/package.nix
similarity index 100%
rename from pkgs/data/fonts/league-gothic/default.nix
rename to pkgs/by-name/le/league-gothic/package.nix
diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/by-name/le/league-of-moveable-type/package.nix
similarity index 100%
rename from pkgs/data/fonts/league-of-moveable-type/default.nix
rename to pkgs/by-name/le/league-of-moveable-type/package.nix
diff --git a/pkgs/data/fonts/league-script-number-one/default.nix b/pkgs/by-name/le/league-script-number-one/package.nix
similarity index 100%
rename from pkgs/data/fonts/league-script-number-one/default.nix
rename to pkgs/by-name/le/league-script-number-one/package.nix
diff --git a/pkgs/data/fonts/league-spartan/default.nix b/pkgs/by-name/le/league-spartan/package.nix
similarity index 100%
rename from pkgs/data/fonts/league-spartan/default.nix
rename to pkgs/by-name/le/league-spartan/package.nix
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/by-name/le/lean/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/lean/default.nix
rename to pkgs/by-name/le/lean/package.nix
diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/by-name/le/lean2/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/lean2/default.nix
rename to pkgs/by-name/le/lean2/package.nix
diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/by-name/le/lean4/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/lean4/default.nix
rename to pkgs/by-name/le/lean4/package.nix
diff --git a/pkgs/tools/misc/leanify/default.nix b/pkgs/by-name/le/leanify/package.nix
similarity index 100%
rename from pkgs/tools/misc/leanify/default.nix
rename to pkgs/by-name/le/leanify/package.nix
diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/by-name/le/leaps/package.nix
similarity index 100%
rename from pkgs/development/tools/leaps/default.nix
rename to pkgs/by-name/le/leaps/package.nix
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/by-name/le/leatherman/package.nix
similarity index 100%
rename from pkgs/development/libraries/leatherman/default.nix
rename to pkgs/by-name/le/leatherman/package.nix
diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/by-name/le/ledfx/package.nix
similarity index 100%
rename from pkgs/applications/audio/ledfx/default.nix
rename to pkgs/by-name/le/ledfx/package.nix
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/ledger-live-desktop/default.nix
rename to pkgs/by-name/le/ledger-live-desktop/package.nix
diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/by-name/le/ledger-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ledger-udev-rules/default.nix
rename to pkgs/by-name/le/ledger-udev-rules/package.nix
diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/by-name/le/ledger2beancount/package.nix
similarity index 100%
rename from pkgs/tools/text/ledger2beancount/default.nix
rename to pkgs/by-name/le/ledger2beancount/package.nix
diff --git a/pkgs/tools/misc/ledit/default.nix b/pkgs/by-name/le/ledit/package.nix
similarity index 100%
rename from pkgs/tools/misc/ledit/default.nix
rename to pkgs/by-name/le/ledit/package.nix
diff --git a/pkgs/tools/system/ledmon/default.nix b/pkgs/by-name/le/ledmon/package.nix
similarity index 100%
rename from pkgs/tools/system/ledmon/default.nix
rename to pkgs/by-name/le/ledmon/package.nix
diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/by-name/le/leela/package.nix
similarity index 100%
rename from pkgs/tools/graphics/leela/default.nix
rename to pkgs/by-name/le/leela/package.nix
diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/by-name/le/leetcode-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/leetcode-cli/default.nix
rename to pkgs/by-name/le/leetcode-cli/package.nix
diff --git a/pkgs/games/left4gore/default.nix b/pkgs/by-name/le/left4gore-bin/package.nix
similarity index 100%
rename from pkgs/games/left4gore/default.nix
rename to pkgs/by-name/le/left4gore-bin/package.nix
diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/by-name/le/leftwm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/leftwm/default.nix
rename to pkgs/by-name/le/leftwm/package.nix
diff --git a/pkgs/applications/window-managers/leftwm/update-time-crate.patch b/pkgs/by-name/le/leftwm/update-time-crate.patch
similarity index 100%
rename from pkgs/applications/window-managers/leftwm/update-time-crate.patch
rename to pkgs/by-name/le/leftwm/update-time-crate.patch
diff --git a/pkgs/applications/version-management/legit-web/default.nix b/pkgs/by-name/le/legit-web/package.nix
similarity index 100%
rename from pkgs/applications/version-management/legit-web/default.nix
rename to pkgs/by-name/le/legit-web/package.nix
diff --git a/pkgs/applications/version-management/legit/default.nix b/pkgs/by-name/le/legit/package.nix
similarity index 100%
rename from pkgs/applications/version-management/legit/default.nix
rename to pkgs/by-name/le/legit/package.nix
diff --git a/pkgs/development/tools/legitify/default.nix b/pkgs/by-name/le/legitify/package.nix
similarity index 100%
rename from pkgs/development/tools/legitify/default.nix
rename to pkgs/by-name/le/legitify/package.nix
diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/by-name/le/lego/package.nix
similarity index 100%
rename from pkgs/tools/admin/lego/default.nix
rename to pkgs/by-name/le/lego/package.nix
diff --git a/pkgs/tools/misc/lektor/default.nix b/pkgs/by-name/le/lektor/package.nix
similarity index 100%
rename from pkgs/tools/misc/lektor/default.nix
rename to pkgs/by-name/le/lektor/package.nix
diff --git a/pkgs/tools/misc/lemmeknow/default.nix b/pkgs/by-name/le/lemmeknow/package.nix
similarity index 100%
rename from pkgs/tools/misc/lemmeknow/default.nix
rename to pkgs/by-name/le/lemmeknow/package.nix
diff --git a/pkgs/tools/misc/lemmy-help/default.nix b/pkgs/by-name/le/lemmy-help/package.nix
similarity index 100%
rename from pkgs/tools/misc/lemmy-help/default.nix
rename to pkgs/by-name/le/lemmy-help/package.nix
diff --git a/pkgs/development/libraries/lemon-graph/default.nix b/pkgs/by-name/le/lemon-graph/package.nix
similarity index 100%
rename from pkgs/development/libraries/lemon-graph/default.nix
rename to pkgs/by-name/le/lemon-graph/package.nix
diff --git a/pkgs/development/libraries/lemon-graph/remove-register.patch b/pkgs/by-name/le/lemon-graph/remove-register.patch
similarity index 100%
rename from pkgs/development/libraries/lemon-graph/remove-register.patch
rename to pkgs/by-name/le/lemon-graph/remove-register.patch
diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/by-name/le/lemon/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/lemon/default.nix
rename to pkgs/by-name/le/lemon/package.nix
diff --git a/pkgs/applications/misc/lemonade/default.nix b/pkgs/by-name/le/lemonade/package.nix
similarity index 100%
rename from pkgs/applications/misc/lemonade/default.nix
rename to pkgs/by-name/le/lemonade/package.nix
diff --git a/pkgs/applications/display-managers/lemurs/0001-fix-static-lifetime-string.patch b/pkgs/by-name/le/lemurs/0001-fix-static-lifetime-string.patch
similarity index 100%
rename from pkgs/applications/display-managers/lemurs/0001-fix-static-lifetime-string.patch
rename to pkgs/by-name/le/lemurs/0001-fix-static-lifetime-string.patch
diff --git a/pkgs/applications/display-managers/lemurs/default.nix b/pkgs/by-name/le/lemurs/package.nix
similarity index 100%
rename from pkgs/applications/display-managers/lemurs/default.nix
rename to pkgs/by-name/le/lemurs/package.nix
diff --git a/pkgs/servers/lenpaste/default.nix b/pkgs/by-name/le/lenpaste/package.nix
similarity index 100%
rename from pkgs/servers/lenpaste/default.nix
rename to pkgs/by-name/le/lenpaste/package.nix
diff --git a/pkgs/applications/networking/cluster/lens/darwin.nix b/pkgs/by-name/le/lens/darwin.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/lens/darwin.nix
rename to pkgs/by-name/le/lens/darwin.nix
diff --git a/pkgs/applications/networking/cluster/lens/linux.nix b/pkgs/by-name/le/lens/linux.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/lens/linux.nix
rename to pkgs/by-name/le/lens/linux.nix
diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/by-name/le/lens/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/lens/default.nix
rename to pkgs/by-name/le/lens/package.nix
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/by-name/le/lensfun/package.nix
similarity index 100%
rename from pkgs/development/libraries/lensfun/default.nix
rename to pkgs/by-name/le/lensfun/package.nix
diff --git a/pkgs/applications/science/electronics/lepton-eda/default.nix b/pkgs/by-name/le/lepton-eda/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/lepton-eda/default.nix
rename to pkgs/by-name/le/lepton-eda/package.nix
diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/by-name/le/lepton/package.nix
similarity index 100%
rename from pkgs/tools/graphics/lepton/default.nix
rename to pkgs/by-name/le/lepton/package.nix
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/by-name/le/leptonica/package.nix
similarity index 100%
rename from pkgs/development/libraries/leptonica/default.nix
rename to pkgs/by-name/le/leptonica/package.nix
diff --git a/pkgs/development/tools/rust/leptosfmt/default.nix b/pkgs/by-name/le/leptosfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/leptosfmt/default.nix
rename to pkgs/by-name/le/leptosfmt/package.nix
diff --git a/pkgs/development/libraries/lerc/default.nix b/pkgs/by-name/le/lerc/package.nix
similarity index 100%
rename from pkgs/development/libraries/lerc/default.nix
rename to pkgs/by-name/le/lerc/package.nix
diff --git a/pkgs/tools/misc/lerpn/default.nix b/pkgs/by-name/le/lerpn/package.nix
similarity index 100%
rename from pkgs/tools/misc/lerpn/default.nix
rename to pkgs/by-name/le/lerpn/package.nix
diff --git a/pkgs/applications/window-managers/lesbar/default.nix b/pkgs/by-name/le/lesbar/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/lesbar/default.nix
rename to pkgs/by-name/le/lesbar/package.nix
diff --git a/pkgs/development/compilers/lesscpy/default.nix b/pkgs/by-name/le/lesscpy/package.nix
similarity index 100%
rename from pkgs/development/compilers/lesscpy/default.nix
rename to pkgs/by-name/le/lesscpy/package.nix
diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/by-name/le/lesspass-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/lesspass-cli/default.nix
rename to pkgs/by-name/le/lesspass-cli/package.nix
diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/by-name/le/lesspipe/package.nix
similarity index 100%
rename from pkgs/tools/misc/lesspipe/default.nix
rename to pkgs/by-name/le/lesspipe/package.nix
diff --git a/pkgs/development/libraries/lesstif/c-missing_xm_h.patch b/pkgs/by-name/le/lesstif/c-missing_xm_h.patch
similarity index 100%
rename from pkgs/development/libraries/lesstif/c-missing_xm_h.patch
rename to pkgs/by-name/le/lesstif/c-missing_xm_h.patch
diff --git a/pkgs/development/libraries/lesstif/c-render_table_crash.patch b/pkgs/by-name/le/lesstif/c-render_table_crash.patch
similarity index 100%
rename from pkgs/development/libraries/lesstif/c-render_table_crash.patch
rename to pkgs/by-name/le/lesstif/c-render_table_crash.patch
diff --git a/pkgs/development/libraries/lesstif/c-xpmpipethrough.patch b/pkgs/by-name/le/lesstif/c-xpmpipethrough.patch
similarity index 100%
rename from pkgs/development/libraries/lesstif/c-xpmpipethrough.patch
rename to pkgs/by-name/le/lesstif/c-xpmpipethrough.patch
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/by-name/le/lesstif/package.nix
similarity index 100%
rename from pkgs/development/libraries/lesstif/default.nix
rename to pkgs/by-name/le/lesstif/package.nix
diff --git a/pkgs/applications/networking/cluster/levant/default.nix b/pkgs/by-name/le/levant/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/levant/default.nix
rename to pkgs/by-name/le/levant/package.nix
diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/by-name/le/level-zero/package.nix
similarity index 100%
rename from pkgs/development/libraries/level-zero/default.nix
rename to pkgs/by-name/le/level-zero/package.nix
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/by-name/le/leveldb/package.nix
similarity index 100%
rename from pkgs/development/libraries/leveldb/default.nix
rename to pkgs/by-name/le/leveldb/package.nix
diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/by-name/le/levmar/package.nix
similarity index 100%
rename from pkgs/development/libraries/levmar/default.nix
rename to pkgs/by-name/le/levmar/package.nix
diff --git a/pkgs/data/fonts/lexend/default.nix b/pkgs/by-name/le/lexend/package.nix
similarity index 100%
rename from pkgs/data/fonts/lexend/default.nix
rename to pkgs/by-name/le/lexend/package.nix
diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/by-name/lf/lftp/package.nix
similarity index 100%
rename from pkgs/tools/networking/lftp/default.nix
rename to pkgs/by-name/lf/lftp/package.nix
diff --git a/pkgs/misc/lguf-brightness/default.nix b/pkgs/by-name/lg/lguf-brightness/package.nix
similarity index 100%
rename from pkgs/misc/lguf-brightness/default.nix
rename to pkgs/by-name/lg/lguf-brightness/package.nix
diff --git a/pkgs/tools/archivers/lha/default.nix b/pkgs/by-name/lh/lha/package.nix
similarity index 100%
rename from pkgs/tools/archivers/lha/default.nix
rename to pkgs/by-name/lh/lha/package.nix
diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/by-name/lh/lhasa/package.nix
similarity index 100%
rename from pkgs/tools/compression/lhasa/default.nix
rename to pkgs/by-name/lh/lhasa/package.nix
diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/by-name/li/lib3ds/package.nix
similarity index 100%
rename from pkgs/development/libraries/lib3ds/default.nix
rename to pkgs/by-name/li/lib3ds/package.nix
diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/by-name/li/lib3mf/package.nix
similarity index 100%
rename from pkgs/development/libraries/lib3mf/default.nix
rename to pkgs/by-name/li/lib3mf/package.nix
diff --git a/pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch b/pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch
similarity index 100%
rename from pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch
rename to pkgs/by-name/li/lib3mf/upgrade-to-cpp-14.patch
diff --git a/pkgs/development/libraries/science/chemistry/libGDSII/default.nix b/pkgs/by-name/li/libGDSII/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/libGDSII/default.nix
rename to pkgs/by-name/li/libGDSII/package.nix
diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/by-name/li/libHX/package.nix
similarity index 100%
rename from pkgs/development/libraries/libHX/default.nix
rename to pkgs/by-name/li/libHX/package.nix
diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/by-name/li/libLAS/package.nix
similarity index 100%
rename from pkgs/development/libraries/libLAS/default.nix
rename to pkgs/by-name/li/libLAS/package.nix
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/by-name/li/libaacs/package.nix
similarity index 100%
rename from pkgs/development/libraries/libaacs/default.nix
rename to pkgs/by-name/li/libaacs/package.nix
diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/by-name/li/libaal/package.nix
similarity index 100%
rename from pkgs/development/libraries/libaal/default.nix
rename to pkgs/by-name/li/libaal/package.nix
diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/by-name/li/libabigail/package.nix
similarity index 100%
rename from pkgs/development/libraries/libabigail/default.nix
rename to pkgs/by-name/li/libabigail/package.nix
diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/by-name/li/libabw/package.nix
similarity index 100%
rename from pkgs/development/libraries/libabw/default.nix
rename to pkgs/by-name/li/libabw/package.nix
diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/by-name/li/libaccounts-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/libaccounts-glib/default.nix
rename to pkgs/by-name/li/libaccounts-glib/package.nix
diff --git a/pkgs/development/libraries/libad9361/default.nix b/pkgs/by-name/li/libad9361/package.nix
similarity index 100%
rename from pkgs/development/libraries/libad9361/default.nix
rename to pkgs/by-name/li/libad9361/package.nix
diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/by-name/li/libaec/package.nix
similarity index 100%
rename from pkgs/development/libraries/libaec/default.nix
rename to pkgs/by-name/li/libaec/package.nix
diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/by-name/li/libaio/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libaio/default.nix
rename to pkgs/by-name/li/libaio/package.nix
diff --git a/pkgs/development/libraries/libajantv2/default.nix b/pkgs/by-name/li/libajantv2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libajantv2/default.nix
rename to pkgs/by-name/li/libajantv2/package.nix
diff --git a/pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch b/pkgs/by-name/li/libamplsolver/libamplsolver-sharedlib.patch
similarity index 100%
rename from pkgs/development/libraries/science/math/libamplsolver/libamplsolver-sharedlib.patch
rename to pkgs/by-name/li/libamplsolver/libamplsolver-sharedlib.patch
diff --git a/pkgs/development/libraries/science/math/libamplsolver/default.nix b/pkgs/by-name/li/libamplsolver/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/libamplsolver/default.nix
rename to pkgs/by-name/li/libamplsolver/package.nix
diff --git a/pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch b/pkgs/by-name/li/libamqpcpp/libamqpcpp-darwin.patch
similarity index 100%
rename from pkgs/development/libraries/libamqpcpp/libamqpcpp-darwin.patch
rename to pkgs/by-name/li/libamqpcpp/libamqpcpp-darwin.patch
diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/by-name/li/libamqpcpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libamqpcpp/default.nix
rename to pkgs/by-name/li/libamqpcpp/package.nix
diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/by-name/li/libantlr3c/package.nix
similarity index 100%
rename from pkgs/development/libraries/libantlr3c/default.nix
rename to pkgs/by-name/li/libantlr3c/package.nix
diff --git a/pkgs/development/libraries/libaom/outputs.patch b/pkgs/by-name/li/libaom/outputs.patch
similarity index 100%
rename from pkgs/development/libraries/libaom/outputs.patch
rename to pkgs/by-name/li/libaom/outputs.patch
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/by-name/li/libaom/package.nix
similarity index 100%
rename from pkgs/development/libraries/libaom/default.nix
rename to pkgs/by-name/li/libaom/package.nix
diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/by-name/li/libaosd/package.nix
similarity index 100%
rename from pkgs/development/libraries/libaosd/default.nix
rename to pkgs/by-name/li/libaosd/package.nix
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/by-name/li/libappindicator/package.nix
similarity index 100%
rename from pkgs/development/libraries/libappindicator/default.nix
rename to pkgs/by-name/li/libappindicator/package.nix
diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/by-name/li/libargon2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libargon2/default.nix
rename to pkgs/by-name/li/libargon2/package.nix
diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/by-name/li/libargs/package.nix
similarity index 100%
rename from pkgs/development/libraries/libargs/default.nix
rename to pkgs/by-name/li/libargs/package.nix
diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/by-name/li/libasr/package.nix
similarity index 100%
rename from pkgs/development/libraries/libasr/default.nix
rename to pkgs/by-name/li/libasr/package.nix
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/by-name/li/libass/package.nix
similarity index 100%
rename from pkgs/development/libraries/libass/default.nix
rename to pkgs/by-name/li/libass/package.nix
diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/by-name/li/libassuan/package.nix
similarity index 100%
rename from pkgs/development/libraries/libassuan/default.nix
rename to pkgs/by-name/li/libassuan/package.nix
diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/by-name/li/libasyncns/package.nix
similarity index 100%
rename from pkgs/development/libraries/libasyncns/default.nix
rename to pkgs/by-name/li/libasyncns/package.nix
diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/by-name/li/libatasmart/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libatasmart/default.nix
rename to pkgs/by-name/li/libatasmart/package.nix
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/by-name/li/libatomic_ops/package.nix
similarity index 100%
rename from pkgs/development/libraries/libatomic_ops/default.nix
rename to pkgs/by-name/li/libatomic_ops/package.nix
diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/by-name/li/libaudclient/package.nix
similarity index 100%
rename from pkgs/development/libraries/libaudclient/default.nix
rename to pkgs/by-name/li/libaudclient/package.nix
diff --git a/pkgs/development/libraries/libaudec/default.nix b/pkgs/by-name/li/libaudec/package.nix
similarity index 100%
rename from pkgs/development/libraries/libaudec/default.nix
rename to pkgs/by-name/li/libaudec/package.nix
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/by-name/li/libavc1394/package.nix
similarity index 100%
rename from pkgs/development/libraries/libavc1394/default.nix
rename to pkgs/by-name/li/libavc1394/package.nix
diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/by-name/li/libavif/package.nix
similarity index 100%
rename from pkgs/development/libraries/libavif/default.nix
rename to pkgs/by-name/li/libavif/package.nix
diff --git a/pkgs/development/libraries/libax25/default.nix b/pkgs/by-name/li/libax25/package.nix
similarity index 100%
rename from pkgs/development/libraries/libax25/default.nix
rename to pkgs/by-name/li/libax25/package.nix
diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/by-name/li/libayatana-appindicator/package.nix
similarity index 100%
rename from pkgs/development/libraries/libayatana-appindicator/default.nix
rename to pkgs/by-name/li/libayatana-appindicator/package.nix
diff --git a/pkgs/development/libraries/libayatana-common/default.nix b/pkgs/by-name/li/libayatana-common/package.nix
similarity index 100%
rename from pkgs/development/libraries/libayatana-common/default.nix
rename to pkgs/by-name/li/libayatana-common/package.nix
diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/by-name/li/libb2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libb2/default.nix
rename to pkgs/by-name/li/libb2/package.nix
diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/by-name/li/libb64/package.nix
similarity index 100%
rename from pkgs/development/libraries/libb64/default.nix
rename to pkgs/by-name/li/libb64/package.nix
diff --git a/pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch b/pkgs/by-name/li/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch
similarity index 100%
rename from pkgs/development/libraries/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch
rename to pkgs/by-name/li/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch
diff --git a/pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch b/pkgs/by-name/li/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch
similarity index 100%
rename from pkgs/development/libraries/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch
rename to pkgs/by-name/li/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch
diff --git a/pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch b/pkgs/by-name/li/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch
similarity index 100%
rename from pkgs/development/libraries/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch
rename to pkgs/by-name/li/libbacktrace/0003-libbacktrace-Support-multiple-build-id-directories.patch
diff --git a/pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch b/pkgs/by-name/li/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch
similarity index 100%
rename from pkgs/development/libraries/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch
rename to pkgs/by-name/li/libbacktrace/0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch
diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/by-name/li/libbacktrace/package.nix
similarity index 100%
rename from pkgs/development/libraries/libbacktrace/default.nix
rename to pkgs/by-name/li/libbacktrace/package.nix
diff --git a/pkgs/development/libraries/libbaseencode/default.nix b/pkgs/by-name/li/libbaseencode/package.nix
similarity index 100%
rename from pkgs/development/libraries/libbaseencode/default.nix
rename to pkgs/by-name/li/libbaseencode/package.nix
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/by-name/li/libbdplus/package.nix
similarity index 100%
rename from pkgs/development/libraries/libbdplus/default.nix
rename to pkgs/by-name/li/libbdplus/package.nix
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/by-name/li/libbladeRF/package.nix
similarity index 100%
rename from pkgs/development/libraries/libbladeRF/default.nix
rename to pkgs/by-name/li/libbladeRF/package.nix
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/by-name/li/libblockdev/package.nix
similarity index 100%
rename from pkgs/development/libraries/libblockdev/default.nix
rename to pkgs/by-name/li/libblockdev/package.nix
diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/by-name/li/libblocksruntime/package.nix
similarity index 100%
rename from pkgs/development/libraries/libblocksruntime/default.nix
rename to pkgs/by-name/li/libblocksruntime/package.nix
diff --git a/pkgs/development/libraries/libbpkg/default.nix b/pkgs/by-name/li/libbpkg/package.nix
similarity index 100%
rename from pkgs/development/libraries/libbpkg/default.nix
rename to pkgs/by-name/li/libbpkg/package.nix
diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/by-name/li/libbraiding/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/libbraiding/default.nix
rename to pkgs/by-name/li/libbraiding/package.nix
diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/by-name/li/libbs2b/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/libbs2b/default.nix
rename to pkgs/by-name/li/libbs2b/package.nix
diff --git a/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch b/pkgs/by-name/li/libbsd/darwin-enable-strtonum.patch
similarity index 100%
rename from pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch
rename to pkgs/by-name/li/libbsd/darwin-enable-strtonum.patch
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/by-name/li/libbsd/package.nix
similarity index 100%
rename from pkgs/development/libraries/libbsd/default.nix
rename to pkgs/by-name/li/libbsd/package.nix
diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/by-name/li/libcacard/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcacard/default.nix
rename to pkgs/by-name/li/libcacard/package.nix
diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/by-name/li/libcangjie/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcangjie/default.nix
rename to pkgs/by-name/li/libcangjie/package.nix
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/by-name/li/libcap/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libcap/default.nix
rename to pkgs/by-name/li/libcap/package.nix
diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/by-name/li/libcap_ng/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libcap-ng/default.nix
rename to pkgs/by-name/li/libcap_ng/package.nix
diff --git a/pkgs/development/libraries/libcaption/default.nix b/pkgs/by-name/li/libcaption/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcaption/default.nix
rename to pkgs/by-name/li/libcaption/package.nix
diff --git a/pkgs/misc/libcardiacarrest/default.nix b/pkgs/by-name/li/libcardiacarrest/package.nix
similarity index 100%
rename from pkgs/misc/libcardiacarrest/default.nix
rename to pkgs/by-name/li/libcardiacarrest/package.nix
diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/by-name/li/libcbor/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcbor/default.nix
rename to pkgs/by-name/li/libcbor/package.nix
diff --git a/pkgs/development/libraries/libccd/default.nix b/pkgs/by-name/li/libccd/package.nix
similarity index 100%
rename from pkgs/development/libraries/libccd/default.nix
rename to pkgs/by-name/li/libccd/package.nix
diff --git a/pkgs/development/libraries/libcdada/default.nix b/pkgs/by-name/li/libcdada/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcdada/default.nix
rename to pkgs/by-name/li/libcdada/package.nix
diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/by-name/li/libcdaudio/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcdaudio/default.nix
rename to pkgs/by-name/li/libcdaudio/package.nix
diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/by-name/li/libcddb/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcddb/default.nix
rename to pkgs/by-name/li/libcddb/package.nix
diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/by-name/li/libcello/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcello/default.nix
rename to pkgs/by-name/li/libcello/package.nix
diff --git a/pkgs/development/libraries/libcerf/default.nix b/pkgs/by-name/li/libcerf/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcerf/default.nix
rename to pkgs/by-name/li/libcerf/package.nix
diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/by-name/li/libcgroup/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libcgroup/default.nix
rename to pkgs/by-name/li/libcgroup/package.nix
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/by-name/li/libchamplain/package.nix
similarity index 100%
rename from pkgs/development/libraries/libchamplain/default.nix
rename to pkgs/by-name/li/libchamplain/package.nix
diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/by-name/li/libchardet/package.nix
similarity index 100%
rename from pkgs/development/libraries/libchardet/default.nix
rename to pkgs/by-name/li/libchardet/package.nix
diff --git a/pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch b/pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch
similarity index 100%
rename from pkgs/development/libraries/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch
rename to pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch
diff --git a/pkgs/development/libraries/libchop/gets-undeclared.patch b/pkgs/by-name/li/libchop/gets-undeclared.patch
similarity index 100%
rename from pkgs/development/libraries/libchop/gets-undeclared.patch
rename to pkgs/by-name/li/libchop/gets-undeclared.patch
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/by-name/li/libchop/package.nix
similarity index 100%
rename from pkgs/development/libraries/libchop/default.nix
rename to pkgs/by-name/li/libchop/package.nix
diff --git a/pkgs/development/libraries/libchop/size_t.patch b/pkgs/by-name/li/libchop/size_t.patch
similarity index 100%
rename from pkgs/development/libraries/libchop/size_t.patch
rename to pkgs/by-name/li/libchop/size_t.patch
diff --git a/pkgs/development/libraries/libcifpp/default.nix b/pkgs/by-name/li/libcifpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcifpp/default.nix
rename to pkgs/by-name/li/libcifpp/package.nix
diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/by-name/li/libcint/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcint/default.nix
rename to pkgs/by-name/li/libcint/package.nix
diff --git a/pkgs/development/libraries/libck/default.nix b/pkgs/by-name/li/libck/package.nix
similarity index 100%
rename from pkgs/development/libraries/libck/default.nix
rename to pkgs/by-name/li/libck/package.nix
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/by-name/li/libcli/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcli/default.nix
rename to pkgs/by-name/li/libcli/package.nix
diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/by-name/li/libcloudproviders/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcloudproviders/default.nix
rename to pkgs/by-name/li/libcloudproviders/package.nix
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/by-name/li/libclthreads/package.nix
similarity index 100%
rename from pkgs/development/libraries/libclthreads/default.nix
rename to pkgs/by-name/li/libclthreads/package.nix
diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/by-name/li/libclxclient/package.nix
similarity index 100%
rename from pkgs/development/libraries/libclxclient/default.nix
rename to pkgs/by-name/li/libclxclient/package.nix
diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/by-name/li/libcmis/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcmis/default.nix
rename to pkgs/by-name/li/libcmis/package.nix
diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/by-name/li/libcollectdclient/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcollectdclient/default.nix
rename to pkgs/by-name/li/libcollectdclient/package.nix
diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/by-name/li/libconfuse/package.nix
similarity index 100%
rename from pkgs/development/libraries/libconfuse/default.nix
rename to pkgs/by-name/li/libconfuse/package.nix
diff --git a/pkgs/development/libraries/libcork/default.nix b/pkgs/by-name/li/libcork/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcork/default.nix
rename to pkgs/by-name/li/libcork/package.nix
diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/by-name/li/libcotp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcotp/default.nix
rename to pkgs/by-name/li/libcotp/package.nix
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/by-name/li/libcouchbase/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcouchbase/default.nix
rename to pkgs/by-name/li/libcouchbase/package.nix
diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/by-name/li/libcrafter/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcrafter/default.nix
rename to pkgs/by-name/li/libcrafter/package.nix
diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/by-name/li/libcredis/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcredis/default.nix
rename to pkgs/by-name/li/libcredis/package.nix
diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/by-name/li/libcrossguid/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcrossguid/default.nix
rename to pkgs/by-name/li/libcrossguid/package.nix
diff --git a/pkgs/development/libraries/libcs50/default.nix b/pkgs/by-name/li/libcs50/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcs50/default.nix
rename to pkgs/by-name/li/libcs50/package.nix
diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/by-name/li/libcsptr/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcsptr/default.nix
rename to pkgs/by-name/li/libcsptr/package.nix
diff --git a/pkgs/development/libraries/libctb/include-kbhit.patch b/pkgs/by-name/li/libctb/include-kbhit.patch
similarity index 100%
rename from pkgs/development/libraries/libctb/include-kbhit.patch
rename to pkgs/by-name/li/libctb/include-kbhit.patch
diff --git a/pkgs/development/libraries/libctb/default.nix b/pkgs/by-name/li/libctb/package.nix
similarity index 100%
rename from pkgs/development/libraries/libctb/default.nix
rename to pkgs/by-name/li/libctb/package.nix
diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/by-name/li/libctemplate/package.nix
similarity index 100%
rename from pkgs/development/libraries/libctemplate/default.nix
rename to pkgs/by-name/li/libctemplate/package.nix
diff --git a/pkgs/development/libraries/libctl/default.nix b/pkgs/by-name/li/libctl/package.nix
similarity index 100%
rename from pkgs/development/libraries/libctl/default.nix
rename to pkgs/by-name/li/libctl/package.nix
diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/by-name/li/libcue/package.nix
similarity index 100%
rename from pkgs/development/libraries/libcue/default.nix
rename to pkgs/by-name/li/libcue/package.nix
diff --git a/pkgs/development/libraries/libdaemon/fix-includes.patch b/pkgs/by-name/li/libdaemon/fix-includes.patch
similarity index 100%
rename from pkgs/development/libraries/libdaemon/fix-includes.patch
rename to pkgs/by-name/li/libdaemon/fix-includes.patch
diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/by-name/li/libdaemon/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdaemon/default.nix
rename to pkgs/by-name/li/libdaemon/package.nix
diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/by-name/li/libdatachannel/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdatachannel/default.nix
rename to pkgs/by-name/li/libdatachannel/package.nix
diff --git a/pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch b/pkgs/by-name/li/libdatovka/libdatovka-deprecated-fn-curl.patch
similarity index 100%
rename from pkgs/development/libraries/libdatovka/libdatovka-deprecated-fn-curl.patch
rename to pkgs/by-name/li/libdatovka/libdatovka-deprecated-fn-curl.patch
diff --git a/pkgs/development/libraries/libdatovka/default.nix b/pkgs/by-name/li/libdatovka/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdatovka/default.nix
rename to pkgs/by-name/li/libdatovka/package.nix
diff --git a/pkgs/development/libraries/libdatrie/default.nix b/pkgs/by-name/li/libdatrie/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdatrie/default.nix
rename to pkgs/by-name/li/libdatrie/package.nix
diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/by-name/li/libdazzle/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdazzle/default.nix
rename to pkgs/by-name/li/libdazzle/package.nix
diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/by-name/li/libdbi/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdbi/default.nix
rename to pkgs/by-name/li/libdbi/package.nix
diff --git a/pkgs/development/libraries/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch b/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-buffer_overflow.patch
similarity index 100%
rename from pkgs/development/libraries/libdbi-drivers/libdbi-drivers-0.9.0-buffer_overflow.patch
rename to pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-buffer_overflow.patch
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/by-name/li/libdbiDrivers/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdbi-drivers/default.nix
rename to pkgs/by-name/li/libdbiDrivers/package.nix
diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/by-name/li/libdbusmenu/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdbusmenu/default.nix
rename to pkgs/by-name/li/libdbusmenu/package.nix
diff --git a/pkgs/development/libraries/libdbusmenu/requires-glib.patch b/pkgs/by-name/li/libdbusmenu/requires-glib.patch
similarity index 100%
rename from pkgs/development/libraries/libdbusmenu/requires-glib.patch
rename to pkgs/by-name/li/libdbusmenu/requires-glib.patch
diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/by-name/li/libde265/package.nix
similarity index 100%
rename from pkgs/development/libraries/libde265/default.nix
rename to pkgs/by-name/li/libde265/package.nix
diff --git a/pkgs/development/libraries/libde265/test-corpus-decode.nix b/pkgs/by-name/li/libde265/test-corpus-decode.nix
similarity index 100%
rename from pkgs/development/libraries/libde265/test-corpus-decode.nix
rename to pkgs/by-name/li/libde265/test-corpus-decode.nix
diff --git a/pkgs/development/libraries/libdecor/default.nix b/pkgs/by-name/li/libdecor/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdecor/default.nix
rename to pkgs/by-name/li/libdecor/package.nix
diff --git a/pkgs/development/libraries/libdex/default.nix b/pkgs/by-name/li/libdex/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdex/default.nix
rename to pkgs/by-name/li/libdex/package.nix
diff --git a/pkgs/development/libraries/libdicom/default.nix b/pkgs/by-name/li/libdicom/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdicom/default.nix
rename to pkgs/by-name/li/libdicom/package.nix
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/by-name/li/libdigidocpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdigidocpp/default.nix
rename to pkgs/by-name/li/libdigidocpp/package.nix
diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/by-name/li/libdiscid/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdiscid/default.nix
rename to pkgs/by-name/li/libdiscid/package.nix
diff --git a/pkgs/development/libraries/libdisplay-info/default.nix b/pkgs/by-name/li/libdisplay-info/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdisplay-info/default.nix
rename to pkgs/by-name/li/libdisplay-info/package.nix
diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/by-name/li/libdivecomputer/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdivecomputer/default.nix
rename to pkgs/by-name/li/libdivecomputer/package.nix
diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/by-name/li/libdivsufsort/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdivsufsort/default.nix
rename to pkgs/by-name/li/libdivsufsort/package.nix
diff --git a/pkgs/development/libraries/libdmapsharing/default.nix b/pkgs/by-name/li/libdmapsharing/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdmapsharing/default.nix
rename to pkgs/by-name/li/libdmapsharing/package.nix
diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/by-name/li/libdmtx/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdmtx/default.nix
rename to pkgs/by-name/li/libdmtx/package.nix
diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/by-name/li/libdnet/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdnet/default.nix
rename to pkgs/by-name/li/libdnet/package.nix
diff --git a/pkgs/development/libraries/libdovi/Cargo.lock b/pkgs/by-name/li/libdovi/Cargo.lock
similarity index 100%
rename from pkgs/development/libraries/libdovi/Cargo.lock
rename to pkgs/by-name/li/libdovi/Cargo.lock
diff --git a/pkgs/development/libraries/libdovi/default.nix b/pkgs/by-name/li/libdovi/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdovi/default.nix
rename to pkgs/by-name/li/libdovi/package.nix
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/by-name/li/libdrm/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdrm/default.nix
rename to pkgs/by-name/li/libdrm/package.nix
diff --git a/pkgs/applications/emulators/libdsk/default.nix b/pkgs/by-name/li/libdsk/package.nix
similarity index 100%
rename from pkgs/applications/emulators/libdsk/default.nix
rename to pkgs/by-name/li/libdsk/package.nix
diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/by-name/li/libdv/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdv/default.nix
rename to pkgs/by-name/li/libdv/package.nix
diff --git a/pkgs/development/libraries/libdvbcsa/default.nix b/pkgs/by-name/li/libdvbcsa/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdvbcsa/default.nix
rename to pkgs/by-name/li/libdvbcsa/package.nix
diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/by-name/li/libdvbpsi/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdvbpsi/default.nix
rename to pkgs/by-name/li/libdvbpsi/package.nix
diff --git a/pkgs/development/libraries/libdwarf/common.nix b/pkgs/by-name/li/libdwarf/common.nix
similarity index 100%
rename from pkgs/development/libraries/libdwarf/common.nix
rename to pkgs/by-name/li/libdwarf/common.nix
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/by-name/li/libdwarf/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdwarf/default.nix
rename to pkgs/by-name/li/libdwarf/package.nix
diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/by-name/li/libdwg/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdwg/default.nix
rename to pkgs/by-name/li/libdwg/package.nix
diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/by-name/li/libdynd/package.nix
similarity index 100%
rename from pkgs/development/libraries/libdynd/default.nix
rename to pkgs/by-name/li/libdynd/package.nix
diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/by-name/li/libe-book/package.nix
similarity index 100%
rename from pkgs/development/libraries/libe-book/default.nix
rename to pkgs/by-name/li/libe-book/package.nix
diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/by-name/li/libe57format/package.nix
similarity index 100%
rename from pkgs/development/libraries/libe57format/default.nix
rename to pkgs/by-name/li/libe57format/package.nix
diff --git a/pkgs/development/libraries/libeatmydata/LFS64.patch b/pkgs/by-name/li/libeatmydata/LFS64.patch
similarity index 100%
rename from pkgs/development/libraries/libeatmydata/LFS64.patch
rename to pkgs/by-name/li/libeatmydata/LFS64.patch
diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/by-name/li/libeatmydata/package.nix
similarity index 100%
rename from pkgs/development/libraries/libeatmydata/default.nix
rename to pkgs/by-name/li/libeatmydata/package.nix
diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/by-name/li/libeb/package.nix
similarity index 100%
rename from pkgs/development/libraries/libeb/default.nix
rename to pkgs/by-name/li/libeb/package.nix
diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/by-name/li/libebml/package.nix
similarity index 100%
rename from pkgs/development/libraries/libebml/default.nix
rename to pkgs/by-name/li/libebml/package.nix
diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/by-name/li/libebur128/package.nix
similarity index 100%
rename from pkgs/development/libraries/libebur128/default.nix
rename to pkgs/by-name/li/libebur128/package.nix
diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/by-name/li/libee/package.nix
similarity index 100%
rename from pkgs/development/libraries/libee/default.nix
rename to pkgs/by-name/li/libee/package.nix
diff --git a/pkgs/development/libraries/libei/default.nix b/pkgs/by-name/li/libei/package.nix
similarity index 100%
rename from pkgs/development/libraries/libei/default.nix
rename to pkgs/by-name/li/libei/package.nix
diff --git a/pkgs/development/libraries/libelf/dont-hardcode-ar.patch b/pkgs/by-name/li/libelf/dont-hardcode-ar.patch
similarity index 100%
rename from pkgs/development/libraries/libelf/dont-hardcode-ar.patch
rename to pkgs/by-name/li/libelf/dont-hardcode-ar.patch
diff --git a/pkgs/development/libraries/libelf/fix-configure-main.patch b/pkgs/by-name/li/libelf/fix-configure-main.patch
similarity index 100%
rename from pkgs/development/libraries/libelf/fix-configure-main.patch
rename to pkgs/by-name/li/libelf/fix-configure-main.patch
diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/by-name/li/libelf/package.nix
similarity index 100%
rename from pkgs/development/libraries/libelf/default.nix
rename to pkgs/by-name/li/libelf/package.nix
diff --git a/pkgs/development/libraries/libelf/preprocessor-warnings.patch b/pkgs/by-name/li/libelf/preprocessor-warnings.patch
similarity index 100%
rename from pkgs/development/libraries/libelf/preprocessor-warnings.patch
rename to pkgs/by-name/li/libelf/preprocessor-warnings.patch
diff --git a/pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch b/pkgs/by-name/li/libelfin/0001-Don-t-detect-package-version-with-Git.patch
similarity index 100%
rename from pkgs/development/libraries/libelfin/0001-Don-t-detect-package-version-with-Git.patch
rename to pkgs/by-name/li/libelfin/0001-Don-t-detect-package-version-with-Git.patch
diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/by-name/li/libelfin/package.nix
similarity index 100%
rename from pkgs/development/libraries/libelfin/default.nix
rename to pkgs/by-name/li/libelfin/package.nix
diff --git a/pkgs/development/libraries/libemf2svg/default.nix b/pkgs/by-name/li/libemf2svg/package.nix
similarity index 100%
rename from pkgs/development/libraries/libemf2svg/default.nix
rename to pkgs/by-name/li/libemf2svg/package.nix
diff --git a/pkgs/development/libraries/libepc/no-avahi-ui.patch b/pkgs/by-name/li/libepc/no-avahi-ui.patch
similarity index 100%
rename from pkgs/development/libraries/libepc/no-avahi-ui.patch
rename to pkgs/by-name/li/libepc/no-avahi-ui.patch
diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/by-name/li/libepc/package.nix
similarity index 100%
rename from pkgs/development/libraries/libepc/default.nix
rename to pkgs/by-name/li/libepc/package.nix
diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/by-name/li/liberal-crime-squad/package.nix
similarity index 100%
rename from pkgs/games/liberal-crime-squad/default.nix
rename to pkgs/by-name/li/liberal-crime-squad/package.nix
diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/by-name/li/liberastika/package.nix
similarity index 100%
rename from pkgs/data/fonts/liberastika/default.nix
rename to pkgs/by-name/li/liberastika/package.nix
diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/by-name/li/liberation-circuit/package.nix
similarity index 100%
rename from pkgs/games/liberation-circuit/default.nix
rename to pkgs/by-name/li/liberation-circuit/package.nix
diff --git a/pkgs/data/fonts/liberation-sans-narrow/default.nix b/pkgs/by-name/li/liberation-sans-narrow/package.nix
similarity index 100%
rename from pkgs/data/fonts/liberation-sans-narrow/default.nix
rename to pkgs/by-name/li/liberation-sans-narrow/package.nix
diff --git a/pkgs/development/libraries/liberfa/default.nix b/pkgs/by-name/li/liberfa/package.nix
similarity index 100%
rename from pkgs/development/libraries/liberfa/default.nix
rename to pkgs/by-name/li/liberfa/package.nix
diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/by-name/li/liberio/package.nix
similarity index 100%
rename from pkgs/development/libraries/liberio/default.nix
rename to pkgs/by-name/li/liberio/package.nix
diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/by-name/li/libertine/package.nix
similarity index 100%
rename from pkgs/data/fonts/libertine/default.nix
rename to pkgs/by-name/li/libertine/package.nix
diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/by-name/li/libertinus/package.nix
similarity index 100%
rename from pkgs/data/fonts/libertinus/default.nix
rename to pkgs/by-name/li/libertinus/package.nix
diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/by-name/li/libesmtp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libesmtp/default.nix
rename to pkgs/by-name/li/libesmtp/package.nix
diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/by-name/li/libestr/package.nix
similarity index 100%
rename from pkgs/development/libraries/libestr/default.nix
rename to pkgs/by-name/li/libestr/package.nix
diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/by-name/li/libetpan/package.nix
similarity index 100%
rename from pkgs/development/libraries/libetpan/default.nix
rename to pkgs/by-name/li/libetpan/package.nix
diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/by-name/li/libev/package.nix
similarity index 100%
rename from pkgs/development/libraries/libev/default.nix
rename to pkgs/by-name/li/libev/package.nix
diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/by-name/li/libevdev/package.nix
similarity index 100%
rename from pkgs/development/libraries/libevdev/default.nix
rename to pkgs/by-name/li/libevdev/package.nix
diff --git a/pkgs/os-specific/linux/libevdevc/default.nix b/pkgs/by-name/li/libevdevc/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libevdevc/default.nix
rename to pkgs/by-name/li/libevdevc/package.nix
diff --git a/pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch b/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch
similarity index 100%
rename from pkgs/development/libraries/libevdevplus/0001-Add-cmake-install-directives.patch
rename to pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch
diff --git a/pkgs/development/libraries/libevdevplus/default.nix b/pkgs/by-name/li/libevdevplus/package.nix
similarity index 100%
rename from pkgs/development/libraries/libevdevplus/default.nix
rename to pkgs/by-name/li/libevdevplus/package.nix
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/by-name/li/libevent/package.nix
similarity index 100%
rename from pkgs/development/libraries/libevent/default.nix
rename to pkgs/by-name/li/libevent/package.nix
diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/by-name/li/libewf/package.nix
similarity index 100%
rename from pkgs/development/libraries/libewf/default.nix
rename to pkgs/by-name/li/libewf/package.nix
diff --git a/pkgs/development/libraries/libexecinfo/30-linux-makefile.patch b/pkgs/by-name/li/libexecinfo/30-linux-makefile.patch
similarity index 100%
rename from pkgs/development/libraries/libexecinfo/30-linux-makefile.patch
rename to pkgs/by-name/li/libexecinfo/30-linux-makefile.patch
diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/by-name/li/libexecinfo/package.nix
similarity index 100%
rename from pkgs/development/libraries/libexecinfo/default.nix
rename to pkgs/by-name/li/libexecinfo/package.nix
diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/by-name/li/libexif/package.nix
similarity index 100%
rename from pkgs/development/libraries/libexif/default.nix
rename to pkgs/by-name/li/libexif/package.nix
diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/by-name/li/libexosip/package.nix
similarity index 100%
rename from pkgs/development/libraries/exosip/default.nix
rename to pkgs/by-name/li/libexosip/package.nix
diff --git a/pkgs/development/libraries/libexsid/default.nix b/pkgs/by-name/li/libexsid/package.nix
similarity index 100%
rename from pkgs/development/libraries/libexsid/default.nix
rename to pkgs/by-name/li/libexsid/package.nix
diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/by-name/li/libexttextcat/package.nix
similarity index 100%
rename from pkgs/development/libraries/libexttextcat/default.nix
rename to pkgs/by-name/li/libexttextcat/package.nix
diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/by-name/li/libf2c/package.nix
similarity index 100%
rename from pkgs/development/libraries/libf2c/default.nix
rename to pkgs/by-name/li/libf2c/package.nix
diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/by-name/li/libfabric/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfabric/default.nix
rename to pkgs/by-name/li/libfabric/package.nix
diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/by-name/li/libfakekey/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfakekey/default.nix
rename to pkgs/by-name/li/libfakekey/package.nix
diff --git a/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch
similarity index 100%
rename from pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch
rename to pkgs/by-name/li/libfaketime/0001-Remove-unsupported-clang-flags.patch
diff --git a/pkgs/development/libraries/libfaketime/nix-store-date.patch b/pkgs/by-name/li/libfaketime/nix-store-date.patch
similarity index 100%
rename from pkgs/development/libraries/libfaketime/nix-store-date.patch
rename to pkgs/by-name/li/libfaketime/nix-store-date.patch
diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/by-name/li/libfaketime/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfaketime/default.nix
rename to pkgs/by-name/li/libfaketime/package.nix
diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/by-name/li/libfann/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfann/default.nix
rename to pkgs/by-name/li/libfann/package.nix
diff --git a/pkgs/development/libraries/libff/default.nix b/pkgs/by-name/li/libff/package.nix
similarity index 100%
rename from pkgs/development/libraries/libff/default.nix
rename to pkgs/by-name/li/libff/package.nix
diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/by-name/li/libffcall/package.nix
similarity index 100%
rename from pkgs/development/libraries/libffcall/default.nix
rename to pkgs/by-name/li/libffcall/package.nix
diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/by-name/li/libfido2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfido2/default.nix
rename to pkgs/by-name/li/libfido2/package.nix
diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/by-name/li/libfishsound/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfishsound/default.nix
rename to pkgs/by-name/li/libfishsound/package.nix
diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/by-name/li/libfixposix/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfixposix/default.nix
rename to pkgs/by-name/li/libfixposix/package.nix
diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/by-name/li/libfm/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfm/default.nix
rename to pkgs/by-name/li/libfm/package.nix
diff --git a/pkgs/development/libraries/libfprint-2-tod1-elan/default.nix b/pkgs/by-name/li/libfprint-2-tod1-elan/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfprint-2-tod1-elan/default.nix
rename to pkgs/by-name/li/libfprint-2-tod1-elan/package.nix
diff --git a/pkgs/development/libraries/libfprint-2-tod1-goodix-550a/default.nix b/pkgs/by-name/li/libfprint-2-tod1-goodix-550a/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfprint-2-tod1-goodix-550a/default.nix
rename to pkgs/by-name/li/libfprint-2-tod1-goodix-550a/package.nix
diff --git a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix b/pkgs/by-name/li/libfprint-2-tod1-goodix/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix
rename to pkgs/by-name/li/libfprint-2-tod1-goodix/package.nix
diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch b/pkgs/by-name/li/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch
similarity index 100%
rename from pkgs/development/libraries/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch
rename to pkgs/by-name/li/libfprint-2-tod1-vfs0090/0001-vfs0090-add-missing-explicit-dependencies-in-meson.b.patch
diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch b/pkgs/by-name/li/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch
similarity index 100%
rename from pkgs/development/libraries/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch
rename to pkgs/by-name/li/libfprint-2-tod1-vfs0090/0002-vfs0090-add-missing-linux-limits.h-include.patch
diff --git a/pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix b/pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfprint-2-tod1-vfs0090/default.nix
rename to pkgs/by-name/li/libfprint-2-tod1-vfs0090/package.nix
diff --git a/pkgs/development/libraries/libfprint-tod/default.nix b/pkgs/by-name/li/libfprint-tod/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfprint-tod/default.nix
rename to pkgs/by-name/li/libfprint-tod/package.nix
diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/by-name/li/libfpx/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfpx/default.nix
rename to pkgs/by-name/li/libfpx/package.nix
diff --git a/pkgs/development/libraries/libfreeaptx/default.nix b/pkgs/by-name/li/libfreeaptx/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfreeaptx/default.nix
rename to pkgs/by-name/li/libfreeaptx/package.nix
diff --git a/pkgs/development/libraries/libfsm/default.nix b/pkgs/by-name/li/libfsm/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfsm/default.nix
rename to pkgs/by-name/li/libfsm/package.nix
diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/by-name/li/libfyaml/package.nix
similarity index 100%
rename from pkgs/development/libraries/libfyaml/default.nix
rename to pkgs/by-name/li/libfyaml/package.nix
diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/by-name/li/libgadu/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgadu/default.nix
rename to pkgs/by-name/li/libgadu/package.nix
diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/by-name/li/libgaminggear/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgaminggear/default.nix
rename to pkgs/by-name/li/libgaminggear/package.nix
diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/by-name/li/libgbinder/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgbinder/default.nix
rename to pkgs/by-name/li/libgbinder/package.nix
diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/by-name/li/libgdamm/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgdamm/default.nix
rename to pkgs/by-name/li/libgdamm/package.nix
diff --git a/pkgs/development/libraries/libgdata/installed-tests-path.patch b/pkgs/by-name/li/libgdata/installed-tests-path.patch
similarity index 100%
rename from pkgs/development/libraries/libgdata/installed-tests-path.patch
rename to pkgs/by-name/li/libgdata/installed-tests-path.patch
diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/by-name/li/libgdata/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgdata/default.nix
rename to pkgs/by-name/li/libgdata/package.nix
diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/by-name/li/libgee/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgee/default.nix
rename to pkgs/by-name/li/libgee/package.nix
diff --git a/pkgs/tools/misc/libgen-cli/default.nix b/pkgs/by-name/li/libgen-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/libgen-cli/default.nix
rename to pkgs/by-name/li/libgen-cli/package.nix
diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/by-name/li/libgeotiff/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgeotiff/default.nix
rename to pkgs/by-name/li/libgeotiff/package.nix
diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/by-name/li/libgepub/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgepub/default.nix
rename to pkgs/by-name/li/libgepub/package.nix
diff --git a/pkgs/os-specific/linux/libgestures/include-fix.patch b/pkgs/by-name/li/libgestures/include-fix.patch
similarity index 100%
rename from pkgs/os-specific/linux/libgestures/include-fix.patch
rename to pkgs/by-name/li/libgestures/include-fix.patch
diff --git a/pkgs/os-specific/linux/libgestures/default.nix b/pkgs/by-name/li/libgestures/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libgestures/default.nix
rename to pkgs/by-name/li/libgestures/package.nix
diff --git a/pkgs/development/libraries/libgflow/default.nix b/pkgs/by-name/li/libgflow/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgflow/default.nix
rename to pkgs/by-name/li/libgflow/package.nix
diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/by-name/li/libgig/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgig/default.nix
rename to pkgs/by-name/li/libgig/package.nix
diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/by-name/li/libgit2-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgit2-glib/default.nix
rename to pkgs/by-name/li/libgit2-glib/package.nix
diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/by-name/li/libglibutil/package.nix
similarity index 100%
rename from pkgs/development/libraries/libglibutil/default.nix
rename to pkgs/by-name/li/libglibutil/package.nix
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/by-name/li/libglvnd/package.nix
similarity index 100%
rename from pkgs/development/libraries/libglvnd/default.nix
rename to pkgs/by-name/li/libglvnd/package.nix
diff --git a/pkgs/development/libraries/libgmpris/default.nix b/pkgs/by-name/li/libgmpris/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgmpris/default.nix
rename to pkgs/by-name/li/libgmpris/package.nix
diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/by-name/li/libgnomekbd/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgnomekbd/default.nix
rename to pkgs/by-name/li/libgnomekbd/package.nix
diff --git a/pkgs/development/libraries/libgnt/default.nix b/pkgs/by-name/li/libgnt/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgnt/default.nix
rename to pkgs/by-name/li/libgnt/package.nix
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/by-name/li/libgnurl/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgnurl/default.nix
rename to pkgs/by-name/li/libgnurl/package.nix
diff --git a/pkgs/development/libraries/libgourou/default.nix b/pkgs/by-name/li/libgourou/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgourou/default.nix
rename to pkgs/by-name/li/libgourou/package.nix
diff --git a/pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch b/pkgs/by-name/li/libgovirt/auto-disable-incompatible-compiler-warnings.patch
similarity index 100%
rename from pkgs/applications/virtualization/libgovirt/auto-disable-incompatible-compiler-warnings.patch
rename to pkgs/by-name/li/libgovirt/auto-disable-incompatible-compiler-warnings.patch
diff --git a/pkgs/applications/virtualization/libgovirt/default.nix b/pkgs/by-name/li/libgovirt/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/libgovirt/default.nix
rename to pkgs/by-name/li/libgovirt/package.nix
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/by-name/li/libgpg-error/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgpg-error/default.nix
rename to pkgs/by-name/li/libgpg-error/package.nix
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/by-name/li/libgphoto2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgphoto2/default.nix
rename to pkgs/by-name/li/libgphoto2/package.nix
diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/by-name/li/libgpiod/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgpiod/default.nix
rename to pkgs/by-name/li/libgpiod/package.nix
diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/by-name/li/libgringotts/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgringotts/default.nix
rename to pkgs/by-name/li/libgringotts/package.nix
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/by-name/li/libgsf/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgsf/default.nix
rename to pkgs/by-name/li/libgsf/package.nix
diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/by-name/li/libgssglue/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgssglue/default.nix
rename to pkgs/by-name/li/libgssglue/package.nix
diff --git a/pkgs/development/libraries/libgtkflow3/default.nix b/pkgs/by-name/li/libgtkflow3/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgtkflow3/default.nix
rename to pkgs/by-name/li/libgtkflow3/package.nix
diff --git a/pkgs/development/libraries/libgtkflow4/default.nix b/pkgs/by-name/li/libgtkflow4/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgtkflow4/default.nix
rename to pkgs/by-name/li/libgtkflow4/package.nix
diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/by-name/li/libgtop/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgtop/default.nix
rename to pkgs/by-name/li/libgtop/package.nix
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/by-name/li/libgudev/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgudev/default.nix
rename to pkgs/by-name/li/libgudev/package.nix
diff --git a/pkgs/development/libraries/libgudev/tests-skip-double-test-on-stub-locale-impls.patch b/pkgs/by-name/li/libgudev/tests-skip-double-test-on-stub-locale-impls.patch
similarity index 100%
rename from pkgs/development/libraries/libgudev/tests-skip-double-test-on-stub-locale-impls.patch
rename to pkgs/by-name/li/libgudev/tests-skip-double-test-on-stub-locale-impls.patch
diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/by-name/li/libgumath/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgumath/default.nix
rename to pkgs/by-name/li/libgumath/package.nix
diff --git a/pkgs/development/libraries/libgweather/fix-pkgconfig.patch b/pkgs/by-name/li/libgweather/fix-pkgconfig.patch
similarity index 100%
rename from pkgs/development/libraries/libgweather/fix-pkgconfig.patch
rename to pkgs/by-name/li/libgweather/fix-pkgconfig.patch
diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/by-name/li/libgweather/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgweather/default.nix
rename to pkgs/by-name/li/libgweather/package.nix
diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/by-name/li/libgxps/package.nix
similarity index 100%
rename from pkgs/development/libraries/libgxps/default.nix
rename to pkgs/by-name/li/libgxps/package.nix
diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/by-name/li/libhangul/package.nix
similarity index 100%
rename from pkgs/development/libraries/libhangul/default.nix
rename to pkgs/by-name/li/libhangul/package.nix
diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/by-name/li/libharu/package.nix
similarity index 100%
rename from pkgs/development/libraries/libharu/default.nix
rename to pkgs/by-name/li/libharu/package.nix
diff --git a/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch b/pkgs/by-name/li/libhdhomerun/nixos-darwin-no-fat-dylib.patch
similarity index 100%
rename from pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch
rename to pkgs/by-name/li/libhdhomerun/nixos-darwin-no-fat-dylib.patch
diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/by-name/li/libhdhomerun/package.nix
similarity index 100%
rename from pkgs/development/libraries/libhdhomerun/default.nix
rename to pkgs/by-name/li/libhdhomerun/package.nix
diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/by-name/li/libheif/package.nix
similarity index 100%
rename from pkgs/development/libraries/libheif/default.nix
rename to pkgs/by-name/li/libheif/package.nix
diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/by-name/li/libhomfly/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/libhomfly/default.nix
rename to pkgs/by-name/li/libhomfly/package.nix
diff --git a/pkgs/development/libraries/libhsts/default.nix b/pkgs/by-name/li/libhsts/package.nix
similarity index 100%
rename from pkgs/development/libraries/libhsts/default.nix
rename to pkgs/by-name/li/libhsts/package.nix
diff --git a/pkgs/development/libraries/libhsts/update.sh b/pkgs/by-name/li/libhsts/update.sh
similarity index 100%
rename from pkgs/development/libraries/libhsts/update.sh
rename to pkgs/by-name/li/libhsts/update.sh
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/by-name/li/libhttpseverywhere/package.nix
similarity index 100%
rename from pkgs/development/libraries/libhttpseverywhere/default.nix
rename to pkgs/by-name/li/libhttpseverywhere/package.nix
diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/by-name/li/libhugetlbfs/package.nix
similarity index 100%
rename from pkgs/development/libraries/libhugetlbfs/default.nix
rename to pkgs/by-name/li/libhugetlbfs/package.nix
diff --git a/pkgs/development/libraries/libhwy/default.nix b/pkgs/by-name/li/libhwy/package.nix
similarity index 100%
rename from pkgs/development/libraries/libhwy/default.nix
rename to pkgs/by-name/li/libhwy/package.nix
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/by-name/li/libiberty/package.nix
similarity index 100%
rename from pkgs/development/libraries/libiberty/default.nix
rename to pkgs/by-name/li/libiberty/package.nix
diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/by-name/li/libibmad/package.nix
similarity index 100%
rename from pkgs/development/libraries/libibmad/default.nix
rename to pkgs/by-name/li/libibmad/package.nix
diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/by-name/li/libibumad/package.nix
similarity index 100%
rename from pkgs/development/libraries/libibumad/default.nix
rename to pkgs/by-name/li/libibumad/package.nix
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/by-name/li/libical/package.nix
similarity index 100%
rename from pkgs/development/libraries/libical/default.nix
rename to pkgs/by-name/li/libical/package.nix
diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/by-name/li/libical/respect-env-tzdir.patch
similarity index 100%
rename from pkgs/development/libraries/libical/respect-env-tzdir.patch
rename to pkgs/by-name/li/libical/respect-env-tzdir.patch
diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/by-name/li/libicns/package.nix
similarity index 100%
rename from pkgs/development/libraries/libicns/default.nix
rename to pkgs/by-name/li/libicns/package.nix
diff --git a/pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch b/pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
similarity index 100%
rename from pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
rename to pkgs/by-name/li/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch
diff --git a/pkgs/development/libraries/libid3tag/debian-patches.patch b/pkgs/by-name/li/libid3tag/debian-patches.patch
similarity index 100%
rename from pkgs/development/libraries/libid3tag/debian-patches.patch
rename to pkgs/by-name/li/libid3tag/debian-patches.patch
diff --git a/pkgs/development/libraries/libid3tag/id3tag.pc b/pkgs/by-name/li/libid3tag/id3tag.pc
similarity index 100%
rename from pkgs/development/libraries/libid3tag/id3tag.pc
rename to pkgs/by-name/li/libid3tag/id3tag.pc
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/by-name/li/libid3tag/package.nix
similarity index 100%
rename from pkgs/development/libraries/libid3tag/default.nix
rename to pkgs/by-name/li/libid3tag/package.nix
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/by-name/li/libidn/package.nix
similarity index 100%
rename from pkgs/development/libraries/libidn/default.nix
rename to pkgs/by-name/li/libidn/package.nix
diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/by-name/li/libiec61883/package.nix
similarity index 100%
rename from pkgs/development/libraries/libiec61883/default.nix
rename to pkgs/by-name/li/libiec61883/package.nix
diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/by-name/li/libieee1284/package.nix
similarity index 100%
rename from pkgs/development/libraries/libieee1284/default.nix
rename to pkgs/by-name/li/libieee1284/package.nix
diff --git a/pkgs/development/libraries/libimagequant/Cargo.lock b/pkgs/by-name/li/libimagequant/Cargo.lock
similarity index 100%
rename from pkgs/development/libraries/libimagequant/Cargo.lock
rename to pkgs/by-name/li/libimagequant/Cargo.lock
diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/by-name/li/libimagequant/package.nix
similarity index 100%
rename from pkgs/development/libraries/libimagequant/default.nix
rename to pkgs/by-name/li/libimagequant/package.nix
diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/by-name/li/libime/package.nix
similarity index 100%
rename from pkgs/development/libraries/libime/default.nix
rename to pkgs/by-name/li/libime/package.nix
diff --git a/pkgs/development/libraries/libimobiledevice-glue/default.nix b/pkgs/by-name/li/libimobiledevice-glue/package.nix
similarity index 100%
rename from pkgs/development/libraries/libimobiledevice-glue/default.nix
rename to pkgs/by-name/li/libimobiledevice-glue/package.nix
diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/by-name/li/libindicator/package.nix
similarity index 100%
rename from pkgs/development/libraries/libindicator/default.nix
rename to pkgs/by-name/li/libindicator/package.nix
diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/by-name/li/libinfinity/package.nix
similarity index 100%
rename from pkgs/development/libraries/libinfinity/default.nix
rename to pkgs/by-name/li/libinfinity/package.nix
diff --git a/pkgs/development/libraries/libinjection/default.nix b/pkgs/by-name/li/libinjection/package.nix
similarity index 100%
rename from pkgs/development/libraries/libinjection/default.nix
rename to pkgs/by-name/li/libinjection/package.nix
diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/by-name/li/libinklevel/package.nix
similarity index 100%
rename from pkgs/development/libraries/libinklevel/default.nix
rename to pkgs/by-name/li/libinklevel/package.nix
diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/by-name/li/libinotify-kqueue/package.nix
similarity index 100%
rename from pkgs/development/libraries/libinotify-kqueue/default.nix
rename to pkgs/by-name/li/libinotify-kqueue/package.nix
diff --git a/pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch b/pkgs/by-name/li/libinput-gestures/0001-hardcode-name.patch
similarity index 100%
rename from pkgs/tools/inputmethods/libinput-gestures/0001-hardcode-name.patch
rename to pkgs/by-name/li/libinput-gestures/0001-hardcode-name.patch
diff --git a/pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch b/pkgs/by-name/li/libinput-gestures/0002-paths.patch
similarity index 100%
rename from pkgs/tools/inputmethods/libinput-gestures/0002-paths.patch
rename to pkgs/by-name/li/libinput-gestures/0002-paths.patch
diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/by-name/li/libinput-gestures/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/libinput-gestures/default.nix
rename to pkgs/by-name/li/libinput-gestures/package.nix
diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/by-name/li/libinsane/package.nix
similarity index 100%
rename from pkgs/development/libraries/libinsane/default.nix
rename to pkgs/by-name/li/libinsane/package.nix
diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/by-name/li/libinstpatch/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/libinstpatch/default.nix
rename to pkgs/by-name/li/libinstpatch/package.nix
diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/by-name/li/libipfix/package.nix
similarity index 100%
rename from pkgs/development/libraries/libipfix/default.nix
rename to pkgs/by-name/li/libipfix/package.nix
diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/by-name/li/libipt/package.nix
similarity index 100%
rename from pkgs/development/libraries/libipt/default.nix
rename to pkgs/by-name/li/libipt/package.nix
diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/by-name/li/libiptcdata/package.nix
similarity index 100%
rename from pkgs/development/libraries/libiptcdata/default.nix
rename to pkgs/by-name/li/libiptcdata/package.nix
diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/by-name/li/libircclient/package.nix
similarity index 100%
rename from pkgs/development/libraries/libircclient/default.nix
rename to pkgs/by-name/li/libircclient/package.nix
diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/by-name/li/libirecovery/package.nix
similarity index 100%
rename from pkgs/development/libraries/libirecovery/default.nix
rename to pkgs/by-name/li/libirecovery/package.nix
diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/by-name/li/libiscsi/package.nix
similarity index 100%
rename from pkgs/development/libraries/libiscsi/default.nix
rename to pkgs/by-name/li/libiscsi/package.nix
diff --git a/pkgs/development/libraries/libisds/default.nix b/pkgs/by-name/li/libisds/package.nix
similarity index 100%
rename from pkgs/development/libraries/libisds/default.nix
rename to pkgs/by-name/li/libisds/package.nix
diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/by-name/li/libite/package.nix
similarity index 100%
rename from pkgs/development/libraries/libite/default.nix
rename to pkgs/by-name/li/libite/package.nix
diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/by-name/li/libivykis/package.nix
similarity index 100%
rename from pkgs/development/libraries/libivykis/default.nix
rename to pkgs/by-name/li/libivykis/package.nix
diff --git a/pkgs/development/libraries/libixp/default.nix b/pkgs/by-name/li/libixp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libixp/default.nix
rename to pkgs/by-name/li/libixp/package.nix
diff --git a/pkgs/development/libraries/libjcat/installed-tests-path.patch b/pkgs/by-name/li/libjcat/installed-tests-path.patch
similarity index 100%
rename from pkgs/development/libraries/libjcat/installed-tests-path.patch
rename to pkgs/by-name/li/libjcat/installed-tests-path.patch
diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/by-name/li/libjcat/package.nix
similarity index 100%
rename from pkgs/development/libraries/libjcat/default.nix
rename to pkgs/by-name/li/libjcat/package.nix
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/by-name/li/libjpeg_original/package.nix
similarity index 100%
rename from pkgs/development/libraries/libjpeg/default.nix
rename to pkgs/by-name/li/libjpeg_original/package.nix
diff --git a/pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch b/pkgs/by-name/li/libjpeg_turbo/0001-Compile-transupp.c-as-part-of-the-library.patch
similarity index 100%
rename from pkgs/development/libraries/libjpeg-turbo/0001-Compile-transupp.c-as-part-of-the-library.patch
rename to pkgs/by-name/li/libjpeg_turbo/0001-Compile-transupp.c-as-part-of-the-library.patch
diff --git a/pkgs/development/libraries/libjpeg-turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch b/pkgs/by-name/li/libjpeg_turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch
similarity index 100%
rename from pkgs/development/libraries/libjpeg-turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch
rename to pkgs/by-name/li/libjpeg_turbo/0002-Make-exported-symbols-in-transupp.c-weak.patch
diff --git a/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch b/pkgs/by-name/li/libjpeg_turbo/mingw-boolean.patch
similarity index 100%
rename from pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch
rename to pkgs/by-name/li/libjpeg_turbo/mingw-boolean.patch
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix
similarity index 100%
rename from pkgs/development/libraries/libjpeg-turbo/default.nix
rename to pkgs/by-name/li/libjpeg_turbo/package.nix
diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libjson-rpc-cpp/default.nix
rename to pkgs/by-name/li/libjson-rpc-cpp/package.nix
diff --git a/pkgs/development/libraries/libjson/install-fix.patch b/pkgs/by-name/li/libjson/install-fix.patch
similarity index 100%
rename from pkgs/development/libraries/libjson/install-fix.patch
rename to pkgs/by-name/li/libjson/install-fix.patch
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/by-name/li/libjson/package.nix
similarity index 100%
rename from pkgs/development/libraries/libjson/default.nix
rename to pkgs/by-name/li/libjson/package.nix
diff --git a/pkgs/development/libraries/libjwt/default.nix b/pkgs/by-name/li/libjwt/package.nix
similarity index 100%
rename from pkgs/development/libraries/libjwt/default.nix
rename to pkgs/by-name/li/libjwt/package.nix
diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/by-name/li/libjxl/package.nix
similarity index 100%
rename from pkgs/development/libraries/libjxl/default.nix
rename to pkgs/by-name/li/libjxl/package.nix
diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/by-name/li/libkate/package.nix
similarity index 100%
rename from pkgs/development/libraries/libkate/default.nix
rename to pkgs/by-name/li/libkate/package.nix
diff --git a/pkgs/development/libraries/libkcapi/default.nix b/pkgs/by-name/li/libkcapi/package.nix
similarity index 100%
rename from pkgs/development/libraries/libkcapi/default.nix
rename to pkgs/by-name/li/libkcapi/package.nix
diff --git a/pkgs/development/libraries/audio/libkeyfinder/default.nix b/pkgs/by-name/li/libkeyfinder/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/libkeyfinder/default.nix
rename to pkgs/by-name/li/libkeyfinder/package.nix
diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/by-name/li/libkkc-data/package.nix
similarity index 100%
rename from pkgs/data/misc/libkkc-data/default.nix
rename to pkgs/by-name/li/libkkc-data/package.nix
diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/by-name/li/libkkc/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/libkkc/default.nix
rename to pkgs/by-name/li/libkkc/package.nix
diff --git a/pkgs/development/libraries/libkqueue/default.nix b/pkgs/by-name/li/libkqueue/package.nix
similarity index 100%
rename from pkgs/development/libraries/libkqueue/default.nix
rename to pkgs/by-name/li/libkqueue/package.nix
diff --git a/pkgs/development/libraries/libkrun/default.nix b/pkgs/by-name/li/libkrun/package.nix
similarity index 100%
rename from pkgs/development/libraries/libkrun/default.nix
rename to pkgs/by-name/li/libkrun/package.nix
diff --git a/pkgs/development/libraries/libkrunfw/default.nix b/pkgs/by-name/li/libkrunfw/package.nix
similarity index 100%
rename from pkgs/development/libraries/libkrunfw/default.nix
rename to pkgs/by-name/li/libkrunfw/package.nix
diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/by-name/li/libks/package.nix
similarity index 100%
rename from pkgs/development/libraries/libks/default.nix
rename to pkgs/by-name/li/libks/package.nix
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/by-name/li/libksba/package.nix
similarity index 100%
rename from pkgs/development/libraries/libksba/default.nix
rename to pkgs/by-name/li/libksba/package.nix
diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/by-name/li/libksi/package.nix
similarity index 100%
rename from pkgs/development/libraries/libksi/default.nix
rename to pkgs/by-name/li/libksi/package.nix
diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/by-name/li/liblangtag/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblangtag/default.nix
rename to pkgs/by-name/li/liblangtag/package.nix
diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/by-name/li/liblastfmSF/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblastfmSF/default.nix
rename to pkgs/by-name/li/liblastfmSF/package.nix
diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/by-name/li/liblaxjson/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblaxjson/default.nix
rename to pkgs/by-name/li/liblaxjson/package.nix
diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/by-name/li/liblbfgs/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/liblbfgs/default.nix
rename to pkgs/by-name/li/liblbfgs/package.nix
diff --git a/pkgs/development/libraries/liblc3/default.nix b/pkgs/by-name/li/liblc3/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblc3/default.nix
rename to pkgs/by-name/li/liblc3/package.nix
diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/by-name/li/liblcf/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblcf/default.nix
rename to pkgs/by-name/li/liblcf/package.nix
diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/by-name/li/liblinear/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblinear/default.nix
rename to pkgs/by-name/li/liblinear/package.nix
diff --git a/pkgs/development/libraries/liblinphone/backport-cpp17.patch b/pkgs/by-name/li/liblinphone/backport-cpp17.patch
similarity index 100%
rename from pkgs/development/libraries/liblinphone/backport-cpp17.patch
rename to pkgs/by-name/li/liblinphone/backport-cpp17.patch
diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/by-name/li/liblinphone/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblinphone/default.nix
rename to pkgs/by-name/li/liblinphone/package.nix
diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/by-name/li/liblo/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblo/default.nix
rename to pkgs/by-name/li/liblo/package.nix
diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/by-name/li/liblockfile/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblockfile/default.nix
rename to pkgs/by-name/li/liblockfile/package.nix
diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/by-name/li/liblogging/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblogging/default.nix
rename to pkgs/by-name/li/liblogging/package.nix
diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/by-name/li/liblognorm/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblognorm/default.nix
rename to pkgs/by-name/li/liblognorm/package.nix
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/by-name/li/liblouis/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblouis/default.nix
rename to pkgs/by-name/li/liblouis/package.nix
diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/by-name/li/liblscp/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblscp/default.nix
rename to pkgs/by-name/li/liblscp/package.nix
diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/by-name/li/libltc/package.nix
similarity index 100%
rename from pkgs/development/libraries/libltc/default.nix
rename to pkgs/by-name/li/libltc/package.nix
diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/by-name/li/liblxi/package.nix
similarity index 100%
rename from pkgs/development/libraries/liblxi/default.nix
rename to pkgs/by-name/li/liblxi/package.nix
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/by-name/li/libmad/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmad/default.nix
rename to pkgs/by-name/li/libmad/package.nix
diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/by-name/li/libmanette/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmanette/default.nix
rename to pkgs/by-name/li/libmanette/package.nix
diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/by-name/li/libmatchbox/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmatchbox/default.nix
rename to pkgs/by-name/li/libmatchbox/package.nix
diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/by-name/li/libmatheval/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmatheval/default.nix
rename to pkgs/by-name/li/libmatheval/package.nix
diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/by-name/li/libmaxminddb/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmaxminddb/default.nix
rename to pkgs/by-name/li/libmaxminddb/package.nix
diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/by-name/li/libmbim/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmbim/default.nix
rename to pkgs/by-name/li/libmbim/package.nix
diff --git a/pkgs/development/libraries/libmcfp/default.nix b/pkgs/by-name/li/libmcfp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmcfp/default.nix
rename to pkgs/by-name/li/libmcfp/package.nix
diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/by-name/li/libmcrypt/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmcrypt/default.nix
rename to pkgs/by-name/li/libmcrypt/package.nix
diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/by-name/li/libmd/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmd/default.nix
rename to pkgs/by-name/li/libmd/package.nix
diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/by-name/li/libmediaart/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmediaart/default.nix
rename to pkgs/by-name/li/libmediaart/package.nix
diff --git a/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch b/pkgs/by-name/li/libmemcached/libmemcached-fix-linking-with-libpthread.patch
similarity index 100%
rename from pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch
rename to pkgs/by-name/li/libmemcached/libmemcached-fix-linking-with-libpthread.patch
diff --git a/pkgs/development/libraries/libmemcached/musl-fixes.patch b/pkgs/by-name/li/libmemcached/musl-fixes.patch
similarity index 100%
rename from pkgs/development/libraries/libmemcached/musl-fixes.patch
rename to pkgs/by-name/li/libmemcached/musl-fixes.patch
diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/by-name/li/libmemcached/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmemcached/default.nix
rename to pkgs/by-name/li/libmemcached/package.nix
diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/by-name/li/libmesode/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmesode/default.nix
rename to pkgs/by-name/li/libmesode/package.nix
diff --git a/pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch b/pkgs/by-name/li/libmhash/autotools-define-conflict-debian-fix.patch
similarity index 100%
rename from pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch
rename to pkgs/by-name/li/libmhash/autotools-define-conflict-debian-fix.patch
diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/by-name/li/libmhash/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmhash/default.nix
rename to pkgs/by-name/li/libmhash/package.nix
diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/by-name/li/libmicrodns/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmicrodns/default.nix
rename to pkgs/by-name/li/libmicrodns/package.nix
diff --git a/pkgs/development/libraries/libmilter/darwin.patch b/pkgs/by-name/li/libmilter/darwin.patch
similarity index 100%
rename from pkgs/development/libraries/libmilter/darwin.patch
rename to pkgs/by-name/li/libmilter/darwin.patch
diff --git a/pkgs/development/libraries/libmilter/install.patch b/pkgs/by-name/li/libmilter/install.patch
similarity index 100%
rename from pkgs/development/libraries/libmilter/install.patch
rename to pkgs/by-name/li/libmilter/install.patch
diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/by-name/li/libmilter/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmilter/default.nix
rename to pkgs/by-name/li/libmilter/package.nix
diff --git a/pkgs/development/libraries/libmilter/sharedlib.patch b/pkgs/by-name/li/libmilter/sharedlib.patch
similarity index 100%
rename from pkgs/development/libraries/libmilter/sharedlib.patch
rename to pkgs/by-name/li/libmilter/sharedlib.patch
diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/by-name/li/libminc/package.nix
similarity index 100%
rename from pkgs/development/libraries/libminc/default.nix
rename to pkgs/by-name/li/libminc/package.nix
diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/by-name/li/libmkv/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmkv/default.nix
rename to pkgs/by-name/li/libmkv/package.nix
diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/by-name/li/libmms/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmms/default.nix
rename to pkgs/by-name/li/libmms/package.nix
diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/by-name/li/libmng/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmng/default.nix
rename to pkgs/by-name/li/libmng/package.nix
diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/by-name/li/libmnl/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmnl/default.nix
rename to pkgs/by-name/li/libmnl/package.nix
diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/by-name/li/libmodbus/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmodbus/default.nix
rename to pkgs/by-name/li/libmodbus/package.nix
diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/by-name/li/libmodplug/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmodplug/default.nix
rename to pkgs/by-name/li/libmodplug/package.nix
diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/by-name/li/libmodule/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmodule/default.nix
rename to pkgs/by-name/li/libmodule/package.nix
diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/by-name/li/libmodulemd/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmodulemd/default.nix
rename to pkgs/by-name/li/libmodulemd/package.nix
diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/by-name/li/libmowgli/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmowgli/default.nix
rename to pkgs/by-name/li/libmowgli/package.nix
diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/by-name/li/libmp3splt/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmp3splt/default.nix
rename to pkgs/by-name/li/libmp3splt/package.nix
diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/by-name/li/libmpack/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmpack/default.nix
rename to pkgs/by-name/li/libmpack/package.nix
diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/by-name/li/libmpc/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmpc/default.nix
rename to pkgs/by-name/li/libmpc/package.nix
diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/by-name/li/libmpcdec/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmpcdec/default.nix
rename to pkgs/by-name/li/libmpcdec/package.nix
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/by-name/li/libmpeg2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmpeg2/default.nix
rename to pkgs/by-name/li/libmpeg2/package.nix
diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/by-name/li/libmspack/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmspack/default.nix
rename to pkgs/by-name/li/libmspack/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/libmsym/default.nix b/pkgs/by-name/li/libmsym/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/libmsym/default.nix
rename to pkgs/by-name/li/libmsym/package.nix
diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/by-name/li/libmtp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmtp/default.nix
rename to pkgs/by-name/li/libmtp/package.nix
diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/by-name/li/libmwaw/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmwaw/default.nix
rename to pkgs/by-name/li/libmwaw/package.nix
diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/by-name/li/libmx/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmx/default.nix
rename to pkgs/by-name/li/libmx/package.nix
diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/by-name/li/libmypaint/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmypaint/default.nix
rename to pkgs/by-name/li/libmypaint/package.nix
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/by-name/li/libmysofa/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/libmysofa/default.nix
rename to pkgs/by-name/li/libmysofa/package.nix
diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/by-name/li/libmysqlconnectorcpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmysqlconnectorcpp/default.nix
rename to pkgs/by-name/li/libmysqlconnectorcpp/package.nix
diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/by-name/li/libnabo/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnabo/default.nix
rename to pkgs/by-name/li/libnabo/package.nix
diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/by-name/li/libnatpmp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnatpmp/default.nix
rename to pkgs/by-name/li/libnatpmp/package.nix
diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/by-name/li/libnats-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnats-c/default.nix
rename to pkgs/by-name/li/libnats-c/package.nix
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/by-name/li/libnatspec/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnatspec/default.nix
rename to pkgs/by-name/li/libnatspec/package.nix
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/by-name/li/libndctl/package.nix
similarity index 100%
rename from pkgs/development/libraries/libndctl/default.nix
rename to pkgs/by-name/li/libndctl/package.nix
diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/by-name/li/libndp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libndp/default.nix
rename to pkgs/by-name/li/libndp/package.nix
diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/by-name/li/libndtypes/package.nix
similarity index 100%
rename from pkgs/development/libraries/libndtypes/default.nix
rename to pkgs/by-name/li/libndtypes/package.nix
diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/by-name/li/libnest2d/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnest2d/default.nix
rename to pkgs/by-name/li/libnest2d/package.nix
diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/by-name/li/libnet/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnet/default.nix
rename to pkgs/by-name/li/libnet/package.nix
diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/by-name/li/libnetfilter_acct/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnetfilter_acct/default.nix
rename to pkgs/by-name/li/libnetfilter_acct/package.nix
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/by-name/li/libnetfilter_conntrack/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnetfilter_conntrack/default.nix
rename to pkgs/by-name/li/libnetfilter_conntrack/package.nix
diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/by-name/li/libnetfilter_cthelper/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnetfilter_cthelper/default.nix
rename to pkgs/by-name/li/libnetfilter_cthelper/package.nix
diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/by-name/li/libnetfilter_cttimeout/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnetfilter_cttimeout/default.nix
rename to pkgs/by-name/li/libnetfilter_cttimeout/package.nix
diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/by-name/li/libnetfilter_log/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnetfilter_log/default.nix
rename to pkgs/by-name/li/libnetfilter_log/package.nix
diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/by-name/li/libnetfilter_queue/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnetfilter_queue/default.nix
rename to pkgs/by-name/li/libnetfilter_queue/package.nix
diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/by-name/li/libnfc/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnfc/default.nix
rename to pkgs/by-name/li/libnfc/package.nix
diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/by-name/li/libnfnetlink/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnfnetlink/default.nix
rename to pkgs/by-name/li/libnfnetlink/package.nix
diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/by-name/li/libnfs/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnfs/default.nix
rename to pkgs/by-name/li/libnfs/package.nix
diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/by-name/li/libnftnl/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnftnl/default.nix
rename to pkgs/by-name/li/libnftnl/package.nix
diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/by-name/li/libngspice/package.nix
similarity index 100%
rename from pkgs/development/libraries/libngspice/default.nix
rename to pkgs/by-name/li/libngspice/package.nix
diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/by-name/li/libnice/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnice/default.nix
rename to pkgs/by-name/li/libnice/package.nix
diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/by-name/li/libnids/package.nix
similarity index 100%
rename from pkgs/tools/networking/libnids/default.nix
rename to pkgs/by-name/li/libnids/package.nix
diff --git a/pkgs/development/libraries/libnitrokey/default.nix b/pkgs/by-name/li/libnitrokey/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnitrokey/default.nix
rename to pkgs/by-name/li/libnitrokey/package.nix
diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/by-name/li/libnixxml/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnixxml/default.nix
rename to pkgs/by-name/li/libnixxml/package.nix
diff --git a/pkgs/os-specific/linux/libnl-tiny/default.nix b/pkgs/by-name/li/libnl-tiny/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libnl-tiny/default.nix
rename to pkgs/by-name/li/libnl-tiny/package.nix
diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/by-name/li/libnl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libnl/default.nix
rename to pkgs/by-name/li/libnl/package.nix
diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/by-name/li/libnotify/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnotify/default.nix
rename to pkgs/by-name/li/libnotify/package.nix
diff --git a/pkgs/development/libraries/science/astronomy/libnova/default.nix b/pkgs/by-name/li/libnova/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/astronomy/libnova/default.nix
rename to pkgs/by-name/li/libnova/package.nix
diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/by-name/li/libnsl/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnsl/default.nix
rename to pkgs/by-name/li/libnsl/package.nix
diff --git a/pkgs/os-specific/linux/libnss-mysql/default.nix b/pkgs/by-name/li/libnss-mysql/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libnss-mysql/default.nix
rename to pkgs/by-name/li/libnss-mysql/package.nix
diff --git a/pkgs/development/libraries/libnut/default.nix b/pkgs/by-name/li/libnut/package.nix
similarity index 100%
rename from pkgs/development/libraries/libnut/default.nix
rename to pkgs/by-name/li/libnut/package.nix
diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/by-name/li/libnvme/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libnvme/default.nix
rename to pkgs/by-name/li/libnvme/package.nix
diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/by-name/li/liboauth/package.nix
similarity index 100%
rename from pkgs/development/libraries/liboauth/default.nix
rename to pkgs/by-name/li/liboauth/package.nix
diff --git a/pkgs/development/libraries/libodb-sqlite/default.nix b/pkgs/by-name/li/libodb-sqlite/package.nix
similarity index 100%
rename from pkgs/development/libraries/libodb-sqlite/default.nix
rename to pkgs/by-name/li/libodb-sqlite/package.nix
diff --git a/pkgs/development/libraries/libodb/default.nix b/pkgs/by-name/li/libodb/package.nix
similarity index 100%
rename from pkgs/development/libraries/libodb/default.nix
rename to pkgs/by-name/li/libodb/package.nix
diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/by-name/li/libodfgen/package.nix
similarity index 100%
rename from pkgs/development/libraries/libodfgen/default.nix
rename to pkgs/by-name/li/libodfgen/package.nix
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/by-name/li/libofa/package.nix
similarity index 100%
rename from pkgs/development/libraries/libofa/default.nix
rename to pkgs/by-name/li/libofa/package.nix
diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/by-name/li/libofx/package.nix
similarity index 100%
rename from pkgs/development/libraries/libofx/default.nix
rename to pkgs/by-name/li/libofx/package.nix
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/by-name/li/libogg/package.nix
similarity index 100%
rename from pkgs/development/libraries/libogg/default.nix
rename to pkgs/by-name/li/libogg/package.nix
diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/by-name/li/liboggz/package.nix
similarity index 100%
rename from pkgs/development/libraries/liboggz/default.nix
rename to pkgs/by-name/li/liboggz/package.nix
diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/by-name/li/liboil/package.nix
similarity index 100%
rename from pkgs/development/libraries/liboil/default.nix
rename to pkgs/by-name/li/liboil/package.nix
diff --git a/pkgs/development/libraries/liboil/x86_64-cpuid.patch b/pkgs/by-name/li/liboil/x86_64-cpuid.patch
similarity index 100%
rename from pkgs/development/libraries/liboil/x86_64-cpuid.patch
rename to pkgs/by-name/li/liboil/x86_64-cpuid.patch
diff --git a/pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch b/pkgs/by-name/li/libomxil-bellagio/fedora-fixes.patch
similarity index 100%
rename from pkgs/development/libraries/libomxil-bellagio/fedora-fixes.patch
rename to pkgs/by-name/li/libomxil-bellagio/fedora-fixes.patch
diff --git a/pkgs/development/libraries/libomxil-bellagio/fno-common.patch b/pkgs/by-name/li/libomxil-bellagio/fno-common.patch
similarity index 100%
rename from pkgs/development/libraries/libomxil-bellagio/fno-common.patch
rename to pkgs/by-name/li/libomxil-bellagio/fno-common.patch
diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/by-name/li/libomxil-bellagio/package.nix
similarity index 100%
rename from pkgs/development/libraries/libomxil-bellagio/default.nix
rename to pkgs/by-name/li/libomxil-bellagio/package.nix
diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/by-name/li/libopenaptx/package.nix
similarity index 100%
rename from pkgs/development/libraries/libopenaptx/default.nix
rename to pkgs/by-name/li/libopenaptx/package.nix
diff --git a/pkgs/development/libraries/libopenglrecorder/default.nix b/pkgs/by-name/li/libopenglrecorder/package.nix
similarity index 100%
rename from pkgs/development/libraries/libopenglrecorder/default.nix
rename to pkgs/by-name/li/libopenglrecorder/package.nix
diff --git a/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix b/pkgs/by-name/li/libopenmpt-modplug/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/libopenmpt-modplug/default.nix
rename to pkgs/by-name/li/libopenmpt-modplug/package.nix
diff --git a/pkgs/servers/mail/opensmtpd/libopensmtpd/no-chown-while-installing.patch b/pkgs/by-name/li/libopensmtpd/no-chown-while-installing.patch
similarity index 100%
rename from pkgs/servers/mail/opensmtpd/libopensmtpd/no-chown-while-installing.patch
rename to pkgs/by-name/li/libopensmtpd/no-chown-while-installing.patch
diff --git a/pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix b/pkgs/by-name/li/libopensmtpd/package.nix
similarity index 100%
rename from pkgs/servers/mail/opensmtpd/libopensmtpd/default.nix
rename to pkgs/by-name/li/libopensmtpd/package.nix
diff --git a/pkgs/development/libraries/liboping/ncurses-6.3.patch b/pkgs/by-name/li/liboping/ncurses-6.3.patch
similarity index 100%
rename from pkgs/development/libraries/liboping/ncurses-6.3.patch
rename to pkgs/by-name/li/liboping/ncurses-6.3.patch
diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/by-name/li/liboping/package.nix
similarity index 100%
rename from pkgs/development/libraries/liboping/default.nix
rename to pkgs/by-name/li/liboping/package.nix
diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/by-name/li/libopusenc/package.nix
similarity index 100%
rename from pkgs/development/libraries/libopusenc/default.nix
rename to pkgs/by-name/li/libopusenc/package.nix
diff --git a/pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch b/pkgs/by-name/li/libosinfo/osinfo-db-data-dir.patch
similarity index 100%
rename from pkgs/development/libraries/libosinfo/osinfo-db-data-dir.patch
rename to pkgs/by-name/li/libosinfo/osinfo-db-data-dir.patch
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/by-name/li/libosinfo/package.nix
similarity index 100%
rename from pkgs/development/libraries/libosinfo/default.nix
rename to pkgs/by-name/li/libosinfo/package.nix
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/by-name/li/libosip/package.nix
similarity index 100%
rename from pkgs/development/libraries/osip/default.nix
rename to pkgs/by-name/li/libosip/package.nix
diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/by-name/li/libosmium/package.nix
similarity index 100%
rename from pkgs/development/libraries/libosmium/default.nix
rename to pkgs/by-name/li/libosmium/package.nix
diff --git a/pkgs/servers/osmocom/libosmo-netif/default.nix b/pkgs/by-name/li/libosmo-netif/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/libosmo-netif/default.nix
rename to pkgs/by-name/li/libosmo-netif/package.nix
diff --git a/pkgs/servers/osmocom/libosmo-sccp/default.nix b/pkgs/by-name/li/libosmo-sccp/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/libosmo-sccp/default.nix
rename to pkgs/by-name/li/libosmo-sccp/package.nix
diff --git a/pkgs/servers/osmocom/libosmoabis/default.nix b/pkgs/by-name/li/libosmoabis/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/libosmoabis/default.nix
rename to pkgs/by-name/li/libosmoabis/package.nix
diff --git a/pkgs/servers/osmocom/libosmocore/default.nix b/pkgs/by-name/li/libosmocore/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/libosmocore/default.nix
rename to pkgs/by-name/li/libosmocore/package.nix
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/by-name/li/libossp_uuid/package.nix
similarity index 100%
rename from pkgs/development/libraries/libossp-uuid/default.nix
rename to pkgs/by-name/li/libossp_uuid/package.nix
diff --git a/pkgs/development/libraries/libossp-uuid/shtool.patch b/pkgs/by-name/li/libossp_uuid/shtool.patch
similarity index 100%
rename from pkgs/development/libraries/libossp-uuid/shtool.patch
rename to pkgs/by-name/li/libossp_uuid/shtool.patch
diff --git a/pkgs/development/libraries/libotr/fix-regtest-client.patch b/pkgs/by-name/li/libotr/fix-regtest-client.patch
similarity index 100%
rename from pkgs/development/libraries/libotr/fix-regtest-client.patch
rename to pkgs/by-name/li/libotr/fix-regtest-client.patch
diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/by-name/li/libotr/package.nix
similarity index 100%
rename from pkgs/development/libraries/libotr/default.nix
rename to pkgs/by-name/li/libotr/package.nix
diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/by-name/li/libow/package.nix
similarity index 100%
rename from pkgs/development/libraries/libow/default.nix
rename to pkgs/by-name/li/libow/package.nix
diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/by-name/li/libowfat/package.nix
similarity index 100%
rename from pkgs/development/libraries/libowfat/default.nix
rename to pkgs/by-name/li/libowfat/package.nix
diff --git a/pkgs/development/libraries/libowlevelzs/default.nix b/pkgs/by-name/li/libowlevelzs/package.nix
similarity index 100%
rename from pkgs/development/libraries/libowlevelzs/default.nix
rename to pkgs/by-name/li/libowlevelzs/package.nix
diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/by-name/li/libp11/package.nix
similarity index 100%
rename from pkgs/development/libraries/libp11/default.nix
rename to pkgs/by-name/li/libp11/package.nix
diff --git a/pkgs/development/libraries/libpam-wrapper/default.nix b/pkgs/by-name/li/libpam-wrapper/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpam-wrapper/default.nix
rename to pkgs/by-name/li/libpam-wrapper/package.nix
diff --git a/pkgs/development/libraries/libpam-wrapper/python.patch b/pkgs/by-name/li/libpam-wrapper/python.patch
similarity index 100%
rename from pkgs/development/libraries/libpam-wrapper/python.patch
rename to pkgs/by-name/li/libpam-wrapper/python.patch
diff --git a/pkgs/development/libraries/libpanel/default.nix b/pkgs/by-name/li/libpanel/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpanel/default.nix
rename to pkgs/by-name/li/libpanel/package.nix
diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/by-name/li/libpaper/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpaper/default.nix
rename to pkgs/by-name/li/libpaper/package.nix
diff --git a/pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch b/pkgs/by-name/li/libpar2/libpar2-0.4-external-verification.patch
similarity index 100%
rename from pkgs/development/libraries/libpar2/libpar2-0.4-external-verification.patch
rename to pkgs/by-name/li/libpar2/libpar2-0.4-external-verification.patch
diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/by-name/li/libpar2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpar2/default.nix
rename to pkgs/by-name/li/libpar2/package.nix
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/by-name/li/libpcap/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpcap/default.nix
rename to pkgs/by-name/li/libpcap/package.nix
diff --git a/pkgs/tools/misc/libpff/default.nix b/pkgs/by-name/li/libpff/package.nix
similarity index 100%
rename from pkgs/tools/misc/libpff/default.nix
rename to pkgs/by-name/li/libpff/package.nix
diff --git a/pkgs/development/libraries/libpfm/fix-windows.patch b/pkgs/by-name/li/libpfm/fix-windows.patch
similarity index 100%
rename from pkgs/development/libraries/libpfm/fix-windows.patch
rename to pkgs/by-name/li/libpfm/fix-windows.patch
diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/by-name/li/libpfm/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpfm/default.nix
rename to pkgs/by-name/li/libpfm/package.nix
diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/by-name/li/libpg_query/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpg_query/default.nix
rename to pkgs/by-name/li/libpg_query/package.nix
diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/by-name/li/libpgf/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpgf/default.nix
rename to pkgs/by-name/li/libpgf/package.nix
diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/by-name/li/libpinyin/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpinyin/default.nix
rename to pkgs/by-name/li/libpinyin/package.nix
diff --git a/pkgs/development/libraries/libpipeline/fix-on-osx.patch b/pkgs/by-name/li/libpipeline/fix-on-osx.patch
similarity index 100%
rename from pkgs/development/libraries/libpipeline/fix-on-osx.patch
rename to pkgs/by-name/li/libpipeline/fix-on-osx.patch
diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/by-name/li/libpipeline/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpipeline/default.nix
rename to pkgs/by-name/li/libpipeline/package.nix
diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/by-name/li/libplacebo/package.nix
similarity index 100%
rename from pkgs/development/libraries/libplacebo/default.nix
rename to pkgs/by-name/li/libplacebo/package.nix
diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/by-name/li/libplctag/package.nix
similarity index 100%
rename from pkgs/development/libraries/libplctag/default.nix
rename to pkgs/by-name/li/libplctag/package.nix
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/by-name/li/libplist/package.nix
similarity index 100%
rename from pkgs/development/libraries/libplist/default.nix
rename to pkgs/by-name/li/libplist/package.nix
diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/by-name/li/libpointmatcher/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpointmatcher/default.nix
rename to pkgs/by-name/li/libpointmatcher/package.nix
diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/by-name/li/libpoly/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/poly/default.nix
rename to pkgs/by-name/li/libpoly/package.nix
diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/by-name/li/libportal/package.nix
similarity index 100%
rename from pkgs/development/libraries/libportal/default.nix
rename to pkgs/by-name/li/libportal/package.nix
diff --git a/pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch b/pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch
similarity index 100%
rename from pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch
rename to pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch
diff --git a/pkgs/development/libraries/libpostal/default.nix b/pkgs/by-name/li/libpostal/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpostal/default.nix
rename to pkgs/by-name/li/libpostal/package.nix
diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/by-name/li/libpqxx/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpqxx/default.nix
rename to pkgs/by-name/li/libpqxx/package.nix
diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/by-name/li/libpseudo/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpseudo/default.nix
rename to pkgs/by-name/li/libpseudo/package.nix
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/by-name/li/libpsl/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpsl/default.nix
rename to pkgs/by-name/li/libpsl/package.nix
diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/by-name/li/libpsm2/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libpsm2/default.nix
rename to pkgs/by-name/li/libpsm2/package.nix
diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/by-name/li/libpst/package.nix
similarity index 100%
rename from pkgs/development/libraries/libpst/default.nix
rename to pkgs/by-name/li/libpst/package.nix
diff --git a/pkgs/development/libraries/libptytty/default.nix b/pkgs/by-name/li/libptytty/package.nix
similarity index 100%
rename from pkgs/development/libraries/libptytty/default.nix
rename to pkgs/by-name/li/libptytty/package.nix
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/by-name/li/libqalculate/package.nix
similarity index 100%
rename from pkgs/development/libraries/libqalculate/default.nix
rename to pkgs/by-name/li/libqalculate/package.nix
diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/by-name/li/libqb/package.nix
similarity index 100%
rename from pkgs/development/libraries/libqb/default.nix
rename to pkgs/by-name/li/libqb/package.nix
diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/by-name/li/libqmi/package.nix
similarity index 100%
rename from pkgs/development/libraries/libqmi/default.nix
rename to pkgs/by-name/li/libqmi/package.nix
diff --git a/pkgs/development/libraries/libqrtr-glib/default.nix b/pkgs/by-name/li/libqrtr-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/libqrtr-glib/default.nix
rename to pkgs/by-name/li/libqrtr-glib/package.nix
diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/by-name/li/libr3/package.nix
similarity index 100%
rename from pkgs/development/libraries/libr3/default.nix
rename to pkgs/by-name/li/libr3/package.nix
diff --git a/pkgs/development/libraries/libraqm/default.nix b/pkgs/by-name/li/libraqm/package.nix
similarity index 100%
rename from pkgs/development/libraries/libraqm/default.nix
rename to pkgs/by-name/li/libraqm/package.nix
diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/by-name/li/libraspberrypi/package.nix
similarity index 100%
rename from pkgs/development/libraries/libraspberrypi/default.nix
rename to pkgs/by-name/li/libraspberrypi/package.nix
diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/by-name/li/libratbag/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libratbag/default.nix
rename to pkgs/by-name/li/libratbag/package.nix
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/by-name/li/libraw/package.nix
similarity index 100%
rename from pkgs/development/libraries/libraw/default.nix
rename to pkgs/by-name/li/libraw/package.nix
diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/by-name/li/libraw1394/package.nix
similarity index 100%
rename from pkgs/development/libraries/libraw1394/default.nix
rename to pkgs/by-name/li/libraw1394/package.nix
diff --git a/pkgs/development/libraries/librclone/default.nix b/pkgs/by-name/li/librclone/package.nix
similarity index 100%
rename from pkgs/development/libraries/librclone/default.nix
rename to pkgs/by-name/li/librclone/package.nix
diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/by-name/li/libre-baskerville/package.nix
similarity index 100%
rename from pkgs/data/fonts/libre-baskerville/default.nix
rename to pkgs/by-name/li/libre-baskerville/package.nix
diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/by-name/li/libre-bodoni/package.nix
similarity index 100%
rename from pkgs/data/fonts/libre-bodoni/default.nix
rename to pkgs/by-name/li/libre-bodoni/package.nix
diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/by-name/li/libre-caslon/package.nix
similarity index 100%
rename from pkgs/data/fonts/libre-caslon/default.nix
rename to pkgs/by-name/li/libre-caslon/package.nix
diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/by-name/li/libre-franklin/package.nix
similarity index 100%
rename from pkgs/data/fonts/libre-franklin/default.nix
rename to pkgs/by-name/li/libre-franklin/package.nix
diff --git a/pkgs/development/libraries/librecast/default.nix b/pkgs/by-name/li/librecast/package.nix
similarity index 100%
rename from pkgs/development/libraries/librecast/default.nix
rename to pkgs/by-name/li/librecast/package.nix
diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/by-name/li/libredirect/libredirect.c
similarity index 100%
rename from pkgs/build-support/libredirect/libredirect.c
rename to pkgs/by-name/li/libredirect/libredirect.c
diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/by-name/li/libredirect/package.nix
similarity index 100%
rename from pkgs/build-support/libredirect/default.nix
rename to pkgs/by-name/li/libredirect/package.nix
diff --git a/pkgs/build-support/libredirect/test.c b/pkgs/by-name/li/libredirect/test.c
similarity index 100%
rename from pkgs/build-support/libredirect/test.c
rename to pkgs/by-name/li/libredirect/test.c
diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/by-name/li/libredwg/package.nix
similarity index 100%
rename from pkgs/development/libraries/libredwg/default.nix
rename to pkgs/by-name/li/libredwg/package.nix
diff --git a/pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix b/pkgs/by-name/li/libreelec-dvb-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/libreelec-dvb-firmware/default.nix
rename to pkgs/by-name/li/libreelec-dvb-firmware/package.nix
diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/by-name/li/librelp/package.nix
similarity index 100%
rename from pkgs/development/libraries/librelp/default.nix
rename to pkgs/by-name/li/librelp/package.nix
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/by-name/li/librem/package.nix
similarity index 100%
rename from pkgs/development/libraries/librem/default.nix
rename to pkgs/by-name/li/librem/package.nix
diff --git a/pkgs/servers/monitoring/librenms/broken-binary-paths.diff b/pkgs/by-name/li/librenms/broken-binary-paths.diff
similarity index 100%
rename from pkgs/servers/monitoring/librenms/broken-binary-paths.diff
rename to pkgs/by-name/li/librenms/broken-binary-paths.diff
diff --git a/pkgs/servers/monitoring/librenms/default.nix b/pkgs/by-name/li/librenms/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/librenms/default.nix
rename to pkgs/by-name/li/librenms/package.nix
diff --git a/pkgs/tools/misc/librespeed-cli/default.nix b/pkgs/by-name/li/librespeed-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/librespeed-cli/default.nix
rename to pkgs/by-name/li/librespeed-cli/package.nix
diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/by-name/li/libreswan/package.nix
similarity index 100%
rename from pkgs/tools/networking/libreswan/default.nix
rename to pkgs/by-name/li/libreswan/package.nix
diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/by-name/li/librevenge/package.nix
similarity index 100%
rename from pkgs/development/libraries/librevenge/default.nix
rename to pkgs/by-name/li/librevenge/package.nix
diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/by-name/li/librime/package.nix
similarity index 100%
rename from pkgs/development/libraries/librime/default.nix
rename to pkgs/by-name/li/librime/package.nix
diff --git a/pkgs/development/libraries/librist/darwin.patch b/pkgs/by-name/li/librist/darwin.patch
similarity index 100%
rename from pkgs/development/libraries/librist/darwin.patch
rename to pkgs/by-name/li/librist/darwin.patch
diff --git a/pkgs/development/libraries/librist/default.nix b/pkgs/by-name/li/librist/package.nix
similarity index 100%
rename from pkgs/development/libraries/librist/default.nix
rename to pkgs/by-name/li/librist/package.nix
diff --git a/pkgs/development/libraries/libroxml/default.nix b/pkgs/by-name/li/libroxml/package.nix
similarity index 100%
rename from pkgs/development/libraries/libroxml/default.nix
rename to pkgs/by-name/li/libroxml/package.nix
diff --git a/pkgs/development/libraries/librseq/default.nix b/pkgs/by-name/li/librseq/package.nix
similarity index 100%
rename from pkgs/development/libraries/librseq/default.nix
rename to pkgs/by-name/li/librseq/package.nix
diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/by-name/li/librsync/package.nix
similarity index 100%
rename from pkgs/development/libraries/librsync/default.nix
rename to pkgs/by-name/li/librsync/package.nix
diff --git a/pkgs/development/libraries/librtprocess/default.nix b/pkgs/by-name/li/librtprocess/package.nix
similarity index 100%
rename from pkgs/development/libraries/librtprocess/default.nix
rename to pkgs/by-name/li/librtprocess/package.nix
diff --git a/pkgs/development/libraries/librttopo/default.nix b/pkgs/by-name/li/librttopo/package.nix
similarity index 100%
rename from pkgs/development/libraries/librttopo/default.nix
rename to pkgs/by-name/li/librttopo/package.nix
diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/by-name/li/libsass/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsass/default.nix
rename to pkgs/by-name/li/libsass/package.nix
diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/by-name/li/libschrift/package.nix
similarity index 100%
rename from pkgs/development/libraries/libschrift/default.nix
rename to pkgs/by-name/li/libschrift/package.nix
diff --git a/pkgs/development/libraries/libsciter/default.nix b/pkgs/by-name/li/libsciter/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsciter/default.nix
rename to pkgs/by-name/li/libsciter/package.nix
diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/by-name/li/libscrypt/package.nix
similarity index 100%
rename from pkgs/development/libraries/libscrypt/default.nix
rename to pkgs/by-name/li/libscrypt/package.nix
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/by-name/li/libsearpc/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsearpc/default.nix
rename to pkgs/by-name/li/libsearpc/package.nix
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/by-name/li/libseccomp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libseccomp/default.nix
rename to pkgs/by-name/li/libseccomp/package.nix
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/by-name/li/libsecret/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsecret/default.nix
rename to pkgs/by-name/li/libsecret/package.nix
diff --git a/pkgs/development/libraries/libsegfault/default.nix b/pkgs/by-name/li/libsegfault/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsegfault/default.nix
rename to pkgs/by-name/li/libsegfault/package.nix
diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/by-name/li/libselinux/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libselinux/default.nix
rename to pkgs/by-name/li/libselinux/package.nix
diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/by-name/li/libsepol/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libsepol/default.nix
rename to pkgs/by-name/li/libsepol/package.nix
diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/by-name/li/libserdes/package.nix
similarity index 100%
rename from pkgs/development/libraries/libserdes/default.nix
rename to pkgs/by-name/li/libserdes/package.nix
diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/by-name/li/libserialport/package.nix
similarity index 100%
rename from pkgs/development/libraries/libserialport/default.nix
rename to pkgs/by-name/li/libserialport/package.nix
diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/by-name/li/libshout/package.nix
similarity index 100%
rename from pkgs/development/libraries/libshout/default.nix
rename to pkgs/by-name/li/libshout/package.nix
diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/by-name/li/libshumate/package.nix
similarity index 100%
rename from pkgs/development/libraries/libshumate/default.nix
rename to pkgs/by-name/li/libshumate/package.nix
diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/by-name/li/libsidplayfp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsidplayfp/default.nix
rename to pkgs/by-name/li/libsidplayfp/package.nix
diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/by-name/li/libsieve/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsieve/default.nix
rename to pkgs/by-name/li/libsieve/package.nix
diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/by-name/li/libsignal-protocol-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsignal-protocol-c/default.nix
rename to pkgs/by-name/li/libsignal-protocol-c/package.nix
diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/by-name/li/libsignon-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsignon-glib/default.nix
rename to pkgs/by-name/li/libsignon-glib/package.nix
diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/by-name/li/libsigrokdecode/package.nix
similarity index 100%
rename from pkgs/development/tools/libsigrokdecode/default.nix
rename to pkgs/by-name/li/libsigrokdecode/package.nix
diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/by-name/li/libsigsegv/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsigsegv/default.nix
rename to pkgs/by-name/li/libsigsegv/package.nix
diff --git a/pkgs/development/libraries/libsigsegv/sigbus_fix.patch b/pkgs/by-name/li/libsigsegv/sigbus_fix.patch
similarity index 100%
rename from pkgs/development/libraries/libsigsegv/sigbus_fix.patch
rename to pkgs/by-name/li/libsigsegv/sigbus_fix.patch
diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/by-name/li/libsixel/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsixel/default.nix
rename to pkgs/by-name/li/libsixel/package.nix
diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/by-name/li/libskk/package.nix
similarity index 100%
rename from pkgs/development/libraries/libskk/default.nix
rename to pkgs/by-name/li/libskk/package.nix
diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/by-name/li/libslirp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libslirp/default.nix
rename to pkgs/by-name/li/libslirp/package.nix
diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/by-name/li/libsmartcols/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsmartcols/default.nix
rename to pkgs/by-name/li/libsmartcols/package.nix
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/by-name/li/libsmbios/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libsmbios/default.nix
rename to pkgs/by-name/li/libsmbios/package.nix
diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/by-name/li/libsmf/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/libsmf/default.nix
rename to pkgs/by-name/li/libsmf/package.nix
diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/by-name/li/libsmi/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsmi/default.nix
rename to pkgs/by-name/li/libsmi/package.nix
diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/by-name/li/libsodium/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsodium/default.nix
rename to pkgs/by-name/li/libsodium/package.nix
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/by-name/li/libsolv/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsolv/default.nix
rename to pkgs/by-name/li/libsolv/package.nix
diff --git a/pkgs/development/libraries/libspatialaudio/default.nix b/pkgs/by-name/li/libspatialaudio/package.nix
similarity index 100%
rename from pkgs/development/libraries/libspatialaudio/default.nix
rename to pkgs/by-name/li/libspatialaudio/package.nix
diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/by-name/li/libspatialite/package.nix
similarity index 100%
rename from pkgs/development/libraries/libspatialite/default.nix
rename to pkgs/by-name/li/libspatialite/package.nix
diff --git a/pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch b/pkgs/by-name/li/libspatialite/xmlNanoHTTPCleanup.patch
similarity index 100%
rename from pkgs/development/libraries/libspatialite/xmlNanoHTTPCleanup.patch
rename to pkgs/by-name/li/libspatialite/xmlNanoHTTPCleanup.patch
diff --git a/pkgs/development/libraries/audio/libspecbleach/default.nix b/pkgs/by-name/li/libspecbleach/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/libspecbleach/default.nix
rename to pkgs/by-name/li/libspecbleach/package.nix
diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/by-name/li/libspectre/package.nix
similarity index 100%
rename from pkgs/development/libraries/libspectre/default.nix
rename to pkgs/by-name/li/libspectre/package.nix
diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/by-name/li/libspectrum/package.nix
similarity index 100%
rename from pkgs/development/libraries/libspectrum/default.nix
rename to pkgs/by-name/li/libspectrum/package.nix
diff --git a/pkgs/development/libraries/libspelling/default.nix b/pkgs/by-name/li/libspelling/package.nix
similarity index 100%
rename from pkgs/development/libraries/libspelling/default.nix
rename to pkgs/by-name/li/libspelling/package.nix
diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/by-name/li/libspf2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libspf2/default.nix
rename to pkgs/by-name/li/libspf2/package.nix
diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/by-name/li/libspiro/package.nix
similarity index 100%
rename from pkgs/development/libraries/libspiro/default.nix
rename to pkgs/by-name/li/libspiro/package.nix
diff --git a/pkgs/development/libraries/libspnav/default.nix b/pkgs/by-name/li/libspnav/package.nix
similarity index 100%
rename from pkgs/development/libraries/libspnav/default.nix
rename to pkgs/by-name/li/libspnav/package.nix
diff --git a/pkgs/development/libraries/libspng/default.nix b/pkgs/by-name/li/libspng/package.nix
similarity index 100%
rename from pkgs/development/libraries/libspng/default.nix
rename to pkgs/by-name/li/libspng/package.nix
diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/by-name/li/libsrs2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsrs2/default.nix
rename to pkgs/by-name/li/libsrs2/package.nix
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/by-name/li/libssh/package.nix
similarity index 100%
rename from pkgs/development/libraries/libssh/default.nix
rename to pkgs/by-name/li/libssh/package.nix
diff --git a/pkgs/development/libraries/libssh2/CVE-2023-48795.patch b/pkgs/by-name/li/libssh2/CVE-2023-48795.patch
similarity index 100%
rename from pkgs/development/libraries/libssh2/CVE-2023-48795.patch
rename to pkgs/by-name/li/libssh2/CVE-2023-48795.patch
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/by-name/li/libssh2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libssh2/default.nix
rename to pkgs/by-name/li/libssh2/package.nix
diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/by-name/li/libstartup_notification/package.nix
similarity index 100%
rename from pkgs/development/libraries/startup-notification/default.nix
rename to pkgs/by-name/li/libstartup_notification/package.nix
diff --git a/pkgs/development/libraries/libstemmer/default.nix b/pkgs/by-name/li/libstemmer/package.nix
similarity index 100%
rename from pkgs/development/libraries/libstemmer/default.nix
rename to pkgs/by-name/li/libstemmer/package.nix
diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/by-name/li/libstroke/package.nix
similarity index 100%
rename from pkgs/development/libraries/libstroke/default.nix
rename to pkgs/by-name/li/libstroke/package.nix
diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/by-name/li/libsurvive/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsurvive/default.nix
rename to pkgs/by-name/li/libsurvive/package.nix
diff --git a/pkgs/development/libraries/libsv/default.nix b/pkgs/by-name/li/libsv/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsv/default.nix
rename to pkgs/by-name/li/libsv/package.nix
diff --git a/pkgs/development/libraries/libsvm/openmp.patch b/pkgs/by-name/li/libsvm/openmp.patch
similarity index 100%
rename from pkgs/development/libraries/libsvm/openmp.patch
rename to pkgs/by-name/li/libsvm/openmp.patch
diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/by-name/li/libsvm/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsvm/default.nix
rename to pkgs/by-name/li/libsvm/package.nix
diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/by-name/li/libsystemtap/package.nix
similarity index 100%
rename from pkgs/development/libraries/libsystemtap/default.nix
rename to pkgs/by-name/li/libsystemtap/package.nix
diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/by-name/li/libtar/package.nix
similarity index 100%
rename from pkgs/development/libraries/libtar/default.nix
rename to pkgs/by-name/li/libtar/package.nix
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/by-name/li/libtasn1/package.nix
similarity index 100%
rename from pkgs/development/libraries/libtasn1/default.nix
rename to pkgs/by-name/li/libtasn1/package.nix
diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/by-name/li/libtelnet/package.nix
similarity index 100%
rename from pkgs/development/libraries/libtelnet/default.nix
rename to pkgs/by-name/li/libtelnet/package.nix
diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/by-name/li/libtermkey/package.nix
similarity index 100%
rename from pkgs/development/libraries/libtermkey/default.nix
rename to pkgs/by-name/li/libtermkey/package.nix
diff --git a/pkgs/development/libraries/libthai/default.nix b/pkgs/by-name/li/libthai/package.nix
similarity index 100%
rename from pkgs/development/libraries/libthai/default.nix
rename to pkgs/by-name/li/libthai/package.nix
diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/by-name/li/libthreadar/package.nix
similarity index 100%
rename from pkgs/development/libraries/libthreadar/default.nix
rename to pkgs/by-name/li/libthreadar/package.nix
diff --git a/pkgs/development/libraries/libticables2/default.nix b/pkgs/by-name/li/libticables2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libticables2/default.nix
rename to pkgs/by-name/li/libticables2/package.nix
diff --git a/pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch b/pkgs/by-name/li/libtickit/001-skip-test-18term-builder-on-macos.patch
similarity index 100%
rename from pkgs/development/libraries/libtickit/001-skip-test-18term-builder-on-macos.patch
rename to pkgs/by-name/li/libtickit/001-skip-test-18term-builder-on-macos.patch
diff --git a/pkgs/development/libraries/libtickit/default.nix b/pkgs/by-name/li/libtickit/package.nix
similarity index 100%
rename from pkgs/development/libraries/libtickit/default.nix
rename to pkgs/by-name/li/libtickit/package.nix
diff --git a/pkgs/development/libraries/libticonv/default.nix b/pkgs/by-name/li/libticonv/package.nix
similarity index 100%
rename from pkgs/development/libraries/libticonv/default.nix
rename to pkgs/by-name/li/libticonv/package.nix
diff --git a/pkgs/development/libraries/libtifiles2/default.nix b/pkgs/by-name/li/libtifiles2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libtifiles2/default.nix
rename to pkgs/by-name/li/libtifiles2/package.nix
diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/by-name/li/libtiger/package.nix
similarity index 100%
rename from pkgs/development/libraries/libtiger/default.nix
rename to pkgs/by-name/li/libtiger/package.nix
diff --git a/pkgs/development/libraries/libtiger/pkg-config.patch b/pkgs/by-name/li/libtiger/pkg-config.patch
similarity index 100%
rename from pkgs/development/libraries/libtiger/pkg-config.patch
rename to pkgs/by-name/li/libtiger/pkg-config.patch
diff --git a/pkgs/development/libraries/libtins/0001-force-cpp-14.patch b/pkgs/by-name/li/libtins/0001-force-cpp-14.patch
similarity index 100%
rename from pkgs/development/libraries/libtins/0001-force-cpp-14.patch
rename to pkgs/by-name/li/libtins/0001-force-cpp-14.patch
diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/by-name/li/libtins/package.nix
similarity index 100%
rename from pkgs/development/libraries/libtins/default.nix
rename to pkgs/by-name/li/libtins/package.nix
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/by-name/li/libtirpc/package.nix
similarity index 100%
rename from pkgs/development/libraries/ti-rpc/default.nix
rename to pkgs/by-name/li/libtirpc/package.nix
diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/by-name/li/libtomcrypt/package.nix
similarity index 100%
rename from pkgs/development/libraries/libtomcrypt/default.nix
rename to pkgs/by-name/li/libtomcrypt/package.nix
diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/by-name/li/libtommath/package.nix
similarity index 100%
rename from pkgs/development/libraries/libtommath/default.nix
rename to pkgs/by-name/li/libtommath/package.nix
diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/by-name/li/libtpms/package.nix
similarity index 100%
rename from pkgs/tools/security/libtpms/default.nix
rename to pkgs/by-name/li/libtpms/package.nix
diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/by-name/li/libtraceevent/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libtraceevent/default.nix
rename to pkgs/by-name/li/libtraceevent/package.nix
diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/by-name/li/libtracefs/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libtracefs/default.nix
rename to pkgs/by-name/li/libtracefs/package.nix
diff --git a/pkgs/development/tools/misc/libtree/default.nix b/pkgs/by-name/li/libtree/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/libtree/default.nix
rename to pkgs/by-name/li/libtree/package.nix
diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/by-name/li/libtsm/package.nix
similarity index 100%
rename from pkgs/development/libraries/libtsm/default.nix
rename to pkgs/by-name/li/libtsm/package.nix
diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/by-name/li/libu2f-host/package.nix
similarity index 100%
rename from pkgs/development/libraries/libu2f-host/default.nix
rename to pkgs/by-name/li/libu2f-host/package.nix
diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/by-name/li/libu2f-server/package.nix
similarity index 100%
rename from pkgs/development/libraries/libu2f-server/default.nix
rename to pkgs/by-name/li/libu2f-server/package.nix
diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/by-name/li/libuchardet/package.nix
similarity index 100%
rename from pkgs/development/libraries/libuchardet/default.nix
rename to pkgs/by-name/li/libuchardet/package.nix
diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/by-name/li/libucl/package.nix
similarity index 100%
rename from pkgs/development/libraries/libucl/default.nix
rename to pkgs/by-name/li/libucl/package.nix
diff --git a/pkgs/development/libraries/libucontext/default.nix b/pkgs/by-name/li/libucontext/package.nix
similarity index 100%
rename from pkgs/development/libraries/libucontext/default.nix
rename to pkgs/by-name/li/libucontext/package.nix
diff --git a/pkgs/development/libraries/libudev-zero/default.nix b/pkgs/by-name/li/libudev-zero/package.nix
similarity index 100%
rename from pkgs/development/libraries/libudev-zero/default.nix
rename to pkgs/by-name/li/libudev-zero/package.nix
diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/by-name/li/libudev0-shim/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libudev0-shim/default.nix
rename to pkgs/by-name/li/libudev0-shim/package.nix
diff --git a/pkgs/development/libraries/libudfread/default.nix b/pkgs/by-name/li/libudfread/package.nix
similarity index 100%
rename from pkgs/development/libraries/libudfread/default.nix
rename to pkgs/by-name/li/libudfread/package.nix
diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/by-name/li/libuecc/package.nix
similarity index 100%
rename from pkgs/development/libraries/libuecc/default.nix
rename to pkgs/by-name/li/libuecc/package.nix
diff --git a/pkgs/development/libraries/libuev/default.nix b/pkgs/by-name/li/libuev/package.nix
similarity index 100%
rename from pkgs/development/libraries/libuev/default.nix
rename to pkgs/by-name/li/libuev/package.nix
diff --git a/pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch b/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch
similarity index 100%
rename from pkgs/development/libraries/libuinputplus/0001-Add-cmake-install-directives.patch
rename to pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch
diff --git a/pkgs/development/libraries/libuinputplus/default.nix b/pkgs/by-name/li/libuinputplus/package.nix
similarity index 100%
rename from pkgs/development/libraries/libuinputplus/default.nix
rename to pkgs/by-name/li/libuinputplus/package.nix
diff --git a/pkgs/development/libraries/libuldaq/0001-uldaq.patch b/pkgs/by-name/li/libuldaq/0001-uldaq.patch
similarity index 100%
rename from pkgs/development/libraries/libuldaq/0001-uldaq.patch
rename to pkgs/by-name/li/libuldaq/0001-uldaq.patch
diff --git a/pkgs/development/libraries/libuldaq/default.nix b/pkgs/by-name/li/libuldaq/package.nix
similarity index 100%
rename from pkgs/development/libraries/libuldaq/default.nix
rename to pkgs/by-name/li/libuldaq/package.nix
diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/by-name/li/libunarr/package.nix
similarity index 100%
rename from pkgs/development/libraries/libunarr/default.nix
rename to pkgs/by-name/li/libunarr/package.nix
diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/by-name/li/libunibreak/package.nix
similarity index 100%
rename from pkgs/development/libraries/libunibreak/default.nix
rename to pkgs/by-name/li/libunibreak/package.nix
diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/by-name/li/libuninameslist/package.nix
similarity index 100%
rename from pkgs/development/libraries/libuninameslist/default.nix
rename to pkgs/by-name/li/libuninameslist/package.nix
diff --git a/pkgs/development/libraries/libunity/fix-vala.patch b/pkgs/by-name/li/libunity/fix-vala.patch
similarity index 100%
rename from pkgs/development/libraries/libunity/fix-vala.patch
rename to pkgs/by-name/li/libunity/fix-vala.patch
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/by-name/li/libunity/package.nix
similarity index 100%
rename from pkgs/development/libraries/libunity/default.nix
rename to pkgs/by-name/li/libunity/package.nix
diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/by-name/li/libupnp/package.nix
similarity index 100%
rename from pkgs/development/libraries/pupnp/default.nix
rename to pkgs/by-name/li/libupnp/package.nix
diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/by-name/li/liburcu/package.nix
similarity index 100%
rename from pkgs/development/libraries/liburcu/default.nix
rename to pkgs/by-name/li/liburcu/package.nix
diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/by-name/li/liburing/package.nix
similarity index 100%
rename from pkgs/development/libraries/liburing/default.nix
rename to pkgs/by-name/li/liburing/package.nix
diff --git a/pkgs/development/libraries/libusbgx/default.nix b/pkgs/by-name/li/libusbgx/package.nix
similarity index 100%
rename from pkgs/development/libraries/libusbgx/default.nix
rename to pkgs/by-name/li/libusbgx/package.nix
diff --git a/pkgs/development/libraries/libusbsio/default.nix b/pkgs/by-name/li/libusbsio/package.nix
similarity index 100%
rename from pkgs/development/libraries/libusbsio/default.nix
rename to pkgs/by-name/li/libusbsio/package.nix
diff --git a/pkgs/development/libraries/libutempter/exec_path.patch b/pkgs/by-name/li/libutempter/exec_path.patch
similarity index 100%
rename from pkgs/development/libraries/libutempter/exec_path.patch
rename to pkgs/by-name/li/libutempter/exec_path.patch
diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/by-name/li/libutempter/package.nix
similarity index 100%
rename from pkgs/development/libraries/libutempter/default.nix
rename to pkgs/by-name/li/libutempter/package.nix
diff --git a/pkgs/development/libraries/libuvc/default.nix b/pkgs/by-name/li/libuvc/package.nix
similarity index 100%
rename from pkgs/development/libraries/libuvc/default.nix
rename to pkgs/by-name/li/libuvc/package.nix
diff --git a/pkgs/development/libraries/libva-vdpau-driver/default.nix b/pkgs/by-name/li/libva-vdpau-driver/package.nix
similarity index 100%
rename from pkgs/development/libraries/libva-vdpau-driver/default.nix
rename to pkgs/by-name/li/libva-vdpau-driver/package.nix
diff --git a/pkgs/development/libraries/libvarlink/default.nix b/pkgs/by-name/li/libvarlink/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvarlink/default.nix
rename to pkgs/by-name/li/libvarlink/package.nix
diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvdpau-va-gl/default.nix
rename to pkgs/by-name/li/libvdpau-va-gl/package.nix
diff --git a/pkgs/development/libraries/libvdpau/installdir.patch b/pkgs/by-name/li/libvdpau/installdir.patch
similarity index 100%
rename from pkgs/development/libraries/libvdpau/installdir.patch
rename to pkgs/by-name/li/libvdpau/installdir.patch
diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/by-name/li/libvdpau/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvdpau/default.nix
rename to pkgs/by-name/li/libvdpau/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix b/pkgs/by-name/li/libvdwxc/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/libvdwxc/default.nix
rename to pkgs/by-name/li/libvdwxc/package.nix
diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/by-name/li/libversion/package.nix
similarity index 100%
rename from pkgs/development/libraries/libversion/default.nix
rename to pkgs/by-name/li/libversion/package.nix
diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/by-name/li/libviper/package.nix
similarity index 100%
rename from pkgs/development/libraries/libviper/default.nix
rename to pkgs/by-name/li/libviper/package.nix
diff --git a/pkgs/development/libraries/libviperfx/default.nix b/pkgs/by-name/li/libviperfx/package.nix
similarity index 100%
rename from pkgs/development/libraries/libviperfx/default.nix
rename to pkgs/by-name/li/libviperfx/package.nix
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/by-name/li/libvirt-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvirt-glib/default.nix
rename to pkgs/by-name/li/libvirt-glib/package.nix
diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/by-name/li/libvisio/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvisio/default.nix
rename to pkgs/by-name/li/libvisio/package.nix
diff --git a/pkgs/development/libraries/libvisio2svg/default.nix b/pkgs/by-name/li/libvisio2svg/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvisio2svg/default.nix
rename to pkgs/by-name/li/libvisio2svg/package.nix
diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/by-name/li/libvisual/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvisual/default.nix
rename to pkgs/by-name/li/libvisual/package.nix
diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/by-name/li/libvmaf/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvmaf/default.nix
rename to pkgs/by-name/li/libvmaf/package.nix
diff --git a/pkgs/development/libraries/libvoikko/default.nix b/pkgs/by-name/li/libvoikko/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvoikko/default.nix
rename to pkgs/by-name/li/libvoikko/package.nix
diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/by-name/li/libvolume_id/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libvolume_id/default.nix
rename to pkgs/by-name/li/libvolume_id/package.nix
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/by-name/li/libvorbis/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvorbis/default.nix
rename to pkgs/by-name/li/libvorbis/package.nix
diff --git a/pkgs/development/libraries/libvori/default.nix b/pkgs/by-name/li/libvori/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvori/default.nix
rename to pkgs/by-name/li/libvori/package.nix
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/by-name/li/libvpx/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvpx/default.nix
rename to pkgs/by-name/li/libvpx/package.nix
diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/by-name/li/libvterm-neovim/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvterm-neovim/default.nix
rename to pkgs/by-name/li/libvterm-neovim/package.nix
diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/by-name/li/libvterm/package.nix
similarity index 100%
rename from pkgs/development/libraries/libvterm/default.nix
rename to pkgs/by-name/li/libvterm/package.nix
diff --git a/pkgs/development/libraries/libwbxml/default.nix b/pkgs/by-name/li/libwbxml/package.nix
similarity index 100%
rename from pkgs/development/libraries/libwbxml/default.nix
rename to pkgs/by-name/li/libwbxml/package.nix
diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/by-name/li/libwebcam/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libwebcam/default.nix
rename to pkgs/by-name/li/libwebcam/package.nix
diff --git a/pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch b/pkgs/by-name/li/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
similarity index 100%
rename from pkgs/os-specific/linux/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
rename to pkgs/by-name/li/libwebcam/uvcdynctrl_symlink_support_and_take_data_dir_from_env.patch
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/by-name/li/libwebp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libwebp/default.nix
rename to pkgs/by-name/li/libwebp/package.nix
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/by-name/li/libwebsockets/package.nix
similarity index 100%
rename from pkgs/development/libraries/libwebsockets/default.nix
rename to pkgs/by-name/li/libwebsockets/package.nix
diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/by-name/li/libwhereami/package.nix
similarity index 100%
rename from pkgs/development/libraries/libwhereami/default.nix
rename to pkgs/by-name/li/libwhereami/package.nix
diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/by-name/li/libwhich/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/libwhich/default.nix
rename to pkgs/by-name/li/libwhich/package.nix
diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/by-name/li/libwmf/package.nix
similarity index 100%
rename from pkgs/development/libraries/libwmf/default.nix
rename to pkgs/by-name/li/libwmf/package.nix
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/by-name/li/libwpg/package.nix
similarity index 100%
rename from pkgs/development/libraries/libwpg/default.nix
rename to pkgs/by-name/li/libwpg/package.nix
diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/by-name/li/libwps/package.nix
similarity index 100%
rename from pkgs/development/libraries/libwps/default.nix
rename to pkgs/by-name/li/libwps/package.nix
diff --git a/pkgs/development/libraries/libwtk-sdl2/default.nix b/pkgs/by-name/li/libwtk-sdl2/package.nix
similarity index 100%
rename from pkgs/development/libraries/libwtk-sdl2/default.nix
rename to pkgs/by-name/li/libwtk-sdl2/package.nix
diff --git a/pkgs/development/libraries/libx86/constants.patch b/pkgs/by-name/li/libx86/constants.patch
similarity index 100%
rename from pkgs/development/libraries/libx86/constants.patch
rename to pkgs/by-name/li/libx86/constants.patch
diff --git a/pkgs/development/libraries/libx86/non-x86.patch b/pkgs/by-name/li/libx86/non-x86.patch
similarity index 100%
rename from pkgs/development/libraries/libx86/non-x86.patch
rename to pkgs/by-name/li/libx86/non-x86.patch
diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/by-name/li/libx86/package.nix
similarity index 100%
rename from pkgs/development/libraries/libx86/default.nix
rename to pkgs/by-name/li/libx86/package.nix
diff --git a/pkgs/development/libraries/libx86/src-for-default.nix b/pkgs/by-name/li/libx86/src-for-default.nix
similarity index 100%
rename from pkgs/development/libraries/libx86/src-for-default.nix
rename to pkgs/by-name/li/libx86/src-for-default.nix
diff --git a/pkgs/development/libraries/libx86/src-info-for-default.nix b/pkgs/by-name/li/libx86/src-info-for-default.nix
similarity index 100%
rename from pkgs/development/libraries/libx86/src-info-for-default.nix
rename to pkgs/by-name/li/libx86/src-info-for-default.nix
diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/by-name/li/libx86emu/package.nix
similarity index 100%
rename from pkgs/development/libraries/libx86emu/default.nix
rename to pkgs/by-name/li/libx86emu/package.nix
diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/by-name/li/libxc/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxc/default.nix
rename to pkgs/by-name/li/libxc/package.nix
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/by-name/li/libxcomp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxcomp/default.nix
rename to pkgs/by-name/li/libxcomp/package.nix
diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/by-name/li/libxdg_basedir/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxdg-basedir/default.nix
rename to pkgs/by-name/li/libxdg_basedir/package.nix
diff --git a/pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch b/pkgs/by-name/li/libxisf/0001-Fix-pkg-config-paths.patch
similarity index 100%
rename from pkgs/development/libraries/science/astronomy/libxisf/0001-Fix-pkg-config-paths.patch
rename to pkgs/by-name/li/libxisf/0001-Fix-pkg-config-paths.patch
diff --git a/pkgs/development/libraries/science/astronomy/libxisf/default.nix b/pkgs/by-name/li/libxisf/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/astronomy/libxisf/default.nix
rename to pkgs/by-name/li/libxisf/package.nix
diff --git a/pkgs/development/libraries/libxkbcommon/disable-x11com.patch b/pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch
similarity index 100%
rename from pkgs/development/libraries/libxkbcommon/disable-x11com.patch
rename to pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxkbcommon/default.nix
rename to pkgs/by-name/li/libxkbcommon_8/package.nix
diff --git a/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch b/pkgs/by-name/li/libxklavier/honor-XKB_CONFIG_ROOT.patch
similarity index 100%
rename from pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch
rename to pkgs/by-name/li/libxklavier/honor-XKB_CONFIG_ROOT.patch
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/by-name/li/libxklavier/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxklavier/default.nix
rename to pkgs/by-name/li/libxklavier/package.nix
diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/by-name/li/libxl/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxl/default.nix
rename to pkgs/by-name/li/libxl/package.nix
diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/by-name/li/libxls/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxls/default.nix
rename to pkgs/by-name/li/libxls/package.nix
diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/by-name/li/libxlsxwriter/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxlsxwriter/default.nix
rename to pkgs/by-name/li/libxlsxwriter/package.nix
diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/by-name/li/libxmi/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxmi/default.nix
rename to pkgs/by-name/li/libxmi/package.nix
diff --git a/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/pkgs/by-name/li/libxmlb/installed-tests-path.patch
similarity index 100%
rename from pkgs/development/libraries/libxmlb/installed-tests-path.patch
rename to pkgs/by-name/li/libxmlb/installed-tests-path.patch
diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/by-name/li/libxmlb/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxmlb/default.nix
rename to pkgs/by-name/li/libxmlb/package.nix
diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/by-name/li/libxmp/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxmp/default.nix
rename to pkgs/by-name/li/libxmp/package.nix
diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/by-name/li/libxnd/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxnd/default.nix
rename to pkgs/by-name/li/libxnd/package.nix
diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/by-name/li/libxsmm/package.nix
similarity index 100%
rename from pkgs/development/libraries/libxsmm/default.nix
rename to pkgs/by-name/li/libxsmm/package.nix
diff --git a/pkgs/development/libraries/libxsmm/rpath.patch b/pkgs/by-name/li/libxsmm/rpath.patch
similarity index 100%
rename from pkgs/development/libraries/libxsmm/rpath.patch
rename to pkgs/by-name/li/libxsmm/rpath.patch
diff --git a/pkgs/tools/graphics/libyafaray/default.nix b/pkgs/by-name/li/libyafaray/package.nix
similarity index 100%
rename from pkgs/tools/graphics/libyafaray/default.nix
rename to pkgs/by-name/li/libyafaray/package.nix
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/by-name/li/libyaml/package.nix
similarity index 100%
rename from pkgs/development/libraries/libyaml/default.nix
rename to pkgs/by-name/li/libyaml/package.nix
diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/by-name/li/libykclient/package.nix
similarity index 100%
rename from pkgs/development/libraries/libykclient/default.nix
rename to pkgs/by-name/li/libykclient/package.nix
diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/by-name/li/libykneomgr/package.nix
similarity index 100%
rename from pkgs/development/libraries/libykneomgr/default.nix
rename to pkgs/by-name/li/libykneomgr/package.nix
diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/by-name/li/libytnef/package.nix
similarity index 100%
rename from pkgs/development/libraries/libytnef/default.nix
rename to pkgs/by-name/li/libytnef/package.nix
diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/by-name/li/libyubikey/package.nix
similarity index 100%
rename from pkgs/development/libraries/libyubikey/default.nix
rename to pkgs/by-name/li/libyubikey/package.nix
diff --git a/pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch b/pkgs/by-name/li/libyuv/link-library-against-libjpeg.patch
similarity index 100%
rename from pkgs/development/libraries/libyuv/link-library-against-libjpeg.patch
rename to pkgs/by-name/li/libyuv/link-library-against-libjpeg.patch
diff --git a/pkgs/development/libraries/libyuv/default.nix b/pkgs/by-name/li/libyuv/package.nix
similarity index 100%
rename from pkgs/development/libraries/libyuv/default.nix
rename to pkgs/by-name/li/libyuv/package.nix
diff --git a/pkgs/development/libraries/libyuv/yuv.pc b/pkgs/by-name/li/libyuv/yuv.pc
similarity index 100%
rename from pkgs/development/libraries/libyuv/yuv.pc
rename to pkgs/by-name/li/libyuv/yuv.pc
diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/by-name/li/libzapojit/package.nix
similarity index 100%
rename from pkgs/development/libraries/libzapojit/default.nix
rename to pkgs/by-name/li/libzapojit/package.nix
diff --git a/pkgs/os-specific/linux/libzbc/default.nix b/pkgs/by-name/li/libzbc/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libzbc/default.nix
rename to pkgs/by-name/li/libzbc/package.nix
diff --git a/pkgs/os-specific/linux/libzbd/default.nix b/pkgs/by-name/li/libzbd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/libzbd/default.nix
rename to pkgs/by-name/li/libzbd/package.nix
diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/by-name/li/libzdb/package.nix
similarity index 100%
rename from pkgs/development/libraries/libzdb/default.nix
rename to pkgs/by-name/li/libzdb/package.nix
diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/by-name/li/libzen/package.nix
similarity index 100%
rename from pkgs/development/libraries/libzen/default.nix
rename to pkgs/by-name/li/libzen/package.nix
diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/by-name/li/libzim/package.nix
similarity index 100%
rename from pkgs/development/libraries/libzim/default.nix
rename to pkgs/by-name/li/libzim/package.nix
diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/by-name/li/libzip/package.nix
similarity index 100%
rename from pkgs/development/libraries/libzip/default.nix
rename to pkgs/by-name/li/libzip/package.nix
diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/by-name/li/libzmf/package.nix
similarity index 100%
rename from pkgs/development/libraries/libzmf/default.nix
rename to pkgs/by-name/li/libzmf/package.nix
diff --git a/pkgs/development/libraries/libzra/fix-pkg-config.patch b/pkgs/by-name/li/libzra/fix-pkg-config.patch
similarity index 100%
rename from pkgs/development/libraries/libzra/fix-pkg-config.patch
rename to pkgs/by-name/li/libzra/fix-pkg-config.patch
diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/by-name/li/libzra/package.nix
similarity index 100%
rename from pkgs/development/libraries/libzra/default.nix
rename to pkgs/by-name/li/libzra/package.nix
diff --git a/pkgs/tools/misc/license-cli/default.nix b/pkgs/by-name/li/license-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/license-cli/default.nix
rename to pkgs/by-name/li/license-cli/package.nix
diff --git a/pkgs/development/tools/license-scanner/default.nix b/pkgs/by-name/li/license-scanner/package.nix
similarity index 100%
rename from pkgs/development/tools/license-scanner/default.nix
rename to pkgs/by-name/li/license-scanner/package.nix
diff --git a/pkgs/development/tools/misc/licenseclassifier/default.nix b/pkgs/by-name/li/licenseclassifier/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/licenseclassifier/default.nix
rename to pkgs/by-name/li/licenseclassifier/package.nix
diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/by-name/li/licensor/package.nix
similarity index 100%
rename from pkgs/tools/misc/licensor/default.nix
rename to pkgs/by-name/li/licensor/package.nix
diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/by-name/li/lie/package.nix
similarity index 100%
rename from pkgs/applications/science/math/LiE/default.nix
rename to pkgs/by-name/li/lie/package.nix
diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/by-name/li/lieer/package.nix
similarity index 100%
rename from pkgs/applications/networking/lieer/default.nix
rename to pkgs/by-name/li/lieer/package.nix
diff --git a/pkgs/tools/misc/lifecycled/default.nix b/pkgs/by-name/li/lifecycled/package.nix
similarity index 100%
rename from pkgs/tools/misc/lifecycled/default.nix
rename to pkgs/by-name/li/lifecycled/package.nix
diff --git a/pkgs/applications/misc/lifelines/default.nix b/pkgs/by-name/li/lifelines/package.nix
similarity index 100%
rename from pkgs/applications/misc/lifelines/default.nix
rename to pkgs/by-name/li/lifelines/package.nix
diff --git a/pkgs/applications/editors/lifeograph/default.nix b/pkgs/by-name/li/lifeograph/package.nix
similarity index 100%
rename from pkgs/applications/editors/lifeograph/default.nix
rename to pkgs/by-name/li/lifeograph/package.nix
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/by-name/li/liferea/package.nix
similarity index 100%
rename from pkgs/applications/networking/newsreaders/liferea/default.nix
rename to pkgs/by-name/li/liferea/package.nix
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch b/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch
similarity index 100%
rename from pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch
rename to pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix
similarity index 100%
rename from pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
rename to pkgs/by-name/li/lightdm-enso-os-greeter/package.nix
diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/by-name/li/lightdm-mini-greeter/package.nix
similarity index 100%
rename from pkgs/applications/display-managers/lightdm-mini-greeter/default.nix
rename to pkgs/by-name/li/lightdm-mini-greeter/package.nix
diff --git a/pkgs/applications/display-managers/lightdm-mobile-greeter/Cargo.lock b/pkgs/by-name/li/lightdm-mobile-greeter/Cargo.lock
similarity index 100%
rename from pkgs/applications/display-managers/lightdm-mobile-greeter/Cargo.lock
rename to pkgs/by-name/li/lightdm-mobile-greeter/Cargo.lock
diff --git a/pkgs/applications/display-managers/lightdm-mobile-greeter/default.nix b/pkgs/by-name/li/lightdm-mobile-greeter/package.nix
similarity index 100%
rename from pkgs/applications/display-managers/lightdm-mobile-greeter/default.nix
rename to pkgs/by-name/li/lightdm-mobile-greeter/package.nix
diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix
similarity index 100%
rename from pkgs/applications/display-managers/lightdm-slick-greeter/default.nix
rename to pkgs/by-name/li/lightdm-slick-greeter/package.nix
diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/by-name/li/lightdm-tiny-greeter/package.nix
similarity index 100%
rename from pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix
rename to pkgs/by-name/li/lightdm-tiny-greeter/package.nix
diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/by-name/li/lightgbm/package.nix
similarity index 100%
rename from pkgs/development/libraries/lightgbm/default.nix
rename to pkgs/by-name/li/lightgbm/package.nix
diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/by-name/li/lightlocker/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/light-locker/default.nix
rename to pkgs/by-name/li/lightlocker/package.nix
diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/by-name/li/lightning-loop/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/lightning-loop/default.nix
rename to pkgs/by-name/li/lightning-loop/package.nix
diff --git a/pkgs/applications/blockchains/lightning-pool/default.nix b/pkgs/by-name/li/lightning-pool/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/lightning-pool/default.nix
rename to pkgs/by-name/li/lightning-pool/package.nix
diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/by-name/li/lightspark/package.nix
similarity index 100%
rename from pkgs/misc/lightspark/default.nix
rename to pkgs/by-name/li/lightspark/package.nix
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/by-name/li/lighttpd/package.nix
similarity index 100%
rename from pkgs/servers/http/lighttpd/default.nix
rename to pkgs/by-name/li/lighttpd/package.nix
diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/by-name/li/lightum/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/lightum/default.nix
rename to pkgs/by-name/li/lightum/package.nix
diff --git a/pkgs/applications/blockchains/lightwalletd/default.nix b/pkgs/by-name/li/lightwalletd/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/lightwalletd/default.nix
rename to pkgs/by-name/li/lightwalletd/package.nix
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/by-name/li/lightworks/package.nix
similarity index 100%
rename from pkgs/applications/video/lightworks/default.nix
rename to pkgs/by-name/li/lightworks/package.nix
diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/by-name/li/ligolo-ng/package.nix
similarity index 100%
rename from pkgs/tools/networking/ligolo-ng/default.nix
rename to pkgs/by-name/li/ligolo-ng/package.nix
diff --git a/pkgs/tools/security/lil-pwny/default.nix b/pkgs/by-name/li/lil-pwny/package.nix
similarity index 100%
rename from pkgs/tools/security/lil-pwny/default.nix
rename to pkgs/by-name/li/lil-pwny/package.nix
diff --git a/pkgs/tools/misc/lilo/default.nix b/pkgs/by-name/li/lilo/package.nix
similarity index 100%
rename from pkgs/tools/misc/lilo/default.nix
rename to pkgs/by-name/li/lilo/package.nix
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/by-name/li/lilv/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/lilv/default.nix
rename to pkgs/by-name/li/lilv/package.nix
diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/by-name/li/lime/package.nix
similarity index 100%
rename from pkgs/development/libraries/lime/default.nix
rename to pkgs/by-name/li/lime/package.nix
diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/by-name/li/limesctl/package.nix
similarity index 100%
rename from pkgs/applications/misc/limesctl/default.nix
rename to pkgs/by-name/li/limesctl/package.nix
diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/by-name/li/limesurvey/package.nix
similarity index 100%
rename from pkgs/servers/limesurvey/default.nix
rename to pkgs/by-name/li/limesurvey/package.nix
diff --git a/pkgs/tools/misc/limitcpu/default.nix b/pkgs/by-name/li/limitcpu/package.nix
similarity index 100%
rename from pkgs/tools/misc/limitcpu/default.nix
rename to pkgs/by-name/li/limitcpu/package.nix
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/by-name/li/linbox/package.nix
similarity index 100%
rename from pkgs/development/libraries/linbox/default.nix
rename to pkgs/by-name/li/linbox/package.nix
diff --git a/pkgs/data/fonts/linden-hill/default.nix b/pkgs/by-name/li/linden-hill/package.nix
similarity index 100%
rename from pkgs/data/fonts/linden-hill/default.nix
rename to pkgs/by-name/li/linden-hill/package.nix
diff --git a/pkgs/data/fonts/line-awesome/default.nix b/pkgs/by-name/li/line-awesome/package.nix
similarity index 100%
rename from pkgs/data/fonts/line-awesome/default.nix
rename to pkgs/by-name/li/line-awesome/package.nix
diff --git a/pkgs/data/fonts/linearicons-free/default.nix b/pkgs/by-name/li/linearicons-free/package.nix
similarity index 100%
rename from pkgs/data/fonts/linearicons-free/default.nix
rename to pkgs/by-name/li/linearicons-free/package.nix
diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/by-name/li/linenoise-ng/package.nix
similarity index 100%
rename from pkgs/development/libraries/linenoise-ng/default.nix
rename to pkgs/by-name/li/linenoise-ng/package.nix
diff --git a/pkgs/development/libraries/linenoise/linenoise.pc.in b/pkgs/by-name/li/linenoise/linenoise.pc.in
similarity index 100%
rename from pkgs/development/libraries/linenoise/linenoise.pc.in
rename to pkgs/by-name/li/linenoise/linenoise.pc.in
diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/by-name/li/linenoise/package.nix
similarity index 100%
rename from pkgs/development/libraries/linenoise/default.nix
rename to pkgs/by-name/li/linenoise/package.nix
diff --git a/pkgs/tools/misc/lineselect/default.nix b/pkgs/by-name/li/lineselect/package.nix
similarity index 100%
rename from pkgs/tools/misc/lineselect/default.nix
rename to pkgs/by-name/li/lineselect/package.nix
diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/by-name/li/lingeling/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/lingeling/default.nix
rename to pkgs/by-name/li/lingeling/package.nix
diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/by-name/li/lingot/package.nix
similarity index 100%
rename from pkgs/applications/audio/lingot/default.nix
rename to pkgs/by-name/li/lingot/package.nix
diff --git a/pkgs/development/compilers/lingua-franca/default.nix b/pkgs/by-name/li/lingua-franca/package.nix
similarity index 100%
rename from pkgs/development/compilers/lingua-franca/default.nix
rename to pkgs/by-name/li/lingua-franca/package.nix
diff --git a/pkgs/data/fonts/linja-pi-pu-lukin/default.nix b/pkgs/by-name/li/linja-pi-pu-lukin/package.nix
similarity index 100%
rename from pkgs/data/fonts/linja-pi-pu-lukin/default.nix
rename to pkgs/by-name/li/linja-pi-pu-lukin/package.nix
diff --git a/pkgs/data/fonts/linja-sike/default.nix b/pkgs/by-name/li/linja-sike/package.nix
similarity index 100%
rename from pkgs/data/fonts/linja-sike/default.nix
rename to pkgs/by-name/li/linja-sike/package.nix
diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/by-name/li/link-grammar/package.nix
similarity index 100%
rename from pkgs/tools/text/link-grammar/default.nix
rename to pkgs/by-name/li/link-grammar/package.nix
diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/by-name/li/linkchecker/package.nix
similarity index 100%
rename from pkgs/tools/networking/linkchecker/default.nix
rename to pkgs/by-name/li/linkchecker/package.nix
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/by-name/li/links2/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/links2/default.nix
rename to pkgs/by-name/li/links2/package.nix
diff --git a/pkgs/tools/security/linux-exploit-suggester/default.nix b/pkgs/by-name/li/linux-exploit-suggester/package.nix
similarity index 100%
rename from pkgs/tools/security/linux-exploit-suggester/default.nix
rename to pkgs/by-name/li/linux-exploit-suggester/package.nix
diff --git a/pkgs/data/documentation/linux-manual/default.nix b/pkgs/by-name/li/linux-manual/package.nix
similarity index 100%
rename from pkgs/data/documentation/linux-manual/default.nix
rename to pkgs/by-name/li/linux-manual/package.nix
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/by-name/li/linux-pam/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam/default.nix
rename to pkgs/by-name/li/linux-pam/package.nix
diff --git a/pkgs/os-specific/linux/pam/suid-wrapper-path.patch b/pkgs/by-name/li/linux-pam/suid-wrapper-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/pam/suid-wrapper-path.patch
rename to pkgs/by-name/li/linux-pam/suid-wrapper-path.patch
diff --git a/pkgs/tools/networking/linux-router/default.nix b/pkgs/by-name/li/linux-router/package.nix
similarity index 100%
rename from pkgs/tools/networking/linux-router/default.nix
rename to pkgs/by-name/li/linux-router/package.nix
diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/by-name/li/linuxConsoleTools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/consoletools/default.nix
rename to pkgs/by-name/li/linuxConsoleTools/package.nix
diff --git a/pkgs/tools/misc/linux-logo/default.nix b/pkgs/by-name/li/linux_logo/package.nix
similarity index 100%
rename from pkgs/tools/misc/linux-logo/default.nix
rename to pkgs/by-name/li/linux_logo/package.nix
diff --git a/pkgs/tools/text/sgml/linuxdoc-tools/default.nix b/pkgs/by-name/li/linuxdoc-tools/package.nix
similarity index 100%
rename from pkgs/tools/text/sgml/linuxdoc-tools/default.nix
rename to pkgs/by-name/li/linuxdoc-tools/package.nix
diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/by-name/li/linuxptp/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/linuxptp/default.nix
rename to pkgs/by-name/li/linuxptp/package.nix
diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/by-name/li/linuxquota/package.nix
similarity index 100%
rename from pkgs/tools/misc/linuxquota/default.nix
rename to pkgs/by-name/li/linuxquota/package.nix
diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/by-name/li/linuxsampler/package.nix
similarity index 100%
rename from pkgs/applications/audio/linuxsampler/default.nix
rename to pkgs/by-name/li/linuxsampler/package.nix
diff --git a/pkgs/tools/audio/linuxwave/default.nix b/pkgs/by-name/li/linuxwave/package.nix
similarity index 100%
rename from pkgs/tools/audio/linuxwave/default.nix
rename to pkgs/by-name/li/linuxwave/package.nix
diff --git a/pkgs/servers/web-apps/linx-server/default.nix b/pkgs/by-name/li/linx-server/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/linx-server/default.nix
rename to pkgs/by-name/li/linx-server/package.nix
diff --git a/pkgs/servers/web-apps/linx-server/test.patch b/pkgs/by-name/li/linx-server/test.patch
similarity index 100%
rename from pkgs/servers/web-apps/linx-server/test.patch
rename to pkgs/by-name/li/linx-server/test.patch
diff --git a/pkgs/tools/misc/lipl/Cargo.lock b/pkgs/by-name/li/lipl/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/lipl/Cargo.lock
rename to pkgs/by-name/li/lipl/Cargo.lock
diff --git a/pkgs/tools/misc/lipl/default.nix b/pkgs/by-name/li/lipl/package.nix
similarity index 100%
rename from pkgs/tools/misc/lipl/default.nix
rename to pkgs/by-name/li/lipl/package.nix
diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/by-name/li/liquibase/package.nix
similarity index 100%
rename from pkgs/development/tools/database/liquibase/default.nix
rename to pkgs/by-name/li/liquibase/package.nix
diff --git a/pkgs/development/java-modules/liquibase_redshift_extension/default.nix b/pkgs/by-name/li/liquibase_redshift_extension/package.nix
similarity index 100%
rename from pkgs/development/java-modules/liquibase_redshift_extension/default.nix
rename to pkgs/by-name/li/liquibase_redshift_extension/package.nix
diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/by-name/li/liquidfun/package.nix
similarity index 100%
rename from pkgs/development/libraries/liquidfun/default.nix
rename to pkgs/by-name/li/liquidfun/package.nix
diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/by-name/li/liquidprompt/package.nix
similarity index 100%
rename from pkgs/shells/liquidprompt/default.nix
rename to pkgs/by-name/li/liquidprompt/package.nix
diff --git a/pkgs/development/libraries/lirc/linux-headers-5.18.patch b/pkgs/by-name/li/lirc/linux-headers-5.18.patch
similarity index 100%
rename from pkgs/development/libraries/lirc/linux-headers-5.18.patch
rename to pkgs/by-name/li/lirc/linux-headers-5.18.patch
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/by-name/li/lirc/package.nix
similarity index 100%
rename from pkgs/development/libraries/lirc/default.nix
rename to pkgs/by-name/li/lirc/package.nix
diff --git a/pkgs/tools/inputmethods/lisgd/default.nix b/pkgs/by-name/li/lisgd/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/lisgd/default.nix
rename to pkgs/by-name/li/lisgd/package.nix
diff --git a/pkgs/applications/networking/listadmin/default.nix b/pkgs/by-name/li/listadmin/package.nix
similarity index 100%
rename from pkgs/applications/networking/listadmin/default.nix
rename to pkgs/by-name/li/listadmin/package.nix
diff --git a/pkgs/applications/editors/lite/default.nix b/pkgs/by-name/li/lite/package.nix
similarity index 100%
rename from pkgs/applications/editors/lite/default.nix
rename to pkgs/by-name/li/lite/package.nix
diff --git a/pkgs/applications/networking/browsers/litebrowser/default.nix b/pkgs/by-name/li/litebrowser/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/litebrowser/default.nix
rename to pkgs/by-name/li/litebrowser/package.nix
diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/by-name/li/litecli/package.nix
similarity index 100%
rename from pkgs/development/tools/database/litecli/default.nix
rename to pkgs/by-name/li/litecli/package.nix
diff --git a/pkgs/development/tools/database/litefs/default.nix b/pkgs/by-name/li/litefs/package.nix
similarity index 100%
rename from pkgs/development/tools/database/litefs/default.nix
rename to pkgs/by-name/li/litefs/package.nix
diff --git a/pkgs/development/libraries/litehtml/default.nix b/pkgs/by-name/li/litehtml/package.nix
similarity index 100%
rename from pkgs/development/libraries/litehtml/default.nix
rename to pkgs/by-name/li/litehtml/package.nix
diff --git a/pkgs/applications/graphics/litemdview/default.nix b/pkgs/by-name/li/litemdview/package.nix
similarity index 100%
rename from pkgs/applications/graphics/litemdview/default.nix
rename to pkgs/by-name/li/litemdview/package.nix
diff --git a/pkgs/development/tools/database/litestream/default.nix b/pkgs/by-name/li/litestream/package.nix
similarity index 100%
rename from pkgs/development/tools/database/litestream/default.nix
rename to pkgs/by-name/li/litestream/package.nix
diff --git a/pkgs/tools/misc/livedl/default.nix b/pkgs/by-name/li/livedl/package.nix
similarity index 100%
rename from pkgs/tools/misc/livedl/default.nix
rename to pkgs/by-name/li/livedl/package.nix
diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/by-name/li/livepeer/package.nix
similarity index 100%
rename from pkgs/servers/livepeer/default.nix
rename to pkgs/by-name/li/livepeer/package.nix
diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/by-name/li/lizardfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/lizardfs/default.nix
rename to pkgs/by-name/li/lizardfs/package.nix
diff --git a/pkgs/data/fonts/lklug-sinhala/default.nix b/pkgs/by-name/lk/lklug-sinhala/package.nix
similarity index 100%
rename from pkgs/data/fonts/lklug-sinhala/default.nix
rename to pkgs/by-name/lk/lklug-sinhala/package.nix
diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/by-name/lk/lkproof/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/tex/lkproof/default.nix
rename to pkgs/by-name/lk/lkproof/package.nix
diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/by-name/lk/lksctp-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/lksctp-tools/default.nix
rename to pkgs/by-name/lk/lksctp-tools/package.nix
diff --git a/pkgs/servers/ldap/lldap/0001-parameterize-frontend-location.patch b/pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch
similarity index 100%
rename from pkgs/servers/ldap/lldap/0001-parameterize-frontend-location.patch
rename to pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch
diff --git a/pkgs/servers/ldap/lldap/Cargo.lock b/pkgs/by-name/ll/lldap/Cargo.lock
similarity index 100%
rename from pkgs/servers/ldap/lldap/Cargo.lock
rename to pkgs/by-name/ll/lldap/Cargo.lock
diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/by-name/ll/lldap/package.nix
similarity index 100%
rename from pkgs/servers/ldap/lldap/default.nix
rename to pkgs/by-name/ll/lldap/package.nix
diff --git a/pkgs/development/libraries/llhttp/default.nix b/pkgs/by-name/ll/llhttp/package.nix
similarity index 100%
rename from pkgs/development/libraries/llhttp/default.nix
rename to pkgs/by-name/ll/llhttp/package.nix
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/by-name/ll/llpp/package.nix
similarity index 100%
rename from pkgs/applications/misc/llpp/default.nix
rename to pkgs/by-name/ll/llpp/package.nix
diff --git a/pkgs/applications/networking/lls/default.nix b/pkgs/by-name/ll/lls/package.nix
similarity index 100%
rename from pkgs/applications/networking/lls/default.nix
rename to pkgs/by-name/ll/lls/package.nix
diff --git a/pkgs/os-specific/linux/lm-sensors/default.nix b/pkgs/by-name/lm/lm_sensors/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/lm-sensors/default.nix
rename to pkgs/by-name/lm/lm_sensors/package.nix
diff --git a/pkgs/development/libraries/lmdb/bin-ext.patch b/pkgs/by-name/lm/lmdb/bin-ext.patch
similarity index 100%
rename from pkgs/development/libraries/lmdb/bin-ext.patch
rename to pkgs/by-name/lm/lmdb/bin-ext.patch
diff --git a/pkgs/development/libraries/lmdb/hardcoded-compiler.patch b/pkgs/by-name/lm/lmdb/hardcoded-compiler.patch
similarity index 100%
rename from pkgs/development/libraries/lmdb/hardcoded-compiler.patch
rename to pkgs/by-name/lm/lmdb/hardcoded-compiler.patch
diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/by-name/lm/lmdb/package.nix
similarity index 100%
rename from pkgs/development/libraries/lmdb/default.nix
rename to pkgs/by-name/lm/lmdb/package.nix
diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/by-name/lm/lmdbxx/package.nix
similarity index 100%
rename from pkgs/development/libraries/lmdbxx/default.nix
rename to pkgs/by-name/lm/lmdbxx/package.nix
diff --git a/pkgs/data/fonts/lmmath/default.nix b/pkgs/by-name/lm/lmmath/package.nix
similarity index 100%
rename from pkgs/data/fonts/lmmath/default.nix
rename to pkgs/by-name/lm/lmmath/package.nix
diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/by-name/lm/lmodern/package.nix
similarity index 100%
rename from pkgs/data/fonts/lmodern/default.nix
rename to pkgs/by-name/lm/lmodern/package.nix
diff --git a/pkgs/tools/security/lmp/default.nix b/pkgs/by-name/lm/lmp/package.nix
similarity index 100%
rename from pkgs/tools/security/lmp/default.nix
rename to pkgs/by-name/lm/lmp/package.nix
diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/by-name/ln/lnav/package.nix
similarity index 100%
rename from pkgs/tools/misc/lnav/default.nix
rename to pkgs/by-name/ln/lnav/package.nix
diff --git a/pkgs/tools/misc/lnch/default.nix b/pkgs/by-name/ln/lnch/package.nix
similarity index 100%
rename from pkgs/tools/misc/lnch/default.nix
rename to pkgs/by-name/ln/lnch/package.nix
diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/by-name/ln/lnd/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/lnd/default.nix
rename to pkgs/by-name/ln/lnd/package.nix
diff --git a/pkgs/applications/blockchains/lndconnect/default.nix b/pkgs/by-name/ln/lndconnect/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/lndconnect/default.nix
rename to pkgs/by-name/ln/lndconnect/package.nix
diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/by-name/ln/lndhub-go/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/lndhub-go/default.nix
rename to pkgs/by-name/ln/lndhub-go/package.nix
diff --git a/pkgs/applications/blockchains/lndinit/default.nix b/pkgs/by-name/ln/lndinit/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/lndinit/default.nix
rename to pkgs/by-name/ln/lndinit/package.nix
diff --git a/pkgs/applications/blockchains/lndmanage/default.nix b/pkgs/by-name/ln/lndmanage/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/lndmanage/default.nix
rename to pkgs/by-name/ln/lndmanage/package.nix
diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/by-name/lo/loadlibrary/package.nix
similarity index 100%
rename from pkgs/tools/misc/loadlibrary/default.nix
rename to pkgs/by-name/lo/loadlibrary/package.nix
diff --git a/pkgs/tools/system/loadwatch/default.nix b/pkgs/by-name/lo/loadwatch/package.nix
similarity index 100%
rename from pkgs/tools/system/loadwatch/default.nix
rename to pkgs/by-name/lo/loadwatch/package.nix
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/by-name/lo/loc/package.nix
similarity index 100%
rename from pkgs/development/misc/loc/default.nix
rename to pkgs/by-name/lo/loc/package.nix
diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/by-name/lo/localproxy/package.nix
similarity index 100%
rename from pkgs/applications/networking/localproxy/default.nix
rename to pkgs/by-name/lo/localproxy/package.nix
diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/by-name/lo/localtime/package.nix
similarity index 100%
rename from pkgs/tools/system/localtime/default.nix
rename to pkgs/by-name/lo/localtime/package.nix
diff --git a/pkgs/tools/misc/locate-dominating-file/default.nix b/pkgs/by-name/lo/locate-dominating-file/package.nix
similarity index 100%
rename from pkgs/tools/misc/locate-dominating-file/default.nix
rename to pkgs/by-name/lo/locate-dominating-file/package.nix
diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/by-name/lo/loccount/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/loccount/default.nix
rename to pkgs/by-name/lo/loccount/package.nix
diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/by-name/lo/lockdep/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/lockdep/default.nix
rename to pkgs/by-name/lo/lockdep/package.nix
diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/by-name/lo/lockfileProgs/package.nix
similarity index 100%
rename from pkgs/tools/misc/lockfile-progs/default.nix
rename to pkgs/by-name/lo/lockfileProgs/package.nix
diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/by-name/lo/log4cplus/package.nix
similarity index 100%
rename from pkgs/development/libraries/log4cplus/default.nix
rename to pkgs/by-name/lo/log4cplus/package.nix
diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/by-name/lo/log4cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/log4cpp/default.nix
rename to pkgs/by-name/lo/log4cpp/package.nix
diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/by-name/lo/log4cxx/package.nix
similarity index 100%
rename from pkgs/development/libraries/log4cxx/default.nix
rename to pkgs/by-name/lo/log4cxx/package.nix
diff --git a/pkgs/tools/security/log4j-detect/default.nix b/pkgs/by-name/lo/log4j-detect/package.nix
similarity index 100%
rename from pkgs/tools/security/log4j-detect/default.nix
rename to pkgs/by-name/lo/log4j-detect/package.nix
diff --git a/pkgs/tools/security/log4j-scan/default.nix b/pkgs/by-name/lo/log4j-scan/package.nix
similarity index 100%
rename from pkgs/tools/security/log4j-scan/default.nix
rename to pkgs/by-name/lo/log4j-scan/package.nix
diff --git a/pkgs/tools/security/log4j-sniffer/default.nix b/pkgs/by-name/lo/log4j-sniffer/package.nix
similarity index 100%
rename from pkgs/tools/security/log4j-sniffer/default.nix
rename to pkgs/by-name/lo/log4j-sniffer/package.nix
diff --git a/pkgs/tools/security/log4j-vuln-scanner/default.nix b/pkgs/by-name/lo/log4j-vuln-scanner/package.nix
similarity index 100%
rename from pkgs/tools/security/log4j-vuln-scanner/default.nix
rename to pkgs/by-name/lo/log4j-vuln-scanner/package.nix
diff --git a/pkgs/tools/security/log4jcheck/default.nix b/pkgs/by-name/lo/log4jcheck/package.nix
similarity index 100%
rename from pkgs/tools/security/log4jcheck/default.nix
rename to pkgs/by-name/lo/log4jcheck/package.nix
diff --git a/pkgs/tools/security/log4shell-detector/default.nix b/pkgs/by-name/lo/log4shell-detector/package.nix
similarity index 100%
rename from pkgs/tools/security/log4shell-detector/default.nix
rename to pkgs/by-name/lo/log4shell-detector/package.nix
diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/by-name/lo/log4shib/package.nix
similarity index 100%
rename from pkgs/development/libraries/log4shib/default.nix
rename to pkgs/by-name/lo/log4shib/package.nix
diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/by-name/lo/logcheck/package.nix
similarity index 100%
rename from pkgs/tools/system/logcheck/default.nix
rename to pkgs/by-name/lo/logcheck/package.nix
diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/by-name/lo/logisim-evolution/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/logisim-evolution/default.nix
rename to pkgs/by-name/lo/logisim-evolution/package.nix
diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/by-name/lo/logisim/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/logisim/default.nix
rename to pkgs/by-name/lo/logisim/package.nix
diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/by-name/lo/logkeys/package.nix
similarity index 100%
rename from pkgs/tools/security/logkeys/default.nix
rename to pkgs/by-name/lo/logkeys/package.nix
diff --git a/pkgs/tools/security/logmap/default.nix b/pkgs/by-name/lo/logmap/package.nix
similarity index 100%
rename from pkgs/tools/security/logmap/default.nix
rename to pkgs/by-name/lo/logmap/package.nix
diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/by-name/lo/logmein-hamachi/package.nix
similarity index 100%
rename from pkgs/tools/networking/logmein-hamachi/default.nix
rename to pkgs/by-name/lo/logmein-hamachi/package.nix
diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/by-name/lo/logrotate/package.nix
similarity index 100%
rename from pkgs/tools/system/logrotate/default.nix
rename to pkgs/by-name/lo/logrotate/package.nix
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/by-name/lo/logstalgia/package.nix
similarity index 100%
rename from pkgs/tools/graphics/logstalgia/default.nix
rename to pkgs/by-name/lo/logstalgia/package.nix
diff --git a/pkgs/tools/misc/logtop/default.nix b/pkgs/by-name/lo/logtop/package.nix
similarity index 100%
rename from pkgs/tools/misc/logtop/default.nix
rename to pkgs/by-name/lo/logtop/package.nix
diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/by-name/lo/lokalise2-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/lokalise2-cli/default.nix
rename to pkgs/by-name/lo/lokalise2-cli/package.nix
diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/by-name/lo/loki/package.nix
similarity index 100%
rename from pkgs/development/libraries/loki/default.nix
rename to pkgs/by-name/lo/loki/package.nix
diff --git a/pkgs/applications/networking/p2p/lokinet/default.nix b/pkgs/by-name/lo/lokinet/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/lokinet/default.nix
rename to pkgs/by-name/lo/lokinet/package.nix
diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/by-name/lo/lombok/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/lombok/default.nix
rename to pkgs/by-name/lo/lombok/package.nix
diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/by-name/lo/long-shebang/package.nix
similarity index 100%
rename from pkgs/misc/long-shebang/default.nix
rename to pkgs/by-name/lo/long-shebang/package.nix
diff --git a/pkgs/servers/monitoring/longview/log-stdout.patch b/pkgs/by-name/lo/longview/log-stdout.patch
similarity index 100%
rename from pkgs/servers/monitoring/longview/log-stdout.patch
rename to pkgs/by-name/lo/longview/log-stdout.patch
diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/by-name/lo/longview/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/longview/default.nix
rename to pkgs/by-name/lo/longview/package.nix
diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/by-name/lo/looking-glass-client/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/looking-glass-client/default.nix
rename to pkgs/by-name/lo/looking-glass-client/package.nix
diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/by-name/lo/loop/package.nix
similarity index 100%
rename from pkgs/tools/misc/loop/default.nix
rename to pkgs/by-name/lo/loop/package.nix
diff --git a/pkgs/applications/graphics/lorien/default.nix b/pkgs/by-name/lo/lorien/package.nix
similarity index 100%
rename from pkgs/applications/graphics/lorien/default.nix
rename to pkgs/by-name/lo/lorien/package.nix
diff --git a/pkgs/applications/audio/losslessaudiochecker/default.nix b/pkgs/by-name/lo/losslessaudiochecker/package.nix
similarity index 100%
rename from pkgs/applications/audio/losslessaudiochecker/default.nix
rename to pkgs/by-name/lo/losslessaudiochecker/package.nix
diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix
similarity index 100%
rename from pkgs/applications/video/losslesscut-bin/build-from-appimage.nix
rename to pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix
diff --git a/pkgs/applications/video/losslesscut-bin/build-from-dmg.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix
similarity index 100%
rename from pkgs/applications/video/losslesscut-bin/build-from-dmg.nix
rename to pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix
diff --git a/pkgs/applications/video/losslesscut-bin/build-from-windows.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-windows.nix
similarity index 100%
rename from pkgs/applications/video/losslesscut-bin/build-from-windows.nix
rename to pkgs/by-name/lo/losslesscut-bin/build-from-windows.nix
diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/by-name/lo/losslesscut-bin/package.nix
similarity index 100%
rename from pkgs/applications/video/losslesscut-bin/default.nix
rename to pkgs/by-name/lo/losslesscut-bin/package.nix
diff --git a/pkgs/tools/misc/lottieconverter/default.nix b/pkgs/by-name/lo/lottieconverter/package.nix
similarity index 100%
rename from pkgs/tools/misc/lottieconverter/default.nix
rename to pkgs/by-name/lo/lottieconverter/package.nix
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/by-name/lo/loudmouth/package.nix
similarity index 100%
rename from pkgs/development/libraries/loudmouth/default.nix
rename to pkgs/by-name/lo/loudmouth/package.nix
diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/by-name/lo/lounge-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/lounge/default.nix
rename to pkgs/by-name/lo/lounge-gtk-theme/package.nix
diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/by-name/lo/lout/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/lout/default.nix
rename to pkgs/by-name/lo/lout/package.nix
diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/by-name/lo/lowdown/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/lowdown/default.nix
rename to pkgs/by-name/lo/lowdown/package.nix
diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/by-name/lo/loxodo/package.nix
similarity index 100%
rename from pkgs/applications/misc/loxodo/default.nix
rename to pkgs/by-name/lo/loxodo/package.nix
diff --git a/pkgs/applications/misc/loxodo/wxpython.patch b/pkgs/by-name/lo/loxodo/wxpython.patch
similarity index 100%
rename from pkgs/applications/misc/loxodo/wxpython.patch
rename to pkgs/by-name/lo/loxodo/wxpython.patch
diff --git a/pkgs/development/libraries/lpcnetfreedv/default.nix b/pkgs/by-name/lp/lpcnetfreedv/package.nix
similarity index 100%
rename from pkgs/development/libraries/lpcnetfreedv/default.nix
rename to pkgs/by-name/lp/lpcnetfreedv/package.nix
diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/by-name/lr/lr/package.nix
similarity index 100%
rename from pkgs/tools/system/lr/default.nix
rename to pkgs/by-name/lr/lr/package.nix
diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/by-name/lr/lrcalc/package.nix
similarity index 100%
rename from pkgs/applications/science/math/lrcalc/default.nix
rename to pkgs/by-name/lr/lrcalc/package.nix
diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/by-name/lr/lrdf/package.nix
similarity index 100%
rename from pkgs/development/libraries/lrdf/default.nix
rename to pkgs/by-name/lr/lrdf/package.nix
diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/by-name/lr/lrs/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/lrs/default.nix
rename to pkgs/by-name/lr/lrs/package.nix
diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/by-name/lr/lrzip/package.nix
similarity index 100%
rename from pkgs/tools/compression/lrzip/default.nix
rename to pkgs/by-name/lr/lrzip/package.nix
diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/by-name/lr/lrzsz/package.nix
similarity index 100%
rename from pkgs/tools/misc/lrzsz/default.nix
rename to pkgs/by-name/lr/lrzsz/package.nix
diff --git a/pkgs/development/tools/ls-lint/default.nix b/pkgs/by-name/ls/ls-lint/package.nix
similarity index 100%
rename from pkgs/development/tools/ls-lint/default.nix
rename to pkgs/by-name/ls/ls-lint/package.nix
diff --git a/pkgs/os-specific/linux/lsb-release/lsb_release.sh b/pkgs/by-name/ls/lsb-release/lsb_release.sh
similarity index 100%
rename from pkgs/os-specific/linux/lsb-release/lsb_release.sh
rename to pkgs/by-name/ls/lsb-release/lsb_release.sh
diff --git a/pkgs/os-specific/linux/lsb-release/default.nix b/pkgs/by-name/ls/lsb-release/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/lsb-release/default.nix
rename to pkgs/by-name/ls/lsb-release/package.nix
diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/by-name/ls/lscolors/package.nix
similarity index 100%
rename from pkgs/applications/misc/lscolors/default.nix
rename to pkgs/by-name/ls/lscolors/package.nix
diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/by-name/ls/lsdvd/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/lsdvd/default.nix
rename to pkgs/by-name/ls/lsdvd/package.nix
diff --git a/pkgs/os-specific/linux/lsirec/default.nix b/pkgs/by-name/ls/lsirec/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/lsirec/default.nix
rename to pkgs/by-name/ls/lsirec/package.nix
diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/by-name/ls/lsiutil/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/lsiutil/default.nix
rename to pkgs/by-name/ls/lsiutil/package.nix
diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/by-name/ls/lsix/package.nix
similarity index 100%
rename from pkgs/tools/graphics/lsix/default.nix
rename to pkgs/by-name/ls/lsix/package.nix
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/by-name/ls/lsof/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/lsof/default.nix
rename to pkgs/by-name/ls/lsof/package.nix
diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/by-name/ls/lsscsi/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/lsscsi/default.nix
rename to pkgs/by-name/ls/lsscsi/package.nix
diff --git a/pkgs/misc/lssecret/default.nix b/pkgs/by-name/ls/lssecret/package.nix
similarity index 100%
rename from pkgs/misc/lssecret/default.nix
rename to pkgs/by-name/ls/lssecret/package.nix
diff --git a/pkgs/applications/misc/lswt/default.nix b/pkgs/by-name/ls/lswt/package.nix
similarity index 100%
rename from pkgs/applications/misc/lswt/default.nix
rename to pkgs/by-name/ls/lswt/package.nix
diff --git a/pkgs/applications/audio/ltc-tools/default.nix b/pkgs/by-name/lt/ltc-tools/package.nix
similarity index 100%
rename from pkgs/applications/audio/ltc-tools/default.nix
rename to pkgs/by-name/lt/ltc-tools/package.nix
diff --git a/pkgs/tools/text/ltex-ls/default.nix b/pkgs/by-name/lt/ltex-ls/package.nix
similarity index 100%
rename from pkgs/tools/text/ltex-ls/default.nix
rename to pkgs/by-name/lt/ltex-ls/package.nix
diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/by-name/lt/ltl2ba/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/ltl2ba/default.nix
rename to pkgs/by-name/lt/ltl2ba/package.nix
diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/by-name/lt/ltrace/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/ltrace/default.nix
rename to pkgs/by-name/lt/ltrace/package.nix
diff --git a/pkgs/development/tools/misc/ltrace/sysdeps-x86.patch b/pkgs/by-name/lt/ltrace/sysdeps-x86.patch
similarity index 100%
rename from pkgs/development/tools/misc/ltrace/sysdeps-x86.patch
rename to pkgs/by-name/lt/ltrace/sysdeps-x86.patch
diff --git a/pkgs/development/tools/misc/ltrace/testsuite-newfstatat.patch b/pkgs/by-name/lt/ltrace/testsuite-newfstatat.patch
similarity index 100%
rename from pkgs/development/tools/misc/ltrace/testsuite-newfstatat.patch
rename to pkgs/by-name/lt/ltrace/testsuite-newfstatat.patch
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/by-name/lt/lttng-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/lttng-tools/default.nix
rename to pkgs/by-name/lt/lttng-tools/package.nix
diff --git a/pkgs/applications/misc/lttoolbox/default.nix b/pkgs/by-name/lt/lttoolbox/package.nix
similarity index 100%
rename from pkgs/applications/misc/lttoolbox/default.nix
rename to pkgs/by-name/lt/lttoolbox/package.nix
diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/by-name/lt/lttv/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/lttv/default.nix
rename to pkgs/by-name/lt/lttv/package.nix
diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/by-name/lt/ltunify/package.nix
similarity index 100%
rename from pkgs/tools/misc/ltunify/default.nix
rename to pkgs/by-name/lt/ltunify/package.nix
diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/by-name/lt/ltwheelconf/package.nix
similarity index 100%
rename from pkgs/applications/misc/ltwheelconf/default.nix
rename to pkgs/by-name/lt/ltwheelconf/package.nix
diff --git a/pkgs/development/libraries/luabridge/default.nix b/pkgs/by-name/lu/luabridge/package.nix
similarity index 100%
rename from pkgs/development/libraries/luabridge/default.nix
rename to pkgs/by-name/lu/luabridge/package.nix
diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/by-name/lu/luau/package.nix
similarity index 100%
rename from pkgs/development/interpreters/luau/default.nix
rename to pkgs/by-name/lu/luau/package.nix
diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/by-name/lu/lucene/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/lucene/default.nix
rename to pkgs/by-name/lu/lucene/package.nix
diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/by-name/lu/lucenepp/package.nix
similarity index 100%
rename from pkgs/development/libraries/lucene++/default.nix
rename to pkgs/by-name/lu/lucenepp/package.nix
diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/by-name/lu/lucky-cli/package.nix
similarity index 100%
rename from pkgs/development/web/lucky-cli/default.nix
rename to pkgs/by-name/lu/lucky-cli/package.nix
diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/by-name/lu/lucky-cli/shard.lock
similarity index 100%
rename from pkgs/development/web/lucky-cli/shard.lock
rename to pkgs/by-name/lu/lucky-cli/shard.lock
diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/by-name/lu/lucky-cli/shards.nix
similarity index 100%
rename from pkgs/development/web/lucky-cli/shards.nix
rename to pkgs/by-name/lu/lucky-cli/shards.nix
diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/by-name/lu/luculent/package.nix
similarity index 100%
rename from pkgs/data/fonts/luculent/default.nix
rename to pkgs/by-name/lu/luculent/package.nix
diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/by-name/lu/ludusavi/package.nix
similarity index 100%
rename from pkgs/applications/backup/ludusavi/default.nix
rename to pkgs/by-name/lu/ludusavi/package.nix
diff --git a/pkgs/games/lugaru/default.nix b/pkgs/by-name/lu/lugaru/package.nix
similarity index 100%
rename from pkgs/games/lugaru/default.nix
rename to pkgs/by-name/lu/lugaru/package.nix
diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/by-name/lu/luigi/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/luigi/default.nix
rename to pkgs/by-name/lu/luigi/package.nix
diff --git a/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff b/pkgs/by-name/lu/lukesmithxyz-st/0000-makefile-fix-install.diff
similarity index 100%
rename from pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff
rename to pkgs/by-name/lu/lukesmithxyz-st/0000-makefile-fix-install.diff
diff --git a/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix b/pkgs/by-name/lu/lukesmithxyz-st/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix
rename to pkgs/by-name/lu/lukesmithxyz-st/package.nix
diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/by-name/lu/lunarml/package.nix
similarity index 100%
rename from pkgs/development/compilers/lunarml/default.nix
rename to pkgs/by-name/lu/lunarml/package.nix
diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/by-name/lu/lunatic/package.nix
similarity index 100%
rename from pkgs/development/interpreters/lunatic/default.nix
rename to pkgs/by-name/lu/lunatic/package.nix
diff --git a/pkgs/development/interpreters/lune/default.nix b/pkgs/by-name/lu/lune/package.nix
similarity index 100%
rename from pkgs/development/interpreters/lune/default.nix
rename to pkgs/by-name/lu/lune/package.nix
diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/by-name/lu/luppp/package.nix
similarity index 100%
rename from pkgs/applications/audio/luppp/default.nix
rename to pkgs/by-name/lu/luppp/package.nix
diff --git a/pkgs/development/tools/lurk/default.nix b/pkgs/by-name/lu/lurk/package.nix
similarity index 100%
rename from pkgs/development/tools/lurk/default.nix
rename to pkgs/by-name/lu/lurk/package.nix
diff --git a/pkgs/tools/video/lux/default.nix b/pkgs/by-name/lu/lux/package.nix
similarity index 100%
rename from pkgs/tools/video/lux/default.nix
rename to pkgs/by-name/lu/lux/package.nix
diff --git a/pkgs/tools/text/lv/default.nix b/pkgs/by-name/lv/lv/package.nix
similarity index 100%
rename from pkgs/tools/text/lv/default.nix
rename to pkgs/by-name/lv/lv/package.nix
diff --git a/pkgs/applications/audio/lv2-cpp-tools/default.nix b/pkgs/by-name/lv/lv2-cpp-tools/package.nix
similarity index 100%
rename from pkgs/applications/audio/lv2-cpp-tools/default.nix
rename to pkgs/by-name/lv/lv2-cpp-tools/package.nix
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/by-name/lv/lv2/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/lv2/default.nix
rename to pkgs/by-name/lv/lv2/package.nix
diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/by-name/lv/lv2bm/package.nix
similarity index 100%
rename from pkgs/applications/audio/lv2bm/default.nix
rename to pkgs/by-name/lv/lv2bm/package.nix
diff --git a/pkgs/tools/backup/lvmsync/Gemfile b/pkgs/by-name/lv/lvmsync/Gemfile
similarity index 100%
rename from pkgs/tools/backup/lvmsync/Gemfile
rename to pkgs/by-name/lv/lvmsync/Gemfile
diff --git a/pkgs/tools/backup/lvmsync/Gemfile.lock b/pkgs/by-name/lv/lvmsync/Gemfile.lock
similarity index 100%
rename from pkgs/tools/backup/lvmsync/Gemfile.lock
rename to pkgs/by-name/lv/lvmsync/Gemfile.lock
diff --git a/pkgs/tools/backup/lvmsync/gemset.nix b/pkgs/by-name/lv/lvmsync/gemset.nix
similarity index 100%
rename from pkgs/tools/backup/lvmsync/gemset.nix
rename to pkgs/by-name/lv/lvmsync/gemset.nix
diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/by-name/lv/lvmsync/package.nix
similarity index 100%
rename from pkgs/tools/backup/lvmsync/default.nix
rename to pkgs/by-name/lv/lvmsync/package.nix
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/by-name/lv/lvtk/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/lvtk/default.nix
rename to pkgs/by-name/lv/lvtk/package.nix
diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/by-name/lw/lwan/package.nix
similarity index 100%
rename from pkgs/servers/http/lwan/default.nix
rename to pkgs/by-name/lw/lwan/package.nix
diff --git a/pkgs/tools/misc/lwc/default.nix b/pkgs/by-name/lw/lwc/package.nix
similarity index 100%
rename from pkgs/tools/misc/lwc/default.nix
rename to pkgs/by-name/lw/lwc/package.nix
diff --git a/pkgs/tools/virtualization/lxd-image-server/default.nix b/pkgs/by-name/lx/lxd-image-server/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/lxd-image-server/default.nix
rename to pkgs/by-name/lx/lxd-image-server/package.nix
diff --git a/pkgs/tools/virtualization/lxd-image-server/run.patch b/pkgs/by-name/lx/lxd-image-server/run.patch
similarity index 100%
rename from pkgs/tools/virtualization/lxd-image-server/run.patch
rename to pkgs/by-name/lx/lxd-image-server/run.patch
diff --git a/pkgs/tools/virtualization/lxd-image-server/state.patch b/pkgs/by-name/lx/lxd-image-server/state.patch
similarity index 100%
rename from pkgs/tools/virtualization/lxd-image-server/state.patch
rename to pkgs/by-name/lx/lxd-image-server/state.patch
diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/by-name/lx/lxdvdrip/package.nix
similarity index 100%
rename from pkgs/applications/video/lxdvdrip/default.nix
rename to pkgs/by-name/lx/lxdvdrip/package.nix
diff --git a/pkgs/applications/terminal-emulators/lxterminal/default.nix b/pkgs/by-name/lx/lxterminal/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/lxterminal/default.nix
rename to pkgs/by-name/lx/lxterminal/package.nix
diff --git a/pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/by-name/lx/lxterminal/respect-xml-catalog-files-var.patch
similarity index 100%
rename from pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch
rename to pkgs/by-name/lx/lxterminal/respect-xml-catalog-files-var.patch
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/by-name/ly/lynis/package.nix
similarity index 100%
rename from pkgs/tools/security/lynis/default.nix
rename to pkgs/by-name/ly/lynis/package.nix
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/by-name/ly/lynx/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/lynx/default.nix
rename to pkgs/by-name/ly/lynx/package.nix
diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/by-name/ly/lyra/package.nix
similarity index 100%
rename from pkgs/development/libraries/lyra/default.nix
rename to pkgs/by-name/ly/lyra/package.nix
diff --git a/pkgs/applications/audio/lyrebird/default.nix b/pkgs/by-name/ly/lyrebird/package.nix
similarity index 100%
rename from pkgs/applications/audio/lyrebird/default.nix
rename to pkgs/by-name/ly/lyrebird/package.nix
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/by-name/lz/lz4/package.nix
similarity index 100%
rename from pkgs/tools/compression/lz4/default.nix
rename to pkgs/by-name/lz/lz4/package.nix
diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/by-name/lz/lzbench/package.nix
similarity index 100%
rename from pkgs/tools/compression/lzbench/default.nix
rename to pkgs/by-name/lz/lzbench/package.nix
diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/by-name/lz/lzfse/package.nix
similarity index 100%
rename from pkgs/tools/compression/lzfse/default.nix
rename to pkgs/by-name/lz/lzfse/package.nix
diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/by-name/lz/lzham/package.nix
similarity index 100%
rename from pkgs/tools/compression/lzham/default.nix
rename to pkgs/by-name/lz/lzham/package.nix
diff --git a/pkgs/tools/compression/lzip/lzip-setup-hook.sh b/pkgs/by-name/lz/lzip/lzip-setup-hook.sh
similarity index 100%
rename from pkgs/tools/compression/lzip/lzip-setup-hook.sh
rename to pkgs/by-name/lz/lzip/lzip-setup-hook.sh
diff --git a/pkgs/tools/compression/lzip/mingw-install-exe-file.patch b/pkgs/by-name/lz/lzip/mingw-install-exe-file.patch
similarity index 100%
rename from pkgs/tools/compression/lzip/mingw-install-exe-file.patch
rename to pkgs/by-name/lz/lzip/mingw-install-exe-file.patch
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/by-name/lz/lzip/package.nix
similarity index 100%
rename from pkgs/tools/compression/lzip/default.nix
rename to pkgs/by-name/lz/lzip/package.nix
diff --git a/pkgs/tools/compression/lziprecover/default.nix b/pkgs/by-name/lz/lziprecover/package.nix
similarity index 100%
rename from pkgs/tools/compression/lziprecover/default.nix
rename to pkgs/by-name/lz/lziprecover/package.nix
diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/by-name/lz/lzo/package.nix
similarity index 100%
rename from pkgs/development/libraries/lzo/default.nix
rename to pkgs/by-name/lz/lzo/package.nix
diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/by-name/lz/lzop/package.nix
similarity index 100%
rename from pkgs/tools/compression/lzop/default.nix
rename to pkgs/by-name/lz/lzop/package.nix
diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/by-name/m-/m-cli/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/m-cli/default.nix
rename to pkgs/by-name/m-/m-cli/package.nix
diff --git a/pkgs/applications/radio/m17-cxx-demod/default.nix b/pkgs/by-name/m1/m17-cxx-demod/package.nix
similarity index 100%
rename from pkgs/applications/radio/m17-cxx-demod/default.nix
rename to pkgs/by-name/m1/m17-cxx-demod/package.nix
diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/by-name/m1/m17n_db/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/m17n-db/default.nix
rename to pkgs/by-name/m1/m17n_db/package.nix
diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/by-name/m3/m33-linux/package.nix
similarity index 100%
rename from pkgs/misc/drivers/m33-linux/default.nix
rename to pkgs/by-name/m3/m33-linux/package.nix
diff --git a/pkgs/applications/audio/m4acut/default.nix b/pkgs/by-name/m4/m4acut/package.nix
similarity index 100%
rename from pkgs/applications/audio/m4acut/default.nix
rename to pkgs/by-name/m4/m4acut/package.nix
diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/by-name/m4/m4ri/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/m4ri/default.nix
rename to pkgs/by-name/m4/m4ri/package.nix
diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/by-name/m4/m4rie/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/m4rie/default.nix
rename to pkgs/by-name/m4/m4rie/package.nix
diff --git a/pkgs/tools/system/mac-fdisk/default.nix b/pkgs/by-name/ma/mac-fdisk/package.nix
similarity index 100%
rename from pkgs/tools/system/mac-fdisk/default.nix
rename to pkgs/by-name/ma/mac-fdisk/package.nix
diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/by-name/ma/mac/package.nix
similarity index 100%
rename from pkgs/development/libraries/mac/default.nix
rename to pkgs/by-name/ma/mac/package.nix
diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/by-name/ma/macchanger/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/macchanger/default.nix
rename to pkgs/by-name/ma/macchanger/package.nix
diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/by-name/ma/macchina/package.nix
similarity index 100%
rename from pkgs/tools/misc/macchina/default.nix
rename to pkgs/by-name/ma/macchina/package.nix
diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/by-name/ma/macdylibbundler/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/macdylibbundler/default.nix
rename to pkgs/by-name/ma/macdylibbundler/package.nix
diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/by-name/ma/mackerel-agent/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/mackerel-agent/default.nix
rename to pkgs/by-name/ma/mackerel-agent/package.nix
diff --git a/pkgs/applications/science/biology/macs2/default.nix b/pkgs/by-name/ma/macs2/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/macs2/default.nix
rename to pkgs/by-name/ma/macs2/package.nix
diff --git a/pkgs/applications/science/biology/macse/default.nix b/pkgs/by-name/ma/macse/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/macse/default.nix
rename to pkgs/by-name/ma/macse/package.nix
diff --git a/pkgs/servers/maddy/default.nix b/pkgs/by-name/ma/maddy/package.nix
similarity index 100%
rename from pkgs/servers/maddy/default.nix
rename to pkgs/by-name/ma/maddy/package.nix
diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/by-name/ma/madonctl/package.nix
similarity index 100%
rename from pkgs/applications/misc/madonctl/default.nix
rename to pkgs/by-name/ma/madonctl/package.nix
diff --git a/pkgs/games/maelstrom/c++17-fixes.diff b/pkgs/by-name/ma/maelstrom/c++17-fixes.diff
similarity index 100%
rename from pkgs/games/maelstrom/c++17-fixes.diff
rename to pkgs/by-name/ma/maelstrom/c++17-fixes.diff
diff --git a/pkgs/games/maelstrom/fix-compilation.patch b/pkgs/by-name/ma/maelstrom/fix-compilation.patch
similarity index 100%
rename from pkgs/games/maelstrom/fix-compilation.patch
rename to pkgs/by-name/ma/maelstrom/fix-compilation.patch
diff --git a/pkgs/games/maelstrom/default.nix b/pkgs/by-name/ma/maelstrom/package.nix
similarity index 100%
rename from pkgs/games/maelstrom/default.nix
rename to pkgs/by-name/ma/maelstrom/package.nix
diff --git a/pkgs/development/libraries/maeparser/default.nix b/pkgs/by-name/ma/maeparser/package.nix
similarity index 100%
rename from pkgs/development/libraries/maeparser/default.nix
rename to pkgs/by-name/ma/maeparser/package.nix
diff --git a/pkgs/applications/science/biology/mafft/default.nix b/pkgs/by-name/ma/mafft/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/mafft/default.nix
rename to pkgs/by-name/ma/mafft/package.nix
diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/by-name/ma/mage/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/mage/default.nix
rename to pkgs/by-name/ma/mage/package.nix
diff --git a/pkgs/development/libraries/magic-enum/default.nix b/pkgs/by-name/ma/magic-enum/package.nix
similarity index 100%
rename from pkgs/development/libraries/magic-enum/default.nix
rename to pkgs/by-name/ma/magic-enum/package.nix
diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/by-name/ma/magnetico/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/magnetico/default.nix
rename to pkgs/by-name/ma/magnetico/package.nix
diff --git a/pkgs/applications/emulators/maiko/default.nix b/pkgs/by-name/ma/maiko/package.nix
similarity index 100%
rename from pkgs/applications/emulators/maiko/default.nix
rename to pkgs/by-name/ma/maiko/package.nix
diff --git a/pkgs/data/misc/mailcap/default.nix b/pkgs/by-name/ma/mailcap/package.nix
similarity index 100%
rename from pkgs/data/misc/mailcap/default.nix
rename to pkgs/by-name/ma/mailcap/package.nix
diff --git a/pkgs/applications/networking/mailreaders/mailcheck/mailcheck-Makefile.patch b/pkgs/by-name/ma/mailcheck/mailcheck-Makefile.patch
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mailcheck/mailcheck-Makefile.patch
rename to pkgs/by-name/ma/mailcheck/mailcheck-Makefile.patch
diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/by-name/ma/mailcheck/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mailcheck/default.nix
rename to pkgs/by-name/ma/mailcheck/package.nix
diff --git a/pkgs/tools/networking/maildrop/maildrop.configure.hack.patch b/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch
similarity index 100%
rename from pkgs/tools/networking/maildrop/maildrop.configure.hack.patch
rename to pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch
diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/by-name/ma/maildrop/package.nix
similarity index 100%
rename from pkgs/tools/networking/maildrop/default.nix
rename to pkgs/by-name/ma/maildrop/package.nix
diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/by-name/ma/mailsend/package.nix
similarity index 100%
rename from pkgs/tools/networking/mailsend/default.nix
rename to pkgs/by-name/ma/mailsend/package.nix
diff --git a/pkgs/applications/networking/mailreaders/mailspring/darwin.nix b/pkgs/by-name/ma/mailspring/darwin.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mailspring/darwin.nix
rename to pkgs/by-name/ma/mailspring/darwin.nix
diff --git a/pkgs/applications/networking/mailreaders/mailspring/linux.nix b/pkgs/by-name/ma/mailspring/linux.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mailspring/linux.nix
rename to pkgs/by-name/ma/mailspring/linux.nix
diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/by-name/ma/mailspring/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mailspring/default.nix
rename to pkgs/by-name/ma/mailspring/package.nix
diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/by-name/ma/maim/package.nix
similarity index 100%
rename from pkgs/tools/graphics/maim/default.nix
rename to pkgs/by-name/ma/maim/package.nix
diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/by-name/ma/mainsail/package.nix
similarity index 100%
rename from pkgs/applications/misc/mainsail/default.nix
rename to pkgs/by-name/ma/mainsail/package.nix
diff --git a/pkgs/tools/text/mairix/mmap.patch b/pkgs/by-name/ma/mairix/mmap.patch
similarity index 100%
rename from pkgs/tools/text/mairix/mmap.patch
rename to pkgs/by-name/ma/mairix/mmap.patch
diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/by-name/ma/mairix/package.nix
similarity index 100%
rename from pkgs/tools/text/mairix/default.nix
rename to pkgs/by-name/ma/mairix/package.nix
diff --git a/pkgs/development/tools/maizzle/default.nix b/pkgs/by-name/ma/maizzle/package.nix
similarity index 100%
rename from pkgs/development/tools/maizzle/default.nix
rename to pkgs/by-name/ma/maizzle/package.nix
diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh
rename to pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh
diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix b/pkgs/by-name/ma/makeBinaryWrapper/package.nix
similarity index 100%
rename from pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix
rename to pkgs/by-name/ma/makeBinaryWrapper/package.nix
diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/by-name/ma/makebootfat/package.nix
similarity index 100%
rename from pkgs/tools/misc/makebootfat/default.nix
rename to pkgs/by-name/ma/makebootfat/package.nix
diff --git a/pkgs/development/tools/analysis/makefile2graph/default.nix b/pkgs/by-name/ma/makefile2graph/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/makefile2graph/default.nix
rename to pkgs/by-name/ma/makefile2graph/package.nix
diff --git a/pkgs/tools/misc/maker-panel/default.nix b/pkgs/by-name/ma/maker-panel/package.nix
similarity index 100%
rename from pkgs/tools/misc/maker-panel/default.nix
rename to pkgs/by-name/ma/maker-panel/package.nix
diff --git a/pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch b/pkgs/by-name/ma/maker-panel/update-gerber-types-to-0.3.patch
similarity index 100%
rename from pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch
rename to pkgs/by-name/ma/maker-panel/update-gerber-types-to-0.3.patch
diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/by-name/ma/makerpm/package.nix
similarity index 100%
rename from pkgs/development/tools/makerpm/default.nix
rename to pkgs/by-name/ma/makerpm/package.nix
diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/by-name/ma/makeself/package.nix
similarity index 100%
rename from pkgs/applications/misc/makeself/default.nix
rename to pkgs/by-name/ma/makeself/package.nix
diff --git a/pkgs/development/tools/profiling/malt/default.nix b/pkgs/by-name/ma/malt/package.nix
similarity index 100%
rename from pkgs/development/tools/profiling/malt/default.nix
rename to pkgs/by-name/ma/malt/package.nix
diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/by-name/ma/mamba/package.nix
similarity index 100%
rename from pkgs/applications/audio/mamba/default.nix
rename to pkgs/by-name/ma/mamba/package.nix
diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/by-name/ma/man-db/package.nix
similarity index 100%
rename from pkgs/tools/misc/man-db/default.nix
rename to pkgs/by-name/ma/man-db/package.nix
diff --git a/pkgs/tools/misc/man-db/systemwide-man-db-conf.patch b/pkgs/by-name/ma/man-db/systemwide-man-db-conf.patch
similarity index 100%
rename from pkgs/tools/misc/man-db/systemwide-man-db-conf.patch
rename to pkgs/by-name/ma/man-db/systemwide-man-db-conf.patch
diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/by-name/ma/man-pages-posix/package.nix
similarity index 100%
rename from pkgs/data/documentation/man-pages-posix/default.nix
rename to pkgs/by-name/ma/man-pages-posix/package.nix
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/by-name/ma/man-pages/package.nix
similarity index 100%
rename from pkgs/data/documentation/man-pages/default.nix
rename to pkgs/by-name/ma/man-pages/package.nix
diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/by-name/ma/mandoc/package.nix
similarity index 100%
rename from pkgs/tools/misc/mandoc/default.nix
rename to pkgs/by-name/ma/mandoc/package.nix
diff --git a/pkgs/tools/misc/mandown/default.nix b/pkgs/by-name/ma/mandown/package.nix
similarity index 100%
rename from pkgs/tools/misc/mandown/default.nix
rename to pkgs/by-name/ma/mandown/package.nix
diff --git a/pkgs/tools/misc/manga-cli/default.nix b/pkgs/by-name/ma/manga-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/manga-cli/default.nix
rename to pkgs/by-name/ma/manga-cli/package.nix
diff --git a/pkgs/development/tools/mani/default.nix b/pkgs/by-name/ma/mani/package.nix
similarity index 100%
rename from pkgs/development/tools/mani/default.nix
rename to pkgs/by-name/ma/mani/package.nix
diff --git a/pkgs/development/tools/manifest-tool/default.nix b/pkgs/by-name/ma/manifest-tool/package.nix
similarity index 100%
rename from pkgs/development/tools/manifest-tool/default.nix
rename to pkgs/by-name/ma/manifest-tool/package.nix
diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/by-name/ma/manrope/package.nix
similarity index 100%
rename from pkgs/data/fonts/manrope/default.nix
rename to pkgs/by-name/ma/manrope/package.nix
diff --git a/pkgs/applications/science/biology/manta/default.nix b/pkgs/by-name/ma/manta/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/manta/default.nix
rename to pkgs/by-name/ma/manta/package.nix
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/by-name/ma/manticore/package.nix
similarity index 100%
rename from pkgs/development/compilers/manticore/default.nix
rename to pkgs/by-name/ma/manticore/package.nix
diff --git a/pkgs/tools/security/mantra/default.nix b/pkgs/by-name/ma/mantra/package.nix
similarity index 100%
rename from pkgs/tools/security/mantra/default.nix
rename to pkgs/by-name/ma/mantra/package.nix
diff --git a/pkgs/tools/misc/map/default.nix b/pkgs/by-name/ma/map-cmd/package.nix
similarity index 100%
rename from pkgs/tools/misc/map/default.nix
rename to pkgs/by-name/ma/map-cmd/package.nix
diff --git a/pkgs/tools/misc/mapcidr/default.nix b/pkgs/by-name/ma/mapcidr/package.nix
similarity index 100%
rename from pkgs/tools/misc/mapcidr/default.nix
rename to pkgs/by-name/ma/mapcidr/package.nix
diff --git a/pkgs/games/mar1d/default.nix b/pkgs/by-name/ma/mar1d/package.nix
similarity index 100%
rename from pkgs/games/mar1d/default.nix
rename to pkgs/by-name/ma/mar1d/package.nix
diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/by-name/ma/marathi-cursive/package.nix
similarity index 100%
rename from pkgs/data/fonts/marathi-cursive/default.nix
rename to pkgs/by-name/ma/marathi-cursive/package.nix
diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/by-name/ma/marathonctl/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/marathonctl/default.nix
rename to pkgs/by-name/ma/marathonctl/package.nix
diff --git a/pkgs/games/marble-marcher-ce/default.nix b/pkgs/by-name/ma/marble-marcher-ce/package.nix
similarity index 100%
rename from pkgs/games/marble-marcher-ce/default.nix
rename to pkgs/by-name/ma/marble-marcher-ce/package.nix
diff --git a/pkgs/games/mari0/default.nix b/pkgs/by-name/ma/mari0/package.nix
similarity index 100%
rename from pkgs/games/mari0/default.nix
rename to pkgs/by-name/ma/mari0/package.nix
diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/by-name/ma/marisa/package.nix
similarity index 100%
rename from pkgs/development/libraries/marisa/default.nix
rename to pkgs/by-name/ma/marisa/package.nix
diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/by-name/ma/mark/package.nix
similarity index 100%
rename from pkgs/tools/text/mark/default.nix
rename to pkgs/by-name/ma/mark/package.nix
diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/by-name/ma/markdown-anki-decks/package.nix
similarity index 100%
rename from pkgs/tools/misc/markdown-anki-decks/default.nix
rename to pkgs/by-name/ma/markdown-anki-decks/package.nix
diff --git a/pkgs/tools/text/markdownlint-cli/default.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix
similarity index 100%
rename from pkgs/tools/text/markdownlint-cli/default.nix
rename to pkgs/by-name/ma/markdownlint-cli/package.nix
diff --git a/pkgs/tools/text/markdownlint-cli2/default.nix b/pkgs/by-name/ma/markdownlint-cli2/package.nix
similarity index 100%
rename from pkgs/tools/text/markdownlint-cli2/default.nix
rename to pkgs/by-name/ma/markdownlint-cli2/package.nix
diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/by-name/ma/marker/package.nix
similarity index 100%
rename from pkgs/applications/editors/marker/default.nix
rename to pkgs/by-name/ma/marker/package.nix
diff --git a/pkgs/applications/misc/markets/default.nix b/pkgs/by-name/ma/markets/package.nix
similarity index 100%
rename from pkgs/applications/misc/markets/default.nix
rename to pkgs/by-name/ma/markets/package.nix
diff --git a/pkgs/tools/text/markscribe/default.nix b/pkgs/by-name/ma/markscribe/package.nix
similarity index 100%
rename from pkgs/tools/text/markscribe/default.nix
rename to pkgs/by-name/ma/markscribe/package.nix
diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/by-name/ma/marktext/package.nix
similarity index 100%
rename from pkgs/applications/misc/marktext/default.nix
rename to pkgs/by-name/ma/marktext/package.nix
diff --git a/pkgs/development/libraries/marl/default.nix b/pkgs/by-name/ma/marl/package.nix
similarity index 100%
rename from pkgs/development/libraries/marl/default.nix
rename to pkgs/by-name/ma/marl/package.nix
diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/pkgs/by-name/ma/marlin-calc/package.nix
similarity index 100%
rename from pkgs/tools/misc/marlin-calc/default.nix
rename to pkgs/by-name/ma/marlin-calc/package.nix
diff --git a/pkgs/tools/typesetting/marp/default.nix b/pkgs/by-name/ma/marp-cli/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/marp/default.nix
rename to pkgs/by-name/ma/marp-cli/package.nix
diff --git a/pkgs/development/tools/mars-mips/default.nix b/pkgs/by-name/ma/mars-mips/package.nix
similarity index 100%
rename from pkgs/development/tools/mars-mips/default.nix
rename to pkgs/by-name/ma/mars-mips/package.nix
diff --git a/pkgs/games/mars/default.nix b/pkgs/by-name/ma/mars/package.nix
similarity index 100%
rename from pkgs/games/mars/default.nix
rename to pkgs/by-name/ma/mars/package.nix
diff --git a/pkgs/data/fonts/martian-mono/default.nix b/pkgs/by-name/ma/martian-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/martian-mono/default.nix
rename to pkgs/by-name/ma/martian-mono/package.nix
diff --git a/pkgs/os-specific/darwin/mas/default.nix b/pkgs/by-name/ma/mas/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/mas/default.nix
rename to pkgs/by-name/ma/mas/package.nix
diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/by-name/ma/mask/package.nix
similarity index 100%
rename from pkgs/development/tools/mask/default.nix
rename to pkgs/by-name/ma/mask/package.nix
diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/by-name/ma/masscan/package.nix
similarity index 100%
rename from pkgs/tools/security/masscan/default.nix
rename to pkgs/by-name/ma/masscan/package.nix
diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/by-name/ma/massren/package.nix
similarity index 100%
rename from pkgs/tools/misc/massren/default.nix
rename to pkgs/by-name/ma/massren/package.nix
diff --git a/pkgs/tools/backup/mastodon-archive/default.nix b/pkgs/by-name/ma/mastodon-archive/package.nix
similarity index 100%
rename from pkgs/tools/backup/mastodon-archive/default.nix
rename to pkgs/by-name/ma/mastodon-archive/package.nix
diff --git a/pkgs/tools/misc/mastotool/default.nix b/pkgs/by-name/ma/mastotool/package.nix
similarity index 100%
rename from pkgs/tools/misc/mastotool/default.nix
rename to pkgs/by-name/ma/mastotool/package.nix
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/by-name/ma/matcha-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/matcha/default.nix
rename to pkgs/by-name/ma/matcha-gtk-theme/package.nix
diff --git a/pkgs/applications/misc/matcha-rss-digest/default.nix b/pkgs/by-name/ma/matcha-rss-digest/package.nix
similarity index 100%
rename from pkgs/applications/misc/matcha-rss-digest/default.nix
rename to pkgs/by-name/ma/matcha-rss-digest/package.nix
diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/by-name/ma/matchbox/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/matchbox/default.nix
rename to pkgs/by-name/ma/matchbox/package.nix
diff --git a/pkgs/data/themes/materia-kde/default.nix b/pkgs/by-name/ma/materia-kde-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/materia-kde/default.nix
rename to pkgs/by-name/ma/materia-kde-theme/package.nix
diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/by-name/ma/materia-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/materia-theme/default.nix
rename to pkgs/by-name/ma/materia-theme/package.nix
diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/by-name/ma/material-design-icons/package.nix
similarity index 100%
rename from pkgs/data/fonts/material-design-icons/default.nix
rename to pkgs/by-name/ma/material-design-icons/package.nix
diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/by-name/ma/material-icons/package.nix
similarity index 100%
rename from pkgs/data/fonts/material-icons/default.nix
rename to pkgs/by-name/ma/material-icons/package.nix
diff --git a/pkgs/data/fonts/material-symbols/default.nix b/pkgs/by-name/ma/material-symbols/package.nix
similarity index 100%
rename from pkgs/data/fonts/material-symbols/default.nix
rename to pkgs/by-name/ma/material-symbols/package.nix
diff --git a/pkgs/tools/text/math-review/default.nix b/pkgs/by-name/ma/math-preview/package.nix
similarity index 100%
rename from pkgs/tools/text/math-review/default.nix
rename to pkgs/by-name/ma/math-preview/package.nix
diff --git a/pkgs/development/libraries/mathgl/default.nix b/pkgs/by-name/ma/mathgl/package.nix
similarity index 100%
rename from pkgs/development/libraries/mathgl/default.nix
rename to pkgs/by-name/ma/mathgl/package.nix
diff --git a/pkgs/tools/misc/mathpix-snipping-tool/default.nix b/pkgs/by-name/ma/mathpix-snipping-tool/package.nix
similarity index 100%
rename from pkgs/tools/misc/mathpix-snipping-tool/default.nix
rename to pkgs/by-name/ma/mathpix-snipping-tool/package.nix
diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/by-name/ma/matio/package.nix
similarity index 100%
rename from pkgs/development/libraries/matio/default.nix
rename to pkgs/by-name/ma/matio/package.nix
diff --git a/pkgs/servers/monitoring/matrix-alertmanager/default.nix b/pkgs/by-name/ma/matrix-alertmanager/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/matrix-alertmanager/default.nix
rename to pkgs/by-name/ma/matrix-alertmanager/package.nix
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/by-name/ma/matrix-appservice-irc/package.nix
similarity index 100%
rename from pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
rename to pkgs/by-name/ma/matrix-appservice-irc/package.nix
diff --git a/pkgs/servers/matrix-conduit/Cargo.lock b/pkgs/by-name/ma/matrix-conduit/Cargo.lock
similarity index 100%
rename from pkgs/servers/matrix-conduit/Cargo.lock
rename to pkgs/by-name/ma/matrix-conduit/Cargo.lock
diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/by-name/ma/matrix-conduit/package.nix
similarity index 100%
rename from pkgs/servers/matrix-conduit/default.nix
rename to pkgs/by-name/ma/matrix-conduit/package.nix
diff --git a/pkgs/servers/matrix-corporal/default.nix b/pkgs/by-name/ma/matrix-corporal/package.nix
similarity index 100%
rename from pkgs/servers/matrix-corporal/default.nix
rename to pkgs/by-name/ma/matrix-corporal/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/by-name/ma/matrix-dl/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
rename to pkgs/by-name/ma/matrix-dl/package.nix
diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/by-name/ma/matrix-hookshot/package.json
similarity index 100%
rename from pkgs/servers/matrix-synapse/matrix-hookshot/package.json
rename to pkgs/by-name/ma/matrix-hookshot/package.json
diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/pkgs/by-name/ma/matrix-hookshot/package.nix
similarity index 100%
rename from pkgs/servers/matrix-synapse/matrix-hookshot/default.nix
rename to pkgs/by-name/ma/matrix-hookshot/package.nix
diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/by-name/ma/matrix-hookshot/pin.json
similarity index 100%
rename from pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
rename to pkgs/by-name/ma/matrix-hookshot/pin.json
diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/update.sh b/pkgs/by-name/ma/matrix-hookshot/update.sh
similarity index 100%
rename from pkgs/servers/matrix-synapse/matrix-hookshot/update.sh
rename to pkgs/by-name/ma/matrix-hookshot/update.sh
diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
rename to pkgs/by-name/ma/mattermost-desktop/package.nix
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/by-name/ma/maude/package.nix
similarity index 100%
rename from pkgs/development/interpreters/maude/default.nix
rename to pkgs/by-name/ma/maude/package.nix
diff --git a/pkgs/servers/mautrix-discord/default.nix b/pkgs/by-name/ma/mautrix-discord/package.nix
similarity index 100%
rename from pkgs/servers/mautrix-discord/default.nix
rename to pkgs/by-name/ma/mautrix-discord/package.nix
diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/by-name/ma/mautrix-facebook/package.nix
similarity index 100%
rename from pkgs/servers/mautrix-facebook/default.nix
rename to pkgs/by-name/ma/mautrix-facebook/package.nix
diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/by-name/ma/mautrix-googlechat/package.nix
similarity index 100%
rename from pkgs/servers/mautrix-googlechat/default.nix
rename to pkgs/by-name/ma/mautrix-googlechat/package.nix
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix
similarity index 100%
rename from pkgs/servers/mautrix-whatsapp/default.nix
rename to pkgs/by-name/ma/mautrix-whatsapp/package.nix
diff --git a/pkgs/tools/archivers/maxcso/default.nix b/pkgs/by-name/ma/maxcso/package.nix
similarity index 100%
rename from pkgs/tools/archivers/maxcso/default.nix
rename to pkgs/by-name/ma/maxcso/package.nix
diff --git a/pkgs/development/libraries/maxflow/default.nix b/pkgs/by-name/ma/maxflow/package.nix
similarity index 100%
rename from pkgs/development/libraries/maxflow/default.nix
rename to pkgs/by-name/ma/maxflow/package.nix
diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/by-name/ma/maxlib/package.nix
similarity index 100%
rename from pkgs/applications/audio/pd-plugins/maxlib/default.nix
rename to pkgs/by-name/ma/maxlib/package.nix
diff --git a/pkgs/tools/text/mb2md/default.nix b/pkgs/by-name/mb/mb2md/package.nix
similarity index 100%
rename from pkgs/tools/text/mb2md/default.nix
rename to pkgs/by-name/mb/mb2md/package.nix
diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/by-name/mb/mbed-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/mbed-cli/default.nix
rename to pkgs/by-name/mb/mbed-cli/package.nix
diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/by-name/mb/mbelib/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/mbelib/default.nix
rename to pkgs/by-name/mb/mbelib/package.nix
diff --git a/pkgs/tools/networking/mbidled/default.nix b/pkgs/by-name/mb/mbidled/package.nix
similarity index 100%
rename from pkgs/tools/networking/mbidled/default.nix
rename to pkgs/by-name/mb/mbidled/package.nix
diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/by-name/mb/mblaze/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mblaze/default.nix
rename to pkgs/by-name/mb/mblaze/package.nix
diff --git a/pkgs/development/tools/mblock-mlink/default.nix b/pkgs/by-name/mb/mblock-mlink/package.nix
similarity index 100%
rename from pkgs/development/tools/mblock-mlink/default.nix
rename to pkgs/by-name/mb/mblock-mlink/package.nix
diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/by-name/mb/mbpfan/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/mbpfan/default.nix
rename to pkgs/by-name/mb/mbpfan/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/by-name/mc/mcabber/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/mcabber/default.nix
rename to pkgs/by-name/mc/mcabber/package.nix
diff --git a/pkgs/os-specific/linux/mceinject/default.nix b/pkgs/by-name/mc/mceinject/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/mceinject/default.nix
rename to pkgs/by-name/mc/mceinject/package.nix
diff --git a/pkgs/games/mchprs/Cargo.lock b/pkgs/by-name/mc/mchprs/Cargo.lock
similarity index 100%
rename from pkgs/games/mchprs/Cargo.lock
rename to pkgs/by-name/mc/mchprs/Cargo.lock
diff --git a/pkgs/games/mchprs/default.nix b/pkgs/by-name/mc/mchprs/package.nix
similarity index 100%
rename from pkgs/games/mchprs/default.nix
rename to pkgs/by-name/mc/mchprs/package.nix
diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/by-name/mc/mcrcon/package.nix
similarity index 100%
rename from pkgs/tools/networking/mcrcon/default.nix
rename to pkgs/by-name/mc/mcrcon/package.nix
diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/by-name/mc/mcrl2/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/mcrl2/default.nix
rename to pkgs/by-name/mc/mcrl2/package.nix
diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/by-name/mc/mcron/package.nix
similarity index 100%
rename from pkgs/tools/system/mcron/default.nix
rename to pkgs/by-name/mc/mcron/package.nix
diff --git a/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch b/pkgs/by-name/mc/mcrypt/format-string_CVE-2012-4426.patch
similarity index 100%
rename from pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch
rename to pkgs/by-name/mc/mcrypt/format-string_CVE-2012-4426.patch
diff --git a/pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch b/pkgs/by-name/mc/mcrypt/malloc_to_stdlib.patch
similarity index 100%
rename from pkgs/tools/misc/mcrypt/malloc_to_stdlib.patch
rename to pkgs/by-name/mc/mcrypt/malloc_to_stdlib.patch
diff --git a/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch b/pkgs/by-name/mc/mcrypt/overflow_CVE-2012-4409.patch
similarity index 100%
rename from pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch
rename to pkgs/by-name/mc/mcrypt/overflow_CVE-2012-4409.patch
diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/by-name/mc/mcrypt/package.nix
similarity index 100%
rename from pkgs/tools/misc/mcrypt/default.nix
rename to pkgs/by-name/mc/mcrypt/package.nix
diff --git a/pkgs/tools/misc/mcrypt/segv.patch b/pkgs/by-name/mc/mcrypt/segv.patch
similarity index 100%
rename from pkgs/tools/misc/mcrypt/segv.patch
rename to pkgs/by-name/mc/mcrypt/segv.patch
diff --git a/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch b/pkgs/by-name/mc/mcrypt/sprintf_CVE-2012-4527.patch
similarity index 100%
rename from pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch
rename to pkgs/by-name/mc/mcrypt/sprintf_CVE-2012-4527.patch
diff --git a/pkgs/development/libraries/science/chemistry/mctc-lib/default.nix b/pkgs/by-name/mc/mctc-lib/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/mctc-lib/default.nix
rename to pkgs/by-name/mc/mctc-lib/package.nix
diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/by-name/mc/mcy/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/mcy/default.nix
rename to pkgs/by-name/mc/mcy/package.nix
diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/by-name/md/mda_lv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/mda-lv2/default.nix
rename to pkgs/by-name/md/mda_lv2/package.nix
diff --git a/pkgs/os-specific/linux/mdadm/fix-hardcoded-mapdir.patch b/pkgs/by-name/md/mdadm4/fix-hardcoded-mapdir.patch
similarity index 100%
rename from pkgs/os-specific/linux/mdadm/fix-hardcoded-mapdir.patch
rename to pkgs/by-name/md/mdadm4/fix-hardcoded-mapdir.patch
diff --git a/pkgs/os-specific/linux/mdadm/no-self-references.patch b/pkgs/by-name/md/mdadm4/no-self-references.patch
similarity index 100%
rename from pkgs/os-specific/linux/mdadm/no-self-references.patch
rename to pkgs/by-name/md/mdadm4/no-self-references.patch
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/by-name/md/mdadm4/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/mdadm/default.nix
rename to pkgs/by-name/md/mdadm4/package.nix
diff --git a/pkgs/tools/text/mdbook-cmdrun/default.nix b/pkgs/by-name/md/mdbook-cmdrun/package.nix
similarity index 100%
rename from pkgs/tools/text/mdbook-cmdrun/default.nix
rename to pkgs/by-name/md/mdbook-cmdrun/package.nix
diff --git a/pkgs/tools/text/mdbook-emojicodes/default.nix b/pkgs/by-name/md/mdbook-emojicodes/package.nix
similarity index 100%
rename from pkgs/tools/text/mdbook-emojicodes/default.nix
rename to pkgs/by-name/md/mdbook-emojicodes/package.nix
diff --git a/pkgs/tools/text/mdbook-i18n-helpers/default.nix b/pkgs/by-name/md/mdbook-i18n-helpers/package.nix
similarity index 100%
rename from pkgs/tools/text/mdbook-i18n-helpers/default.nix
rename to pkgs/by-name/md/mdbook-i18n-helpers/package.nix
diff --git a/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
similarity index 100%
rename from pkgs/tools/text/mdbook-kroki-preprocessor/default.nix
rename to pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix
diff --git a/pkgs/tools/text/mdbook-man/default.nix b/pkgs/by-name/md/mdbook-man/package.nix
similarity index 100%
rename from pkgs/tools/text/mdbook-man/default.nix
rename to pkgs/by-name/md/mdbook-man/package.nix
diff --git a/pkgs/tools/text/mdbook-open-on-gh/default.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix
similarity index 100%
rename from pkgs/tools/text/mdbook-open-on-gh/default.nix
rename to pkgs/by-name/md/mdbook-open-on-gh/package.nix
diff --git a/pkgs/tools/text/mdbook-pagetoc/default.nix b/pkgs/by-name/md/mdbook-pagetoc/package.nix
similarity index 100%
rename from pkgs/tools/text/mdbook-pagetoc/default.nix
rename to pkgs/by-name/md/mdbook-pagetoc/package.nix
diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/by-name/md/mdbtools/package.nix
similarity index 100%
rename from pkgs/tools/misc/mdbtools/default.nix
rename to pkgs/by-name/md/mdbtools/package.nix
diff --git a/pkgs/development/tools/misc/mdctags/default.nix b/pkgs/by-name/md/mdctags/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/mdctags/default.nix
rename to pkgs/by-name/md/mdctags/package.nix
diff --git a/pkgs/os-specific/linux/mdevctl/default.nix b/pkgs/by-name/md/mdevctl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/mdevctl/default.nix
rename to pkgs/by-name/md/mdevctl/package.nix
diff --git a/pkgs/tools/cd-dvd/mdf2iso/default.nix b/pkgs/by-name/md/mdf2iso/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/mdf2iso/default.nix
rename to pkgs/by-name/md/mdf2iso/package.nix
diff --git a/pkgs/tools/text/mdhtml/default.nix b/pkgs/by-name/md/mdhtml/package.nix
similarity index 100%
rename from pkgs/tools/text/mdhtml/default.nix
rename to pkgs/by-name/md/mdhtml/package.nix
diff --git a/pkgs/development/libraries/mdk-sdk/default.nix b/pkgs/by-name/md/mdk-sdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/mdk-sdk/default.nix
rename to pkgs/by-name/md/mdk-sdk/package.nix
diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/by-name/md/mdk/package.nix
similarity index 100%
rename from pkgs/development/tools/mdk/default.nix
rename to pkgs/by-name/md/mdk/package.nix
diff --git a/pkgs/tools/networking/mdk4/default.nix b/pkgs/by-name/md/mdk4/package.nix
similarity index 100%
rename from pkgs/tools/networking/mdk4/default.nix
rename to pkgs/by-name/md/mdk4/package.nix
diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/by-name/md/mdp/package.nix
similarity index 100%
rename from pkgs/applications/misc/mdp/default.nix
rename to pkgs/by-name/md/mdp/package.nix
diff --git a/pkgs/tools/misc/mdr/default.nix b/pkgs/by-name/md/mdr/package.nix
similarity index 100%
rename from pkgs/tools/misc/mdr/default.nix
rename to pkgs/by-name/md/mdr/package.nix
diff --git a/pkgs/tools/misc/mdslides/default.nix b/pkgs/by-name/md/mdslides/package.nix
similarity index 100%
rename from pkgs/tools/misc/mdslides/default.nix
rename to pkgs/by-name/md/mdslides/package.nix
diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/by-name/me/me_cleaner/package.nix
similarity index 100%
rename from pkgs/tools/misc/me_cleaner/default.nix
rename to pkgs/by-name/me/me_cleaner/package.nix
diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/by-name/me/media-player-info/package.nix
similarity index 100%
rename from pkgs/data/misc/media-player-info/default.nix
rename to pkgs/by-name/me/media-player-info/package.nix
diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/by-name/me/mediathekview/package.nix
similarity index 100%
rename from pkgs/applications/video/mediathekview/default.nix
rename to pkgs/by-name/me/mediathekview/package.nix
diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/by-name/me/mediawiki/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/mediawiki/default.nix
rename to pkgs/by-name/me/mediawiki/package.nix
diff --git a/pkgs/tools/system/mediawriter/default.nix b/pkgs/by-name/me/mediawriter/package.nix
similarity index 100%
rename from pkgs/tools/system/mediawriter/default.nix
rename to pkgs/by-name/me/mediawriter/package.nix
diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/by-name/me/medio/package.nix
similarity index 100%
rename from pkgs/data/fonts/medio/default.nix
rename to pkgs/by-name/me/medio/package.nix
diff --git a/pkgs/tools/security/medusa/default.nix b/pkgs/by-name/me/medusa/package.nix
similarity index 100%
rename from pkgs/tools/security/medusa/default.nix
rename to pkgs/by-name/me/medusa/package.nix
diff --git a/pkgs/tools/networking/meek/default.nix b/pkgs/by-name/me/meek/package.nix
similarity index 100%
rename from pkgs/tools/networking/meek/default.nix
rename to pkgs/by-name/me/meek/package.nix
diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/by-name/me/megacli/package.nix
similarity index 100%
rename from pkgs/tools/misc/megacli/default.nix
rename to pkgs/by-name/me/megacli/package.nix
diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/by-name/me/megacmd/package.nix
similarity index 100%
rename from pkgs/applications/misc/megacmd/default.nix
rename to pkgs/by-name/me/megacmd/package.nix
diff --git a/pkgs/games/megaglest/default.nix b/pkgs/by-name/me/megaglest/package.nix
similarity index 100%
rename from pkgs/games/megaglest/default.nix
rename to pkgs/by-name/me/megaglest/package.nix
diff --git a/pkgs/applications/science/biology/megahit/default.nix b/pkgs/by-name/me/megahit/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/megahit/default.nix
rename to pkgs/by-name/me/megahit/package.nix
diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/by-name/me/meh/package.nix
similarity index 100%
rename from pkgs/applications/graphics/meh/default.nix
rename to pkgs/by-name/me/meh/package.nix
diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/by-name/me/mela/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/mela/default.nix
rename to pkgs/by-name/me/mela/package.nix
diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/by-name/me/melange/package.nix
similarity index 100%
rename from pkgs/development/tools/melange/default.nix
rename to pkgs/by-name/me/melange/package.nix
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/by-name/me/meld/package.nix
similarity index 100%
rename from pkgs/applications/version-management/meld/default.nix
rename to pkgs/by-name/me/meld/package.nix
diff --git a/pkgs/data/fonts/melete/default.nix b/pkgs/by-name/me/melete/package.nix
similarity index 100%
rename from pkgs/data/fonts/melete/default.nix
rename to pkgs/by-name/me/melete/package.nix
diff --git a/pkgs/tools/misc/melody/default.nix b/pkgs/by-name/me/melody/package.nix
similarity index 100%
rename from pkgs/tools/misc/melody/default.nix
rename to pkgs/by-name/me/melody/package.nix
diff --git a/pkgs/tools/security/melt/default.nix b/pkgs/by-name/me/melt/package.nix
similarity index 100%
rename from pkgs/tools/security/melt/default.nix
rename to pkgs/by-name/me/melt/package.nix
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/by-name/me/memcached/package.nix
similarity index 100%
rename from pkgs/servers/memcached/default.nix
rename to pkgs/by-name/me/memcached/package.nix
diff --git a/pkgs/servers/web-apps/meme-bingo-web/default.nix b/pkgs/by-name/me/meme-bingo-web/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/meme-bingo-web/default.nix
rename to pkgs/by-name/me/meme-bingo-web/package.nix
diff --git a/pkgs/applications/graphics/meme-image-generator/default.nix b/pkgs/by-name/me/meme-image-generator/package.nix
similarity index 100%
rename from pkgs/applications/graphics/meme-image-generator/default.nix
rename to pkgs/by-name/me/meme-image-generator/package.nix
diff --git a/pkgs/applications/science/biology/meme-suite/default.nix b/pkgs/by-name/me/meme-suite/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/meme-suite/default.nix
rename to pkgs/by-name/me/meme-suite/package.nix
diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/by-name/me/memo/package.nix
similarity index 100%
rename from pkgs/applications/misc/memo/default.nix
rename to pkgs/by-name/me/memo/package.nix
diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/by-name/me/memray/package.nix
similarity index 100%
rename from pkgs/development/tools/memray/default.nix
rename to pkgs/by-name/me/memray/package.nix
diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/by-name/me/memtest86-efi/package.nix
similarity index 100%
rename from pkgs/tools/misc/memtest86-efi/default.nix
rename to pkgs/by-name/me/memtest86-efi/package.nix
diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/by-name/me/memtest86plus/package.nix
similarity index 100%
rename from pkgs/tools/misc/memtest86+/default.nix
rename to pkgs/by-name/me/memtest86plus/package.nix
diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/by-name/me/memtester/package.nix
similarity index 100%
rename from pkgs/tools/system/memtester/default.nix
rename to pkgs/by-name/me/memtester/package.nix
diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/by-name/me/memtier-benchmark/package.nix
similarity index 100%
rename from pkgs/tools/networking/memtier-benchmark/default.nix
rename to pkgs/by-name/me/memtier-benchmark/package.nix
diff --git a/pkgs/applications/misc/mencal/default.nix b/pkgs/by-name/me/mencal/package.nix
similarity index 100%
rename from pkgs/applications/misc/mencal/default.nix
rename to pkgs/by-name/me/mencal/package.nix
diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/by-name/me/menu-cache/package.nix
similarity index 100%
rename from pkgs/development/libraries/menu-cache/default.nix
rename to pkgs/by-name/me/menu-cache/package.nix
diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/by-name/me/menumaker/package.nix
similarity index 100%
rename from pkgs/applications/misc/menumaker/default.nix
rename to pkgs/by-name/me/menumaker/package.nix
diff --git a/pkgs/applications/misc/mepo/default.nix b/pkgs/by-name/me/mepo/package.nix
similarity index 100%
rename from pkgs/applications/misc/mepo/default.nix
rename to pkgs/by-name/me/mepo/package.nix
diff --git a/pkgs/servers/http/merecat/default.nix b/pkgs/by-name/me/merecat/package.nix
similarity index 100%
rename from pkgs/servers/http/merecat/default.nix
rename to pkgs/by-name/me/merecat/package.nix
diff --git a/pkgs/tools/misc/mermaid-filter/default.nix b/pkgs/by-name/me/mermaid-filter/package.nix
similarity index 100%
rename from pkgs/tools/misc/mermaid-filter/default.nix
rename to pkgs/by-name/me/mermaid-filter/package.nix
diff --git a/pkgs/development/tools/database/mermerd/default.nix b/pkgs/by-name/me/mermerd/package.nix
similarity index 100%
rename from pkgs/development/tools/database/mermerd/default.nix
rename to pkgs/by-name/me/mermerd/package.nix
diff --git a/pkgs/data/fonts/merriweather-sans/default.nix b/pkgs/by-name/me/merriweather-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/merriweather-sans/default.nix
rename to pkgs/by-name/me/merriweather-sans/package.nix
diff --git a/pkgs/data/fonts/merriweather/default.nix b/pkgs/by-name/me/merriweather/package.nix
similarity index 100%
rename from pkgs/data/fonts/merriweather/default.nix
rename to pkgs/by-name/me/merriweather/package.nix
diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/by-name/me/mesa-demos/package.nix
similarity index 100%
rename from pkgs/tools/graphics/mesa-demos/default.nix
rename to pkgs/by-name/me/mesa-demos/package.nix
diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/by-name/me/mesa_glu/package.nix
similarity index 100%
rename from pkgs/development/libraries/mesa-glu/default.nix
rename to pkgs/by-name/me/mesa_glu/package.nix
diff --git a/pkgs/development/libraries/meshoptimizer/default.nix b/pkgs/by-name/me/meshoptimizer/package.nix
similarity index 100%
rename from pkgs/development/libraries/meshoptimizer/default.nix
rename to pkgs/by-name/me/meshoptimizer/package.nix
diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/by-name/me/meslo-lg/package.nix
similarity index 100%
rename from pkgs/data/fonts/meslo-lg/default.nix
rename to pkgs/by-name/me/meslo-lg/package.nix
diff --git a/pkgs/data/fonts/meslo-lgs-nf/default.nix b/pkgs/by-name/me/meslo-lgs-nf/package.nix
similarity index 100%
rename from pkgs/data/fonts/meslo-lgs-nf/default.nix
rename to pkgs/by-name/me/meslo-lgs-nf/package.nix
diff --git a/pkgs/misc/meson-tools/default.nix b/pkgs/by-name/me/meson-tools/package.nix
similarity index 100%
rename from pkgs/misc/meson-tools/default.nix
rename to pkgs/by-name/me/meson-tools/package.nix
diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/by-name/me/messer-slim/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/messer-slim/default.nix
rename to pkgs/by-name/me/messer-slim/package.nix
diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/by-name/me/metaBuildEnv/package.nix
similarity index 100%
rename from pkgs/development/compilers/meta-environment/meta-build-env/default.nix
rename to pkgs/by-name/me/metaBuildEnv/package.nix
diff --git a/pkgs/tools/security/metabigor/default.nix b/pkgs/by-name/me/metabigor/package.nix
similarity index 100%
rename from pkgs/tools/security/metabigor/default.nix
rename to pkgs/by-name/me/metabigor/package.nix
diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/by-name/me/metadata-cleaner/package.nix
similarity index 100%
rename from pkgs/applications/misc/metadata-cleaner/default.nix
rename to pkgs/by-name/me/metadata-cleaner/package.nix
diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/by-name/me/metal-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/metal-cli/default.nix
rename to pkgs/by-name/me/metal-cli/package.nix
diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/by-name/me/metals/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/metals/default.nix
rename to pkgs/by-name/me/metals/package.nix
diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/by-name/me/metamath/package.nix
similarity index 100%
rename from pkgs/development/interpreters/metamath/default.nix
rename to pkgs/by-name/me/metamath/package.nix
diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/by-name/me/metamorphose2/package.nix
similarity index 100%
rename from pkgs/applications/misc/metamorphose2/default.nix
rename to pkgs/by-name/me/metamorphose2/package.nix
diff --git a/pkgs/tools/graphics/metapixel/default.nix b/pkgs/by-name/me/metapixel/package.nix
similarity index 100%
rename from pkgs/tools/graphics/metapixel/default.nix
rename to pkgs/by-name/me/metapixel/package.nix
diff --git a/pkgs/applications/misc/metar/default.nix b/pkgs/by-name/me/metar/package.nix
similarity index 100%
rename from pkgs/applications/misc/metar/default.nix
rename to pkgs/by-name/me/metar/package.nix
diff --git a/pkgs/os-specific/linux/metastore/default.nix b/pkgs/by-name/me/metastore/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/metastore/default.nix
rename to pkgs/by-name/me/metastore/package.nix
diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/by-name/me/meteo/package.nix
similarity index 100%
rename from pkgs/applications/networking/weather/meteo/default.nix
rename to pkgs/by-name/me/meteo/package.nix
diff --git a/pkgs/servers/meteor/main.patch b/pkgs/by-name/me/meteor/main.patch
similarity index 100%
rename from pkgs/servers/meteor/main.patch
rename to pkgs/by-name/me/meteor/main.patch
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/by-name/me/meteor/package.nix
similarity index 100%
rename from pkgs/servers/meteor/default.nix
rename to pkgs/by-name/me/meteor/package.nix
diff --git a/pkgs/applications/audio/meterbridge/buf_rect.patch b/pkgs/by-name/me/meterbridge/buf_rect.patch
similarity index 100%
rename from pkgs/applications/audio/meterbridge/buf_rect.patch
rename to pkgs/by-name/me/meterbridge/buf_rect.patch
diff --git a/pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch b/pkgs/by-name/me/meterbridge/fix_build_with_gcc-5.patch
similarity index 100%
rename from pkgs/applications/audio/meterbridge/fix_build_with_gcc-5.patch
rename to pkgs/by-name/me/meterbridge/fix_build_with_gcc-5.patch
diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/by-name/me/meterbridge/package.nix
similarity index 100%
rename from pkgs/applications/audio/meterbridge/default.nix
rename to pkgs/by-name/me/meterbridge/package.nix
diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/by-name/me/metersLv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/meters_lv2/default.nix
rename to pkgs/by-name/me/metersLv2/package.nix
diff --git a/pkgs/games/methane/default.nix b/pkgs/by-name/me/methane/package.nix
similarity index 100%
rename from pkgs/games/methane/default.nix
rename to pkgs/by-name/me/methane/package.nix
diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/by-name/me/metis-prover/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/metis-prover/default.nix
rename to pkgs/by-name/me/metis-prover/package.nix
diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/by-name/me/metis/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/metis/default.nix
rename to pkgs/by-name/me/metis/package.nix
diff --git a/pkgs/misc/cups/drivers/brother/mfc465cncupswrapper/default.nix b/pkgs/by-name/mf/mfc465cncupswrapper/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/brother/mfc465cncupswrapper/default.nix
rename to pkgs/by-name/mf/mfc465cncupswrapper/package.nix
diff --git a/pkgs/misc/cups/drivers/brother/mfc465cnlpr/default.nix b/pkgs/by-name/mf/mfc465cnlpr/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/brother/mfc465cnlpr/default.nix
rename to pkgs/by-name/mf/mfc465cnlpr/package.nix
diff --git a/pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix b/pkgs/by-name/mf/mfc5890cncupswrapper/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfc5890cncupswrapper/default.nix
rename to pkgs/by-name/mf/mfc5890cncupswrapper/package.nix
diff --git a/pkgs/misc/cups/drivers/mfc5890cnlpr/default.nix b/pkgs/by-name/mf/mfc5890cnlpr/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfc5890cnlpr/default.nix
rename to pkgs/by-name/mf/mfc5890cnlpr/package.nix
diff --git a/pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix b/pkgs/by-name/mf/mfc9140cdncupswrapper/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfc9140cdncupswrapper/default.nix
rename to pkgs/by-name/mf/mfc9140cdncupswrapper/package.nix
diff --git a/pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix b/pkgs/by-name/mf/mfc9140cdnlpr/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfc9140cdnlpr/default.nix
rename to pkgs/by-name/mf/mfc9140cdnlpr/package.nix
diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/by-name/mf/mfcj470dw-cupswrapper/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix
rename to pkgs/by-name/mf/mfcj470dw-cupswrapper/package.nix
diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/by-name/mf/mfcj6510dw-cupswrapper/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix
rename to pkgs/by-name/mf/mfcj6510dw-cupswrapper/package.nix
diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/by-name/mf/mfcl2700dncupswrapper/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix
rename to pkgs/by-name/mf/mfcl2700dncupswrapper/package.nix
diff --git a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix b/pkgs/by-name/mf/mfcl2720dwcupswrapper/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix
rename to pkgs/by-name/mf/mfcl2720dwcupswrapper/package.nix
diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/by-name/mf/mfcl2720dwlpr/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix
rename to pkgs/by-name/mf/mfcl2720dwlpr/package.nix
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/by-name/mf/mfcl2740dwcupswrapper/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix
rename to pkgs/by-name/mf/mfcl2740dwcupswrapper/package.nix
diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/by-name/mf/mfcl2740dwlpr/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix
rename to pkgs/by-name/mf/mfcl2740dwlpr/package.nix
diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/by-name/mf/mfcl8690cdwcupswrapper/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix
rename to pkgs/by-name/mf/mfcl8690cdwcupswrapper/package.nix
diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/by-name/mf/mfcl8690cdwlpr/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix
rename to pkgs/by-name/mf/mfcl8690cdwlpr/package.nix
diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/by-name/mf/mfcuk/package.nix
similarity index 100%
rename from pkgs/tools/security/mfcuk/default.nix
rename to pkgs/by-name/mf/mfcuk/package.nix
diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/by-name/mf/mfoc/package.nix
similarity index 100%
rename from pkgs/tools/security/mfoc/default.nix
rename to pkgs/by-name/mf/mfoc/package.nix
diff --git a/pkgs/tools/typesetting/tex/mftrace/default.nix b/pkgs/by-name/mf/mftrace/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/tex/mftrace/default.nix
rename to pkgs/by-name/mf/mftrace/package.nix
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/by-name/mg/mg/package.nix
similarity index 100%
rename from pkgs/applications/editors/mg/default.nix
rename to pkgs/by-name/mg/mg/package.nix
diff --git a/pkgs/applications/system/mgmt/default.nix b/pkgs/by-name/mg/mgmt/package.nix
similarity index 100%
rename from pkgs/applications/system/mgmt/default.nix
rename to pkgs/by-name/mg/mgmt/package.nix
diff --git a/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch b/pkgs/by-name/mh/mhddfs/fix-format-security-error.patch
similarity index 100%
rename from pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch
rename to pkgs/by-name/mh/mhddfs/fix-format-security-error.patch
diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/by-name/mh/mhddfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/mhddfs/default.nix
rename to pkgs/by-name/mh/mhddfs/package.nix
diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/by-name/mi/mi2ly/package.nix
similarity index 100%
rename from pkgs/applications/audio/mi2ly/default.nix
rename to pkgs/by-name/mi/mi2ly/package.nix
diff --git a/pkgs/servers/http/micro-httpd/default.nix b/pkgs/by-name/mi/micro-httpd/package.nix
similarity index 100%
rename from pkgs/servers/http/micro-httpd/default.nix
rename to pkgs/by-name/mi/micro-httpd/package.nix
diff --git a/pkgs/servers/microbin/default.nix b/pkgs/by-name/mi/microbin/package.nix
similarity index 100%
rename from pkgs/servers/microbin/default.nix
rename to pkgs/by-name/mi/microbin/package.nix
diff --git a/pkgs/applications/terminal-emulators/microcom/default.nix b/pkgs/by-name/mi/microcom/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/microcom/default.nix
rename to pkgs/by-name/mi/microcom/package.nix
diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/by-name/mi/micromamba/package.nix
similarity index 100%
rename from pkgs/tools/package-management/micromamba/default.nix
rename to pkgs/by-name/mi/micromamba/package.nix
diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/by-name/mi/micronaut/package.nix
similarity index 100%
rename from pkgs/development/tools/micronaut/default.nix
rename to pkgs/by-name/mi/micronaut/package.nix
diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/by-name/mi/micronucleus/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/micronucleus/default.nix
rename to pkgs/by-name/mi/micronucleus/package.nix
diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/by-name/mi/microplane/package.nix
similarity index 100%
rename from pkgs/tools/misc/microplane/default.nix
rename to pkgs/by-name/mi/microplane/package.nix
diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/by-name/mi/micropython/package.nix
similarity index 100%
rename from pkgs/development/interpreters/micropython/default.nix
rename to pkgs/by-name/mi/micropython/package.nix
diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/by-name/mi/microscheme/package.nix
similarity index 100%
rename from pkgs/development/compilers/microscheme/default.nix
rename to pkgs/by-name/mi/microscheme/package.nix
diff --git a/pkgs/servers/microserver/default.nix b/pkgs/by-name/mi/microserver/package.nix
similarity index 100%
rename from pkgs/servers/microserver/default.nix
rename to pkgs/by-name/mi/microserver/package.nix
diff --git a/pkgs/development/libraries/microsoft-gsl/default.nix b/pkgs/by-name/mi/microsoft-gsl/package.nix
similarity index 100%
rename from pkgs/development/libraries/microsoft-gsl/default.nix
rename to pkgs/by-name/mi/microsoft-gsl/package.nix
diff --git a/pkgs/tools/audio/mictray/default.nix b/pkgs/by-name/mi/mictray/package.nix
similarity index 100%
rename from pkgs/tools/audio/mictray/default.nix
rename to pkgs/by-name/mi/mictray/package.nix
diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/by-name/mi/mid2key/package.nix
similarity index 100%
rename from pkgs/applications/audio/mid2key/default.nix
rename to pkgs/by-name/mi/mid2key/package.nix
diff --git a/pkgs/applications/audio/midi-trigger/default.nix b/pkgs/by-name/mi/midi-trigger/package.nix
similarity index 100%
rename from pkgs/applications/audio/midi-trigger/default.nix
rename to pkgs/by-name/mi/midi-trigger/package.nix
diff --git a/pkgs/tools/audio/midicsv/default.nix b/pkgs/by-name/mi/midicsv/package.nix
similarity index 100%
rename from pkgs/tools/audio/midicsv/default.nix
rename to pkgs/by-name/mi/midicsv/package.nix
diff --git a/pkgs/tools/audio/midimonster/default.nix b/pkgs/by-name/mi/midimonster/package.nix
similarity index 100%
rename from pkgs/tools/audio/midimonster/default.nix
rename to pkgs/by-name/mi/midimonster/package.nix
diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/by-name/mi/midisheetmusic/package.nix
similarity index 100%
rename from pkgs/applications/audio/midisheetmusic/default.nix
rename to pkgs/by-name/mi/midisheetmusic/package.nix
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/by-name/mi/midori-unwrapped/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/midori/default.nix
rename to pkgs/by-name/mi/midori-unwrapped/package.nix
diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/by-name/mi/migmix/package.nix
similarity index 100%
rename from pkgs/data/fonts/migmix/default.nix
rename to pkgs/by-name/mi/migmix/package.nix
diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/by-name/mi/migrate/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/migrate/default.nix
rename to pkgs/by-name/mi/migrate/package.nix
diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/by-name/mi/migu/package.nix
similarity index 100%
rename from pkgs/data/fonts/migu/default.nix
rename to pkgs/by-name/mi/migu/package.nix
diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/by-name/mi/mikmod/package.nix
similarity index 100%
rename from pkgs/applications/audio/mikmod/default.nix
rename to pkgs/by-name/mi/mikmod/package.nix
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/by-name/mi/mill/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/mill/default.nix
rename to pkgs/by-name/mi/mill/package.nix
diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/by-name/mi/miller/package.nix
similarity index 100%
rename from pkgs/tools/text/miller/default.nix
rename to pkgs/by-name/mi/miller/package.nix
diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/by-name/mi/millet/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/language-servers/millet/Cargo.lock
rename to pkgs/by-name/mi/millet/Cargo.lock
diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/by-name/mi/millet/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/millet/default.nix
rename to pkgs/by-name/mi/millet/package.nix
diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/by-name/mi/milu/package.nix
similarity index 100%
rename from pkgs/applications/misc/milu/default.nix
rename to pkgs/by-name/mi/milu/package.nix
diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/by-name/mi/mimalloc/package.nix
similarity index 100%
rename from pkgs/development/libraries/mimalloc/default.nix
rename to pkgs/by-name/mi/mimalloc/package.nix
diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/by-name/mi/mimeo/package.nix
similarity index 100%
rename from pkgs/tools/misc/mimeo/default.nix
rename to pkgs/by-name/mi/mimeo/package.nix
diff --git a/pkgs/development/libraries/mimetic/narrowing.patch b/pkgs/by-name/mi/mimetic/narrowing.patch
similarity index 100%
rename from pkgs/development/libraries/mimetic/narrowing.patch
rename to pkgs/by-name/mi/mimetic/narrowing.patch
diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/by-name/mi/mimetic/package.nix
similarity index 100%
rename from pkgs/development/libraries/mimetic/default.nix
rename to pkgs/by-name/mi/mimetic/package.nix
diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/by-name/mi/mimic/package.nix
similarity index 100%
rename from pkgs/applications/audio/mimic/default.nix
rename to pkgs/by-name/mi/mimic/package.nix
diff --git a/pkgs/applications/science/biology/minc-widgets/default.nix b/pkgs/by-name/mi/minc_widgets/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/minc-widgets/default.nix
rename to pkgs/by-name/mi/minc_widgets/package.nix
diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/by-name/mi/minder/package.nix
similarity index 100%
rename from pkgs/applications/misc/minder/default.nix
rename to pkgs/by-name/mi/minder/package.nix
diff --git a/pkgs/tools/games/minecraft/minecraft-server-hibernation/default.nix b/pkgs/by-name/mi/minecraft-server-hibernation/package.nix
similarity index 100%
rename from pkgs/tools/games/minecraft/minecraft-server-hibernation/default.nix
rename to pkgs/by-name/mi/minecraft-server-hibernation/package.nix
diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/by-name/mi/minesweep-rs/package.nix
similarity index 100%
rename from pkgs/games/minesweep-rs/default.nix
rename to pkgs/by-name/mi/minesweep-rs/package.nix
diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/by-name/mi/mingetty/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/mingetty/default.nix
rename to pkgs/by-name/mi/mingetty/package.nix
diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/by-name/mi/miniHttpd/package.nix
similarity index 100%
rename from pkgs/servers/http/mini-httpd/default.nix
rename to pkgs/by-name/mi/miniHttpd/package.nix
diff --git a/pkgs/applications/science/biology/minia/no-bundle.patch b/pkgs/by-name/mi/minia/no-bundle.patch
similarity index 100%
rename from pkgs/applications/science/biology/minia/no-bundle.patch
rename to pkgs/by-name/mi/minia/no-bundle.patch
diff --git a/pkgs/applications/science/biology/minia/default.nix b/pkgs/by-name/mi/minia/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/minia/default.nix
rename to pkgs/by-name/mi/minia/package.nix
diff --git a/pkgs/development/libraries/miniaudio/default.nix b/pkgs/by-name/mi/miniaudio/package.nix
similarity index 100%
rename from pkgs/development/libraries/miniaudio/default.nix
rename to pkgs/by-name/mi/miniaudio/package.nix
diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/by-name/mi/miniball/package.nix
similarity index 100%
rename from pkgs/development/libraries/miniball/default.nix
rename to pkgs/by-name/mi/miniball/package.nix
diff --git a/pkgs/tools/security/minica/default.nix b/pkgs/by-name/mi/minica/package.nix
similarity index 100%
rename from pkgs/tools/security/minica/default.nix
rename to pkgs/by-name/mi/minica/package.nix
diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/by-name/mi/minidjvu/package.nix
similarity index 100%
rename from pkgs/applications/graphics/minidjvu/default.nix
rename to pkgs/by-name/mi/minidjvu/package.nix
diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/by-name/mi/minidlna/package.nix
similarity index 100%
rename from pkgs/tools/networking/minidlna/default.nix
rename to pkgs/by-name/mi/minidlna/package.nix
diff --git a/pkgs/development/web/minify/default.nix b/pkgs/by-name/mi/minify/package.nix
similarity index 100%
rename from pkgs/development/web/minify/default.nix
rename to pkgs/by-name/mi/minify/package.nix
diff --git a/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff b/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff
similarity index 100%
rename from pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff
rename to pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff
diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/by-name/mi/minigalaxy/package.nix
similarity index 100%
rename from pkgs/applications/misc/minigalaxy/default.nix
rename to pkgs/by-name/mi/minigalaxy/package.nix
diff --git a/pkgs/development/libraries/minilibx/default.nix b/pkgs/by-name/mi/minilibx/package.nix
similarity index 100%
rename from pkgs/development/libraries/minilibx/default.nix
rename to pkgs/by-name/mi/minilibx/package.nix
diff --git a/pkgs/development/compilers/minimacy/default.nix b/pkgs/by-name/mi/minimacy/package.nix
similarity index 100%
rename from pkgs/development/compilers/minimacy/default.nix
rename to pkgs/by-name/mi/minimacy/package.nix
diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/by-name/mi/minimap2/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/minimap2/default.nix
rename to pkgs/by-name/mi/minimap2/package.nix
diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/by-name/mi/minimodem/package.nix
similarity index 100%
rename from pkgs/applications/radio/minimodem/default.nix
rename to pkgs/by-name/mi/minimodem/package.nix
diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/by-name/mi/mininet/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/mininet/default.nix
rename to pkgs/by-name/mi/mininet/package.nix
diff --git a/pkgs/tools/security/minio-certgen/default.nix b/pkgs/by-name/mi/minio-certgen/package.nix
similarity index 100%
rename from pkgs/tools/security/minio-certgen/default.nix
rename to pkgs/by-name/mi/minio-certgen/package.nix
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/by-name/mi/minio-client/package.nix
similarity index 100%
rename from pkgs/tools/networking/minio-client/default.nix
rename to pkgs/by-name/mi/minio-client/package.nix
diff --git a/pkgs/applications/audio/miniplayer/default.nix b/pkgs/by-name/mi/miniplayer/package.nix
similarity index 100%
rename from pkgs/applications/audio/miniplayer/default.nix
rename to pkgs/by-name/mi/miniplayer/package.nix
diff --git a/pkgs/tools/misc/minipro/default.nix b/pkgs/by-name/mi/minipro/package.nix
similarity index 100%
rename from pkgs/tools/misc/minipro/default.nix
rename to pkgs/by-name/mi/minipro/package.nix
diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/by-name/mi/minisat/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/minisat/default.nix
rename to pkgs/by-name/mi/minisat/package.nix
diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/by-name/mi/miniscript/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/miniscript/default.nix
rename to pkgs/by-name/mi/miniscript/package.nix
diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/by-name/mi/miniserve/package.nix
similarity index 100%
rename from pkgs/tools/misc/miniserve/default.nix
rename to pkgs/by-name/mi/miniserve/package.nix
diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/by-name/mi/minisign/package.nix
similarity index 100%
rename from pkgs/tools/security/minisign/default.nix
rename to pkgs/by-name/mi/minisign/package.nix
diff --git a/pkgs/tools/networking/minissdpd/makefile-install-dir.patch b/pkgs/by-name/mi/minissdpd/makefile-install-dir.patch
similarity index 100%
rename from pkgs/tools/networking/minissdpd/makefile-install-dir.patch
rename to pkgs/by-name/mi/minissdpd/makefile-install-dir.patch
diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/by-name/mi/minissdpd/package.nix
similarity index 100%
rename from pkgs/tools/networking/minissdpd/default.nix
rename to pkgs/by-name/mi/minissdpd/package.nix
diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/by-name/mi/ministat/package.nix
similarity index 100%
rename from pkgs/tools/misc/ministat/default.nix
rename to pkgs/by-name/mi/ministat/package.nix
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/by-name/mi/miniupnpc/package.nix
similarity index 100%
rename from pkgs/tools/networking/miniupnpc/default.nix
rename to pkgs/by-name/mi/miniupnpc/package.nix
diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/by-name/mi/minixml/package.nix
similarity index 100%
rename from pkgs/development/libraries/minixml/default.nix
rename to pkgs/by-name/mi/minixml/package.nix
diff --git a/pkgs/development/libraries/miniz/default.nix b/pkgs/by-name/mi/miniz/package.nix
similarity index 100%
rename from pkgs/development/libraries/miniz/default.nix
rename to pkgs/by-name/mi/miniz/package.nix
diff --git a/pkgs/tools/security/minizign/default.nix b/pkgs/by-name/mi/minizign/package.nix
similarity index 100%
rename from pkgs/tools/security/minizign/default.nix
rename to pkgs/by-name/mi/minizign/package.nix
diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/by-name/mi/minizip-ng/package.nix
similarity index 100%
rename from pkgs/development/libraries/minizip-ng/default.nix
rename to pkgs/by-name/mi/minizip-ng/package.nix
diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/by-name/mi/minizip/package.nix
similarity index 100%
rename from pkgs/development/libraries/minizip/default.nix
rename to pkgs/by-name/mi/minizip/package.nix
diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/by-name/mi/miraclecast/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/miraclecast/default.nix
rename to pkgs/by-name/mi/miraclecast/package.nix
diff --git a/pkgs/applications/video/mirakurun/fix-musl-detection.patch b/pkgs/by-name/mi/mirakurun/fix-musl-detection.patch
similarity index 100%
rename from pkgs/applications/video/mirakurun/fix-musl-detection.patch
rename to pkgs/by-name/mi/mirakurun/fix-musl-detection.patch
diff --git a/pkgs/applications/video/mirakurun/mirakurun.1 b/pkgs/by-name/mi/mirakurun/mirakurun.1
similarity index 100%
rename from pkgs/applications/video/mirakurun/mirakurun.1
rename to pkgs/by-name/mi/mirakurun/mirakurun.1
diff --git a/pkgs/applications/video/mirakurun/nix-filesystem.patch b/pkgs/by-name/mi/mirakurun/nix-filesystem.patch
similarity index 100%
rename from pkgs/applications/video/mirakurun/nix-filesystem.patch
rename to pkgs/by-name/mi/mirakurun/nix-filesystem.patch
diff --git a/pkgs/applications/video/mirakurun/default.nix b/pkgs/by-name/mi/mirakurun/package.nix
similarity index 100%
rename from pkgs/applications/video/mirakurun/default.nix
rename to pkgs/by-name/mi/mirakurun/package.nix
diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/by-name/mi/miranda/package.nix
similarity index 100%
rename from pkgs/development/compilers/miranda/default.nix
rename to pkgs/by-name/mi/miranda/package.nix
diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/by-name/mi/miredo/package.nix
similarity index 100%
rename from pkgs/tools/networking/miredo/default.nix
rename to pkgs/by-name/mi/miredo/package.nix
diff --git a/pkgs/servers/mirrorbits/default.nix b/pkgs/by-name/mi/mirrorbits/package.nix
similarity index 100%
rename from pkgs/servers/mirrorbits/default.nix
rename to pkgs/by-name/mi/mirrorbits/package.nix
diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/by-name/mi/miscfiles/package.nix
similarity index 100%
rename from pkgs/data/misc/miscfiles/default.nix
rename to pkgs/by-name/mi/miscfiles/package.nix
diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/by-name/mi/mission-planner/package.nix
similarity index 100%
rename from pkgs/applications/science/robotics/mission-planner/default.nix
rename to pkgs/by-name/mi/mission-planner/package.nix
diff --git a/pkgs/development/libraries/mitama-cpp-result/default.nix b/pkgs/by-name/mi/mitama-cpp-result/package.nix
similarity index 100%
rename from pkgs/development/libraries/mitama-cpp-result/default.nix
rename to pkgs/by-name/mi/mitama-cpp-result/package.nix
diff --git a/pkgs/tools/security/mitm6/default.nix b/pkgs/by-name/mi/mitm6/package.nix
similarity index 100%
rename from pkgs/tools/security/mitm6/default.nix
rename to pkgs/by-name/mi/mitm6/package.nix
diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/by-name/mi/mitmproxy2swagger/package.nix
similarity index 100%
rename from pkgs/tools/security/mitmproxy2swagger/default.nix
rename to pkgs/by-name/mi/mitmproxy2swagger/package.nix
diff --git a/pkgs/development/tools/mix2nix/default.nix b/pkgs/by-name/mi/mix2nix/package.nix
similarity index 100%
rename from pkgs/development/tools/mix2nix/default.nix
rename to pkgs/by-name/mi/mix2nix/package.nix
diff --git a/pkgs/servers/mjolnir/001-disable-nsfwprotection.patch b/pkgs/by-name/mj/mjolnir/001-disable-nsfwprotection.patch
similarity index 100%
rename from pkgs/servers/mjolnir/001-disable-nsfwprotection.patch
rename to pkgs/by-name/mj/mjolnir/001-disable-nsfwprotection.patch
diff --git a/pkgs/servers/mjolnir/package.json b/pkgs/by-name/mj/mjolnir/package.json
similarity index 100%
rename from pkgs/servers/mjolnir/package.json
rename to pkgs/by-name/mj/mjolnir/package.json
diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/by-name/mj/mjolnir/package.nix
similarity index 100%
rename from pkgs/servers/mjolnir/default.nix
rename to pkgs/by-name/mj/mjolnir/package.nix
diff --git a/pkgs/tools/video/mjpegtools/c++-17-fixes.patch b/pkgs/by-name/mj/mjpegtools/c++-17-fixes.patch
similarity index 100%
rename from pkgs/tools/video/mjpegtools/c++-17-fixes.patch
rename to pkgs/by-name/mj/mjpegtools/c++-17-fixes.patch
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/by-name/mj/mjpegtools/package.nix
similarity index 100%
rename from pkgs/tools/video/mjpegtools/default.nix
rename to pkgs/by-name/mj/mjpegtools/package.nix
diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/by-name/mj/mjpg-streamer/package.nix
similarity index 100%
rename from pkgs/applications/video/mjpg-streamer/default.nix
rename to pkgs/by-name/mj/mjpg-streamer/package.nix
diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/by-name/mk/mkcert/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/mkcert/default.nix
rename to pkgs/by-name/mk/mkcert/package.nix
diff --git a/pkgs/applications/video/mkclean/default.nix b/pkgs/by-name/mk/mkclean/package.nix
similarity index 100%
rename from pkgs/applications/video/mkclean/default.nix
rename to pkgs/by-name/mk/mkclean/package.nix
diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/by-name/mk/mkcue/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/mkcue/default.nix
rename to pkgs/by-name/mk/mkcue/package.nix
diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix
rename to pkgs/by-name/mk/mkinitcpio-nfs-utils/package.nix
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/by-name/mk/mkl/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/mkl/default.nix
rename to pkgs/by-name/mk/mkl/package.nix
diff --git a/pkgs/development/libraries/science/math/mkl/test/default.nix b/pkgs/by-name/mk/mkl/test/default.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/mkl/test/default.nix
rename to pkgs/by-name/mk/mkl/test/default.nix
diff --git a/pkgs/development/libraries/science/math/mkl/test/test.c b/pkgs/by-name/mk/mkl/test/test.c
similarity index 100%
rename from pkgs/development/libraries/science/math/mkl/test/test.c
rename to pkgs/by-name/mk/mkl/test/test.c
diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/by-name/mk/mkp224o/package.nix
similarity index 100%
rename from pkgs/tools/security/mkp224o/default.nix
rename to pkgs/by-name/mk/mkp224o/package.nix
diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/by-name/mk/mkrand/package.nix
similarity index 100%
rename from pkgs/tools/security/mkrand/default.nix
rename to pkgs/by-name/mk/mkrand/package.nix
diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/by-name/mk/mktemp/package.nix
similarity index 100%
rename from pkgs/tools/security/mktemp/default.nix
rename to pkgs/by-name/mk/mktemp/package.nix
diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/by-name/mk/mktorrent/package.nix
similarity index 100%
rename from pkgs/tools/misc/mktorrent/default.nix
rename to pkgs/by-name/mk/mktorrent/package.nix
diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/by-name/ml/mlarchive2maildir/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix
rename to pkgs/by-name/ml/mlarchive2maildir/package.nix
diff --git a/pkgs/tools/system/mlc/default.nix b/pkgs/by-name/ml/mlc/package.nix
similarity index 100%
rename from pkgs/tools/system/mlc/default.nix
rename to pkgs/by-name/ml/mlc/package.nix
diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/by-name/ml/mle/package.nix
similarity index 100%
rename from pkgs/applications/editors/mle/default.nix
rename to pkgs/by-name/ml/mle/package.nix
diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/by-name/ml/mlflow-server/package.nix
similarity index 100%
rename from pkgs/servers/mlflow-server/default.nix
rename to pkgs/by-name/ml/mlflow-server/package.nix
diff --git a/pkgs/development/libraries/mlib/default.nix b/pkgs/by-name/ml/mlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/mlib/default.nix
rename to pkgs/by-name/ml/mlib/package.nix
diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/by-name/ml/mlkit/package.nix
similarity index 100%
rename from pkgs/development/compilers/mlkit/default.nix
rename to pkgs/by-name/ml/mlkit/package.nix
diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/by-name/ml/mlmmj/package.nix
similarity index 100%
rename from pkgs/servers/mail/mlmmj/default.nix
rename to pkgs/by-name/ml/mlmmj/package.nix
diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/by-name/ml/mloader/package.nix
similarity index 100%
rename from pkgs/tools/misc/mloader/default.nix
rename to pkgs/by-name/ml/mloader/package.nix
diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/by-name/ml/mlocate/package.nix
similarity index 100%
rename from pkgs/tools/misc/mlocate/default.nix
rename to pkgs/by-name/ml/mlocate/package.nix
diff --git a/pkgs/applications/window-managers/mlvwm/default.nix b/pkgs/by-name/ml/mlvwm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/mlvwm/default.nix
rename to pkgs/by-name/ml/mlvwm/package.nix
diff --git a/pkgs/tools/misc/mlxbf-bootctl/default.nix b/pkgs/by-name/ml/mlxbf-bootctl/package.nix
similarity index 100%
rename from pkgs/tools/misc/mlxbf-bootctl/default.nix
rename to pkgs/by-name/ml/mlxbf-bootctl/package.nix
diff --git a/pkgs/misc/mlxbf-bootimages/default.nix b/pkgs/by-name/ml/mlxbf-bootimages/package.nix
similarity index 100%
rename from pkgs/misc/mlxbf-bootimages/default.nix
rename to pkgs/by-name/ml/mlxbf-bootimages/package.nix
diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/by-name/mm/MMA/package.nix
similarity index 100%
rename from pkgs/applications/audio/MMA/default.nix
rename to pkgs/by-name/mm/MMA/package.nix
diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/by-name/mm/mm-common/package.nix
similarity index 100%
rename from pkgs/development/libraries/mm-common/default.nix
rename to pkgs/by-name/mm/mm-common/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/by-name/mm/mm/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/mm/default.nix
rename to pkgs/by-name/mm/mm/package.nix
diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/by-name/mm/mmake/package.nix
similarity index 100%
rename from pkgs/tools/misc/mmake/default.nix
rename to pkgs/by-name/mm/mmake/package.nix
diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/by-name/mm/mmark/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/mmark/default.nix
rename to pkgs/by-name/mm/mmark/package.nix
diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/by-name/mm/mmc-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/mmc-utils/default.nix
rename to pkgs/by-name/mm/mmc-utils/package.nix
diff --git a/pkgs/tools/misc/mmctl/default.nix b/pkgs/by-name/mm/mmctl/package.nix
similarity index 100%
rename from pkgs/tools/misc/mmctl/default.nix
rename to pkgs/by-name/mm/mmctl/package.nix
diff --git a/pkgs/tools/text/mmdoc/default.nix b/pkgs/by-name/mm/mmdoc/package.nix
similarity index 100%
rename from pkgs/tools/text/mmdoc/default.nix
rename to pkgs/by-name/mm/mmdoc/package.nix
diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/by-name/mm/mmh/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mmh/default.nix
rename to pkgs/by-name/mm/mmh/package.nix
diff --git a/pkgs/development/tools/mmixware/default.nix b/pkgs/by-name/mm/mmixware/package.nix
similarity index 100%
rename from pkgs/development/tools/mmixware/default.nix
rename to pkgs/by-name/mm/mmixware/package.nix
diff --git a/pkgs/tools/networking/mmsd-tng/default.nix b/pkgs/by-name/mm/mmsd-tng/package.nix
similarity index 100%
rename from pkgs/tools/networking/mmsd-tng/default.nix
rename to pkgs/by-name/mm/mmsd-tng/package.nix
diff --git a/pkgs/tools/networking/mmsd/default.nix b/pkgs/by-name/mm/mmsd/package.nix
similarity index 100%
rename from pkgs/tools/networking/mmsd/default.nix
rename to pkgs/by-name/mm/mmsd/package.nix
diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/by-name/mm/mmtc/package.nix
similarity index 100%
rename from pkgs/applications/audio/mmtc/default.nix
rename to pkgs/by-name/mm/mmtc/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix b/pkgs/by-name/mm/mmtf-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/mmtf-cpp/default.nix
rename to pkgs/by-name/mm/mmtf-cpp/package.nix
diff --git a/pkgs/tools/X11/mmutils/default.nix b/pkgs/by-name/mm/mmutils/package.nix
similarity index 100%
rename from pkgs/tools/X11/mmutils/default.nix
rename to pkgs/by-name/mm/mmutils/package.nix
diff --git a/pkgs/tools/misc/mmv-go/default.nix b/pkgs/by-name/mm/mmv-go/package.nix
similarity index 100%
rename from pkgs/tools/misc/mmv-go/default.nix
rename to pkgs/by-name/mm/mmv-go/package.nix
diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/by-name/mm/mmv/package.nix
similarity index 100%
rename from pkgs/tools/misc/mmv/default.nix
rename to pkgs/by-name/mm/mmv/package.nix
diff --git a/pkgs/applications/misc/mnamer/default.nix b/pkgs/by-name/mn/mnamer/package.nix
similarity index 100%
rename from pkgs/applications/misc/mnamer/default.nix
rename to pkgs/by-name/mn/mnamer/package.nix
diff --git a/pkgs/applications/misc/mnamer/remove_requirements.patch b/pkgs/by-name/mn/mnamer/remove_requirements.patch
similarity index 100%
rename from pkgs/applications/misc/mnamer/remove_requirements.patch
rename to pkgs/by-name/mn/mnamer/remove_requirements.patch
diff --git a/pkgs/applications/misc/mnamer/update_hack.patch b/pkgs/by-name/mn/mnamer/update_hack.patch
similarity index 100%
rename from pkgs/applications/misc/mnamer/update_hack.patch
rename to pkgs/by-name/mn/mnamer/update_hack.patch
diff --git a/pkgs/tools/misc/mnc/default.nix b/pkgs/by-name/mn/mnc/package.nix
similarity index 100%
rename from pkgs/tools/misc/mnc/default.nix
rename to pkgs/by-name/mn/mnc/package.nix
diff --git a/pkgs/misc/mnemonicode/default.nix b/pkgs/by-name/mn/mnemonicode/package.nix
similarity index 100%
rename from pkgs/misc/mnemonicode/default.nix
rename to pkgs/by-name/mn/mnemonicode/package.nix
diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/by-name/mn/mni_autoreg/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/mni_autoreg/default.nix
rename to pkgs/by-name/mn/mni_autoreg/package.nix
diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/by-name/mn/mnist/package.nix
similarity index 100%
rename from pkgs/data/machine-learning/mnist/default.nix
rename to pkgs/by-name/mn/mnist/package.nix
diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/by-name/mn/mno16/package.nix
similarity index 100%
rename from pkgs/data/fonts/mno16/default.nix
rename to pkgs/by-name/mn/mno16/package.nix
diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/by-name/mo/moar/package.nix
similarity index 100%
rename from pkgs/tools/misc/moar/default.nix
rename to pkgs/by-name/mo/moar/package.nix
diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/by-name/mo/mob/package.nix
similarity index 100%
rename from pkgs/applications/misc/mob/default.nix
rename to pkgs/by-name/mo/mob/package.nix
diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/by-name/mo/mobile-broadband-provider-info/package.nix
similarity index 100%
rename from pkgs/data/misc/mobile-broadband-provider-info/default.nix
rename to pkgs/by-name/mo/mobile-broadband-provider-info/package.nix
diff --git a/pkgs/applications/misc/mobilecoin-wallet/default.nix b/pkgs/by-name/mo/mobilecoin-wallet/package.nix
similarity index 100%
rename from pkgs/applications/misc/mobilecoin-wallet/default.nix
rename to pkgs/by-name/mo/mobilecoin-wallet/package.nix
diff --git a/pkgs/development/tools/mockgen/default.nix b/pkgs/by-name/mo/mockgen/package.nix
similarity index 100%
rename from pkgs/development/tools/mockgen/default.nix
rename to pkgs/by-name/mo/mockgen/package.nix
diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/by-name/mo/mockobjects/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/mockobjects/default.nix
rename to pkgs/by-name/mo/mockobjects/package.nix
diff --git a/pkgs/tools/networking/mockoon/default.nix b/pkgs/by-name/mo/mockoon/package.nix
similarity index 100%
rename from pkgs/tools/networking/mockoon/default.nix
rename to pkgs/by-name/mo/mockoon/package.nix
diff --git a/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix b/pkgs/by-name/mo/mod-arpeggiator-lv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/mod-arpeggiator-lv2/default.nix
rename to pkgs/by-name/mo/mod-arpeggiator-lv2/package.nix
diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/by-name/mo/mod-distortion/package.nix
similarity index 100%
rename from pkgs/applications/audio/mod-distortion/default.nix
rename to pkgs/by-name/mo/mod-distortion/package.nix
diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/by-name/mo/mod/package.nix
similarity index 100%
rename from pkgs/development/tools/mod/default.nix
rename to pkgs/by-name/mo/mod/package.nix
diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/by-name/mo/modd/package.nix
similarity index 100%
rename from pkgs/development/tools/modd/default.nix
rename to pkgs/by-name/mo/modd/package.nix
diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/by-name/mo/modem-manager-gui/package.nix
similarity index 100%
rename from pkgs/applications/networking/modem-manager-gui/default.nix
rename to pkgs/by-name/mo/modem-manager-gui/package.nix
diff --git a/pkgs/tools/networking/modemmanager/no-dummy-dirs-in-sysconfdir.patch b/pkgs/by-name/mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch
similarity index 100%
rename from pkgs/tools/networking/modemmanager/no-dummy-dirs-in-sysconfdir.patch
rename to pkgs/by-name/mo/modemmanager/no-dummy-dirs-in-sysconfdir.patch
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/by-name/mo/modemmanager/package.nix
similarity index 100%
rename from pkgs/tools/networking/modemmanager/default.nix
rename to pkgs/by-name/mo/modemmanager/package.nix
diff --git a/pkgs/tools/security/modsecurity-crs/default.nix b/pkgs/by-name/mo/modsecurity-crs/package.nix
similarity index 100%
rename from pkgs/tools/security/modsecurity-crs/default.nix
rename to pkgs/by-name/mo/modsecurity-crs/package.nix
diff --git a/pkgs/tools/security/modsecurity/Makefile.am.patch b/pkgs/by-name/mo/modsecurity_standalone/Makefile.am.patch
similarity index 100%
rename from pkgs/tools/security/modsecurity/Makefile.am.patch
rename to pkgs/by-name/mo/modsecurity_standalone/Makefile.am.patch
diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/by-name/mo/modsecurity_standalone/package.nix
similarity index 100%
rename from pkgs/tools/security/modsecurity/default.nix
rename to pkgs/by-name/mo/modsecurity_standalone/package.nix
diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/by-name/mo/mojave-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/mojave/default.nix
rename to pkgs/by-name/mo/mojave-gtk-theme/package.nix
diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/by-name/mo/moka-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/moka-icon-theme/default.nix
rename to pkgs/by-name/mo/moka-icon-theme/package.nix
diff --git a/pkgs/tools/security/mokutil/default.nix b/pkgs/by-name/mo/mokutil/package.nix
similarity index 100%
rename from pkgs/tools/security/mokutil/default.nix
rename to pkgs/by-name/mo/mokutil/package.nix
diff --git a/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch b/pkgs/by-name/mo/molden/dont_register_file_types.patch
similarity index 100%
rename from pkgs/applications/science/chemistry/molden/dont_register_file_types.patch
rename to pkgs/by-name/mo/molden/dont_register_file_types.patch
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/by-name/mo/molden/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/molden/default.nix
rename to pkgs/by-name/mo/molden/package.nix
diff --git a/pkgs/tools/networking/mole/default.nix b/pkgs/by-name/mo/mole/package.nix
similarity index 100%
rename from pkgs/tools/networking/mole/default.nix
rename to pkgs/by-name/mo/mole/package.nix
diff --git a/pkgs/servers/gemini/molly-brown/default.nix b/pkgs/by-name/mo/molly-brown/package.nix
similarity index 100%
rename from pkgs/servers/gemini/molly-brown/default.nix
rename to pkgs/by-name/mo/molly-brown/package.nix
diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/by-name/mo/molly-guard/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/molly-guard/default.nix
rename to pkgs/by-name/mo/molly-guard/package.nix
diff --git a/pkgs/applications/audio/molot-lite/default.nix b/pkgs/by-name/mo/molot-lite/package.nix
similarity index 100%
rename from pkgs/applications/audio/molot-lite/default.nix
rename to pkgs/by-name/mo/molot-lite/package.nix
diff --git a/pkgs/applications/video/molotov/default.nix b/pkgs/by-name/mo/molotov/package.nix
similarity index 100%
rename from pkgs/applications/video/molotov/default.nix
rename to pkgs/by-name/mo/molotov/package.nix
diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/by-name/mo/moltengamepad/package.nix
similarity index 100%
rename from pkgs/misc/drivers/moltengamepad/default.nix
rename to pkgs/by-name/mo/moltengamepad/package.nix
diff --git a/pkgs/data/fonts/mona-sans/default.nix b/pkgs/by-name/mo/mona-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/mona-sans/default.nix
rename to pkgs/by-name/mo/mona-sans/package.nix
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/by-name/mo/monetdb/package.nix
similarity index 100%
rename from pkgs/servers/sql/monetdb/default.nix
rename to pkgs/by-name/mo/monetdb/package.nix
diff --git a/pkgs/tools/security/mongoaudit/default.nix b/pkgs/by-name/mo/mongoaudit/package.nix
similarity index 100%
rename from pkgs/tools/security/mongoaudit/default.nix
rename to pkgs/by-name/mo/mongoaudit/package.nix
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/by-name/mo/mongodb-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/mongodb-tools/default.nix
rename to pkgs/by-name/mo/mongodb-tools/package.nix
diff --git a/pkgs/development/libraries/science/math/mongoose/default.nix b/pkgs/by-name/mo/mongoose/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/mongoose/default.nix
rename to pkgs/by-name/mo/mongoose/package.nix
diff --git a/pkgs/servers/web-apps/monica/default.nix b/pkgs/by-name/mo/monica/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/monica/default.nix
rename to pkgs/by-name/mo/monica/package.nix
diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/by-name/mo/monit/package.nix
similarity index 100%
rename from pkgs/tools/system/monit/default.nix
rename to pkgs/by-name/mo/monit/package.nix
diff --git a/pkgs/applications/misc/monitorcontrol/default.nix b/pkgs/by-name/mo/monitorcontrol/package.nix
similarity index 100%
rename from pkgs/applications/misc/monitorcontrol/default.nix
rename to pkgs/by-name/mo/monitorcontrol/package.nix
diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/by-name/mo/monitoring-plugins/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/plugins/default.nix
rename to pkgs/by-name/mo/monitoring-plugins/package.nix
diff --git a/pkgs/applications/audio/monkeys-audio/buildfix.diff b/pkgs/by-name/mo/monkeysAudio/buildfix.diff
similarity index 100%
rename from pkgs/applications/audio/monkeys-audio/buildfix.diff
rename to pkgs/by-name/mo/monkeysAudio/buildfix.diff
diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/by-name/mo/monkeysAudio/package.nix
similarity index 100%
rename from pkgs/applications/audio/monkeys-audio/default.nix
rename to pkgs/by-name/mo/monkeysAudio/package.nix
diff --git a/pkgs/tools/security/monkeysphere/monkeysphere.patch b/pkgs/by-name/mo/monkeysphere/monkeysphere.patch
similarity index 100%
rename from pkgs/tools/security/monkeysphere/monkeysphere.patch
rename to pkgs/by-name/mo/monkeysphere/monkeysphere.patch
diff --git a/pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch b/pkgs/by-name/mo/monkeysphere/openssh-nixos-sandbox.patch
similarity index 100%
rename from pkgs/tools/security/monkeysphere/openssh-nixos-sandbox.patch
rename to pkgs/by-name/mo/monkeysphere/openssh-nixos-sandbox.patch
diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/by-name/mo/monkeysphere/package.nix
similarity index 100%
rename from pkgs/tools/security/monkeysphere/default.nix
rename to pkgs/by-name/mo/monkeysphere/package.nix
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/by-name/mo/mono-addins/package.nix
similarity index 100%
rename from pkgs/development/libraries/mono-addins/default.nix
rename to pkgs/by-name/mo/mono-addins/package.nix
diff --git a/pkgs/build-support/mono-dll-fixer/dll-fixer.pl b/pkgs/by-name/mo/monoDLLFixer/dll-fixer.pl
similarity index 100%
rename from pkgs/build-support/mono-dll-fixer/dll-fixer.pl
rename to pkgs/by-name/mo/monoDLLFixer/dll-fixer.pl
diff --git a/pkgs/build-support/mono-dll-fixer/default.nix b/pkgs/by-name/mo/monoDLLFixer/package.nix
similarity index 100%
rename from pkgs/build-support/mono-dll-fixer/default.nix
rename to pkgs/by-name/mo/monoDLLFixer/package.nix
diff --git a/pkgs/data/fonts/monocraft/default.nix b/pkgs/by-name/mo/monocraft/package.nix
similarity index 100%
rename from pkgs/data/fonts/monocraft/default.nix
rename to pkgs/by-name/mo/monocraft/package.nix
diff --git a/pkgs/development/libraries/monocypher/default.nix b/pkgs/by-name/mo/monocypher/package.nix
similarity index 100%
rename from pkgs/development/libraries/monocypher/default.nix
rename to pkgs/by-name/mo/monocypher/package.nix
diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/by-name/mo/monoid/package.nix
similarity index 100%
rename from pkgs/data/fonts/monoid/default.nix
rename to pkgs/by-name/mo/monoid/package.nix
diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/by-name/mo/mononoki/package.nix
similarity index 100%
rename from pkgs/data/fonts/mononoki/default.nix
rename to pkgs/by-name/mo/mononoki/package.nix
diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/by-name/mo/monosat/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/monosat/default.nix
rename to pkgs/by-name/mo/monosat/package.nix
diff --git a/pkgs/tools/misc/mons/default.nix b/pkgs/by-name/mo/mons/package.nix
similarity index 100%
rename from pkgs/tools/misc/mons/default.nix
rename to pkgs/by-name/mo/mons/package.nix
diff --git a/pkgs/tools/security/monsoon/default.nix b/pkgs/by-name/mo/monsoon/package.nix
similarity index 100%
rename from pkgs/tools/security/monsoon/default.nix
rename to pkgs/by-name/mo/monsoon/package.nix
diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/by-name/mo/montserrat/package.nix
similarity index 100%
rename from pkgs/data/fonts/montserrat/default.nix
rename to pkgs/by-name/mo/montserrat/package.nix
diff --git a/pkgs/applications/audio/mooSpace/default.nix b/pkgs/by-name/mo/mooSpace/package.nix
similarity index 100%
rename from pkgs/applications/audio/mooSpace/default.nix
rename to pkgs/by-name/mo/mooSpace/package.nix
diff --git a/pkgs/tools/networking/moodle-dl/default.nix b/pkgs/by-name/mo/moodle-dl/package.nix
similarity index 100%
rename from pkgs/tools/networking/moodle-dl/default.nix
rename to pkgs/by-name/mo/moodle-dl/package.nix
diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/by-name/mo/moon-buggy/package.nix
similarity index 100%
rename from pkgs/games/moon-buggy/default.nix
rename to pkgs/by-name/mo/moon-buggy/package.nix
diff --git a/pkgs/tools/misc/moon-phases/default.nix b/pkgs/by-name/mo/moon-phases/package.nix
similarity index 100%
rename from pkgs/tools/misc/moon-phases/default.nix
rename to pkgs/by-name/mo/moon-phases/package.nix
diff --git a/pkgs/misc/moonfire-nvr/Cargo.lock b/pkgs/by-name/mo/moonfire-nvr/Cargo.lock
similarity index 100%
rename from pkgs/misc/moonfire-nvr/Cargo.lock
rename to pkgs/by-name/mo/moonfire-nvr/Cargo.lock
diff --git a/pkgs/misc/moonfire-nvr/default.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix
similarity index 100%
rename from pkgs/misc/moonfire-nvr/default.nix
rename to pkgs/by-name/mo/moonfire-nvr/package.nix
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/by-name/mo/moonlight-embedded/package.nix
similarity index 100%
rename from pkgs/applications/misc/moonlight-embedded/default.nix
rename to pkgs/by-name/mo/moonlight-embedded/package.nix
diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/by-name/mo/moonraker/package.nix
similarity index 100%
rename from pkgs/servers/moonraker/default.nix
rename to pkgs/by-name/mo/moonraker/package.nix
diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/by-name/mo/moosefs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/moosefs/default.nix
rename to pkgs/by-name/mo/moosefs/package.nix
diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/by-name/mo/mop/package.nix
similarity index 100%
rename from pkgs/applications/misc/mop/default.nix
rename to pkgs/by-name/mo/mop/package.nix
diff --git a/pkgs/applications/science/chemistry/mopac/default.nix b/pkgs/by-name/mo/mopac/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/mopac/default.nix
rename to pkgs/by-name/mo/mopac/package.nix
diff --git a/pkgs/development/tools/moq/default.nix b/pkgs/by-name/mo/moq/package.nix
similarity index 100%
rename from pkgs/development/tools/moq/default.nix
rename to pkgs/by-name/mo/moq/package.nix
diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/by-name/mo/morph/package.nix
similarity index 100%
rename from pkgs/tools/package-management/morph/default.nix
rename to pkgs/by-name/mo/morph/package.nix
diff --git a/pkgs/tools/text/morsel/default.nix b/pkgs/by-name/mo/morsel/package.nix
similarity index 100%
rename from pkgs/tools/text/morsel/default.nix
rename to pkgs/by-name/mo/morsel/package.nix
diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/by-name/mo/morty/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/morty/default.nix
rename to pkgs/by-name/mo/morty/package.nix
diff --git a/pkgs/tools/misc/moserial/default.nix b/pkgs/by-name/mo/moserial/package.nix
similarity index 100%
rename from pkgs/tools/misc/moserial/default.nix
rename to pkgs/by-name/mo/moserial/package.nix
diff --git a/pkgs/tools/networking/mosh/bash_completion_datadir.patch b/pkgs/by-name/mo/mosh/bash_completion_datadir.patch
similarity index 100%
rename from pkgs/tools/networking/mosh/bash_completion_datadir.patch
rename to pkgs/by-name/mo/mosh/bash_completion_datadir.patch
diff --git a/pkgs/tools/networking/mosh/mosh-client_path.patch b/pkgs/by-name/mo/mosh/mosh-client_path.patch
similarity index 100%
rename from pkgs/tools/networking/mosh/mosh-client_path.patch
rename to pkgs/by-name/mo/mosh/mosh-client_path.patch
diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/by-name/mo/mosh/package.nix
similarity index 100%
rename from pkgs/tools/networking/mosh/default.nix
rename to pkgs/by-name/mo/mosh/package.nix
diff --git a/pkgs/tools/networking/mosh/ssh_path.patch b/pkgs/by-name/mo/mosh/ssh_path.patch
similarity index 100%
rename from pkgs/tools/networking/mosh/ssh_path.patch
rename to pkgs/by-name/mo/mosh/ssh_path.patch
diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/by-name/mo/mosml/package.nix
similarity index 100%
rename from pkgs/development/compilers/mosml/default.nix
rename to pkgs/by-name/mo/mosml/package.nix
diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/by-name/mo/mosquitto/package.nix
similarity index 100%
rename from pkgs/servers/mqtt/mosquitto/default.nix
rename to pkgs/by-name/mo/mosquitto/package.nix
diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/by-name/mo/most/package.nix
similarity index 100%
rename from pkgs/tools/misc/most/default.nix
rename to pkgs/by-name/mo/most/package.nix
diff --git a/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch b/pkgs/by-name/mo/motif/Add-X.Org-to-bindings-file.patch
similarity index 100%
rename from pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch
rename to pkgs/by-name/mo/motif/Add-X.Org-to-bindings-file.patch
diff --git a/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch b/pkgs/by-name/mo/motif/Remove-unsupported-weak-refs-on-darwin.patch
similarity index 100%
rename from pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch
rename to pkgs/by-name/mo/motif/Remove-unsupported-weak-refs-on-darwin.patch
diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/by-name/mo/motif/package.nix
similarity index 100%
rename from pkgs/development/libraries/motif/default.nix
rename to pkgs/by-name/mo/motif/package.nix
diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/by-name/mo/motion/package.nix
similarity index 100%
rename from pkgs/applications/video/motion/default.nix
rename to pkgs/by-name/mo/motion/package.nix
diff --git a/pkgs/tools/networking/motrix/default.nix b/pkgs/by-name/mo/motrix/package.nix
similarity index 100%
rename from pkgs/tools/networking/motrix/default.nix
rename to pkgs/by-name/mo/motrix/package.nix
diff --git a/pkgs/tools/filesystems/mount-zip/default.nix b/pkgs/by-name/mo/mount-zip/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/mount-zip/default.nix
rename to pkgs/by-name/mo/mount-zip/package.nix
diff --git a/pkgs/tools/filesystems/mountain-duck/default.nix b/pkgs/by-name/mo/mountain-duck/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/mountain-duck/default.nix
rename to pkgs/by-name/mo/mountain-duck/package.nix
diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/by-name/mo/mousetweaks/package.nix
similarity index 100%
rename from pkgs/applications/accessibility/mousetweaks/default.nix
rename to pkgs/by-name/mo/mousetweaks/package.nix
diff --git a/pkgs/development/tools/database/movine/default.nix b/pkgs/by-name/mo/movine/package.nix
similarity index 100%
rename from pkgs/development/tools/database/movine/default.nix
rename to pkgs/by-name/mo/movine/package.nix
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/by-name/mo/movit/package.nix
similarity index 100%
rename from pkgs/development/libraries/movit/default.nix
rename to pkgs/by-name/mo/movit/package.nix
diff --git a/pkgs/servers/mail/mox/default.nix b/pkgs/by-name/mo/mox/package.nix
similarity index 100%
rename from pkgs/servers/mail/mox/default.nix
rename to pkgs/by-name/mo/mox/package.nix
diff --git a/pkgs/servers/mail/mox/version.patch b/pkgs/by-name/mo/mox/version.patch
similarity index 100%
rename from pkgs/servers/mail/mox/version.patch
rename to pkgs/by-name/mo/mox/version.patch
diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/by-name/mo/mozjpeg/package.nix
similarity index 100%
rename from pkgs/applications/graphics/mozjpeg/default.nix
rename to pkgs/by-name/mo/mozjpeg/package.nix
diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/by-name/mo/mozlz4a/package.nix
similarity index 100%
rename from pkgs/tools/compression/mozlz4a/default.nix
rename to pkgs/by-name/mo/mozlz4a/package.nix
diff --git a/pkgs/applications/misc/mozphab/default.nix b/pkgs/by-name/mo/mozphab/package.nix
similarity index 100%
rename from pkgs/applications/misc/mozphab/default.nix
rename to pkgs/by-name/mo/mozphab/package.nix
diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/by-name/mp/mp3blaster/package.nix
similarity index 100%
rename from pkgs/applications/audio/mp3blaster/default.nix
rename to pkgs/by-name/mp/mp3blaster/package.nix
diff --git a/pkgs/tools/audio/mp3cat/default.nix b/pkgs/by-name/mp/mp3cat/package.nix
similarity index 100%
rename from pkgs/tools/audio/mp3cat/default.nix
rename to pkgs/by-name/mp/mp3cat/package.nix
diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/by-name/mp/mp3fs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/mp3fs/default.nix
rename to pkgs/by-name/mp/mp3fs/package.nix
diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/by-name/mp/mp3gain/package.nix
similarity index 100%
rename from pkgs/applications/audio/mp3gain/default.nix
rename to pkgs/by-name/mp/mp3gain/package.nix
diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/by-name/mp/mp3splt/package.nix
similarity index 100%
rename from pkgs/applications/audio/mp3splt/default.nix
rename to pkgs/by-name/mp/mp3splt/package.nix
diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/by-name/mp/mp3val/package.nix
similarity index 100%
rename from pkgs/applications/audio/mp3val/default.nix
rename to pkgs/by-name/mp/mp3val/package.nix
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/by-name/mp/mp4v2/package.nix
similarity index 100%
rename from pkgs/development/libraries/mp4v2/default.nix
rename to pkgs/by-name/mp/mp4v2/package.nix
diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/by-name/mp/mpage/package.nix
similarity index 100%
rename from pkgs/tools/text/mpage/default.nix
rename to pkgs/by-name/mp/mpage/package.nix
diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/by-name/mp/mpc123/package.nix
similarity index 100%
rename from pkgs/applications/audio/mpc123/default.nix
rename to pkgs/by-name/mp/mpc123/package.nix
diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/by-name/mp/mpd-discord-rpc/package.nix
similarity index 100%
rename from pkgs/tools/audio/mpd-discord-rpc/default.nix
rename to pkgs/by-name/mp/mpd-discord-rpc/package.nix
diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/by-name/mp/mpd-mpris/package.nix
similarity index 100%
rename from pkgs/tools/audio/mpd-mpris/default.nix
rename to pkgs/by-name/mp/mpd-mpris/package.nix
diff --git a/pkgs/tools/audio/mpd-notification/default.nix b/pkgs/by-name/mp/mpd-notification/package.nix
similarity index 100%
rename from pkgs/tools/audio/mpd-notification/default.nix
rename to pkgs/by-name/mp/mpd-notification/package.nix
diff --git a/pkgs/applications/audio/mpd-touch-screen-gui/default.nix b/pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
similarity index 100%
rename from pkgs/applications/audio/mpd-touch-screen-gui/default.nix
rename to pkgs/by-name/mp/mpd-touch-screen-gui/package.nix
diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/by-name/mp/mpdas/package.nix
similarity index 100%
rename from pkgs/tools/audio/mpdas/default.nix
rename to pkgs/by-name/mp/mpdas/package.nix
diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/by-name/mp/mpdecimal/package.nix
similarity index 100%
rename from pkgs/development/libraries/mpdecimal/default.nix
rename to pkgs/by-name/mp/mpdecimal/package.nix
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/by-name/mp/mpdris2/package.nix
similarity index 100%
rename from pkgs/tools/audio/mpdris2/default.nix
rename to pkgs/by-name/mp/mpdris2/package.nix
diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/by-name/mp/mpdscribble/package.nix
similarity index 100%
rename from pkgs/tools/misc/mpdscribble/default.nix
rename to pkgs/by-name/mp/mpdscribble/package.nix
diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/by-name/mp/mpfi/package.nix
similarity index 100%
rename from pkgs/development/libraries/mpfi/default.nix
rename to pkgs/by-name/mp/mpfi/package.nix
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/by-name/mp/mpfr/package.nix
similarity index 100%
rename from pkgs/development/libraries/mpfr/default.nix
rename to pkgs/by-name/mp/mpfr/package.nix
diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/by-name/mp/mpfshell/package.nix
similarity index 100%
rename from pkgs/development/tools/mpfshell/default.nix
rename to pkgs/by-name/mp/mpfshell/package.nix
diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/by-name/mp/mph_2b_damase/package.nix
similarity index 100%
rename from pkgs/data/fonts/mph-2b-damase/default.nix
rename to pkgs/by-name/mp/mph_2b_damase/package.nix
diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh
rename to pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh
diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix
similarity index 100%
rename from pkgs/build-support/setup-hooks/mpi-check-hook/default.nix
rename to pkgs/by-name/mp/mpiCheckPhaseHook/package.nix
diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml b/pkgs/by-name/mp/mpiCheckPhaseHook/topology.xml
similarity index 100%
rename from pkgs/build-support/setup-hooks/mpi-check-hook/topology.xml
rename to pkgs/by-name/mp/mpiCheckPhaseHook/topology.xml
diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/by-name/mp/mpir/package.nix
similarity index 100%
rename from pkgs/development/libraries/mpir/default.nix
rename to pkgs/by-name/mp/mpir/package.nix
diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/by-name/mp/mprime/package.nix
similarity index 100%
rename from pkgs/tools/misc/mprime/default.nix
rename to pkgs/by-name/mp/mprime/package.nix
diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/by-name/mp/mpris-scrobbler/package.nix
similarity index 100%
rename from pkgs/tools/audio/mpris-scrobbler/default.nix
rename to pkgs/by-name/mp/mpris-scrobbler/package.nix
diff --git a/pkgs/tools/misc/mprocs/default.nix b/pkgs/by-name/mp/mprocs/package.nix
similarity index 100%
rename from pkgs/tools/misc/mprocs/default.nix
rename to pkgs/by-name/mp/mprocs/package.nix
diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/by-name/mp/mps/package.nix
similarity index 100%
rename from pkgs/development/libraries/mps/default.nix
rename to pkgs/by-name/mp/mps/package.nix
diff --git a/pkgs/applications/video/mpv-shim-default-shaders/default.nix b/pkgs/by-name/mp/mpv-shim-default-shaders/package.nix
similarity index 100%
rename from pkgs/applications/video/mpv-shim-default-shaders/default.nix
rename to pkgs/by-name/mp/mpv-shim-default-shaders/package.nix
diff --git a/pkgs/tools/wayland/mpvpaper/default.nix b/pkgs/by-name/mp/mpvpaper/package.nix
similarity index 100%
rename from pkgs/tools/wayland/mpvpaper/default.nix
rename to pkgs/by-name/mp/mpvpaper/package.nix
diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/by-name/mp/mpw/package.nix
similarity index 100%
rename from pkgs/tools/security/mpw/default.nix
rename to pkgs/by-name/mp/mpw/package.nix
diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/by-name/mq/mq-cli/package.nix
similarity index 100%
rename from pkgs/tools/system/mq-cli/default.nix
rename to pkgs/by-name/mq/mq-cli/package.nix
diff --git a/pkgs/tools/networking/mqtt-benchmark/default.nix b/pkgs/by-name/mq/mqtt-benchmark/package.nix
similarity index 100%
rename from pkgs/tools/networking/mqtt-benchmark/default.nix
rename to pkgs/by-name/mq/mqtt-benchmark/package.nix
diff --git a/pkgs/development/libraries/mqtt_cpp/default.nix b/pkgs/by-name/mq/mqtt_cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/mqtt_cpp/default.nix
rename to pkgs/by-name/mq/mqtt_cpp/package.nix
diff --git a/pkgs/tools/networking/mqttmultimeter/deps.nix b/pkgs/by-name/mq/mqttmultimeter/deps.nix
similarity index 100%
rename from pkgs/tools/networking/mqttmultimeter/deps.nix
rename to pkgs/by-name/mq/mqttmultimeter/deps.nix
diff --git a/pkgs/tools/networking/mqttmultimeter/default.nix b/pkgs/by-name/mq/mqttmultimeter/package.nix
similarity index 100%
rename from pkgs/tools/networking/mqttmultimeter/default.nix
rename to pkgs/by-name/mq/mqttmultimeter/package.nix
diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/by-name/mr/mr/package.nix
similarity index 100%
rename from pkgs/applications/version-management/mr/default.nix
rename to pkgs/by-name/mr/mr/package.nix
diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/by-name/mr/mrbayes/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/mrbayes/default.nix
rename to pkgs/by-name/mr/mrbayes/package.nix
diff --git a/pkgs/tools/text/mrkd/default.nix b/pkgs/by-name/mr/mrkd/package.nix
similarity index 100%
rename from pkgs/tools/text/mrkd/default.nix
rename to pkgs/by-name/mr/mrkd/package.nix
diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/by-name/mr/mro-unicode/package.nix
similarity index 100%
rename from pkgs/data/fonts/mro-unicode/default.nix
rename to pkgs/by-name/mr/mro-unicode/package.nix
diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/by-name/mr/mrpeach/package.nix
similarity index 100%
rename from pkgs/applications/audio/pd-plugins/mrpeach/default.nix
rename to pkgs/by-name/mr/mrpeach/package.nix
diff --git a/pkgs/shells/mrsh/default.nix b/pkgs/by-name/mr/mrsh/package.nix
similarity index 100%
rename from pkgs/shells/mrsh/default.nix
rename to pkgs/by-name/mr/mrsh/package.nix
diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/by-name/mr/mrtg/package.nix
similarity index 100%
rename from pkgs/tools/misc/mrtg/default.nix
rename to pkgs/by-name/mr/mrtg/package.nix
diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/by-name/mr/mruby/package.nix
similarity index 100%
rename from pkgs/development/compilers/mruby/default.nix
rename to pkgs/by-name/mr/mruby/package.nix
diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/by-name/mr/mrxvt/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/mrxvt/default.nix
rename to pkgs/by-name/mr/mrxvt/package.nix
diff --git a/pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch b/pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch
similarity index 100%
rename from pkgs/tools/misc/ms-sys/manpages-without-build-timestamps.patch
rename to pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch
diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/by-name/ms/ms-sys/package.nix
similarity index 100%
rename from pkgs/tools/misc/ms-sys/default.nix
rename to pkgs/by-name/ms/ms-sys/package.nix
diff --git a/pkgs/applications/science/logic/msat/default.nix b/pkgs/by-name/ms/msat/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/msat/default.nix
rename to pkgs/by-name/ms/msat/package.nix
diff --git a/pkgs/development/tools/build-managers/msbuild/deps.nix b/pkgs/by-name/ms/msbuild/deps.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/msbuild/deps.nix
rename to pkgs/by-name/ms/msbuild/deps.nix
diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/by-name/ms/msbuild/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/msbuild/default.nix
rename to pkgs/by-name/ms/msbuild/package.nix
diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/by-name/ms/mscgen/package.nix
similarity index 100%
rename from pkgs/tools/graphics/mscgen/default.nix
rename to pkgs/by-name/ms/mscgen/package.nix
diff --git a/pkgs/tools/security/msfpc/default.nix b/pkgs/by-name/ms/msfpc/package.nix
similarity index 100%
rename from pkgs/tools/security/msfpc/default.nix
rename to pkgs/by-name/ms/msfpc/package.nix
diff --git a/pkgs/development/libraries/msgpack-c/default.nix b/pkgs/by-name/ms/msgpack-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/msgpack-c/default.nix
rename to pkgs/by-name/ms/msgpack-c/package.nix
diff --git a/pkgs/development/libraries/msgpack-cxx/default.nix b/pkgs/by-name/ms/msgpack-cxx/package.nix
similarity index 100%
rename from pkgs/development/libraries/msgpack-cxx/default.nix
rename to pkgs/by-name/ms/msgpack-cxx/package.nix
diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/by-name/ms/msgpack-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/msgpack-tools/default.nix
rename to pkgs/by-name/ms/msgpack-tools/package.nix
diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/by-name/ms/msgpack/generic.nix
similarity index 100%
rename from pkgs/development/libraries/msgpack/generic.nix
rename to pkgs/by-name/ms/msgpack/generic.nix
diff --git a/pkgs/development/libraries/msgpack/default.nix b/pkgs/by-name/ms/msgpack/package.nix
similarity index 100%
rename from pkgs/development/libraries/msgpack/default.nix
rename to pkgs/by-name/ms/msgpack/package.nix
diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/by-name/ms/msgpuck/package.nix
similarity index 100%
rename from pkgs/development/libraries/msgpuck/default.nix
rename to pkgs/by-name/ms/msgpuck/package.nix
diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/by-name/ms/msgviewer/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/msgviewer/default.nix
rename to pkgs/by-name/ms/msgviewer/package.nix
diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/by-name/ms/msieve/package.nix
similarity index 100%
rename from pkgs/applications/science/math/msieve/default.nix
rename to pkgs/by-name/ms/msieve/package.nix
diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/by-name/ms/msilbc/package.nix
similarity index 100%
rename from pkgs/development/libraries/msilbc/default.nix
rename to pkgs/by-name/ms/msilbc/package.nix
diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/by-name/ms/msitools/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/msitools/default.nix
rename to pkgs/by-name/ms/msitools/package.nix
diff --git a/pkgs/tools/security/msldapdump/default.nix b/pkgs/by-name/ms/msldapdump/package.nix
similarity index 100%
rename from pkgs/tools/security/msldapdump/default.nix
rename to pkgs/by-name/ms/msldapdump/package.nix
diff --git a/pkgs/tools/misc/mslink/default.nix b/pkgs/by-name/ms/mslink/package.nix
similarity index 100%
rename from pkgs/tools/misc/mslink/default.nix
rename to pkgs/by-name/ms/mslink/package.nix
diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/by-name/ms/msr-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/msr-tools/default.nix
rename to pkgs/by-name/ms/msr-tools/package.nix
diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/by-name/ms/mstflint/package.nix
similarity index 100%
rename from pkgs/tools/misc/mstflint/default.nix
rename to pkgs/by-name/ms/mstflint/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/mstore/default.nix b/pkgs/by-name/ms/mstore/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/mstore/default.nix
rename to pkgs/by-name/ms/mstore/package.nix
diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/by-name/ms/mstpd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/mstpd/default.nix
rename to pkgs/by-name/ms/mstpd/package.nix
diff --git a/pkgs/applications/networking/mailreaders/mswatch/default.nix b/pkgs/by-name/ms/mswatch/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mswatch/default.nix
rename to pkgs/by-name/ms/mswatch/package.nix
diff --git a/pkgs/tools/backup/mt-st/default.nix b/pkgs/by-name/mt/mt-st/package.nix
similarity index 100%
rename from pkgs/tools/backup/mt-st/default.nix
rename to pkgs/by-name/mt/mt-st/package.nix
diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/by-name/mt/mtail/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/mtail/default.nix
rename to pkgs/by-name/mt/mtail/package.nix
diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/by-name/mt/mtdev/package.nix
similarity index 100%
rename from pkgs/development/libraries/mtdev/default.nix
rename to pkgs/by-name/mt/mtdev/package.nix
diff --git a/pkgs/tools/misc/mtm/default.nix b/pkgs/by-name/mt/mtm/package.nix
similarity index 100%
rename from pkgs/tools/misc/mtm/default.nix
rename to pkgs/by-name/mt/mtm/package.nix
diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/by-name/mt/mtpaint/package.nix
similarity index 100%
rename from pkgs/applications/graphics/mtpaint/default.nix
rename to pkgs/by-name/mt/mtpaint/package.nix
diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/by-name/mt/mtpfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/mtpfs/default.nix
rename to pkgs/by-name/mt/mtpfs/package.nix
diff --git a/pkgs/tools/networking/mtr-exporter/default.nix b/pkgs/by-name/mt/mtr-exporter/package.nix
similarity index 100%
rename from pkgs/tools/networking/mtr-exporter/default.nix
rename to pkgs/by-name/mt/mtr-exporter/package.nix
diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/by-name/mt/mtx/package.nix
similarity index 100%
rename from pkgs/tools/backup/mtx/default.nix
rename to pkgs/by-name/mt/mtx/package.nix
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/by-name/mu/mu/package.nix
similarity index 100%
rename from pkgs/tools/networking/mu/default.nix
rename to pkgs/by-name/mu/mu/package.nix
diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/by-name/mu/mubeng/package.nix
similarity index 100%
rename from pkgs/tools/networking/mubeng/default.nix
rename to pkgs/by-name/mu/mubeng/package.nix
diff --git a/pkgs/development/tools/haskell/mueval/default.nix b/pkgs/by-name/mu/mueval/package.nix
similarity index 100%
rename from pkgs/development/tools/haskell/mueval/default.nix
rename to pkgs/by-name/mu/mueval/package.nix
diff --git a/pkgs/tools/networking/muffet/default.nix b/pkgs/by-name/mu/muffet/package.nix
similarity index 100%
rename from pkgs/tools/networking/muffet/default.nix
rename to pkgs/by-name/mu/muffet/package.nix
diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/by-name/mu/mujs/package.nix
similarity index 100%
rename from pkgs/development/interpreters/mujs/default.nix
rename to pkgs/by-name/mu/mujs/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/multicharge/default.nix b/pkgs/by-name/mu/multicharge/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/multicharge/default.nix
rename to pkgs/by-name/mu/multicharge/package.nix
diff --git a/pkgs/misc/screensavers/multilockscreen/default.nix b/pkgs/by-name/mu/multilockscreen/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/multilockscreen/default.nix
rename to pkgs/by-name/mu/multilockscreen/package.nix
diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/by-name/mu/multimon-ng/package.nix
similarity index 100%
rename from pkgs/applications/radio/multimon-ng/default.nix
rename to pkgs/by-name/mu/multimon-ng/package.nix
diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/by-name/mu/multipart-parser-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/multipart-parser-c/default.nix
rename to pkgs/by-name/mu/multipart-parser-c/package.nix
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/by-name/mu/multipath-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/multipath-tools/default.nix
rename to pkgs/by-name/mu/multipath-tools/package.nix
diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/by-name/mu/multitail/package.nix
similarity index 100%
rename from pkgs/tools/misc/multitail/default.nix
rename to pkgs/by-name/mu/multitail/package.nix
diff --git a/pkgs/tools/misc/multitime/default.nix b/pkgs/by-name/mu/multitime/package.nix
similarity index 100%
rename from pkgs/tools/misc/multitime/default.nix
rename to pkgs/by-name/mu/multitime/package.nix
diff --git a/pkgs/applications/video/multiviewer-for-f1/default.nix b/pkgs/by-name/mu/multiviewer-for-f1/package.nix
similarity index 100%
rename from pkgs/applications/video/multiviewer-for-f1/default.nix
rename to pkgs/by-name/mu/multiviewer-for-f1/package.nix
diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/by-name/mu/multus-cni/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/multus-cni/default.nix
rename to pkgs/by-name/mu/multus-cni/package.nix
diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/by-name/mu/munge/package.nix
similarity index 100%
rename from pkgs/tools/security/munge/default.nix
rename to pkgs/by-name/mu/munge/package.nix
diff --git a/pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch b/pkgs/by-name/mu/munin/adding_sconfdir_munin-node.patch
similarity index 100%
rename from pkgs/servers/monitoring/munin/adding_sconfdir_munin-node.patch
rename to pkgs/by-name/mu/munin/adding_sconfdir_munin-node.patch
diff --git a/pkgs/servers/monitoring/munin/adding_servicedir_munin-node.patch b/pkgs/by-name/mu/munin/adding_servicedir_munin-node.patch
similarity index 100%
rename from pkgs/servers/monitoring/munin/adding_servicedir_munin-node.patch
rename to pkgs/by-name/mu/munin/adding_servicedir_munin-node.patch
diff --git a/pkgs/servers/monitoring/munin/dont_preserve_source_dir_permissions.patch b/pkgs/by-name/mu/munin/dont_preserve_source_dir_permissions.patch
similarity index 100%
rename from pkgs/servers/monitoring/munin/dont_preserve_source_dir_permissions.patch
rename to pkgs/by-name/mu/munin/dont_preserve_source_dir_permissions.patch
diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/by-name/mu/munin/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/munin/default.nix
rename to pkgs/by-name/mu/munin/package.nix
diff --git a/pkgs/servers/monitoring/munin/preserve_environment.patch b/pkgs/by-name/mu/munin/preserve_environment.patch
similarity index 100%
rename from pkgs/servers/monitoring/munin/preserve_environment.patch
rename to pkgs/by-name/mu/munin/preserve_environment.patch
diff --git a/pkgs/development/compilers/muonlang/default.nix b/pkgs/by-name/mu/muonlang/package.nix
similarity index 100%
rename from pkgs/development/compilers/muonlang/default.nix
rename to pkgs/by-name/mu/muonlang/package.nix
diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/by-name/mu/muparserx/package.nix
similarity index 100%
rename from pkgs/development/libraries/muparserx/default.nix
rename to pkgs/by-name/mu/muparserx/package.nix
diff --git a/pkgs/applications/misc/mupdf/fix-cpp-build.patch b/pkgs/by-name/mu/mupdf/fix-cpp-build.patch
similarity index 100%
rename from pkgs/applications/misc/mupdf/fix-cpp-build.patch
rename to pkgs/by-name/mu/mupdf/fix-cpp-build.patch
diff --git a/pkgs/applications/misc/mupdf/fix-darwin-system-deps.patch b/pkgs/by-name/mu/mupdf/fix-darwin-system-deps.patch
similarity index 100%
rename from pkgs/applications/misc/mupdf/fix-darwin-system-deps.patch
rename to pkgs/by-name/mu/mupdf/fix-darwin-system-deps.patch
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/by-name/mu/mupdf/package.nix
similarity index 100%
rename from pkgs/applications/misc/mupdf/default.nix
rename to pkgs/by-name/mu/mupdf/package.nix
diff --git a/pkgs/applications/emulators/mupen64plus/default.nix b/pkgs/by-name/mu/mupen64plus/package.nix
similarity index 100%
rename from pkgs/applications/emulators/mupen64plus/default.nix
rename to pkgs/by-name/mu/mupen64plus/package.nix
diff --git a/pkgs/shells/murex/default.nix b/pkgs/by-name/mu/murex/package.nix
similarity index 100%
rename from pkgs/shells/murex/default.nix
rename to pkgs/by-name/mu/murex/package.nix
diff --git a/pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch b/pkgs/by-name/mu/muscle/muscle-darwin-g++.patch
similarity index 100%
rename from pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch
rename to pkgs/by-name/mu/muscle/muscle-darwin-g++.patch
diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/by-name/mu/muscle/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/muscle/default.nix
rename to pkgs/by-name/mu/muscle/package.nix
diff --git a/pkgs/applications/audio/museeks/default.nix b/pkgs/by-name/mu/museeks/package.nix
similarity index 100%
rename from pkgs/applications/audio/museeks/default.nix
rename to pkgs/by-name/mu/museeks/package.nix
diff --git a/pkgs/os-specific/linux/musl-fts/default.nix b/pkgs/by-name/mu/musl-fts/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/musl-fts/default.nix
rename to pkgs/by-name/mu/musl-fts/package.nix
diff --git a/pkgs/os-specific/linux/musl-obstack/default.nix b/pkgs/by-name/mu/musl-obstack/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/musl-obstack/default.nix
rename to pkgs/by-name/mu/musl-obstack/package.nix
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/by-name/mu/musl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/musl/default.nix
rename to pkgs/by-name/mu/musl/package.nix
diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/by-name/mu/mustache-go/package.nix
similarity index 100%
rename from pkgs/development/tools/mustache-go/default.nix
rename to pkgs/by-name/mu/mustache-go/package.nix
diff --git a/pkgs/development/libraries/mustache-hpp/default.nix b/pkgs/by-name/mu/mustache-hpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/mustache-hpp/default.nix
rename to pkgs/by-name/mu/mustache-hpp/package.nix
diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/by-name/mu/mustache-spec/package.nix
similarity index 100%
rename from pkgs/data/documentation/mustache-spec/default.nix
rename to pkgs/by-name/mu/mustache-spec/package.nix
diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/by-name/mu/mutagen-compose/package.nix
similarity index 100%
rename from pkgs/tools/misc/mutagen-compose/default.nix
rename to pkgs/by-name/mu/mutagen-compose/package.nix
diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/by-name/mu/mutagen/package.nix
similarity index 100%
rename from pkgs/tools/misc/mutagen/default.nix
rename to pkgs/by-name/mu/mutagen/package.nix
diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/by-name/mu/mutest/package.nix
similarity index 100%
rename from pkgs/development/libraries/mutest/default.nix
rename to pkgs/by-name/mu/mutest/package.nix
diff --git a/pkgs/development/tools/mutmut/default.nix b/pkgs/by-name/mu/mutmut/package.nix
similarity index 100%
rename from pkgs/development/tools/mutmut/default.nix
rename to pkgs/by-name/mu/mutmut/package.nix
diff --git a/pkgs/tools/networking/mutt-ics/default.nix b/pkgs/by-name/mu/mutt-ics/package.nix
similarity index 100%
rename from pkgs/tools/networking/mutt-ics/default.nix
rename to pkgs/by-name/mu/mutt-ics/package.nix
diff --git a/pkgs/tools/misc/mutt-wizard/default.nix b/pkgs/by-name/mu/mutt-wizard/package.nix
similarity index 100%
rename from pkgs/tools/misc/mutt-wizard/default.nix
rename to pkgs/by-name/mu/mutt-wizard/package.nix
diff --git a/pkgs/applications/networking/mailreaders/mutt/no-build-only-refs.patch b/pkgs/by-name/mu/mutt/no-build-only-refs.patch
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mutt/no-build-only-refs.patch
rename to pkgs/by-name/mu/mutt/no-build-only-refs.patch
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/by-name/mu/mutt/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/mutt/default.nix
rename to pkgs/by-name/mu/mutt/package.nix
diff --git a/pkgs/by-name/mu/mutter/43/default.nix b/pkgs/by-name/mu/mutter43/package.nix
similarity index 100%
rename from pkgs/by-name/mu/mutter/43/default.nix
rename to pkgs/by-name/mu/mutter43/package.nix
diff --git a/pkgs/applications/audio/muzika/default.nix b/pkgs/by-name/mu/muzika/package.nix
similarity index 100%
rename from pkgs/applications/audio/muzika/default.nix
rename to pkgs/by-name/mu/muzika/package.nix
diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/by-name/mv/mvapich/package.nix
similarity index 100%
rename from pkgs/development/libraries/mvapich/default.nix
rename to pkgs/by-name/mv/mvapich/package.nix
diff --git a/pkgs/tools/misc/mvebu64boot/default.nix b/pkgs/by-name/mv/mvebu64boot/package.nix
similarity index 100%
rename from pkgs/tools/misc/mvebu64boot/default.nix
rename to pkgs/by-name/mv/mvebu64boot/package.nix
diff --git a/pkgs/tools/text/mw/default.nix b/pkgs/by-name/mw/mw/package.nix
similarity index 100%
rename from pkgs/tools/text/mw/default.nix
rename to pkgs/by-name/mw/mw/package.nix
diff --git a/pkgs/tools/security/mx-takeover/default.nix b/pkgs/by-name/mx/mx-takeover/package.nix
similarity index 100%
rename from pkgs/tools/security/mx-takeover/default.nix
rename to pkgs/by-name/mx/mx-takeover/package.nix
diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/by-name/mx/mxt-app/package.nix
similarity index 100%
rename from pkgs/misc/mxt-app/default.nix
rename to pkgs/by-name/mx/mxt-app/package.nix
diff --git a/pkgs/applications/misc/mya/argp.patch b/pkgs/by-name/my/mya/argp.patch
similarity index 100%
rename from pkgs/applications/misc/mya/argp.patch
rename to pkgs/by-name/my/mya/argp.patch
diff --git a/pkgs/applications/misc/mya/default.nix b/pkgs/by-name/my/mya/package.nix
similarity index 100%
rename from pkgs/applications/misc/mya/default.nix
rename to pkgs/by-name/my/mya/package.nix
diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/by-name/my/mycli/package.nix
similarity index 100%
rename from pkgs/tools/admin/mycli/default.nix
rename to pkgs/by-name/my/mycli/package.nix
diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/by-name/my/mycorrhiza/package.nix
similarity index 100%
rename from pkgs/servers/mycorrhiza/default.nix
rename to pkgs/by-name/my/mycorrhiza/package.nix
diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/by-name/my/mycrypto/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/mycrypto/default.nix
rename to pkgs/by-name/my/mycrypto/package.nix
diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/by-name/my/mydumper/package.nix
similarity index 100%
rename from pkgs/tools/backup/mydumper/default.nix
rename to pkgs/by-name/my/mydumper/package.nix
diff --git a/pkgs/tools/backup/mylvmbackup/default.nix b/pkgs/by-name/my/mylvmbackup/package.nix
similarity index 100%
rename from pkgs/tools/backup/mylvmbackup/default.nix
rename to pkgs/by-name/my/mylvmbackup/package.nix
diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/by-name/my/mympd/package.nix
similarity index 100%
rename from pkgs/applications/audio/mympd/default.nix
rename to pkgs/by-name/my/mympd/package.nix
diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/by-name/my/mynewt-newt/package.nix
similarity index 100%
rename from pkgs/tools/package-management/mynewt-newt/default.nix
rename to pkgs/by-name/my/mynewt-newt/package.nix
diff --git a/pkgs/tools/misc/mynewt-newtmgr/default.nix b/pkgs/by-name/my/mynewt-newtmgr/package.nix
similarity index 100%
rename from pkgs/tools/misc/mynewt-newtmgr/default.nix
rename to pkgs/by-name/my/mynewt-newtmgr/package.nix
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/by-name/my/mypaint/package.nix
similarity index 100%
rename from pkgs/applications/graphics/mypaint/default.nix
rename to pkgs/by-name/my/mypaint/package.nix
diff --git a/pkgs/development/compilers/myrddin/default.nix b/pkgs/by-name/my/myrddin/package.nix
similarity index 100%
rename from pkgs/development/compilers/myrddin/default.nix
rename to pkgs/by-name/my/myrddin/package.nix
diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/by-name/my/myrica/package.nix
similarity index 100%
rename from pkgs/data/fonts/myrica/default.nix
rename to pkgs/by-name/my/myrica/package.nix
diff --git a/pkgs/os-specific/darwin/mysides/default.nix b/pkgs/by-name/my/mysides/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/mysides/default.nix
rename to pkgs/by-name/my/mysides/package.nix
diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/by-name/my/mysql2pgsql/package.nix
similarity index 100%
rename from pkgs/tools/misc/mysql2pgsql/default.nix
rename to pkgs/by-name/my/mysql2pgsql/package.nix
diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/by-name/my/mysql_jdbc/package.nix
similarity index 100%
rename from pkgs/servers/sql/mysql/jdbc/default.nix
rename to pkgs/by-name/my/mysql_jdbc/package.nix
diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/by-name/my/mysqltuner/package.nix
similarity index 100%
rename from pkgs/tools/misc/mysqltuner/default.nix
rename to pkgs/by-name/my/mysqltuner/package.nix
diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/by-name/my/mystem/package.nix
similarity index 100%
rename from pkgs/applications/misc/mystem/default.nix
rename to pkgs/by-name/my/mystem/package.nix
diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/by-name/my/mythes/package.nix
similarity index 100%
rename from pkgs/development/libraries/mythes/default.nix
rename to pkgs/by-name/my/mythes/package.nix
diff --git a/pkgs/games/n2048/default.nix b/pkgs/by-name/n2/n2048/package.nix
similarity index 100%
rename from pkgs/games/n2048/default.nix
rename to pkgs/by-name/n2/n2048/package.nix
diff --git a/pkgs/tools/networking/n2n/default.nix b/pkgs/by-name/n2/n2n/package.nix
similarity index 100%
rename from pkgs/tools/networking/n2n/default.nix
rename to pkgs/by-name/n2/n2n/package.nix
diff --git a/pkgs/applications/science/biology/N3/default.nix b/pkgs/by-name/n3/n3/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/N3/default.nix
rename to pkgs/by-name/n3/n3/package.nix
diff --git a/pkgs/development/tools/misc/n98-magerun/default.nix b/pkgs/by-name/n9/n98-magerun/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/n98-magerun/default.nix
rename to pkgs/by-name/n9/n98-magerun/package.nix
diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/by-name/na/naabu/package.nix
similarity index 100%
rename from pkgs/tools/security/naabu/default.nix
rename to pkgs/by-name/na/naabu/package.nix
diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/by-name/na/nabi/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/nabi/default.nix
rename to pkgs/by-name/na/nabi/package.nix
diff --git a/pkgs/data/fonts/nacelle/default.nix b/pkgs/by-name/na/nacelle/package.nix
similarity index 100%
rename from pkgs/data/fonts/nacelle/default.nix
rename to pkgs/by-name/na/nacelle/package.nix
diff --git a/pkgs/games/naev/default.nix b/pkgs/by-name/na/naev/package.nix
similarity index 100%
rename from pkgs/games/naev/default.nix
rename to pkgs/by-name/na/naev/package.nix
diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/by-name/na/nafees/package.nix
similarity index 100%
rename from pkgs/data/fonts/nafees/default.nix
rename to pkgs/by-name/na/nafees/package.nix
diff --git a/pkgs/development/tools/nagelfar/default.nix b/pkgs/by-name/na/nagelfar/package.nix
similarity index 100%
rename from pkgs/development/tools/nagelfar/default.nix
rename to pkgs/by-name/na/nagelfar/package.nix
diff --git a/pkgs/servers/monitoring/nagios/nagios.patch b/pkgs/by-name/na/nagios/nagios.patch
similarity index 100%
rename from pkgs/servers/monitoring/nagios/nagios.patch
rename to pkgs/by-name/na/nagios/nagios.patch
diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/by-name/na/nagios/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/nagios/default.nix
rename to pkgs/by-name/na/nagios/package.nix
diff --git a/pkgs/data/fonts/nahid-fonts/default.nix b/pkgs/by-name/na/nahid-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/nahid-fonts/default.nix
rename to pkgs/by-name/na/nahid-fonts/package.nix
diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/by-name/na/nailgun/package.nix
similarity index 100%
rename from pkgs/development/tools/nailgun/default.nix
rename to pkgs/by-name/na/nailgun/package.nix
diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/by-name/na/nali/package.nix
similarity index 100%
rename from pkgs/applications/networking/nali/default.nix
rename to pkgs/by-name/na/nali/package.nix
diff --git a/pkgs/development/tools/misc/namaka/default.nix b/pkgs/by-name/na/namaka/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/namaka/default.nix
rename to pkgs/by-name/na/namaka/package.nix
diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/by-name/na/namazu/package.nix
similarity index 100%
rename from pkgs/tools/text/namazu/default.nix
rename to pkgs/by-name/na/namazu/package.nix
diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/by-name/na/namecoind/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/namecoin/default.nix
rename to pkgs/by-name/na/namecoind/package.nix
diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/by-name/na/nanoblogger/package.nix
similarity index 100%
rename from pkgs/applications/misc/nanoblogger/default.nix
rename to pkgs/by-name/na/nanoblogger/package.nix
diff --git a/pkgs/development/libraries/nanodbc/default.nix b/pkgs/by-name/na/nanodbc/package.nix
similarity index 100%
rename from pkgs/development/libraries/nanodbc/default.nix
rename to pkgs/by-name/na/nanodbc/package.nix
diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/by-name/na/nanomsg/package.nix
similarity index 100%
rename from pkgs/development/libraries/nanomsg/default.nix
rename to pkgs/by-name/na/nanomsg/package.nix
diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/by-name/na/nanorc/package.nix
similarity index 100%
rename from pkgs/applications/editors/nano/nanorc/default.nix
rename to pkgs/by-name/na/nanorc/package.nix
diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/by-name/na/nanosaur/package.nix
similarity index 100%
rename from pkgs/games/nanosaur/default.nix
rename to pkgs/by-name/na/nanosaur/package.nix
diff --git a/pkgs/games/nanosaur2/default.nix b/pkgs/by-name/na/nanosaur2/package.nix
similarity index 100%
rename from pkgs/games/nanosaur2/default.nix
rename to pkgs/by-name/na/nanosaur2/package.nix
diff --git a/pkgs/development/libraries/nanosvg/default.nix b/pkgs/by-name/na/nanosvg/package.nix
similarity index 100%
rename from pkgs/development/libraries/nanosvg/default.nix
rename to pkgs/by-name/na/nanosvg/package.nix
diff --git a/pkgs/tools/audio/nanotts/default.nix b/pkgs/by-name/na/nanotts/package.nix
similarity index 100%
rename from pkgs/tools/audio/nanotts/default.nix
rename to pkgs/by-name/na/nanotts/package.nix
diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/by-name/na/nanum-gothic-coding/package.nix
similarity index 100%
rename from pkgs/data/fonts/nanum-gothic-coding/default.nix
rename to pkgs/by-name/na/nanum-gothic-coding/package.nix
diff --git a/pkgs/data/fonts/nanum/default.nix b/pkgs/by-name/na/nanum/package.nix
similarity index 100%
rename from pkgs/data/fonts/nanum/default.nix
rename to pkgs/by-name/na/nanum/package.nix
diff --git a/pkgs/development/tools/nap/default.nix b/pkgs/by-name/na/nap/package.nix
similarity index 100%
rename from pkgs/development/tools/nap/default.nix
rename to pkgs/by-name/na/nap/package.nix
diff --git a/pkgs/development/tools/napi-rs-cli/default.nix b/pkgs/by-name/na/napi-rs-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/napi-rs-cli/default.nix
rename to pkgs/by-name/na/napi-rs-cli/package.nix
diff --git a/pkgs/tools/networking/narrowlink/default.nix b/pkgs/by-name/na/narrowlink/package.nix
similarity index 100%
rename from pkgs/tools/networking/narrowlink/default.nix
rename to pkgs/by-name/na/narrowlink/package.nix
diff --git a/pkgs/servers/nas/default.nix b/pkgs/by-name/na/nas/package.nix
similarity index 100%
rename from pkgs/servers/nas/default.nix
rename to pkgs/by-name/na/nas/package.nix
diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/by-name/na/nasc/package.nix
similarity index 100%
rename from pkgs/applications/science/math/nasc/default.nix
rename to pkgs/by-name/na/nasc/package.nix
diff --git a/pkgs/data/fonts/nasin-nanpa/default.nix b/pkgs/by-name/na/nasin-nanpa/package.nix
similarity index 100%
rename from pkgs/data/fonts/nasin-nanpa/default.nix
rename to pkgs/by-name/na/nasin-nanpa/package.nix
diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/by-name/na/nasm/package.nix
similarity index 100%
rename from pkgs/development/compilers/nasm/default.nix
rename to pkgs/by-name/na/nasm/package.nix
diff --git a/pkgs/development/tools/nasmfmt/default.nix b/pkgs/by-name/na/nasmfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/nasmfmt/default.nix
rename to pkgs/by-name/na/nasmfmt/package.nix
diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/by-name/na/nasty/package.nix
similarity index 100%
rename from pkgs/tools/security/nasty/default.nix
rename to pkgs/by-name/na/nasty/package.nix
diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/by-name/na/nat-traverse/package.nix
similarity index 100%
rename from pkgs/tools/networking/nat-traverse/default.nix
rename to pkgs/by-name/na/nat-traverse/package.nix
diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/by-name/na/national-park-typeface/package.nix
similarity index 100%
rename from pkgs/data/fonts/national-park/default.nix
rename to pkgs/by-name/na/national-park-typeface/package.nix
diff --git a/pkgs/tools/misc/natls/default.nix b/pkgs/by-name/na/natls/package.nix
similarity index 100%
rename from pkgs/tools/misc/natls/default.nix
rename to pkgs/by-name/na/natls/package.nix
diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/by-name/na/nats-server/package.nix
similarity index 100%
rename from pkgs/servers/nats-server/default.nix
rename to pkgs/by-name/na/nats-server/package.nix
diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/by-name/na/nats-streaming-server/package.nix
similarity index 100%
rename from pkgs/servers/nats-streaming-server/default.nix
rename to pkgs/by-name/na/nats-streaming-server/package.nix
diff --git a/pkgs/tools/system/nats-top/default.nix b/pkgs/by-name/na/nats-top/package.nix
similarity index 100%
rename from pkgs/tools/system/nats-top/default.nix
rename to pkgs/by-name/na/nats-top/package.nix
diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/by-name/na/natscli/package.nix
similarity index 100%
rename from pkgs/tools/system/natscli/default.nix
rename to pkgs/by-name/na/natscli/package.nix
diff --git a/pkgs/applications/misc/natural-docs/default.nix b/pkgs/by-name/na/natural-docs/package.nix
similarity index 100%
rename from pkgs/applications/misc/natural-docs/default.nix
rename to pkgs/by-name/na/natural-docs/package.nix
diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch b/pkgs/by-name/na/nautilus-open-any-terminal/hardcode-gsettings.patch
similarity index 100%
rename from pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch
rename to pkgs/by-name/na/nautilus-open-any-terminal/hardcode-gsettings.patch
diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/by-name/na/nautilus-open-any-terminal/package.nix
similarity index 100%
rename from pkgs/tools/misc/nautilus-open-any-terminal/default.nix
rename to pkgs/by-name/na/nautilus-open-any-terminal/package.nix
diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/by-name/na/nauty/package.nix
similarity index 100%
rename from pkgs/applications/science/math/nauty/default.nix
rename to pkgs/by-name/na/nauty/package.nix
diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/by-name/na/navi/package.nix
similarity index 100%
rename from pkgs/applications/misc/navi/default.nix
rename to pkgs/by-name/na/navi/package.nix
diff --git a/pkgs/tools/misc/nb/default.nix b/pkgs/by-name/nb/nb/package.nix
similarity index 100%
rename from pkgs/tools/misc/nb/default.nix
rename to pkgs/by-name/nb/nb/package.nix
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/by-name/nb/nbd/package.nix
similarity index 100%
rename from pkgs/tools/networking/nbd/default.nix
rename to pkgs/by-name/nb/nbd/package.nix
diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/by-name/nb/nbench/package.nix
similarity index 100%
rename from pkgs/tools/misc/nbench/default.nix
rename to pkgs/by-name/nb/nbench/package.nix
diff --git a/pkgs/tools/security/nbutools/default.nix b/pkgs/by-name/nb/nbutools/package.nix
similarity index 100%
rename from pkgs/tools/security/nbutools/default.nix
rename to pkgs/by-name/nb/nbutools/package.nix
diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/by-name/nb/nbxplorer/deps.nix
similarity index 100%
rename from pkgs/applications/blockchains/nbxplorer/deps.nix
rename to pkgs/by-name/nb/nbxplorer/deps.nix
diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/by-name/nb/nbxplorer/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/nbxplorer/default.nix
rename to pkgs/by-name/nb/nbxplorer/package.nix
diff --git a/pkgs/applications/blockchains/nbxplorer/update.sh b/pkgs/by-name/nb/nbxplorer/update.sh
similarity index 100%
rename from pkgs/applications/blockchains/nbxplorer/update.sh
rename to pkgs/by-name/nb/nbxplorer/update.sh
diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/by-name/nb/nbxplorer/util/update-common.sh
similarity index 100%
rename from pkgs/applications/blockchains/nbxplorer/util/update-common.sh
rename to pkgs/by-name/nb/nbxplorer/util/update-common.sh
diff --git a/pkgs/servers/dns/ncdns/fix-tpl-path.patch b/pkgs/by-name/nc/ncdns/fix-tpl-path.patch
similarity index 100%
rename from pkgs/servers/dns/ncdns/fix-tpl-path.patch
rename to pkgs/by-name/nc/ncdns/fix-tpl-path.patch
diff --git a/pkgs/servers/dns/ncdns/ncdns-go.mod b/pkgs/by-name/nc/ncdns/ncdns-go.mod
similarity index 100%
rename from pkgs/servers/dns/ncdns/ncdns-go.mod
rename to pkgs/by-name/nc/ncdns/ncdns-go.mod
diff --git a/pkgs/servers/dns/ncdns/ncdns-go.sum b/pkgs/by-name/nc/ncdns/ncdns-go.sum
similarity index 100%
rename from pkgs/servers/dns/ncdns/ncdns-go.sum
rename to pkgs/by-name/nc/ncdns/ncdns-go.sum
diff --git a/pkgs/servers/dns/ncdns/default.nix b/pkgs/by-name/nc/ncdns/package.nix
similarity index 100%
rename from pkgs/servers/dns/ncdns/default.nix
rename to pkgs/by-name/nc/ncdns/package.nix
diff --git a/pkgs/servers/dns/ncdns/x509-go.mod b/pkgs/by-name/nc/ncdns/x509-go.mod
similarity index 100%
rename from pkgs/servers/dns/ncdns/x509-go.mod
rename to pkgs/by-name/nc/ncdns/x509-go.mod
diff --git a/pkgs/servers/dns/ncdns/x509-go.sum b/pkgs/by-name/nc/ncdns/x509-go.sum
similarity index 100%
rename from pkgs/servers/dns/ncdns/x509-go.sum
rename to pkgs/by-name/nc/ncdns/x509-go.sum
diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/by-name/nc/ncftp/package.nix
similarity index 100%
rename from pkgs/tools/networking/ncftp/default.nix
rename to pkgs/by-name/nc/ncftp/package.nix
diff --git a/pkgs/applications/networking/ncgopher/default.nix b/pkgs/by-name/nc/ncgopher/package.nix
similarity index 100%
rename from pkgs/applications/networking/ncgopher/default.nix
rename to pkgs/by-name/nc/ncgopher/package.nix
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/by-name/nc/ncmpc/package.nix
similarity index 100%
rename from pkgs/applications/audio/ncmpc/default.nix
rename to pkgs/by-name/nc/ncmpc/package.nix
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/by-name/nc/ncmpcpp/package.nix
similarity index 100%
rename from pkgs/applications/audio/ncmpcpp/default.nix
rename to pkgs/by-name/nc/ncmpcpp/package.nix
diff --git a/pkgs/development/libraries/ncnn/cmakelists.patch b/pkgs/by-name/nc/ncnn/cmakelists.patch
similarity index 100%
rename from pkgs/development/libraries/ncnn/cmakelists.patch
rename to pkgs/by-name/nc/ncnn/cmakelists.patch
diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/by-name/nc/ncnn/package.nix
similarity index 100%
rename from pkgs/development/libraries/ncnn/default.nix
rename to pkgs/by-name/nc/ncnn/package.nix
diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/by-name/nc/nco/package.nix
similarity index 100%
rename from pkgs/development/libraries/nco/default.nix
rename to pkgs/by-name/nc/nco/package.nix
diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/by-name/nc/ncompress/package.nix
similarity index 100%
rename from pkgs/tools/compression/ncompress/default.nix
rename to pkgs/by-name/nc/ncompress/package.nix
diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/by-name/nc/ncpamixer/package.nix
similarity index 100%
rename from pkgs/applications/audio/ncpamixer/default.nix
rename to pkgs/by-name/nc/ncpamixer/package.nix
diff --git a/pkgs/applications/audio/ncpamixer/remove_dynamic_download.patch b/pkgs/by-name/nc/ncpamixer/remove_dynamic_download.patch
similarity index 100%
rename from pkgs/applications/audio/ncpamixer/remove_dynamic_download.patch
rename to pkgs/by-name/nc/ncpamixer/remove_dynamic_download.patch
diff --git a/pkgs/tools/security/ncrack/default.nix b/pkgs/by-name/nc/ncrack/package.nix
similarity index 100%
rename from pkgs/tools/security/ncrack/default.nix
rename to pkgs/by-name/nc/ncrack/package.nix
diff --git a/pkgs/tools/X11/ncview/default.nix b/pkgs/by-name/nc/ncview/package.nix
similarity index 100%
rename from pkgs/tools/X11/ncview/default.nix
rename to pkgs/by-name/nc/ncview/package.nix
diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/by-name/nd/ndisc6/package.nix
similarity index 100%
rename from pkgs/tools/networking/ndisc6/default.nix
rename to pkgs/by-name/nd/ndisc6/package.nix
diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/by-name/nd/ndjbdns/package.nix
similarity index 100%
rename from pkgs/tools/networking/ndjbdns/default.nix
rename to pkgs/by-name/nd/ndjbdns/package.nix
diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/by-name/nd/ndpi/package.nix
similarity index 100%
rename from pkgs/development/libraries/ndpi/default.nix
rename to pkgs/by-name/nd/ndpi/package.nix
diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/by-name/nd/ndppd/package.nix
similarity index 100%
rename from pkgs/applications/networking/ndppd/default.nix
rename to pkgs/by-name/nd/ndppd/package.nix
diff --git a/pkgs/tools/archivers/ndstool/default.nix b/pkgs/by-name/nd/ndstool/package.nix
similarity index 100%
rename from pkgs/tools/archivers/ndstool/default.nix
rename to pkgs/by-name/nd/ndstool/package.nix
diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/by-name/ne/ne/package.nix
similarity index 100%
rename from pkgs/applications/editors/ne/default.nix
rename to pkgs/by-name/ne/ne/package.nix
diff --git a/pkgs/tools/misc/near-cli/package.json b/pkgs/by-name/ne/near-cli/package.json
similarity index 100%
rename from pkgs/tools/misc/near-cli/package.json
rename to pkgs/by-name/ne/near-cli/package.json
diff --git a/pkgs/tools/misc/near-cli/default.nix b/pkgs/by-name/ne/near-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/near-cli/default.nix
rename to pkgs/by-name/ne/near-cli/package.nix
diff --git a/pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch b/pkgs/by-name/ne/nearcore/0001-make-near-test-contracts-optional.patch
similarity index 100%
rename from pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch
rename to pkgs/by-name/ne/nearcore/0001-make-near-test-contracts-optional.patch
diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/by-name/ne/nearcore/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/nearcore/default.nix
rename to pkgs/by-name/ne/nearcore/package.nix
diff --git a/pkgs/servers/neard/default.nix b/pkgs/by-name/ne/neard/package.nix
similarity index 100%
rename from pkgs/servers/neard/default.nix
rename to pkgs/by-name/ne/neard/package.nix
diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/by-name/ne/neardal/package.nix
similarity index 100%
rename from pkgs/development/libraries/neardal/default.nix
rename to pkgs/by-name/ne/neardal/package.nix
diff --git a/pkgs/development/libraries/neatvnc/fix-ffmpeg.patch b/pkgs/by-name/ne/neatvnc/fix-ffmpeg.patch
similarity index 100%
rename from pkgs/development/libraries/neatvnc/fix-ffmpeg.patch
rename to pkgs/by-name/ne/neatvnc/fix-ffmpeg.patch
diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/by-name/ne/neatvnc/package.nix
similarity index 100%
rename from pkgs/development/libraries/neatvnc/default.nix
rename to pkgs/by-name/ne/neatvnc/package.nix
diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/by-name/ne/nebula/package.nix
similarity index 100%
rename from pkgs/tools/networking/nebula/default.nix
rename to pkgs/by-name/ne/nebula/package.nix
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/by-name/ne/nedit/package.nix
similarity index 100%
rename from pkgs/applications/editors/nedit/default.nix
rename to pkgs/by-name/ne/nedit/package.nix
diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/by-name/ne/neil/package.nix
similarity index 100%
rename from pkgs/development/tools/neil/default.nix
rename to pkgs/by-name/ne/neil/package.nix
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/by-name/ne/neko/package.nix
similarity index 100%
rename from pkgs/development/compilers/neko/default.nix
rename to pkgs/by-name/ne/neko/package.nix
diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/by-name/ne/nelua/package.nix
similarity index 100%
rename from pkgs/development/interpreters/nelua/default.nix
rename to pkgs/by-name/ne/nelua/package.nix
diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/by-name/ne/nemiver/package.nix
similarity index 100%
rename from pkgs/development/tools/nemiver/default.nix
rename to pkgs/by-name/ne/nemiver/package.nix
diff --git a/pkgs/applications/science/machine-learning/nengo-gui/default.nix b/pkgs/by-name/ne/nengo-gui/package.nix
similarity index 100%
rename from pkgs/applications/science/machine-learning/nengo-gui/default.nix
rename to pkgs/by-name/ne/nengo-gui/package.nix
diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/by-name/ne/neo-cowsay/package.nix
similarity index 100%
rename from pkgs/tools/misc/neo-cowsay/default.nix
rename to pkgs/by-name/ne/neo-cowsay/package.nix
diff --git a/pkgs/applications/misc/neo/default.nix b/pkgs/by-name/ne/neo/package.nix
similarity index 100%
rename from pkgs/applications/misc/neo/default.nix
rename to pkgs/by-name/ne/neo/package.nix
diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/by-name/ne/neo4j-desktop/package.nix
similarity index 100%
rename from pkgs/applications/misc/neo4j-desktop/default.nix
rename to pkgs/by-name/ne/neo4j-desktop/package.nix
diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/by-name/ne/neo4j/package.nix
similarity index 100%
rename from pkgs/servers/nosql/neo4j/default.nix
rename to pkgs/by-name/ne/neo4j/package.nix
diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/by-name/ne/neocmakelsp/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/neocmakelsp/default.nix
rename to pkgs/by-name/ne/neocmakelsp/package.nix
diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/by-name/ne/neocomp/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/neocomp/default.nix
rename to pkgs/by-name/ne/neocomp/package.nix
diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/by-name/ne/neofetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/neofetch/default.nix
rename to pkgs/by-name/ne/neofetch/package.nix
diff --git a/pkgs/development/libraries/neon/darwin-fix-configure.patch b/pkgs/by-name/ne/neon/darwin-fix-configure.patch
similarity index 100%
rename from pkgs/development/libraries/neon/darwin-fix-configure.patch
rename to pkgs/by-name/ne/neon/darwin-fix-configure.patch
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/by-name/ne/neon/package.nix
similarity index 100%
rename from pkgs/development/libraries/neon/default.nix
rename to pkgs/by-name/ne/neon/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/neosay/default.nix b/pkgs/by-name/ne/neosay/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/neosay/default.nix
rename to pkgs/by-name/ne/neosay/package.nix
diff --git a/pkgs/applications/misc/nerd-font-patcher/default.nix b/pkgs/by-name/ne/nerd-font-patcher/package.nix
similarity index 100%
rename from pkgs/applications/misc/nerd-font-patcher/default.nix
rename to pkgs/by-name/ne/nerd-font-patcher/package.nix
diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/by-name/ne/nerdctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/nerdctl/default.nix
rename to pkgs/by-name/ne/nerdctl/package.nix
diff --git a/pkgs/tools/text/nerdfix/default.nix b/pkgs/by-name/ne/nerdfix/package.nix
similarity index 100%
rename from pkgs/tools/text/nerdfix/default.nix
rename to pkgs/by-name/ne/nerdfix/package.nix
diff --git a/pkgs/development/tools/nest-cli/default.nix b/pkgs/by-name/ne/nest-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/nest-cli/default.nix
rename to pkgs/by-name/ne/nest-cli/package.nix
diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/by-name/ne/net-snmp/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/net-snmp/default.nix
rename to pkgs/by-name/ne/net-snmp/package.nix
diff --git a/pkgs/tools/networking/netassert/default.nix b/pkgs/by-name/ne/netassert/package.nix
similarity index 100%
rename from pkgs/tools/networking/netassert/default.nix
rename to pkgs/by-name/ne/netassert/package.nix
diff --git a/pkgs/tools/filesystems/netatalk/000-no-suid.patch b/pkgs/by-name/ne/netatalk/000-no-suid.patch
similarity index 100%
rename from pkgs/tools/filesystems/netatalk/000-no-suid.patch
rename to pkgs/by-name/ne/netatalk/000-no-suid.patch
diff --git a/pkgs/tools/filesystems/netatalk/001-omit-localstatedir-creation.patch b/pkgs/by-name/ne/netatalk/001-omit-localstatedir-creation.patch
similarity index 100%
rename from pkgs/tools/filesystems/netatalk/001-omit-localstatedir-creation.patch
rename to pkgs/by-name/ne/netatalk/001-omit-localstatedir-creation.patch
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/by-name/ne/netatalk/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/netatalk/default.nix
rename to pkgs/by-name/ne/netatalk/package.nix
diff --git a/pkgs/tools/networking/netavark/default.nix b/pkgs/by-name/ne/netavark/package.nix
similarity index 100%
rename from pkgs/tools/networking/netavark/default.nix
rename to pkgs/by-name/ne/netavark/package.nix
diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/by-name/ne/netboot/package.nix
similarity index 100%
rename from pkgs/tools/networking/netboot/default.nix
rename to pkgs/by-name/ne/netboot/package.nix
diff --git a/pkgs/tools/misc/netbootxyz-efi/default.nix b/pkgs/by-name/ne/netbootxyz-efi/package.nix
similarity index 100%
rename from pkgs/tools/misc/netbootxyz-efi/default.nix
rename to pkgs/by-name/ne/netbootxyz-efi/package.nix
diff --git a/pkgs/tools/admin/netbox2netshot/default.nix b/pkgs/by-name/ne/netbox2netshot/package.nix
similarity index 100%
rename from pkgs/tools/admin/netbox2netshot/default.nix
rename to pkgs/by-name/ne/netbox2netshot/package.nix
diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/by-name/ne/netcat-gnu/package.nix
similarity index 100%
rename from pkgs/tools/networking/netcat/default.nix
rename to pkgs/by-name/ne/netcat-gnu/package.nix
diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/by-name/ne/netcat-openbsd/package.nix
similarity index 100%
rename from pkgs/tools/networking/netcat-openbsd/default.nix
rename to pkgs/by-name/ne/netcat-openbsd/package.nix
diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/by-name/ne/netcdf/package.nix
similarity index 100%
rename from pkgs/development/libraries/netcdf/default.nix
rename to pkgs/by-name/ne/netcdf/package.nix
diff --git a/pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch b/pkgs/by-name/ne/netcdfcxx4/cmake-h5free.patch
similarity index 100%
rename from pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch
rename to pkgs/by-name/ne/netcdfcxx4/cmake-h5free.patch
diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/by-name/ne/netcdfcxx4/package.nix
similarity index 100%
rename from pkgs/development/libraries/netcdf-cxx4/default.nix
rename to pkgs/by-name/ne/netcdfcxx4/package.nix
diff --git a/pkgs/development/tools/misc/netcoredbg/deps.nix b/pkgs/by-name/ne/netcoredbg/deps.nix
similarity index 100%
rename from pkgs/development/tools/misc/netcoredbg/deps.nix
rename to pkgs/by-name/ne/netcoredbg/deps.nix
diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/by-name/ne/netcoredbg/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/netcoredbg/default.nix
rename to pkgs/by-name/ne/netcoredbg/package.nix
diff --git a/pkgs/tools/networking/netdiscover/default.nix b/pkgs/by-name/ne/netdiscover/package.nix
similarity index 100%
rename from pkgs/tools/networking/netdiscover/default.nix
rename to pkgs/by-name/ne/netdiscover/package.nix
diff --git a/pkgs/tools/inputmethods/netevent/default.nix b/pkgs/by-name/ne/netevent/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/netevent/default.nix
rename to pkgs/by-name/ne/netevent/package.nix
diff --git a/pkgs/applications/video/netflix/default.nix b/pkgs/by-name/ne/netflix/package.nix
similarity index 100%
rename from pkgs/applications/video/netflix/default.nix
rename to pkgs/by-name/ne/netflix/package.nix
diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/by-name/ne/nethogs/package.nix
similarity index 100%
rename from pkgs/tools/networking/nethogs/default.nix
rename to pkgs/by-name/ne/nethogs/package.nix
diff --git a/pkgs/tools/networking/nethoscope/default.nix b/pkgs/by-name/ne/nethoscope/package.nix
similarity index 100%
rename from pkgs/tools/networking/nethoscope/default.nix
rename to pkgs/by-name/ne/nethoscope/package.nix
diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/by-name/ne/netifd/package.nix
similarity index 100%
rename from pkgs/tools/networking/netifd/default.nix
rename to pkgs/by-name/ne/netifd/package.nix
diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/by-name/ne/netkittftp/package.nix
similarity index 100%
rename from pkgs/tools/networking/netkit/tftp/default.nix
rename to pkgs/by-name/ne/netkittftp/package.nix
diff --git a/pkgs/applications/science/logic/netlistsvg/package-lock.json b/pkgs/by-name/ne/netlistsvg/package-lock.json
similarity index 100%
rename from pkgs/applications/science/logic/netlistsvg/package-lock.json
rename to pkgs/by-name/ne/netlistsvg/package-lock.json
diff --git a/pkgs/applications/science/logic/netlistsvg/default.nix b/pkgs/by-name/ne/netlistsvg/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/netlistsvg/default.nix
rename to pkgs/by-name/ne/netlistsvg/package.nix
diff --git a/pkgs/applications/science/logic/netlistsvg/test.v b/pkgs/by-name/ne/netlistsvg/test.v
similarity index 100%
rename from pkgs/applications/science/logic/netlistsvg/test.v
rename to pkgs/by-name/ne/netlistsvg/test.v
diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/by-name/ne/netlogo/package.nix
similarity index 100%
rename from pkgs/applications/science/misc/netlogo/default.nix
rename to pkgs/by-name/ne/netlogo/package.nix
diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/by-name/ne/netmask/package.nix
similarity index 100%
rename from pkgs/tools/networking/netmask/default.nix
rename to pkgs/by-name/ne/netmask/package.nix
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/by-name/ne/netperf/package.nix
similarity index 100%
rename from pkgs/applications/networking/netperf/default.nix
rename to pkgs/by-name/ne/netperf/package.nix
diff --git a/pkgs/tools/admin/netplan/default.nix b/pkgs/by-name/ne/netplan/package.nix
similarity index 100%
rename from pkgs/tools/admin/netplan/default.nix
rename to pkgs/by-name/ne/netplan/package.nix
diff --git a/pkgs/games/netris/default.nix b/pkgs/by-name/ne/netris/package.nix
similarity index 100%
rename from pkgs/games/netris/default.nix
rename to pkgs/by-name/ne/netris/package.nix
diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/by-name/ne/netrw/package.nix
similarity index 100%
rename from pkgs/tools/networking/netrw/default.nix
rename to pkgs/by-name/ne/netrw/package.nix
diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/by-name/ne/netselect/package.nix
similarity index 100%
rename from pkgs/tools/networking/netselect/default.nix
rename to pkgs/by-name/ne/netselect/package.nix
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/by-name/ne/netsniff-ng/package.nix
similarity index 100%
rename from pkgs/tools/networking/netsniff-ng/default.nix
rename to pkgs/by-name/ne/netsniff-ng/package.nix
diff --git a/pkgs/servers/networkaudiod/default.nix b/pkgs/by-name/ne/networkaudiod/package.nix
similarity index 100%
rename from pkgs/servers/networkaudiod/default.nix
rename to pkgs/by-name/ne/networkaudiod/package.nix
diff --git a/pkgs/tools/networking/networkd-dispatcher/default.nix b/pkgs/by-name/ne/networkd-dispatcher/package.nix
similarity index 100%
rename from pkgs/tools/networking/networkd-dispatcher/default.nix
rename to pkgs/by-name/ne/networkd-dispatcher/package.nix
diff --git a/pkgs/tools/networking/networkd-dispatcher/support_nix_store_path.patch b/pkgs/by-name/ne/networkd-dispatcher/support_nix_store_path.patch
similarity index 100%
rename from pkgs/tools/networking/networkd-dispatcher/support_nix_store_path.patch
rename to pkgs/by-name/ne/networkd-dispatcher/support_nix_store_path.patch
diff --git a/pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in b/pkgs/by-name/ne/networking-ts-cxx/networking_ts.pc.in
similarity index 100%
rename from pkgs/development/libraries/networking-ts-cxx/networking_ts.pc.in
rename to pkgs/by-name/ne/networking-ts-cxx/networking_ts.pc.in
diff --git a/pkgs/development/libraries/networking-ts-cxx/default.nix b/pkgs/by-name/ne/networking-ts-cxx/package.nix
similarity index 100%
rename from pkgs/development/libraries/networking-ts-cxx/default.nix
rename to pkgs/by-name/ne/networking-ts-cxx/package.nix
diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch b/pkgs/by-name/ne/networkmanager-fortisslvpn/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/networkmanager/fortisslvpn/fix-paths.patch
rename to pkgs/by-name/ne/networkmanager-fortisslvpn/fix-paths.patch
diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
similarity index 100%
rename from pkgs/tools/networking/networkmanager/fortisslvpn/default.nix
rename to pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/support-ppp-2.5.0.patch b/pkgs/by-name/ne/networkmanager-fortisslvpn/support-ppp-2.5.0.patch
similarity index 100%
rename from pkgs/tools/networking/networkmanager/fortisslvpn/support-ppp-2.5.0.patch
rename to pkgs/by-name/ne/networkmanager-fortisslvpn/support-ppp-2.5.0.patch
diff --git a/pkgs/tools/networking/networkmanager/iodine/fix-paths.patch b/pkgs/by-name/ne/networkmanager-iodine/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/networkmanager/iodine/fix-paths.patch
rename to pkgs/by-name/ne/networkmanager-iodine/fix-paths.patch
diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/by-name/ne/networkmanager-iodine/package.nix
similarity index 100%
rename from pkgs/tools/networking/networkmanager/iodine/default.nix
rename to pkgs/by-name/ne/networkmanager-iodine/package.nix
diff --git a/pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch b/pkgs/by-name/ne/networkmanager-l2tp/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch
rename to pkgs/by-name/ne/networkmanager-l2tp/fix-paths.patch
diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
similarity index 100%
rename from pkgs/tools/networking/networkmanager/l2tp/default.nix
rename to pkgs/by-name/ne/networkmanager-l2tp/package.nix
diff --git a/pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch b/pkgs/by-name/ne/networkmanager-openconnect/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/networkmanager/openconnect/fix-paths.patch
rename to pkgs/by-name/ne/networkmanager-openconnect/fix-paths.patch
diff --git a/pkgs/tools/networking/networkmanager/openconnect/default.nix b/pkgs/by-name/ne/networkmanager-openconnect/package.nix
similarity index 100%
rename from pkgs/tools/networking/networkmanager/openconnect/default.nix
rename to pkgs/by-name/ne/networkmanager-openconnect/package.nix
diff --git a/pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch b/pkgs/by-name/ne/networkmanager-openvpn/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/networkmanager/openvpn/fix-paths.patch
rename to pkgs/by-name/ne/networkmanager-openvpn/fix-paths.patch
diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/by-name/ne/networkmanager-openvpn/package.nix
similarity index 100%
rename from pkgs/tools/networking/networkmanager/openvpn/default.nix
rename to pkgs/by-name/ne/networkmanager-openvpn/package.nix
diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/by-name/ne/networkmanager-sstp/package.nix
similarity index 100%
rename from pkgs/tools/networking/networkmanager/sstp/default.nix
rename to pkgs/by-name/ne/networkmanager-sstp/package.nix
diff --git a/pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch b/pkgs/by-name/ne/networkmanager-vpnc/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch
rename to pkgs/by-name/ne/networkmanager-vpnc/fix-paths.patch
diff --git a/pkgs/tools/networking/networkmanager/vpnc/default.nix b/pkgs/by-name/ne/networkmanager-vpnc/package.nix
similarity index 100%
rename from pkgs/tools/networking/networkmanager/vpnc/default.nix
rename to pkgs/by-name/ne/networkmanager-vpnc/package.nix
diff --git a/pkgs/tools/networking/networkmanager/dmenu/default.nix b/pkgs/by-name/ne/networkmanager_dmenu/package.nix
similarity index 100%
rename from pkgs/tools/networking/networkmanager/dmenu/default.nix
rename to pkgs/by-name/ne/networkmanager_dmenu/package.nix
diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/by-name/ne/networkmanager_strongswan/package.nix
similarity index 100%
rename from pkgs/tools/networking/networkmanager/strongswan/default.nix
rename to pkgs/by-name/ne/networkmanager_strongswan/package.nix
diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/by-name/ne/networkmanagerapplet/package.nix
similarity index 100%
rename from pkgs/tools/networking/networkmanager/applet/default.nix
rename to pkgs/by-name/ne/networkmanagerapplet/package.nix
diff --git a/pkgs/tools/security/networkminer/deps.nix b/pkgs/by-name/ne/networkminer/deps.nix
similarity index 100%
rename from pkgs/tools/security/networkminer/deps.nix
rename to pkgs/by-name/ne/networkminer/deps.nix
diff --git a/pkgs/tools/security/networkminer/default.nix b/pkgs/by-name/ne/networkminer/package.nix
similarity index 100%
rename from pkgs/tools/security/networkminer/default.nix
rename to pkgs/by-name/ne/networkminer/package.nix
diff --git a/pkgs/tools/security/networkminer/xdg-dirs.patch b/pkgs/by-name/ne/networkminer/xdg-dirs.patch
similarity index 100%
rename from pkgs/tools/security/networkminer/xdg-dirs.patch
rename to pkgs/by-name/ne/networkminer/xdg-dirs.patch
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/by-name/ne/neuron/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/neuron/default.nix
rename to pkgs/by-name/ne/neuron/package.nix
diff --git a/pkgs/games/neverball/default.nix b/pkgs/by-name/ne/neverball/package.nix
similarity index 100%
rename from pkgs/games/neverball/default.nix
rename to pkgs/by-name/ne/neverball/package.nix
diff --git a/pkgs/applications/audio/new-session-manager/default.nix b/pkgs/by-name/ne/new-session-manager/package.nix
similarity index 100%
rename from pkgs/applications/audio/new-session-manager/default.nix
rename to pkgs/by-name/ne/new-session-manager/package.nix
diff --git a/pkgs/development/web/newman/default.nix b/pkgs/by-name/ne/newman/package.nix
similarity index 100%
rename from pkgs/development/web/newman/default.nix
rename to pkgs/by-name/ne/newman/package.nix
diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/by-name/ne/newrelic-sysmond/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/newrelic-sysmond/default.nix
rename to pkgs/by-name/ne/newrelic-sysmond/package.nix
diff --git a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock b/pkgs/by-name/ne/newsflash/Cargo.lock
similarity index 100%
rename from pkgs/applications/networking/feedreaders/newsflash/Cargo.lock
rename to pkgs/by-name/ne/newsflash/Cargo.lock
diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/by-name/ne/newsflash/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/newsflash/default.nix
rename to pkgs/by-name/ne/newsflash/package.nix
diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/by-name/ne/newtonwars/package.nix
similarity index 100%
rename from pkgs/games/newtonwars/default.nix
rename to pkgs/by-name/ne/newtonwars/package.nix
diff --git a/pkgs/development/tools/parsing/nex/default.nix b/pkgs/by-name/ne/nex/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/nex/default.nix
rename to pkgs/by-name/ne/nex/package.nix
diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/by-name/ne/nextdns/package.nix
similarity index 100%
rename from pkgs/applications/networking/nextdns/default.nix
rename to pkgs/by-name/ne/nextdns/package.nix
diff --git a/pkgs/development/interpreters/nextflow/deps.json b/pkgs/by-name/ne/nextflow/deps.json
similarity index 100%
rename from pkgs/development/interpreters/nextflow/deps.json
rename to pkgs/by-name/ne/nextflow/deps.json
diff --git a/pkgs/development/interpreters/nextflow/default.nix b/pkgs/by-name/ne/nextflow/package.nix
similarity index 100%
rename from pkgs/development/interpreters/nextflow/default.nix
rename to pkgs/by-name/ne/nextflow/package.nix
diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/by-name/ne/nexttrace/package.nix
similarity index 100%
rename from pkgs/tools/networking/nexttrace/default.nix
rename to pkgs/by-name/ne/nexttrace/package.nix
diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/by-name/ne/nexuiz/package.nix
similarity index 100%
rename from pkgs/games/nexuiz/default.nix
rename to pkgs/by-name/ne/nexuiz/package.nix
diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/by-name/nf/nfdump/package.nix
similarity index 100%
rename from pkgs/tools/networking/nfdump/default.nix
rename to pkgs/by-name/nf/nfdump/package.nix
diff --git a/pkgs/misc/nflz/default.nix b/pkgs/by-name/nf/nflz/package.nix
similarity index 100%
rename from pkgs/misc/nflz/default.nix
rename to pkgs/by-name/nf/nflz/package.nix
diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/by-name/nf/nfpm/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nfpm/default.nix
rename to pkgs/by-name/nf/nfpm/package.nix
diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix
similarity index 100%
rename from pkgs/servers/nfs-ganesha/default.nix
rename to pkgs/by-name/nf/nfs-ganesha/package.nix
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/by-name/nf/nfs-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/nfs-utils/default.nix
rename to pkgs/by-name/nf/nfs-utils/package.nix
diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/by-name/nf/nfstrace/package.nix
similarity index 100%
rename from pkgs/tools/networking/nfstrace/default.nix
rename to pkgs/by-name/nf/nfstrace/package.nix
diff --git a/pkgs/applications/networking/ngadmin/default.nix b/pkgs/by-name/ng/ngadmin/package.nix
similarity index 100%
rename from pkgs/applications/networking/ngadmin/default.nix
rename to pkgs/by-name/ng/ngadmin/package.nix
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/by-name/ng/nghttp2/package.nix
similarity index 100%
rename from pkgs/development/libraries/nghttp2/default.nix
rename to pkgs/by-name/ng/nghttp2/package.nix
diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/by-name/ng/nginx-config-formatter/package.nix
similarity index 100%
rename from pkgs/tools/misc/nginx-config-formatter/default.nix
rename to pkgs/by-name/ng/nginx-config-formatter/package.nix
diff --git a/pkgs/data/documentation/nginx-doc/exclude-google-analytics.patch b/pkgs/by-name/ng/nginx-doc/exclude-google-analytics.patch
similarity index 100%
rename from pkgs/data/documentation/nginx-doc/exclude-google-analytics.patch
rename to pkgs/by-name/ng/nginx-doc/exclude-google-analytics.patch
diff --git a/pkgs/data/documentation/nginx-doc/default.nix b/pkgs/by-name/ng/nginx-doc/package.nix
similarity index 100%
rename from pkgs/data/documentation/nginx-doc/default.nix
rename to pkgs/by-name/ng/nginx-doc/package.nix
diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/by-name/ng/ngircd/package.nix
similarity index 100%
rename from pkgs/servers/irc/ngircd/default.nix
rename to pkgs/by-name/ng/ngircd/package.nix
diff --git a/pkgs/development/interpreters/ngn-k/default.nix b/pkgs/by-name/ng/ngn-k/package.nix
similarity index 100%
rename from pkgs/development/interpreters/ngn-k/default.nix
rename to pkgs/by-name/ng/ngn-k/package.nix
diff --git a/pkgs/development/interpreters/ngn-k/repl-license-path.patch b/pkgs/by-name/ng/ngn-k/repl-license-path.patch
similarity index 100%
rename from pkgs/development/interpreters/ngn-k/repl-license-path.patch
rename to pkgs/by-name/ng/ngn-k/repl-license-path.patch
diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/by-name/ng/ngrep/package.nix
similarity index 100%
rename from pkgs/tools/networking/ngrep/default.nix
rename to pkgs/by-name/ng/ngrep/package.nix
diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/by-name/ng/ngt/package.nix
similarity index 100%
rename from pkgs/development/libraries/ngt/default.nix
rename to pkgs/by-name/ng/ngt/package.nix
diff --git a/pkgs/applications/networking/remote/nice-dcv-client/default.nix b/pkgs/by-name/ni/nice-dcv-client/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/nice-dcv-client/default.nix
rename to pkgs/by-name/ni/nice-dcv-client/package.nix
diff --git a/pkgs/tools/package-management/niff/default.nix b/pkgs/by-name/ni/niff/package.nix
similarity index 100%
rename from pkgs/tools/package-management/niff/default.nix
rename to pkgs/by-name/ni/niff/package.nix
diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/by-name/ni/nifi/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/nifi/default.nix
rename to pkgs/by-name/ni/nifi/package.nix
diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/by-name/ni/nifticlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/nifticlib/default.nix
rename to pkgs/by-name/ni/nifticlib/package.nix
diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/by-name/ni/niftyreg/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/niftyreg/default.nix
rename to pkgs/by-name/ni/niftyreg/package.nix
diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/by-name/ni/niftyseg/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/niftyseg/default.nix
rename to pkgs/by-name/ni/niftyseg/package.nix
diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/by-name/ni/nika-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/nika-fonts/default.nix
rename to pkgs/by-name/ni/nika-fonts/package.nix
diff --git a/pkgs/tools/networking/nikto/nix-wrapper-fix.patch b/pkgs/by-name/ni/nikto/nix-wrapper-fix.patch
similarity index 100%
rename from pkgs/tools/networking/nikto/nix-wrapper-fix.patch
rename to pkgs/by-name/ni/nikto/nix-wrapper-fix.patch
diff --git a/pkgs/tools/networking/nikto/default.nix b/pkgs/by-name/ni/nikto/package.nix
similarity index 100%
rename from pkgs/tools/networking/nikto/default.nix
rename to pkgs/by-name/ni/nikto/package.nix
diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/by-name/ni/nilfs-utils/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/nilfs-utils/default.nix
rename to pkgs/by-name/ni/nilfs-utils/package.nix
diff --git a/pkgs/applications/audio/ninjas2/default.nix b/pkgs/by-name/ni/ninjas2/package.nix
similarity index 100%
rename from pkgs/applications/audio/ninjas2/default.nix
rename to pkgs/by-name/ni/ninjas2/package.nix
diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/by-name/ni/ninka/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/ninka/default.nix
rename to pkgs/by-name/ni/ninka/package.nix
diff --git a/pkgs/games/ninvaders/default.nix b/pkgs/by-name/ni/ninvaders/package.nix
similarity index 100%
rename from pkgs/games/ninvaders/default.nix
rename to pkgs/by-name/ni/ninvaders/package.nix
diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/by-name/ni/nip2/package.nix
similarity index 100%
rename from pkgs/tools/graphics/nip2/default.nix
rename to pkgs/by-name/ni/nip2/package.nix
diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/by-name/ni/nitrogen/package.nix
similarity index 100%
rename from pkgs/tools/X11/nitrogen/default.nix
rename to pkgs/by-name/ni/nitrogen/package.nix
diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/by-name/ni/nix-bash-completions/package.nix
similarity index 100%
rename from pkgs/shells/bash/nix-bash-completions/default.nix
rename to pkgs/by-name/ni/nix-bash-completions/package.nix
diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in b/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in
similarity index 100%
rename from pkgs/servers/http/nix-binary-cache/nix-binary-cache-start.in
rename to pkgs/by-name/ni/nix-binary-cache/nix-binary-cache-start.in
diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in b/pkgs/by-name/ni/nix-binary-cache/nix-binary-cache.cgi.in
similarity index 100%
rename from pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in
rename to pkgs/by-name/ni/nix-binary-cache/nix-binary-cache.cgi.in
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/by-name/ni/nix-binary-cache/package.nix
similarity index 100%
rename from pkgs/servers/http/nix-binary-cache/default.nix
rename to pkgs/by-name/ni/nix-binary-cache/package.nix
diff --git a/pkgs/development/tools/misc/nix-bisect/default.nix b/pkgs/by-name/ni/nix-bisect/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/nix-bisect/default.nix
rename to pkgs/by-name/ni/nix-bisect/package.nix
diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/by-name/ni/nix-build-uncached/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/nix-build-uncached/default.nix
rename to pkgs/by-name/ni/nix-build-uncached/package.nix
diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/by-name/ni/nix-bundle/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nix-bundle/default.nix
rename to pkgs/by-name/ni/nix-bundle/package.nix
diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/by-name/ni/nix-doc/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nix-doc/default.nix
rename to pkgs/by-name/ni/nix-doc/package.nix
diff --git a/pkgs/tools/nix/nix-init/Cargo.lock b/pkgs/by-name/ni/nix-init/Cargo.lock
similarity index 100%
rename from pkgs/tools/nix/nix-init/Cargo.lock
rename to pkgs/by-name/ni/nix-init/Cargo.lock
diff --git a/pkgs/tools/nix/nix-init/get_nix_license.nix b/pkgs/by-name/ni/nix-init/get_nix_license.nix
similarity index 100%
rename from pkgs/tools/nix/nix-init/get_nix_license.nix
rename to pkgs/by-name/ni/nix-init/get_nix_license.nix
diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/by-name/ni/nix-init/package.nix
similarity index 100%
rename from pkgs/tools/nix/nix-init/default.nix
rename to pkgs/by-name/ni/nix-init/package.nix
diff --git a/pkgs/tools/nix/nix-melt/default.nix b/pkgs/by-name/ni/nix-melt/package.nix
similarity index 100%
rename from pkgs/tools/nix/nix-melt/default.nix
rename to pkgs/by-name/ni/nix-melt/package.nix
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/by-name/ni/nix-plugins/package.nix
similarity index 100%
rename from pkgs/development/libraries/nix-plugins/default.nix
rename to pkgs/by-name/ni/nix-plugins/package.nix
diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/by-name/ni/nix-prefetch/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nix-prefetch/default.nix
rename to pkgs/by-name/ni/nix-prefetch/package.nix
diff --git a/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix
similarity index 100%
rename from pkgs/tools/nix/nix-query-tree-viewer/default.nix
rename to pkgs/by-name/ni/nix-query-tree-viewer/package.nix
diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/by-name/ni/nix-script/package.nix
similarity index 100%
rename from pkgs/tools/nix/nix-script/default.nix
rename to pkgs/by-name/ni/nix-script/package.nix
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/by-name/ni/nix-serve/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nix-serve/default.nix
rename to pkgs/by-name/ni/nix-serve/package.nix
diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/by-name/ni/nix-tour/package.nix
similarity index 100%
rename from pkgs/applications/misc/nix-tour/default.nix
rename to pkgs/by-name/ni/nix-tour/package.nix
diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/by-name/ni/nix-zsh-completions/package.nix
similarity index 100%
rename from pkgs/shells/zsh/nix-zsh-completions/default.nix
rename to pkgs/by-name/ni/nix-zsh-completions/package.nix
diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/by-name/ni/nixdoc/package.nix
similarity index 100%
rename from pkgs/tools/nix/nixdoc/default.nix
rename to pkgs/by-name/ni/nixdoc/package.nix
diff --git a/pkgs/tools/nix/nixel/default.nix b/pkgs/by-name/ni/nixel/package.nix
similarity index 100%
rename from pkgs/tools/nix/nixel/default.nix
rename to pkgs/by-name/ni/nixel/package.nix
diff --git a/pkgs/data/themes/nixos-bgrt-plymouth/default.nix b/pkgs/by-name/ni/nixos-bgrt-plymouth/package.nix
similarity index 100%
rename from pkgs/data/themes/nixos-bgrt-plymouth/default.nix
rename to pkgs/by-name/ni/nixos-bgrt-plymouth/package.nix
diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh b/pkgs/by-name/ni/nixos-container/nixos-container-completion.sh
similarity index 100%
rename from pkgs/tools/virtualization/nixos-container/nixos-container-completion.sh
rename to pkgs/by-name/ni/nixos-container/nixos-container-completion.sh
diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/by-name/ni/nixos-container/nixos-container.pl
similarity index 100%
rename from pkgs/tools/virtualization/nixos-container/nixos-container.pl
rename to pkgs/by-name/ni/nixos-container/nixos-container.pl
diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/by-name/ni/nixos-container/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/nixos-container/default.nix
rename to pkgs/by-name/ni/nixos-container/package.nix
diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/by-name/ni/nixos-generators/package.nix
similarity index 100%
rename from pkgs/tools/nix/nixos-generators/default.nix
rename to pkgs/by-name/ni/nixos-generators/package.nix
diff --git a/pkgs/tools/nix/nixos-install-tools/default.nix b/pkgs/by-name/ni/nixos-install-tools/package.nix
similarity index 100%
rename from pkgs/tools/nix/nixos-install-tools/default.nix
rename to pkgs/by-name/ni/nixos-install-tools/package.nix
diff --git a/pkgs/tools/nix/nixos-render-docs/default.nix b/pkgs/by-name/ni/nixos-render-docs/package.nix
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/default.nix
rename to pkgs/by-name/ni/nixos-render-docs/package.nix
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/__init__.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py
rename to pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/__init__.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/asciidoc.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/asciidoc.py
rename to pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/asciidoc.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/commonmark.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/commonmark.py
rename to pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/commonmark.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py
rename to pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manpage.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manpage.py
rename to pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manpage.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py
rename to pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual_structure.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual_structure.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual_structure.py
rename to pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual_structure.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/md.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
rename to pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/md.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/options.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py
rename to pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/options.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/parallel.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/parallel.py
rename to pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/parallel.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/types.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py
rename to pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/types.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/utils.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/utils.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/utils.py
rename to pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/utils.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/pyproject.toml b/pkgs/by-name/ni/nixos-render-docs/src/pyproject.toml
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/pyproject.toml
rename to pkgs/by-name/ni/nixos-render-docs/src/pyproject.toml
diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/sample_md.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/sample_md.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/tests/sample_md.py
rename to pkgs/by-name/ni/nixos-render-docs/src/tests/sample_md.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_asciidoc.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/tests/test_asciidoc.py
rename to pkgs/by-name/ni/nixos-render-docs/src/tests/test_asciidoc.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_auto_id_prefix.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_auto_id_prefix.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/tests/test_auto_id_prefix.py
rename to pkgs/by-name/ni/nixos-render-docs/src/tests/test_auto_id_prefix.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_commonmark.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/tests/test_commonmark.py
rename to pkgs/by-name/ni/nixos-render-docs/src/tests/test_commonmark.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_headings.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py
rename to pkgs/by-name/ni/nixos-render-docs/src/tests/test_headings.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_html.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py
rename to pkgs/by-name/ni/nixos-render-docs/src/tests/test_html.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_lists.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py
rename to pkgs/by-name/ni/nixos-render-docs/src/tests/test_lists.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_manpage.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/tests/test_manpage.py
rename to pkgs/by-name/ni/nixos-render-docs/src/tests/test_manpage.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_options.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py
rename to pkgs/by-name/ni/nixos-render-docs/src/tests/test_options.py
diff --git a/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_plugins.py
similarity index 100%
rename from pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py
rename to pkgs/by-name/ni/nixos-render-docs/src/tests/test_plugins.py
diff --git a/pkgs/tools/virtualization/nixos-shell/default.nix b/pkgs/by-name/ni/nixos-shell/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/nixos-shell/default.nix
rename to pkgs/by-name/ni/nixos-shell/package.nix
diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/by-name/ni/nixpacks/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/nixpacks/default.nix
rename to pkgs/by-name/ni/nixpacks/package.nix
diff --git a/pkgs/tools/nix/nixpkgs-hammering/default.nix b/pkgs/by-name/ni/nixpkgs-hammering/package.nix
similarity index 100%
rename from pkgs/tools/nix/nixpkgs-hammering/default.nix
rename to pkgs/by-name/ni/nixpkgs-hammering/package.nix
diff --git a/pkgs/tools/nix/nixpkgs-lint/default.nix b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
similarity index 100%
rename from pkgs/tools/nix/nixpkgs-lint/default.nix
rename to pkgs/by-name/ni/nixpkgs-lint-community/package.nix
diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nixpkgs-review/default.nix
rename to pkgs/by-name/ni/nixpkgs-review/package.nix
diff --git a/pkgs/games/njam/logfile.patch b/pkgs/by-name/nj/njam/logfile.patch
similarity index 100%
rename from pkgs/games/njam/logfile.patch
rename to pkgs/by-name/nj/njam/logfile.patch
diff --git a/pkgs/games/njam/default.nix b/pkgs/by-name/nj/njam/package.nix
similarity index 100%
rename from pkgs/games/njam/default.nix
rename to pkgs/by-name/nj/njam/package.nix
diff --git a/pkgs/tools/system/nkeys/default.nix b/pkgs/by-name/nk/nkeys/package.nix
similarity index 100%
rename from pkgs/tools/system/nkeys/default.nix
rename to pkgs/by-name/nk/nkeys/package.nix
diff --git a/pkgs/tools/text/nkf/default.nix b/pkgs/by-name/nk/nkf/package.nix
similarity index 100%
rename from pkgs/tools/text/nkf/default.nix
rename to pkgs/by-name/nk/nkf/package.nix
diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/by-name/nl/nload/package.nix
similarity index 100%
rename from pkgs/applications/networking/nload/default.nix
rename to pkgs/by-name/nl/nload/package.nix
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/by-name/nl/nlohmann_json/package.nix
similarity index 100%
rename from pkgs/development/libraries/nlohmann_json/default.nix
rename to pkgs/by-name/nl/nlohmann_json/package.nix
diff --git a/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch b/pkgs/by-name/nl/nlojet/nlojet_clang_fix.patch
similarity index 100%
rename from pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch
rename to pkgs/by-name/nl/nlojet/nlojet_clang_fix.patch
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/by-name/nl/nlojet/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/nlojet/default.nix
rename to pkgs/by-name/nl/nlojet/package.nix
diff --git a/pkgs/tools/security/nmap-formatter/default.nix b/pkgs/by-name/nm/nmap-formatter/package.nix
similarity index 100%
rename from pkgs/tools/security/nmap-formatter/default.nix
rename to pkgs/by-name/nm/nmap-formatter/package.nix
diff --git a/pkgs/tools/networking/nmh/default.nix b/pkgs/by-name/nm/nmh/package.nix
similarity index 100%
rename from pkgs/tools/networking/nmh/default.nix
rename to pkgs/by-name/nm/nmh/package.nix
diff --git a/pkgs/os-specific/linux/nmon/default.nix b/pkgs/by-name/nm/nmon/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/nmon/default.nix
rename to pkgs/by-name/nm/nmon/package.nix
diff --git a/pkgs/development/embedded/nmrpflash/default.nix b/pkgs/by-name/nm/nmrpflash/package.nix
similarity index 100%
rename from pkgs/development/embedded/nmrpflash/default.nix
rename to pkgs/by-name/nm/nmrpflash/package.nix
diff --git a/pkgs/tools/misc/nms/default.nix b/pkgs/by-name/nm/nms/package.nix
similarity index 100%
rename from pkgs/tools/misc/nms/default.nix
rename to pkgs/by-name/nm/nms/package.nix
diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/by-name/nn/nng/package.nix
similarity index 100%
rename from pkgs/development/libraries/nng/default.nix
rename to pkgs/by-name/nn/nng/package.nix
diff --git a/pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch b/pkgs/by-name/nn/nnn/darwin-fix-file-mime-opts.patch
similarity index 100%
rename from pkgs/applications/file-managers/nnn/darwin-fix-file-mime-opts.patch
rename to pkgs/by-name/nn/nnn/darwin-fix-file-mime-opts.patch
diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/by-name/nn/nnn/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/nnn/default.nix
rename to pkgs/by-name/nn/nnn/package.nix
diff --git a/pkgs/applications/science/physics/nnpdf/default.nix b/pkgs/by-name/nn/nnpdf/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/nnpdf/default.nix
rename to pkgs/by-name/nn/nnpdf/package.nix
diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/by-name/nn/nntp-proxy/package.nix
similarity index 100%
rename from pkgs/applications/networking/nntp-proxy/default.nix
rename to pkgs/by-name/nn/nntp-proxy/package.nix
diff --git a/pkgs/applications/radio/noaa-apt/Cargo.lock b/pkgs/by-name/no/noaa-apt/Cargo.lock
similarity index 100%
rename from pkgs/applications/radio/noaa-apt/Cargo.lock
rename to pkgs/by-name/no/noaa-apt/Cargo.lock
diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/by-name/no/noaa-apt/package.nix
similarity index 100%
rename from pkgs/applications/radio/noaa-apt/default.nix
rename to pkgs/by-name/no/noaa-apt/package.nix
diff --git a/pkgs/tools/misc/node-glob/default.nix b/pkgs/by-name/no/node-glob/package.nix
similarity index 100%
rename from pkgs/tools/misc/node-glob/default.nix
rename to pkgs/by-name/no/node-glob/package.nix
diff --git a/pkgs/tools/admin/manta/default.nix b/pkgs/by-name/no/node-manta/package.nix
similarity index 100%
rename from pkgs/tools/admin/manta/default.nix
rename to pkgs/by-name/no/node-manta/package.nix
diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/by-name/no/node-problem-detector/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/node-problem-detector/default.nix
rename to pkgs/by-name/no/node-problem-detector/package.nix
diff --git a/pkgs/development/tools/nodehun/default.nix b/pkgs/by-name/no/nodehun/package.nix
similarity index 100%
rename from pkgs/development/tools/nodehun/default.nix
rename to pkgs/by-name/no/nodehun/package.nix
diff --git a/pkgs/development/tools/nodehun/update-nan.patch b/pkgs/by-name/no/nodehun/update-nan.patch
similarity index 100%
rename from pkgs/development/tools/nodehun/update-nan.patch
rename to pkgs/by-name/no/nodehun/update-nan.patch
diff --git a/pkgs/development/tools/nodenv/default.nix b/pkgs/by-name/no/nodenv/package.nix
similarity index 100%
rename from pkgs/development/tools/nodenv/default.nix
rename to pkgs/by-name/no/nodenv/package.nix
diff --git a/pkgs/applications/file-managers/noice/default.nix b/pkgs/by-name/no/noice/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/noice/default.nix
rename to pkgs/by-name/no/noice/package.nix
diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/by-name/no/noip/package.nix
similarity index 100%
rename from pkgs/tools/networking/noip/default.nix
rename to pkgs/by-name/no/noip/package.nix
diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/by-name/no/noise-repellent/package.nix
similarity index 100%
rename from pkgs/applications/audio/noise-repellent/default.nix
rename to pkgs/by-name/no/noise-repellent/package.nix
diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/by-name/no/noisetorch/package.nix
similarity index 100%
rename from pkgs/applications/audio/noisetorch/default.nix
rename to pkgs/by-name/no/noisetorch/package.nix
diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/by-name/no/nomachine-client/package.nix
similarity index 100%
rename from pkgs/tools/admin/nomachine-client/default.nix
rename to pkgs/by-name/no/nomachine-client/package.nix
diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/by-name/no/nomad-autoscaler/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/nomad-autoscaler/default.nix
rename to pkgs/by-name/no/nomad-autoscaler/package.nix
diff --git a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/pkgs/by-name/no/nomad-driver-podman/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/nomad-driver-podman/default.nix
rename to pkgs/by-name/no/nomad-driver-podman/package.nix
diff --git a/pkgs/tools/misc/nomino/default.nix b/pkgs/by-name/no/nomino/package.nix
similarity index 100%
rename from pkgs/tools/misc/nomino/default.nix
rename to pkgs/by-name/no/nomino/package.nix
diff --git a/pkgs/data/icons/nordzy-cursor-theme/default.nix b/pkgs/by-name/no/nordzy-cursor-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/nordzy-cursor-theme/default.nix
rename to pkgs/by-name/no/nordzy-cursor-theme/package.nix
diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/by-name/no/nordzy-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/nordzy-icon-theme/default.nix
rename to pkgs/by-name/no/nordzy-icon-theme/package.nix
diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/by-name/no/normalize/package.nix
similarity index 100%
rename from pkgs/applications/audio/normalize/default.nix
rename to pkgs/by-name/no/normalize/package.nix
diff --git a/pkgs/development/tools/norminette/default.nix b/pkgs/by-name/no/norminette/package.nix
similarity index 100%
rename from pkgs/development/tools/norminette/default.nix
rename to pkgs/by-name/no/norminette/package.nix
diff --git a/pkgs/tools/networking/norouter/default.nix b/pkgs/by-name/no/norouter/package.nix
similarity index 100%
rename from pkgs/tools/networking/norouter/default.nix
rename to pkgs/by-name/no/norouter/package.nix
diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/by-name/no/norwester-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/norwester/default.nix
rename to pkgs/by-name/no/norwester-font/package.nix
diff --git a/pkgs/tools/security/noseyparker/default.nix b/pkgs/by-name/no/noseyparker/package.nix
similarity index 100%
rename from pkgs/tools/security/noseyparker/default.nix
rename to pkgs/by-name/no/noseyparker/package.nix
diff --git a/pkgs/tools/security/nosqli/default.nix b/pkgs/by-name/no/nosqli/package.nix
similarity index 100%
rename from pkgs/tools/security/nosqli/default.nix
rename to pkgs/by-name/no/nosqli/package.nix
diff --git a/pkgs/servers/nostr-rs-relay/default.nix b/pkgs/by-name/no/nostr-rs-relay/package.nix
similarity index 100%
rename from pkgs/servers/nostr-rs-relay/default.nix
rename to pkgs/by-name/no/nostr-rs-relay/package.nix
diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/by-name/no/notable/package.nix
similarity index 100%
rename from pkgs/applications/misc/notable/default.nix
rename to pkgs/by-name/no/notable/package.nix
diff --git a/pkgs/tools/networking/notemap/default.nix b/pkgs/by-name/no/notemap/package.nix
similarity index 100%
rename from pkgs/tools/networking/notemap/default.nix
rename to pkgs/by-name/no/notemap/package.nix
diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/by-name/no/notes-up/package.nix
similarity index 100%
rename from pkgs/applications/office/notes-up/default.nix
rename to pkgs/by-name/no/notes-up/package.nix
diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/by-name/no/noteshrink/package.nix
similarity index 100%
rename from pkgs/tools/misc/noteshrink/default.nix
rename to pkgs/by-name/no/noteshrink/package.nix
diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/by-name/no/notesnook/package.nix
similarity index 100%
rename from pkgs/applications/misc/notesnook/default.nix
rename to pkgs/by-name/no/notesnook/package.nix
diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/by-name/no/notify-desktop/package.nix
similarity index 100%
rename from pkgs/tools/misc/notify-desktop/default.nix
rename to pkgs/by-name/no/notify-desktop/package.nix
diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/by-name/no/notify-osd-customizable/package.nix
similarity index 100%
rename from pkgs/applications/misc/notify-osd-customizable/default.nix
rename to pkgs/by-name/no/notify-osd-customizable/package.nix
diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/by-name/no/notify-osd/package.nix
similarity index 100%
rename from pkgs/applications/misc/notify-osd/default.nix
rename to pkgs/by-name/no/notify-osd/package.nix
diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/by-name/no/notify-sharp/package.nix
similarity index 100%
rename from pkgs/development/libraries/notify-sharp/default.nix
rename to pkgs/by-name/no/notify-sharp/package.nix
diff --git a/pkgs/tools/misc/notify/default.nix b/pkgs/by-name/no/notify/package.nix
similarity index 100%
rename from pkgs/tools/misc/notify/default.nix
rename to pkgs/by-name/no/notify/package.nix
diff --git a/pkgs/applications/misc/notifymuch/default.nix b/pkgs/by-name/no/notifymuch/package.nix
similarity index 100%
rename from pkgs/applications/misc/notifymuch/default.nix
rename to pkgs/by-name/no/notifymuch/package.nix
diff --git a/pkgs/applications/office/notion-app-enhanced/default.nix b/pkgs/by-name/no/notion-app-enhanced/package.nix
similarity index 100%
rename from pkgs/applications/office/notion-app-enhanced/default.nix
rename to pkgs/by-name/no/notion-app-enhanced/package.nix
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/by-name/no/notmuch-addrlookup/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
rename to pkgs/by-name/no/notmuch-addrlookup/package.nix
diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/by-name/no/notmuch-bower/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/notmuch-bower/default.nix
rename to pkgs/by-name/no/notmuch-bower/package.nix
diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/by-name/no/nova-filters/package.nix
similarity index 100%
rename from pkgs/applications/audio/nova-filters/default.nix
rename to pkgs/by-name/no/nova-filters/package.nix
diff --git a/pkgs/applications/networking/cluster/nova/default.nix b/pkgs/by-name/no/nova/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/nova/default.nix
rename to pkgs/by-name/no/nova/package.nix
diff --git a/pkgs/applications/networking/novnc/fix-paths.patch b/pkgs/by-name/no/novnc/fix-paths.patch
similarity index 100%
rename from pkgs/applications/networking/novnc/fix-paths.patch
rename to pkgs/by-name/no/novnc/fix-paths.patch
diff --git a/pkgs/applications/networking/novnc/default.nix b/pkgs/by-name/no/novnc/package.nix
similarity index 100%
rename from pkgs/applications/networking/novnc/default.nix
rename to pkgs/by-name/no/novnc/package.nix
diff --git a/pkgs/applications/networking/novnc/websockify.patch b/pkgs/by-name/no/novnc/websockify.patch
similarity index 100%
rename from pkgs/applications/networking/novnc/websockify.patch
rename to pkgs/by-name/no/novnc/websockify.patch
diff --git a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch b/pkgs/by-name/no/noweb/no-FAQ.patch
similarity index 100%
rename from pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
rename to pkgs/by-name/no/noweb/no-FAQ.patch
diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/by-name/no/noweb/package.nix
similarity index 100%
rename from pkgs/development/tools/literate-programming/noweb/default.nix
rename to pkgs/by-name/no/noweb/package.nix
diff --git a/pkgs/tools/package-management/nox/nox-review-wip.patch b/pkgs/by-name/no/nox/nox-review-wip.patch
similarity index 100%
rename from pkgs/tools/package-management/nox/nox-review-wip.patch
rename to pkgs/by-name/no/nox/nox-review-wip.patch
diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/by-name/no/nox/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nox/default.nix
rename to pkgs/by-name/no/nox/package.nix
diff --git a/pkgs/applications/emulators/np2kai/default.nix b/pkgs/by-name/np/np2kai/package.nix
similarity index 100%
rename from pkgs/applications/emulators/np2kai/default.nix
rename to pkgs/by-name/np/np2kai/package.nix
diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/by-name/np/npapi_sdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/npapi-sdk/default.nix
rename to pkgs/by-name/np/npapi_sdk/package.nix
diff --git a/pkgs/tools/nix/npins/default.nix b/pkgs/by-name/np/npins/package.nix
similarity index 100%
rename from pkgs/tools/nix/npins/default.nix
rename to pkgs/by-name/np/npins/package.nix
diff --git a/pkgs/tools/nix/npins/source.nix b/pkgs/by-name/np/npins/source.nix
similarity index 100%
rename from pkgs/tools/nix/npins/source.nix
rename to pkgs/by-name/np/npins/source.nix
diff --git a/pkgs/tools/nix/npins/sources.json b/pkgs/by-name/np/npins/sources.json
similarity index 100%
rename from pkgs/tools/nix/npins/sources.json
rename to pkgs/by-name/np/npins/sources.json
diff --git a/pkgs/tools/package-management/npm-check-updates/default.nix b/pkgs/by-name/np/npm-check-updates/package.nix
similarity index 100%
rename from pkgs/tools/package-management/npm-check-updates/default.nix
rename to pkgs/by-name/np/npm-check-updates/package.nix
diff --git a/pkgs/development/tools/npm-check/default.nix b/pkgs/by-name/np/npm-check/package.nix
similarity index 100%
rename from pkgs/development/tools/npm-check/default.nix
rename to pkgs/by-name/np/npm-check/package.nix
diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/by-name/np/npth/package.nix
similarity index 100%
rename from pkgs/development/libraries/npth/default.nix
rename to pkgs/by-name/np/npth/package.nix
diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/by-name/nq/nq/package.nix
similarity index 100%
rename from pkgs/tools/system/nq/default.nix
rename to pkgs/by-name/nq/nq/package.nix
diff --git a/pkgs/development/compilers/nqc/nqc-unistd.patch b/pkgs/by-name/nq/nqc/nqc-unistd.patch
similarity index 100%
rename from pkgs/development/compilers/nqc/nqc-unistd.patch
rename to pkgs/by-name/nq/nqc/nqc-unistd.patch
diff --git a/pkgs/development/compilers/nqc/default.nix b/pkgs/by-name/nq/nqc/package.nix
similarity index 100%
rename from pkgs/development/compilers/nqc/default.nix
rename to pkgs/by-name/nq/nqc/package.nix
diff --git a/pkgs/tools/networking/nqptp/default.nix b/pkgs/by-name/nq/nqptp/package.nix
similarity index 100%
rename from pkgs/tools/networking/nqptp/default.nix
rename to pkgs/by-name/nq/nqptp/package.nix
diff --git a/pkgs/tools/networking/nqptp/remove-setcap.patch b/pkgs/by-name/nq/nqptp/remove-setcap.patch
similarity index 100%
rename from pkgs/tools/networking/nqptp/remove-setcap.patch
rename to pkgs/by-name/nq/nqptp/remove-setcap.patch
diff --git a/pkgs/tools/networking/nqptp/systemd-service-capability.patch b/pkgs/by-name/nq/nqptp/systemd-service-capability.patch
similarity index 100%
rename from pkgs/tools/networking/nqptp/systemd-service-capability.patch
rename to pkgs/by-name/nq/nqptp/systemd-service-capability.patch
diff --git a/pkgs/development/libraries/nrf5-sdk/default.nix b/pkgs/by-name/nr/nrf5-sdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/nrf5-sdk/default.nix
rename to pkgs/by-name/nr/nrf5-sdk/package.nix
diff --git a/pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch b/pkgs/by-name/nr/nrg2iso/c-compiler.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/nrg2iso/c-compiler.patch
rename to pkgs/by-name/nr/nrg2iso/c-compiler.patch
diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/by-name/nr/nrg2iso/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/nrg2iso/default.nix
rename to pkgs/by-name/nr/nrg2iso/package.nix
diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/by-name/nr/nrsc5/package.nix
similarity index 100%
rename from pkgs/applications/misc/nrsc5/default.nix
rename to pkgs/by-name/nr/nrsc5/package.nix
diff --git a/pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules b/pkgs/by-name/ns/ns-usbloader/99-ns-usbloader.rules
similarity index 100%
rename from pkgs/applications/misc/ns-usbloader/99-ns-usbloader.rules
rename to pkgs/by-name/ns/ns-usbloader/99-ns-usbloader.rules
diff --git a/pkgs/applications/misc/ns-usbloader/make-deterministic.patch b/pkgs/by-name/ns/ns-usbloader/make-deterministic.patch
similarity index 100%
rename from pkgs/applications/misc/ns-usbloader/make-deterministic.patch
rename to pkgs/by-name/ns/ns-usbloader/make-deterministic.patch
diff --git a/pkgs/applications/misc/ns-usbloader/no-launch4j.patch b/pkgs/by-name/ns/ns-usbloader/no-launch4j.patch
similarity index 100%
rename from pkgs/applications/misc/ns-usbloader/no-launch4j.patch
rename to pkgs/by-name/ns/ns-usbloader/no-launch4j.patch
diff --git a/pkgs/applications/misc/ns-usbloader/default.nix b/pkgs/by-name/ns/ns-usbloader/package.nix
similarity index 100%
rename from pkgs/applications/misc/ns-usbloader/default.nix
rename to pkgs/by-name/ns/ns-usbloader/package.nix
diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/by-name/ns/nsc/package.nix
similarity index 100%
rename from pkgs/tools/system/nsc/default.nix
rename to pkgs/by-name/ns/nsc/package.nix
diff --git a/pkgs/shells/nsh/default.nix b/pkgs/by-name/ns/nsh/package.nix
similarity index 100%
rename from pkgs/shells/nsh/default.nix
rename to pkgs/by-name/ns/nsh/package.nix
diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/by-name/ns/nsis/package.nix
similarity index 100%
rename from pkgs/development/tools/nsis/default.nix
rename to pkgs/by-name/ns/nsis/package.nix
diff --git a/pkgs/games/nsnake/default.nix b/pkgs/by-name/ns/nsnake/package.nix
similarity index 100%
rename from pkgs/games/nsnake/default.nix
rename to pkgs/by-name/ns/nsnake/package.nix
diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/by-name/ns/nsncd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/nsncd/default.nix
rename to pkgs/by-name/ns/nsncd/package.nix
diff --git a/pkgs/servers/nsq/default.nix b/pkgs/by-name/ns/nsq/package.nix
similarity index 100%
rename from pkgs/servers/nsq/default.nix
rename to pkgs/by-name/ns/nsq/package.nix
diff --git a/pkgs/os-specific/linux/nss_ldap/crashes.patch b/pkgs/by-name/ns/nss_ldap/crashes.patch
similarity index 100%
rename from pkgs/os-specific/linux/nss_ldap/crashes.patch
rename to pkgs/by-name/ns/nss_ldap/crashes.patch
diff --git a/pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch b/pkgs/by-name/ns/nss_ldap/nss_ldap-265-glibc-2.16.patch
similarity index 100%
rename from pkgs/os-specific/linux/nss_ldap/nss_ldap-265-glibc-2.16.patch
rename to pkgs/by-name/ns/nss_ldap/nss_ldap-265-glibc-2.16.patch
diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/by-name/ns/nss_ldap/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/nss_ldap/default.nix
rename to pkgs/by-name/ns/nss_ldap/package.nix
diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/by-name/ns/nss_pam_ldapd/package.nix
similarity index 100%
rename from pkgs/tools/networking/nss-pam-ldapd/default.nix
rename to pkgs/by-name/ns/nss_pam_ldapd/package.nix
diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/by-name/ns/nss_wrapper/package.nix
similarity index 100%
rename from pkgs/development/libraries/nss_wrapper/default.nix
rename to pkgs/by-name/ns/nss_wrapper/package.nix
diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/by-name/ns/nssmdns/package.nix
similarity index 100%
rename from pkgs/tools/networking/nss-mdns/default.nix
rename to pkgs/by-name/ns/nssmdns/package.nix
diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/by-name/ns/nsync/package.nix
similarity index 100%
rename from pkgs/development/libraries/nsync/default.nix
rename to pkgs/by-name/ns/nsync/package.nix
diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/by-name/nt/ntbtls/package.nix
similarity index 100%
rename from pkgs/development/libraries/ntbtls/default.nix
rename to pkgs/by-name/nt/ntbtls/package.nix
diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/by-name/nt/ntirpc/package.nix
similarity index 100%
rename from pkgs/development/libraries/ntirpc/default.nix
rename to pkgs/by-name/nt/ntirpc/package.nix
diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/by-name/nt/ntk/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/ntk/default.nix
rename to pkgs/by-name/nt/ntk/package.nix
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/by-name/nt/ntl/package.nix
similarity index 100%
rename from pkgs/development/libraries/ntl/default.nix
rename to pkgs/by-name/nt/ntl/package.nix
diff --git a/pkgs/tools/security/ntlmrecon/default.nix b/pkgs/by-name/nt/ntlmrecon/package.nix
similarity index 100%
rename from pkgs/tools/security/ntlmrecon/default.nix
rename to pkgs/by-name/nt/ntlmrecon/package.nix
diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/by-name/nt/ntopng/package.nix
similarity index 100%
rename from pkgs/tools/networking/ntopng/default.nix
rename to pkgs/by-name/nt/ntopng/package.nix
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/by-name/nt/ntp/package.nix
similarity index 100%
rename from pkgs/tools/networking/ntp/default.nix
rename to pkgs/by-name/nt/ntp/package.nix
diff --git a/pkgs/tools/networking/nttcp/format-security.patch b/pkgs/by-name/nt/nttcp/format-security.patch
similarity index 100%
rename from pkgs/tools/networking/nttcp/format-security.patch
rename to pkgs/by-name/nt/nttcp/format-security.patch
diff --git a/pkgs/tools/networking/nttcp/default.nix b/pkgs/by-name/nt/nttcp/package.nix
similarity index 100%
rename from pkgs/tools/networking/nttcp/default.nix
rename to pkgs/by-name/nt/nttcp/package.nix
diff --git a/pkgs/tools/networking/ntttcp/default.nix b/pkgs/by-name/nt/ntttcp/package.nix
similarity index 100%
rename from pkgs/tools/networking/ntttcp/default.nix
rename to pkgs/by-name/nt/ntttcp/package.nix
diff --git a/pkgs/applications/science/logic/nuXmv/default.nix b/pkgs/by-name/nu/nuXmv/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/nuXmv/default.nix
rename to pkgs/by-name/nu/nuXmv/package.nix
diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/by-name/nu/nu_scripts/package.nix
similarity index 100%
rename from pkgs/shells/nushell/nu_scripts/default.nix
rename to pkgs/by-name/nu/nu_scripts/package.nix
diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/by-name/nu/nuclei/package.nix
similarity index 100%
rename from pkgs/tools/security/nuclei/default.nix
rename to pkgs/by-name/nu/nuclei/package.nix
diff --git a/pkgs/games/nudoku/default.nix b/pkgs/by-name/nu/nudoku/package.nix
similarity index 100%
rename from pkgs/games/nudoku/default.nix
rename to pkgs/by-name/nu/nudoku/package.nix
diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/by-name/nu/nuget-to-nix/nuget-to-nix.sh
similarity index 100%
rename from pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
rename to pkgs/by-name/nu/nuget-to-nix/nuget-to-nix.sh
diff --git a/pkgs/build-support/dotnet/nuget-to-nix/default.nix b/pkgs/by-name/nu/nuget-to-nix/package.nix
similarity index 100%
rename from pkgs/build-support/dotnet/nuget-to-nix/default.nix
rename to pkgs/by-name/nu/nuget-to-nix/package.nix
diff --git a/pkgs/applications/emulators/nuked-md/default.nix b/pkgs/by-name/nu/nuked-md/package.nix
similarity index 100%
rename from pkgs/applications/emulators/nuked-md/default.nix
rename to pkgs/by-name/nu/nuked-md/package.nix
diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/by-name/nu/nullidentdmod/package.nix
similarity index 100%
rename from pkgs/servers/identd/nullidentdmod/default.nix
rename to pkgs/by-name/nu/nullidentdmod/package.nix
diff --git a/pkgs/tools/text/num-utils/default.nix b/pkgs/by-name/nu/num-utils/package.nix
similarity index 100%
rename from pkgs/tools/text/num-utils/default.nix
rename to pkgs/by-name/nu/num-utils/package.nix
diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/by-name/nu/numactl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/numactl/default.nix
rename to pkgs/by-name/nu/numactl/package.nix
diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/by-name/nu/numad/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/numad/default.nix
rename to pkgs/by-name/nu/numad/package.nix
diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/by-name/nu/numatop/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/numatop/default.nix
rename to pkgs/by-name/nu/numatop/package.nix
diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/by-name/nu/numberstation/package.nix
similarity index 100%
rename from pkgs/applications/misc/numberstation/default.nix
rename to pkgs/by-name/nu/numberstation/package.nix
diff --git a/pkgs/development/libraries/numcpp/default.nix b/pkgs/by-name/nu/numcpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/numcpp/default.nix
rename to pkgs/by-name/nu/numcpp/package.nix
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/by-name/nu/numdiff/package.nix
similarity index 100%
rename from pkgs/tools/text/numdiff/default.nix
rename to pkgs/by-name/nu/numdiff/package.nix
diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/by-name/nu/numix-cursor-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/numix-cursor-theme/default.nix
rename to pkgs/by-name/nu/numix-cursor-theme/package.nix
diff --git a/pkgs/data/themes/numix/default.nix b/pkgs/by-name/nu/numix-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/numix/default.nix
rename to pkgs/by-name/nu/numix-gtk-theme/package.nix
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
similarity index 100%
rename from pkgs/data/icons/numix-icon-theme-circle/default.nix
rename to pkgs/by-name/nu/numix-icon-theme-circle/package.nix
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix
similarity index 100%
rename from pkgs/data/icons/numix-icon-theme-square/default.nix
rename to pkgs/by-name/nu/numix-icon-theme-square/package.nix
diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/numix-solarized/default.nix
rename to pkgs/by-name/nu/numix-solarized-gtk-theme/package.nix
diff --git a/pkgs/data/themes/numix-sx/default.nix b/pkgs/by-name/nu/numix-sx-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/numix-sx/default.nix
rename to pkgs/by-name/nu/numix-sx-gtk-theme/package.nix
diff --git a/pkgs/tools/X11/numlockx/default.nix b/pkgs/by-name/nu/numlockx/package.nix
similarity index 100%
rename from pkgs/tools/X11/numlockx/default.nix
rename to pkgs/by-name/nu/numlockx/package.nix
diff --git a/pkgs/applications/science/math/numworks-epsilon/default.nix b/pkgs/by-name/nu/numworks-epsilon/package.nix
similarity index 100%
rename from pkgs/applications/science/math/numworks-epsilon/default.nix
rename to pkgs/by-name/nu/numworks-epsilon/package.nix
diff --git a/pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules b/pkgs/by-name/nu/numworks-udev-rules/50-numworks-calculator.rules
similarity index 100%
rename from pkgs/os-specific/linux/numworks-udev-rules/50-numworks-calculator.rules
rename to pkgs/by-name/nu/numworks-udev-rules/50-numworks-calculator.rules
diff --git a/pkgs/os-specific/linux/numworks-udev-rules/default.nix b/pkgs/by-name/nu/numworks-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/numworks-udev-rules/default.nix
rename to pkgs/by-name/nu/numworks-udev-rules/package.nix
diff --git a/pkgs/os-specific/linux/numworks-udev-rules/update.sh b/pkgs/by-name/nu/numworks-udev-rules/update.sh
similarity index 100%
rename from pkgs/os-specific/linux/numworks-udev-rules/update.sh
rename to pkgs/by-name/nu/numworks-udev-rules/update.sh
diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/by-name/nu/nuraft/package.nix
similarity index 100%
rename from pkgs/development/libraries/nuraft/default.nix
rename to pkgs/by-name/nu/nuraft/package.nix
diff --git a/pkgs/tools/misc/nurl/Cargo.lock b/pkgs/by-name/nu/nurl/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/nurl/Cargo.lock
rename to pkgs/by-name/nu/nurl/Cargo.lock
diff --git a/pkgs/tools/misc/nurl/default.nix b/pkgs/by-name/nu/nurl/package.nix
similarity index 100%
rename from pkgs/tools/misc/nurl/default.nix
rename to pkgs/by-name/nu/nurl/package.nix
diff --git a/pkgs/applications/science/logic/nusmv/default.nix b/pkgs/by-name/nu/nusmv/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/nusmv/default.nix
rename to pkgs/by-name/nu/nusmv/package.nix
diff --git a/pkgs/applications/misc/nut/hardcode-paths.patch b/pkgs/by-name/nu/nut/hardcode-paths.patch
similarity index 100%
rename from pkgs/applications/misc/nut/hardcode-paths.patch
rename to pkgs/by-name/nu/nut/hardcode-paths.patch
diff --git a/pkgs/applications/misc/nut/nutshutdown-conf-default.patch b/pkgs/by-name/nu/nut/nutshutdown-conf-default.patch
similarity index 100%
rename from pkgs/applications/misc/nut/nutshutdown-conf-default.patch
rename to pkgs/by-name/nu/nut/nutshutdown-conf-default.patch
diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/by-name/nu/nut/package.nix
similarity index 100%
rename from pkgs/applications/misc/nut/default.nix
rename to pkgs/by-name/nu/nut/package.nix
diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/by-name/nu/nuttcp/package.nix
similarity index 100%
rename from pkgs/tools/networking/nuttcp/default.nix
rename to pkgs/by-name/nu/nuttcp/package.nix
diff --git a/pkgs/tools/misc/nux/default.nix b/pkgs/by-name/nu/nux/package.nix
similarity index 100%
rename from pkgs/tools/misc/nux/default.nix
rename to pkgs/by-name/nu/nux/package.nix
diff --git a/pkgs/tools/package-management/nvd/default.nix b/pkgs/by-name/nv/nvd/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nvd/default.nix
rename to pkgs/by-name/nv/nvd/package.nix
diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/by-name/nv/nvi/package.nix
similarity index 100%
rename from pkgs/applications/editors/nvi/default.nix
rename to pkgs/by-name/nv/nvi/package.nix
diff --git a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/pkgs/by-name/nv/nvidia-optical-flow-sdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix
rename to pkgs/by-name/nv/nvidia-optical-flow-sdk/package.nix
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/by-name/nv/nvidia_cg_toolkit/package.nix
similarity index 100%
rename from pkgs/development/compilers/nvidia-cg-toolkit/default.nix
rename to pkgs/by-name/nv/nvidia_cg_toolkit/package.nix
diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/by-name/nv/nvimpager/package.nix
similarity index 100%
rename from pkgs/tools/misc/nvimpager/default.nix
rename to pkgs/by-name/nv/nvimpager/package.nix
diff --git a/pkgs/tools/system/nvitop/default.nix b/pkgs/by-name/nv/nvitop/package.nix
similarity index 100%
rename from pkgs/tools/system/nvitop/default.nix
rename to pkgs/by-name/nv/nvitop/package.nix
diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/by-name/nv/nvme-cli/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/nvme-cli/default.nix
rename to pkgs/by-name/nv/nvme-cli/package.nix
diff --git a/pkgs/os-specific/linux/nvmet-cli/default.nix b/pkgs/by-name/nv/nvmet-cli/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/nvmet-cli/default.nix
rename to pkgs/by-name/nv/nvmet-cli/package.nix
diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/by-name/nv/nvpy/package.nix
similarity index 100%
rename from pkgs/applications/editors/nvpy/default.nix
rename to pkgs/by-name/nv/nvpy/package.nix
diff --git a/pkgs/applications/misc/nwg-bar/fix-paths.patch b/pkgs/by-name/nw/nwg-bar/fix-paths.patch
similarity index 100%
rename from pkgs/applications/misc/nwg-bar/fix-paths.patch
rename to pkgs/by-name/nw/nwg-bar/fix-paths.patch
diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/by-name/nw/nwg-bar/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-bar/default.nix
rename to pkgs/by-name/nw/nwg-bar/package.nix
diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/by-name/nw/nwg-displays/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-displays/default.nix
rename to pkgs/by-name/nw/nwg-displays/package.nix
diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/by-name/nw/nwg-dock/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-dock/default.nix
rename to pkgs/by-name/nw/nwg-dock/package.nix
diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/by-name/nw/nwg-launchers/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-launchers/default.nix
rename to pkgs/by-name/nw/nwg-launchers/package.nix
diff --git a/pkgs/applications/misc/nwg-look/default.nix b/pkgs/by-name/nw/nwg-look/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-look/default.nix
rename to pkgs/by-name/nw/nwg-look/package.nix
diff --git a/pkgs/applications/misc/nwg-menu/default.nix b/pkgs/by-name/nw/nwg-menu/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-menu/default.nix
rename to pkgs/by-name/nw/nwg-menu/package.nix
diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/by-name/nw/nwg-wrapper/package.nix
similarity index 100%
rename from pkgs/applications/misc/nwg-wrapper/default.nix
rename to pkgs/by-name/nw/nwg-wrapper/package.nix
diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/by-name/nx/nx-libs/package.nix
similarity index 100%
rename from pkgs/tools/X11/nx-libs/default.nix
rename to pkgs/by-name/nx/nx-libs/package.nix
diff --git a/pkgs/tools/compression/nx2elf/default.nix b/pkgs/by-name/nx/nx2elf/package.nix
similarity index 100%
rename from pkgs/tools/compression/nx2elf/default.nix
rename to pkgs/by-name/nx/nx2elf/package.nix
diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
rename to pkgs/by-name/nx/nxpmicro-mfgtools/package.nix
diff --git a/pkgs/tools/misc/nyancat/default.nix b/pkgs/by-name/ny/nyancat/package.nix
similarity index 100%
rename from pkgs/tools/misc/nyancat/default.nix
rename to pkgs/by-name/ny/nyancat/package.nix
diff --git a/pkgs/tools/networking/nylon/configure-use-solib.patch b/pkgs/by-name/ny/nylon/configure-use-solib.patch
similarity index 100%
rename from pkgs/tools/networking/nylon/configure-use-solib.patch
rename to pkgs/by-name/ny/nylon/configure-use-solib.patch
diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/by-name/ny/nylon/package.nix
similarity index 100%
rename from pkgs/tools/networking/nylon/default.nix
rename to pkgs/by-name/ny/nylon/package.nix
diff --git a/pkgs/tools/networking/nyx/default.nix b/pkgs/by-name/ny/nyx/package.nix
similarity index 100%
rename from pkgs/tools/networking/nyx/default.nix
rename to pkgs/by-name/ny/nyx/package.nix
diff --git a/pkgs/development/interpreters/oak/default.nix b/pkgs/by-name/oa/oak/package.nix
similarity index 100%
rename from pkgs/development/interpreters/oak/default.nix
rename to pkgs/by-name/oa/oak/package.nix
diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/by-name/oa/oapi-codegen/package.nix
similarity index 100%
rename from pkgs/tools/networking/oapi-codegen/default.nix
rename to pkgs/by-name/oa/oapi-codegen/package.nix
diff --git a/pkgs/development/libraries/oatpp/default.nix b/pkgs/by-name/oa/oatpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/oatpp/default.nix
rename to pkgs/by-name/oa/oatpp/package.nix
diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix
similarity index 100%
rename from pkgs/servers/oauth2-proxy/default.nix
rename to pkgs/by-name/oa/oauth2-proxy/package.nix
diff --git a/pkgs/tools/security/oauth2c/default.nix b/pkgs/by-name/oa/oauth2c/package.nix
similarity index 100%
rename from pkgs/tools/security/oauth2c/default.nix
rename to pkgs/by-name/oa/oauth2c/package.nix
diff --git a/pkgs/applications/emulators/oberon-risc-emu/default.nix b/pkgs/by-name/ob/oberon-risc-emu/package.nix
similarity index 100%
rename from pkgs/applications/emulators/oberon-risc-emu/default.nix
rename to pkgs/by-name/ob/oberon-risc-emu/package.nix
diff --git a/pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/pkgs/by-name/ob/obex_data_server/obex-data-server-0.4.6-build-fixes-1.patch
similarity index 100%
rename from pkgs/tools/bluetooth/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch
rename to pkgs/by-name/ob/obex_data_server/obex-data-server-0.4.6-build-fixes-1.patch
diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/by-name/ob/obex_data_server/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/obex-data-server/default.nix
rename to pkgs/by-name/ob/obex_data_server/package.nix
diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/by-name/ob/obexd/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/obexd/default.nix
rename to pkgs/by-name/ob/obexd/package.nix
diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/by-name/ob/obexfs/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/obexfs/default.nix
rename to pkgs/by-name/ob/obexfs/package.nix
diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/by-name/ob/obexftp/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/obexftp/default.nix
rename to pkgs/by-name/ob/obexftp/package.nix
diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/by-name/ob/obfs4/package.nix
similarity index 100%
rename from pkgs/tools/networking/obfs4/default.nix
rename to pkgs/by-name/ob/obfs4/package.nix
diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/by-name/ob/objconv/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/objconv/default.nix
rename to pkgs/by-name/ob/objconv/package.nix
diff --git a/pkgs/applications/misc/obs-cli/default.nix b/pkgs/by-name/ob/obs-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/obs-cli/default.nix
rename to pkgs/by-name/ob/obs-cli/package.nix
diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/by-name/ob/obuild/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/obuild/default.nix
rename to pkgs/by-name/ob/obuild/package.nix
diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/by-name/oc/ocaml-top/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/ocaml-top/default.nix
rename to pkgs/by-name/oc/ocaml-top/package.nix
diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/by-name/oc/ocaml_make/package.nix
similarity index 100%
rename from pkgs/development/ocaml-modules/ocamlmake/default.nix
rename to pkgs/by-name/oc/ocaml_make/package.nix
diff --git a/pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh b/pkgs/by-name/oc/ocaml_make/setup-hook.sh
similarity index 100%
rename from pkgs/development/ocaml-modules/ocamlmake/setup-hook.sh
rename to pkgs/by-name/oc/ocaml_make/setup-hook.sh
diff --git a/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/pkgs/by-name/oc/ocf-resource-agents/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ocf-resource-agents/default.nix
rename to pkgs/by-name/oc/ocf-resource-agents/package.nix
diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/by-name/oc/oci-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/oci-cli/default.nix
rename to pkgs/by-name/oc/oci-cli/package.nix
diff --git a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix
rename to pkgs/by-name/oc/oci-seccomp-bpf-hook/package.nix
diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/by-name/oc/ocl-icd/package.nix
similarity index 100%
rename from pkgs/development/libraries/ocl-icd/default.nix
rename to pkgs/by-name/oc/ocl-icd/package.nix
diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/by-name/oc/oclgrind/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/oclgrind/default.nix
rename to pkgs/by-name/oc/oclgrind/package.nix
diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/by-name/oc/ocm/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/ocm/default.nix
rename to pkgs/by-name/oc/ocm/package.nix
diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/by-name/oc/ocproxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/ocproxy/default.nix
rename to pkgs/by-name/oc/ocproxy/package.nix
diff --git a/pkgs/data/fonts/ocr-a/default.nix b/pkgs/by-name/oc/ocr-a/package.nix
similarity index 100%
rename from pkgs/data/fonts/ocr-a/default.nix
rename to pkgs/by-name/oc/ocr-a/package.nix
diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/by-name/oc/ocrad/package.nix
similarity index 100%
rename from pkgs/applications/graphics/ocrad/default.nix
rename to pkgs/by-name/oc/ocrad/package.nix
diff --git a/pkgs/applications/graphics/ocrfeeder/fix-launch.diff b/pkgs/by-name/oc/ocrfeeder/fix-launch.diff
similarity index 100%
rename from pkgs/applications/graphics/ocrfeeder/fix-launch.diff
rename to pkgs/by-name/oc/ocrfeeder/fix-launch.diff
diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/by-name/oc/ocrfeeder/package.nix
similarity index 100%
rename from pkgs/applications/graphics/ocrfeeder/default.nix
rename to pkgs/by-name/oc/ocrfeeder/package.nix
diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/by-name/oc/ocserv/package.nix
similarity index 100%
rename from pkgs/tools/networking/ocserv/default.nix
rename to pkgs/by-name/oc/ocserv/package.nix
diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/by-name/oc/ocsigen-i18n/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
rename to pkgs/by-name/oc/ocsigen-i18n/package.nix
diff --git a/pkgs/development/libraries/octomap/default.nix b/pkgs/by-name/oc/octomap/package.nix
similarity index 100%
rename from pkgs/development/libraries/octomap/default.nix
rename to pkgs/by-name/oc/octomap/package.nix
diff --git a/pkgs/applications/misc/octoprint/ffmpeg-path.patch b/pkgs/by-name/oc/octoprint/ffmpeg-path.patch
similarity index 100%
rename from pkgs/applications/misc/octoprint/ffmpeg-path.patch
rename to pkgs/by-name/oc/octoprint/ffmpeg-path.patch
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/by-name/oc/octoprint/package.nix
similarity index 100%
rename from pkgs/applications/misc/octoprint/default.nix
rename to pkgs/by-name/oc/octoprint/package.nix
diff --git a/pkgs/applications/misc/octoprint/pip-path.patch b/pkgs/by-name/oc/octoprint/pip-path.patch
similarity index 100%
rename from pkgs/applications/misc/octoprint/pip-path.patch
rename to pkgs/by-name/oc/octoprint/pip-path.patch
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix
similarity index 100%
rename from pkgs/applications/misc/octoprint/plugins.nix
rename to pkgs/by-name/oc/octoprint/plugins.nix
diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/by-name/oc/octopus-caller/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/octopus/default.nix
rename to pkgs/by-name/oc/octopus-caller/package.nix
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/by-name/oc/octopus/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/octopus/default.nix
rename to pkgs/by-name/oc/octopus/package.nix
diff --git a/pkgs/tools/security/octosuite/default.nix b/pkgs/by-name/oc/octosuite/package.nix
similarity index 100%
rename from pkgs/tools/security/octosuite/default.nix
rename to pkgs/by-name/oc/octosuite/package.nix
diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/by-name/oc/oculante/package.nix
similarity index 100%
rename from pkgs/applications/graphics/oculante/default.nix
rename to pkgs/by-name/oc/oculante/package.nix
diff --git a/pkgs/games/doom-ports/odamex/default.nix b/pkgs/by-name/od/odamex/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/odamex/default.nix
rename to pkgs/by-name/od/odamex/package.nix
diff --git a/pkgs/os-specific/linux/oddjob/default.nix b/pkgs/by-name/od/oddjob/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/oddjob/default.nix
rename to pkgs/by-name/od/oddjob/package.nix
diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/by-name/od/ode/package.nix
similarity index 100%
rename from pkgs/development/libraries/ode/default.nix
rename to pkgs/by-name/od/ode/package.nix
diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/by-name/od/odin2/package.nix
similarity index 100%
rename from pkgs/applications/audio/odin2/default.nix
rename to pkgs/by-name/od/odin2/package.nix
diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/by-name/od/odo/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/odo/default.nix
rename to pkgs/by-name/od/odo/package.nix
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/by-name/od/odp-dpdk/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/odp-dpdk/default.nix
rename to pkgs/by-name/od/odp-dpdk/package.nix
diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/by-name/od/odpic/package.nix
similarity index 100%
rename from pkgs/development/libraries/odpic/default.nix
rename to pkgs/by-name/od/odpic/package.nix
diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/by-name/od/odroid-xu3-bootloader/package.nix
similarity index 100%
rename from pkgs/tools/misc/odroid-xu3-bootloader/default.nix
rename to pkgs/by-name/od/odroid-xu3-bootloader/package.nix
diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/by-name/od/odt2txt/package.nix
similarity index 100%
rename from pkgs/tools/text/odt2txt/default.nix
rename to pkgs/by-name/od/odt2txt/package.nix
diff --git a/pkgs/tools/misc/odyssey/default.nix b/pkgs/by-name/od/odyssey/package.nix
similarity index 100%
rename from pkgs/tools/misc/odyssey/default.nix
rename to pkgs/by-name/od/odyssey/package.nix
diff --git a/pkgs/applications/editors/oed/default.nix b/pkgs/by-name/oe/oed/package.nix
similarity index 100%
rename from pkgs/applications/editors/oed/default.nix
rename to pkgs/by-name/oe/oed/package.nix
diff --git a/pkgs/tools/security/offensive-azure/default.nix b/pkgs/by-name/of/offensive-azure/package.nix
similarity index 100%
rename from pkgs/tools/security/offensive-azure/default.nix
rename to pkgs/by-name/of/offensive-azure/package.nix
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/by-name/of/offlineimap/package.nix
similarity index 100%
rename from pkgs/tools/networking/offlineimap/default.nix
rename to pkgs/by-name/of/offlineimap/package.nix
diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/by-name/of/offrss/package.nix
similarity index 100%
rename from pkgs/applications/networking/offrss/default.nix
rename to pkgs/by-name/of/offrss/package.nix
diff --git a/pkgs/tools/compression/offzip/default.nix b/pkgs/by-name/of/offzip/package.nix
similarity index 100%
rename from pkgs/tools/compression/offzip/default.nix
rename to pkgs/by-name/of/offzip/package.nix
diff --git a/pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch b/pkgs/by-name/of/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
similarity index 100%
rename from pkgs/tools/networking/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
rename to pkgs/by-name/of/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/by-name/of/ofono/package.nix
similarity index 100%
rename from pkgs/tools/networking/ofono/default.nix
rename to pkgs/by-name/of/ofono/package.nix
diff --git a/pkgs/development/libraries/ogdf/default.nix b/pkgs/by-name/og/ogdf/package.nix
similarity index 100%
rename from pkgs/development/libraries/ogdf/default.nix
rename to pkgs/by-name/og/ogdf/package.nix
diff --git a/pkgs/tools/misc/oggvideotools/default.nix b/pkgs/by-name/og/oggvideotools/package.nix
similarity index 100%
rename from pkgs/tools/misc/oggvideotools/default.nix
rename to pkgs/by-name/og/oggvideotools/package.nix
diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/by-name/og/ogmtools/package.nix
similarity index 100%
rename from pkgs/applications/video/ogmtools/default.nix
rename to pkgs/by-name/og/ogmtools/package.nix
diff --git a/pkgs/development/tools/rust/ograc/default.nix b/pkgs/by-name/og/ograc/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/ograc/default.nix
rename to pkgs/by-name/og/ograc/package.nix
diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/by-name/oh/oh-my-git/package.nix
similarity index 100%
rename from pkgs/games/oh-my-git/default.nix
rename to pkgs/by-name/oh/oh-my-git/package.nix
diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix
similarity index 100%
rename from pkgs/shells/zsh/oh-my-zsh/default.nix
rename to pkgs/by-name/oh/oh-my-zsh/package.nix
diff --git a/pkgs/shells/oh/default.nix b/pkgs/by-name/oh/oh/package.nix
similarity index 100%
rename from pkgs/shells/oh/default.nix
rename to pkgs/by-name/oh/oh/package.nix
diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/by-name/oh/oha/package.nix
similarity index 100%
rename from pkgs/tools/networking/oha/default.nix
rename to pkgs/by-name/oh/oha/package.nix
diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/by-name/oi/oidentd/package.nix
similarity index 100%
rename from pkgs/servers/identd/oidentd/default.nix
rename to pkgs/by-name/oi/oidentd/package.nix
diff --git a/pkgs/applications/misc/oil-buku/default.nix b/pkgs/by-name/oi/oil-buku/package.nix
similarity index 100%
rename from pkgs/applications/misc/oil-buku/default.nix
rename to pkgs/by-name/oi/oil-buku/package.nix
diff --git a/pkgs/shells/oksh/default.nix b/pkgs/by-name/ok/oksh/package.nix
similarity index 100%
rename from pkgs/shells/oksh/default.nix
rename to pkgs/by-name/ok/oksh/package.nix
diff --git a/pkgs/tools/admin/okta-aws-cli/default.nix b/pkgs/by-name/ok/okta-aws-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/okta-aws-cli/default.nix
rename to pkgs/by-name/ok/okta-aws-cli/package.nix
diff --git a/pkgs/servers/olaris/default.nix b/pkgs/by-name/ol/olaris-server/package.nix
similarity index 100%
rename from pkgs/servers/olaris/default.nix
rename to pkgs/by-name/ol/olaris-server/package.nix
diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/by-name/ol/oldsindhi/package.nix
similarity index 100%
rename from pkgs/data/fonts/oldsindhi/default.nix
rename to pkgs/by-name/ol/oldsindhi/package.nix
diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/by-name/ol/oldstandard/package.nix
similarity index 100%
rename from pkgs/data/fonts/oldstandard/default.nix
rename to pkgs/by-name/ol/oldstandard/package.nix
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/by-name/ol/olm/package.nix
similarity index 100%
rename from pkgs/development/libraries/olm/default.nix
rename to pkgs/by-name/ol/olm/package.nix
diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/by-name/ol/olsrd/package.nix
similarity index 100%
rename from pkgs/tools/networking/olsrd/default.nix
rename to pkgs/by-name/ol/olsrd/package.nix
diff --git a/pkgs/development/tools/misc/om4/default.nix b/pkgs/by-name/om/om4/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/om4/default.nix
rename to pkgs/by-name/om/om4/package.nix
diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/by-name/om/omake/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/omake/default.nix
rename to pkgs/by-name/om/omake/package.nix
diff --git a/pkgs/data/themes/omni-gtk-theme/default.nix b/pkgs/by-name/om/omni-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/omni-gtk-theme/default.nix
rename to pkgs/by-name/om/omni-gtk-theme/package.nix
diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/by-name/om/omniorb/package.nix
similarity index 100%
rename from pkgs/development/tools/omniorb/default.nix
rename to pkgs/by-name/om/omniorb/package.nix
diff --git a/pkgs/development/libraries/omorfi/default.nix b/pkgs/by-name/om/omorfi/package.nix
similarity index 100%
rename from pkgs/development/libraries/omorfi/default.nix
rename to pkgs/by-name/om/omorfi/package.nix
diff --git a/pkgs/applications/networking/omping/default.nix b/pkgs/by-name/om/omping/package.nix
similarity index 100%
rename from pkgs/applications/networking/omping/default.nix
rename to pkgs/by-name/om/omping/package.nix
diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/by-name/om/omxplayer/package.nix
similarity index 100%
rename from pkgs/applications/video/omxplayer/default.nix
rename to pkgs/by-name/om/omxplayer/package.nix
diff --git a/pkgs/applications/misc/onboard/fix-paths.patch b/pkgs/by-name/on/onboard/fix-paths.patch
similarity index 100%
rename from pkgs/applications/misc/onboard/fix-paths.patch
rename to pkgs/by-name/on/onboard/fix-paths.patch
diff --git a/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch b/pkgs/by-name/on/onboard/hunspell-use-xdg-datadirs.patch
similarity index 100%
rename from pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch
rename to pkgs/by-name/on/onboard/hunspell-use-xdg-datadirs.patch
diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/by-name/on/onboard/package.nix
similarity index 100%
rename from pkgs/applications/misc/onboard/default.nix
rename to pkgs/by-name/on/onboard/package.nix
diff --git a/pkgs/tools/misc/ondir/default.nix b/pkgs/by-name/on/ondir/package.nix
similarity index 100%
rename from pkgs/tools/misc/ondir/default.nix
rename to pkgs/by-name/on/ondir/package.nix
diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/by-name/on/oneko/package.nix
similarity index 100%
rename from pkgs/applications/misc/oneko/default.nix
rename to pkgs/by-name/on/oneko/package.nix
diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/by-name/on/oneshot/package.nix
similarity index 100%
rename from pkgs/tools/networking/oneshot/default.nix
rename to pkgs/by-name/on/oneshot/package.nix
diff --git a/pkgs/tools/security/onesixtyone/default.nix b/pkgs/by-name/on/onesixtyone/package.nix
similarity index 100%
rename from pkgs/tools/security/onesixtyone/default.nix
rename to pkgs/by-name/on/onesixtyone/package.nix
diff --git a/pkgs/data/themes/onestepback/default.nix b/pkgs/by-name/on/onestepback/package.nix
similarity index 100%
rename from pkgs/data/themes/onestepback/default.nix
rename to pkgs/by-name/on/onestepback/package.nix
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/by-name/on/oniguruma/package.nix
similarity index 100%
rename from pkgs/development/libraries/oniguruma/default.nix
rename to pkgs/by-name/on/oniguruma/package.nix
diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/by-name/on/onioncircuits/package.nix
similarity index 100%
rename from pkgs/tools/security/onioncircuits/default.nix
rename to pkgs/by-name/on/onioncircuits/package.nix
diff --git a/pkgs/tools/security/onlykey-agent/default.nix b/pkgs/by-name/on/onlykey-agent/package.nix
similarity index 100%
rename from pkgs/tools/security/onlykey-agent/default.nix
rename to pkgs/by-name/on/onlykey-agent/package.nix
diff --git a/pkgs/tools/security/onlykey-cli/default.nix b/pkgs/by-name/on/onlykey-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/onlykey-cli/default.nix
rename to pkgs/by-name/on/onlykey-cli/package.nix
diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/by-name/on/onlyoffice-documentserver/package.nix
similarity index 100%
rename from pkgs/servers/onlyoffice-documentserver/default.nix
rename to pkgs/by-name/on/onlyoffice-documentserver/package.nix
diff --git a/pkgs/tools/virtualization/onmetal-image/default.nix b/pkgs/by-name/on/onmetal-image/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/onmetal-image/default.nix
rename to pkgs/by-name/on/onmetal-image/package.nix
diff --git a/pkgs/development/libraries/science/biology/oobicpl/default.nix b/pkgs/by-name/oo/oobicpl/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/biology/oobicpl/default.nix
rename to pkgs/by-name/oo/oobicpl/package.nix
diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/by-name/oo/ookla-speedtest/package.nix
similarity index 100%
rename from pkgs/tools/networking/ookla-speedtest/default.nix
rename to pkgs/by-name/oo/ookla-speedtest/package.nix
diff --git a/pkgs/tools/networking/oonf-olsrd2/default.nix b/pkgs/by-name/oo/oonf-olsrd2/package.nix
similarity index 100%
rename from pkgs/tools/networking/oonf-olsrd2/default.nix
rename to pkgs/by-name/oo/oonf-olsrd2/package.nix
diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/by-name/oo/ooniprobe-cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/ooniprobe-cli/default.nix
rename to pkgs/by-name/oo/ooniprobe-cli/package.nix
diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/by-name/op/opae/package.nix
similarity index 100%
rename from pkgs/development/libraries/opae/default.nix
rename to pkgs/by-name/op/opae/package.nix
diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/by-name/op/opaline/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/opaline/default.nix
rename to pkgs/by-name/op/opaline/package.nix
diff --git a/pkgs/development/tools/ocaml/opam-publish/default.nix b/pkgs/by-name/op/opam-publish/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/opam-publish/default.nix
rename to pkgs/by-name/op/opam-publish/package.nix
diff --git a/pkgs/development/tools/ocaml/opam2json/default.nix b/pkgs/by-name/op/opam2json/package.nix
similarity index 100%
rename from pkgs/development/tools/ocaml/opam2json/default.nix
rename to pkgs/by-name/op/opam2json/package.nix
diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/by-name/op/opcr-policy/package.nix
similarity index 100%
rename from pkgs/development/tools/opcr-policy/default.nix
rename to pkgs/by-name/op/opcr-policy/package.nix
diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/by-name/op/open-dyslexic/package.nix
similarity index 100%
rename from pkgs/data/fonts/open-dyslexic/default.nix
rename to pkgs/by-name/op/open-dyslexic/package.nix
diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/by-name/op/open-ecard/package.nix
similarity index 100%
rename from pkgs/tools/security/open-ecard/default.nix
rename to pkgs/by-name/op/open-ecard/package.nix
diff --git a/pkgs/data/fonts/open-fonts/default.nix b/pkgs/by-name/op/open-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/open-fonts/default.nix
rename to pkgs/by-name/op/open-fonts/package.nix
diff --git a/pkgs/applications/video/open-in-mpv/default.nix b/pkgs/by-name/op/open-in-mpv/package.nix
similarity index 100%
rename from pkgs/applications/video/open-in-mpv/default.nix
rename to pkgs/by-name/op/open-in-mpv/package.nix
diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/by-name/op/open-isns/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/open-isns/default.nix
rename to pkgs/by-name/op/open-isns/package.nix
diff --git a/pkgs/tools/misc/open-pdf-sign/default.nix b/pkgs/by-name/op/open-pdf-sign/package.nix
similarity index 100%
rename from pkgs/tools/misc/open-pdf-sign/default.nix
rename to pkgs/by-name/op/open-pdf-sign/package.nix
diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/by-name/op/open-policy-agent/package.nix
similarity index 100%
rename from pkgs/development/tools/open-policy-agent/default.nix
rename to pkgs/by-name/op/open-policy-agent/package.nix
diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/by-name/op/open-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/open-sans/default.nix
rename to pkgs/by-name/op/open-sans/package.nix
diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/by-name/op/open-stage-control/package.nix
similarity index 100%
rename from pkgs/applications/audio/open-stage-control/default.nix
rename to pkgs/by-name/op/open-stage-control/package.nix
diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/by-name/op/open-wbo/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/open-wbo/default.nix
rename to pkgs/by-name/op/open-wbo/package.nix
diff --git a/pkgs/games/openarena/Makefile.local b/pkgs/by-name/op/openarena/Makefile.local
similarity index 100%
rename from pkgs/games/openarena/Makefile.local
rename to pkgs/by-name/op/openarena/Makefile.local
diff --git a/pkgs/games/openarena/default.nix b/pkgs/by-name/op/openarena/package.nix
similarity index 100%
rename from pkgs/games/openarena/default.nix
rename to pkgs/by-name/op/openarena/package.nix
diff --git a/pkgs/servers/openbgpd/default.nix b/pkgs/by-name/op/openbgpd/package.nix
similarity index 100%
rename from pkgs/servers/openbgpd/default.nix
rename to pkgs/by-name/op/openbgpd/package.nix
diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/by-name/op/openboardview/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/openboardview/default.nix
rename to pkgs/by-name/op/openboardview/package.nix
diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/by-name/op/openbox/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/openbox/default.nix
rename to pkgs/by-name/op/openbox/package.nix
diff --git a/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch b/pkgs/by-name/op/openbsm/bsm-add-audit_token_to_pid.patch
similarity index 100%
rename from pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch
rename to pkgs/by-name/op/openbsm/bsm-add-audit_token_to_pid.patch
diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/by-name/op/openbsm/package.nix
similarity index 100%
rename from pkgs/development/libraries/openbsm/default.nix
rename to pkgs/by-name/op/openbsm/package.nix
diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/by-name/op/opencascade-occt/package.nix
similarity index 100%
rename from pkgs/development/libraries/opencascade-occt/default.nix
rename to pkgs/by-name/op/opencascade-occt/package.nix
diff --git a/pkgs/tools/misc/opencbm/default.nix b/pkgs/by-name/op/opencbm/package.nix
similarity index 100%
rename from pkgs/tools/misc/opencbm/default.nix
rename to pkgs/by-name/op/opencbm/package.nix
diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/by-name/op/opencc/package.nix
similarity index 100%
rename from pkgs/tools/text/opencc/default.nix
rename to pkgs/by-name/op/opencc/package.nix
diff --git a/pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch b/pkgs/by-name/op/opencl-clang/opencl-headers-dir.patch
similarity index 100%
rename from pkgs/development/libraries/opencl-clang/opencl-headers-dir.patch
rename to pkgs/by-name/op/opencl-clang/opencl-headers-dir.patch
diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/by-name/op/opencl-clang/package.nix
similarity index 100%
rename from pkgs/development/libraries/opencl-clang/default.nix
rename to pkgs/by-name/op/opencl-clang/package.nix
diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/by-name/op/opencl-clhpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/opencl-clhpp/default.nix
rename to pkgs/by-name/op/opencl-clhpp/package.nix
diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/by-name/op/opencl-headers/package.nix
similarity index 100%
rename from pkgs/development/libraries/opencl-headers/default.nix
rename to pkgs/by-name/op/opencl-headers/package.nix
diff --git a/pkgs/games/openclonk/default.nix b/pkgs/by-name/op/openclonk/package.nix
similarity index 100%
rename from pkgs/games/openclonk/default.nix
rename to pkgs/by-name/op/openclonk/package.nix
diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/by-name/op/opencollada/package.nix
similarity index 100%
rename from pkgs/development/libraries/opencollada/default.nix
rename to pkgs/by-name/op/opencollada/package.nix
diff --git a/pkgs/development/libraries/opencollada/pcre.patch b/pkgs/by-name/op/opencollada/pcre.patch
similarity index 100%
rename from pkgs/development/libraries/opencollada/pcre.patch
rename to pkgs/by-name/op/opencollada/pcre.patch
diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/by-name/op/opencore-amr/package.nix
similarity index 100%
rename from pkgs/development/libraries/opencore-amr/default.nix
rename to pkgs/by-name/op/opencore-amr/package.nix
diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/by-name/op/opencorsairlink/package.nix
similarity index 100%
rename from pkgs/tools/misc/opencorsairlink/default.nix
rename to pkgs/by-name/op/opencorsairlink/package.nix
diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/by-name/op/opencryptoki/package.nix
similarity index 100%
rename from pkgs/tools/security/opencryptoki/default.nix
rename to pkgs/by-name/op/opencryptoki/package.nix
diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/by-name/op/openct/package.nix
similarity index 100%
rename from pkgs/development/libraries/openct/default.nix
rename to pkgs/by-name/op/openct/package.nix
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/by-name/op/opendbx/package.nix
similarity index 100%
rename from pkgs/development/libraries/opendbx/default.nix
rename to pkgs/by-name/op/opendbx/package.nix
diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/by-name/op/opendkim/package.nix
similarity index 100%
rename from pkgs/development/libraries/opendkim/default.nix
rename to pkgs/by-name/op/opendkim/package.nix
diff --git a/pkgs/development/libraries/opendmarc/default.nix b/pkgs/by-name/op/opendmarc/package.nix
similarity index 100%
rename from pkgs/development/libraries/opendmarc/default.nix
rename to pkgs/by-name/op/opendmarc/package.nix
diff --git a/pkgs/games/opendune/default.nix b/pkgs/by-name/op/opendune/package.nix
similarity index 100%
rename from pkgs/games/opendune/default.nix
rename to pkgs/by-name/op/opendune/package.nix
diff --git a/pkgs/games/opendungeons/cmakepaths.patch b/pkgs/by-name/op/opendungeons/cmakepaths.patch
similarity index 100%
rename from pkgs/games/opendungeons/cmakepaths.patch
rename to pkgs/by-name/op/opendungeons/cmakepaths.patch
diff --git a/pkgs/games/opendungeons/fix_link_date_time.patch b/pkgs/by-name/op/opendungeons/fix_link_date_time.patch
similarity index 100%
rename from pkgs/games/opendungeons/fix_link_date_time.patch
rename to pkgs/by-name/op/opendungeons/fix_link_date_time.patch
diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/by-name/op/opendungeons/package.nix
similarity index 100%
rename from pkgs/games/opendungeons/default.nix
rename to pkgs/by-name/op/opendungeons/package.nix
diff --git a/pkgs/development/libraries/openexrid-unstable/openexrid.patch b/pkgs/by-name/op/openexrid-unstable/openexrid.patch
similarity index 100%
rename from pkgs/development/libraries/openexrid-unstable/openexrid.patch
rename to pkgs/by-name/op/openexrid-unstable/openexrid.patch
diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/by-name/op/openexrid-unstable/package.nix
similarity index 100%
rename from pkgs/development/libraries/openexrid-unstable/default.nix
rename to pkgs/by-name/op/openexrid-unstable/package.nix
diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/by-name/op/openfec/package.nix
similarity index 100%
rename from pkgs/development/libraries/openfec/default.nix
rename to pkgs/by-name/op/openfec/package.nix
diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/by-name/op/openfortivpn/package.nix
similarity index 100%
rename from pkgs/tools/networking/openfortivpn/default.nix
rename to pkgs/by-name/op/openfortivpn/package.nix
diff --git a/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/pkgs/by-name/op/openfpgaloader/package.nix
similarity index 100%
rename from pkgs/development/embedded/fpga/openfpgaloader/default.nix
rename to pkgs/by-name/op/openfpgaloader/package.nix
diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/by-name/op/openfx/package.nix
similarity index 100%
rename from pkgs/development/libraries/openfx/default.nix
rename to pkgs/by-name/op/openfx/package.nix
diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/by-name/op/opengrok/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/opengrok/default.nix
rename to pkgs/by-name/op/opengrok/package.nix
diff --git a/pkgs/development/libraries/openhmd/default.nix b/pkgs/by-name/op/openhmd/package.nix
similarity index 100%
rename from pkgs/development/libraries/openhmd/default.nix
rename to pkgs/by-name/op/openhmd/package.nix
diff --git a/pkgs/development/libraries/openimagedenoise/cuda.patch b/pkgs/by-name/op/openimagedenoise/cuda.patch
similarity index 100%
rename from pkgs/development/libraries/openimagedenoise/cuda.patch
rename to pkgs/by-name/op/openimagedenoise/cuda.patch
diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/by-name/op/openimagedenoise/package.nix
similarity index 100%
rename from pkgs/development/libraries/openimagedenoise/default.nix
rename to pkgs/by-name/op/openimagedenoise/package.nix
diff --git a/pkgs/tools/system/openipmi/default.nix b/pkgs/by-name/op/openipmi/package.nix
similarity index 100%
rename from pkgs/tools/system/openipmi/default.nix
rename to pkgs/by-name/op/openipmi/package.nix
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/by-name/op/openiscsi/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/open-iscsi/default.nix
rename to pkgs/by-name/op/openiscsi/package.nix
diff --git a/pkgs/tools/text/sgml/openjade/msggen.patch b/pkgs/by-name/op/openjade/msggen.patch
similarity index 100%
rename from pkgs/tools/text/sgml/openjade/msggen.patch
rename to pkgs/by-name/op/openjade/msggen.patch
diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/by-name/op/openjade/package.nix
similarity index 100%
rename from pkgs/tools/text/sgml/openjade/default.nix
rename to pkgs/by-name/op/openjade/package.nix
diff --git a/pkgs/games/openjk/default.nix b/pkgs/by-name/op/openjk/package.nix
similarity index 100%
rename from pkgs/games/openjk/default.nix
rename to pkgs/by-name/op/openjk/package.nix
diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/by-name/op/openjpeg/package.nix
similarity index 100%
rename from pkgs/development/libraries/openjpeg/default.nix
rename to pkgs/by-name/op/openjpeg/package.nix
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/by-name/op/openldap/package.nix
similarity index 100%
rename from pkgs/development/libraries/openldap/default.nix
rename to pkgs/by-name/op/openldap/package.nix
diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/by-name/op/openlibm/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/openlibm/default.nix
rename to pkgs/by-name/op/openlibm/package.nix
diff --git a/pkgs/games/openlierox/default.nix b/pkgs/by-name/op/openlierox/package.nix
similarity index 100%
rename from pkgs/games/openlierox/default.nix
rename to pkgs/by-name/op/openlierox/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/by-name/op/openmm/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/openmm/default.nix
rename to pkgs/by-name/op/openmm/package.nix
diff --git a/pkgs/applications/science/chemistry/openmolcas/openblasPath.patch b/pkgs/by-name/op/openmolcas/openblasPath.patch
similarity index 100%
rename from pkgs/applications/science/chemistry/openmolcas/openblasPath.patch
rename to pkgs/by-name/op/openmolcas/openblasPath.patch
diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/by-name/op/openmolcas/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/openmolcas/default.nix
rename to pkgs/by-name/op/openmolcas/package.nix
diff --git a/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch b/pkgs/by-name/op/openmolcas/qcmaquis.patch
similarity index 100%
rename from pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch
rename to pkgs/by-name/op/openmolcas/qcmaquis.patch
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/by-name/op/openmpi/package.nix
similarity index 100%
rename from pkgs/development/libraries/openmpi/default.nix
rename to pkgs/by-name/op/openmpi/package.nix
diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/by-name/op/openntpd/package.nix
similarity index 100%
rename from pkgs/tools/networking/openntpd/default.nix
rename to pkgs/by-name/op/openntpd/package.nix
diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/by-name/op/openobex/package.nix
similarity index 100%
rename from pkgs/tools/bluetooth/openobex/default.nix
rename to pkgs/by-name/op/openobex/package.nix
diff --git a/pkgs/development/embedded/openocd/default.nix b/pkgs/by-name/op/openocd/package.nix
similarity index 100%
rename from pkgs/development/embedded/openocd/default.nix
rename to pkgs/by-name/op/openocd/package.nix
diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/by-name/op/openpa/package.nix
similarity index 100%
rename from pkgs/development/libraries/openpa/default.nix
rename to pkgs/by-name/op/openpa/package.nix
diff --git a/pkgs/games/openrct2/default.nix b/pkgs/by-name/op/openrct2/package.nix
similarity index 100%
rename from pkgs/games/openrct2/default.nix
rename to pkgs/by-name/op/openrct2/package.nix
diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/by-name/op/openresolv/package.nix
similarity index 100%
rename from pkgs/tools/networking/openresolv/default.nix
rename to pkgs/by-name/op/openresolv/package.nix
diff --git a/pkgs/applications/misc/openring/default.nix b/pkgs/by-name/op/openring/package.nix
similarity index 100%
rename from pkgs/applications/misc/openring/default.nix
rename to pkgs/by-name/op/openring/package.nix
diff --git a/pkgs/tools/security/openrisk/default.nix b/pkgs/by-name/op/openrisk/package.nix
similarity index 100%
rename from pkgs/tools/security/openrisk/default.nix
rename to pkgs/by-name/op/openrisk/package.nix
diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/by-name/op/opensaml-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/opensaml-cpp/default.nix
rename to pkgs/by-name/op/opensaml-cpp/package.nix
diff --git a/pkgs/misc/opensbi/default.nix b/pkgs/by-name/op/opensbi/package.nix
similarity index 100%
rename from pkgs/misc/opensbi/default.nix
rename to pkgs/by-name/op/opensbi/package.nix
diff --git a/pkgs/development/tools/language-servers/openscad-lsp/default.nix b/pkgs/by-name/op/openscad-lsp/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/openscad-lsp/default.nix
rename to pkgs/by-name/op/openscad-lsp/package.nix
diff --git a/pkgs/tools/system/openseachest/default.nix b/pkgs/by-name/op/openseachest/package.nix
similarity index 100%
rename from pkgs/tools/system/openseachest/default.nix
rename to pkgs/by-name/op/openseachest/package.nix
diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/by-name/op/opensearch/package.nix
similarity index 100%
rename from pkgs/servers/search/opensearch/default.nix
rename to pkgs/by-name/op/opensearch/package.nix
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/by-name/op/openshift/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/openshift/default.nix
rename to pkgs/by-name/op/openshift/package.nix
diff --git a/pkgs/development/libraries/openslide/default.nix b/pkgs/by-name/op/openslide/package.nix
similarity index 100%
rename from pkgs/development/libraries/openslide/default.nix
rename to pkgs/by-name/op/openslide/package.nix
diff --git a/pkgs/development/libraries/openslp/CVE-2016-4912.patch b/pkgs/by-name/op/openslp/CVE-2016-4912.patch
similarity index 100%
rename from pkgs/development/libraries/openslp/CVE-2016-4912.patch
rename to pkgs/by-name/op/openslp/CVE-2016-4912.patch
diff --git a/pkgs/development/libraries/openslp/CVE-2019-5544.patch b/pkgs/by-name/op/openslp/CVE-2019-5544.patch
similarity index 100%
rename from pkgs/development/libraries/openslp/CVE-2019-5544.patch
rename to pkgs/by-name/op/openslp/CVE-2019-5544.patch
diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/by-name/op/openslp/package.nix
similarity index 100%
rename from pkgs/development/libraries/openslp/default.nix
rename to pkgs/by-name/op/openslp/package.nix
diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/by-name/op/opensm/package.nix
similarity index 100%
rename from pkgs/tools/networking/opensm/default.nix
rename to pkgs/by-name/op/opensm/package.nix
diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/by-name/op/opensmt/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/opensmt/default.nix
rename to pkgs/by-name/op/opensmt/package.nix
diff --git a/pkgs/servers/mail/opensmtpd/filter-dkimsign/no-chown-while-installing.patch b/pkgs/by-name/op/opensmtpd-filter-dkimsign/no-chown-while-installing.patch
similarity index 100%
rename from pkgs/servers/mail/opensmtpd/filter-dkimsign/no-chown-while-installing.patch
rename to pkgs/by-name/op/opensmtpd-filter-dkimsign/no-chown-while-installing.patch
diff --git a/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix b/pkgs/by-name/op/opensmtpd-filter-dkimsign/package.nix
similarity index 100%
rename from pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix
rename to pkgs/by-name/op/opensmtpd-filter-dkimsign/package.nix
diff --git a/pkgs/games/opensoldat/default.nix b/pkgs/by-name/op/opensoldat/package.nix
similarity index 100%
rename from pkgs/games/opensoldat/default.nix
rename to pkgs/by-name/op/opensoldat/package.nix
diff --git a/pkgs/tools/text/sgml/opensp/fix-register-storage-class.patch b/pkgs/by-name/op/opensp/fix-register-storage-class.patch
similarity index 100%
rename from pkgs/tools/text/sgml/opensp/fix-register-storage-class.patch
rename to pkgs/by-name/op/opensp/fix-register-storage-class.patch
diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/by-name/op/opensp/package.nix
similarity index 100%
rename from pkgs/tools/text/sgml/opensp/default.nix
rename to pkgs/by-name/op/opensp/package.nix
diff --git a/pkgs/tools/text/sgml/opensp/setup-hook.sh b/pkgs/by-name/op/opensp/setup-hook.sh
similarity index 100%
rename from pkgs/tools/text/sgml/opensp/setup-hook.sh
rename to pkgs/by-name/op/opensp/setup-hook.sh
diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/by-name/op/openspecfun/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/openspecfun/default.nix
rename to pkgs/by-name/op/openspecfun/package.nix
diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/by-name/op/openspin/package.nix
similarity index 100%
rename from pkgs/development/compilers/openspin/default.nix
rename to pkgs/by-name/op/openspin/package.nix
diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/by-name/op/opensubdiv/package.nix
similarity index 100%
rename from pkgs/development/libraries/opensubdiv/default.nix
rename to pkgs/by-name/op/opensubdiv/package.nix
diff --git a/pkgs/games/opensupaplex/default.nix b/pkgs/by-name/op/opensupaplex/package.nix
similarity index 100%
rename from pkgs/games/opensupaplex/default.nix
rename to pkgs/by-name/op/opensupaplex/package.nix
diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/by-name/op/opentofu/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/opentofu/default.nix
rename to pkgs/by-name/op/opentofu/package.nix
diff --git a/pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch b/pkgs/by-name/op/opentofu/provider-path-0_15.patch
similarity index 100%
rename from pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch
rename to pkgs/by-name/op/opentofu/provider-path-0_15.patch
diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/by-name/op/opentracing-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/opentracing-cpp/default.nix
rename to pkgs/by-name/op/opentracing-cpp/package.nix
diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/by-name/op/opentracker/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/opentracker/default.nix
rename to pkgs/by-name/op/opentracker/package.nix
diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/by-name/op/opentsdb/package.nix
similarity index 100%
rename from pkgs/tools/misc/opentsdb/default.nix
rename to pkgs/by-name/op/opentsdb/package.nix
diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/by-name/op/opentyrian/package.nix
similarity index 100%
rename from pkgs/games/opentyrian/default.nix
rename to pkgs/by-name/op/opentyrian/package.nix
diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/by-name/op/openvino/package.nix
similarity index 100%
rename from pkgs/development/libraries/openvino/default.nix
rename to pkgs/by-name/op/openvino/package.nix
diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/by-name/op/openwsman/package.nix
similarity index 100%
rename from pkgs/development/libraries/openwsman/default.nix
rename to pkgs/by-name/op/openwsman/package.nix
diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/by-name/op/openxr-loader/package.nix
similarity index 100%
rename from pkgs/development/libraries/openxr-loader/default.nix
rename to pkgs/by-name/op/openxr-loader/package.nix
diff --git a/pkgs/data/themes/openzone/default.nix b/pkgs/by-name/op/openzone-cursors/package.nix
similarity index 100%
rename from pkgs/data/themes/openzone/default.nix
rename to pkgs/by-name/op/openzone-cursors/package.nix
diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/by-name/op/openzwave/package.nix
similarity index 100%
rename from pkgs/development/libraries/openzwave/default.nix
rename to pkgs/by-name/op/openzwave/package.nix
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/by-name/op/opera/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/opera/default.nix
rename to pkgs/by-name/op/opera/package.nix
diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/by-name/op/operator-sdk/package.nix
similarity index 100%
rename from pkgs/development/tools/operator-sdk/default.nix
rename to pkgs/by-name/op/operator-sdk/package.nix
diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/by-name/op/opkg-utils/package.nix
similarity index 100%
rename from pkgs/tools/package-management/opkg-utils/default.nix
rename to pkgs/by-name/op/opkg-utils/package.nix
diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/by-name/op/opkg/package.nix
similarity index 100%
rename from pkgs/tools/package-management/opkg/default.nix
rename to pkgs/by-name/op/opkg/package.nix
diff --git a/pkgs/tools/misc/oppai-ng/default.nix b/pkgs/by-name/op/oppai-ng/package.nix
similarity index 100%
rename from pkgs/tools/misc/oppai-ng/default.nix
rename to pkgs/by-name/op/oppai-ng/package.nix
diff --git a/pkgs/applications/virtualization/ops/default.nix b/pkgs/by-name/op/ops/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/ops/default.nix
rename to pkgs/by-name/op/ops/package.nix
diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/by-name/op/opsdroid/package.nix
similarity index 100%
rename from pkgs/applications/networking/opsdroid/default.nix
rename to pkgs/by-name/op/opsdroid/package.nix
diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/by-name/op/optar/package.nix
similarity index 100%
rename from pkgs/tools/graphics/optar/default.nix
rename to pkgs/by-name/op/optar/package.nix
diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/by-name/op/optipng/package.nix
similarity index 100%
rename from pkgs/tools/graphics/optipng/default.nix
rename to pkgs/by-name/op/optipng/package.nix
diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/by-name/op/opusTools/package.nix
similarity index 100%
rename from pkgs/applications/audio/opus-tools/default.nix
rename to pkgs/by-name/op/opusTools/package.nix
diff --git a/pkgs/applications/audio/opusfile/disable-cert-store.patch b/pkgs/by-name/op/opusfile/disable-cert-store.patch
similarity index 100%
rename from pkgs/applications/audio/opusfile/disable-cert-store.patch
rename to pkgs/by-name/op/opusfile/disable-cert-store.patch
diff --git a/pkgs/applications/audio/opusfile/include-multistream.patch b/pkgs/by-name/op/opusfile/include-multistream.patch
similarity index 100%
rename from pkgs/applications/audio/opusfile/include-multistream.patch
rename to pkgs/by-name/op/opusfile/include-multistream.patch
diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/by-name/op/opusfile/package.nix
similarity index 100%
rename from pkgs/applications/audio/opusfile/default.nix
rename to pkgs/by-name/op/opusfile/package.nix
diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/by-name/op/opustags/package.nix
similarity index 100%
rename from pkgs/applications/audio/opustags/default.nix
rename to pkgs/by-name/op/opustags/package.nix
diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/by-name/oq/oq/package.nix
similarity index 100%
rename from pkgs/development/tools/oq/default.nix
rename to pkgs/by-name/oq/oq/package.nix
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/by-name/or/oracle-instantclient/package.nix
similarity index 100%
rename from pkgs/development/libraries/oracle-instantclient/default.nix
rename to pkgs/by-name/or/oracle-instantclient/package.nix
diff --git a/pkgs/data/icons/oranchelo-icon-theme/default.nix b/pkgs/by-name/or/oranchelo-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/oranchelo-icon-theme/default.nix
rename to pkgs/by-name/or/oranchelo-icon-theme/package.nix
diff --git a/pkgs/applications/misc/oranda/default.nix b/pkgs/by-name/or/oranda/package.nix
similarity index 100%
rename from pkgs/applications/misc/oranda/default.nix
rename to pkgs/by-name/or/oranda/package.nix
diff --git a/pkgs/development/tools/oras/default.nix b/pkgs/by-name/or/oras/package.nix
similarity index 100%
rename from pkgs/development/tools/oras/default.nix
rename to pkgs/by-name/or/oras/package.nix
diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/by-name/or/orbitron/package.nix
similarity index 100%
rename from pkgs/data/fonts/orbitron/default.nix
rename to pkgs/by-name/or/orbitron/package.nix
diff --git a/pkgs/development/embedded/orbuculum/default.nix b/pkgs/by-name/or/orbuculum/package.nix
similarity index 100%
rename from pkgs/development/embedded/orbuculum/default.nix
rename to pkgs/by-name/or/orbuculum/package.nix
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/by-name/or/orc/package.nix
similarity index 100%
rename from pkgs/development/compilers/orc/default.nix
rename to pkgs/by-name/or/orc/package.nix
diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/by-name/or/orca-c/package.nix
similarity index 100%
rename from pkgs/applications/audio/orca-c/default.nix
rename to pkgs/by-name/or/orca-c/package.nix
diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/by-name/or/orcania/package.nix
similarity index 100%
rename from pkgs/development/libraries/orcania/default.nix
rename to pkgs/by-name/or/orcania/package.nix
diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/by-name/or/orchis-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/orchis-theme/default.nix
rename to pkgs/by-name/or/orchis-theme/package.nix
diff --git a/pkgs/tools/misc/org-stats/default.nix b/pkgs/by-name/or/org-stats/package.nix
similarity index 100%
rename from pkgs/tools/misc/org-stats/default.nix
rename to pkgs/by-name/or/org-stats/package.nix
diff --git a/pkgs/tools/misc/org-stats/version.patch b/pkgs/by-name/or/org-stats/version.patch
similarity index 100%
rename from pkgs/tools/misc/org-stats/version.patch
rename to pkgs/by-name/or/org-stats/version.patch
diff --git a/pkgs/data/themes/orion/default.nix b/pkgs/by-name/or/orion/package.nix
similarity index 100%
rename from pkgs/data/themes/orion/default.nix
rename to pkgs/by-name/or/orion/package.nix
diff --git a/pkgs/tools/security/orjail/default.nix b/pkgs/by-name/or/orjail/package.nix
similarity index 100%
rename from pkgs/tools/security/orjail/default.nix
rename to pkgs/by-name/or/orjail/package.nix
diff --git a/pkgs/development/libraries/orocos-kdl/default.nix b/pkgs/by-name/or/orocos-kdl/package.nix
similarity index 100%
rename from pkgs/development/libraries/orocos-kdl/default.nix
rename to pkgs/by-name/or/orocos-kdl/package.nix
diff --git a/pkgs/development/tools/misc/orogene/default.nix b/pkgs/by-name/or/orogene/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/orogene/default.nix
rename to pkgs/by-name/or/orogene/package.nix
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/by-name/or/ortp/package.nix
similarity index 100%
rename from pkgs/development/libraries/ortp/default.nix
rename to pkgs/by-name/or/ortp/package.nix
diff --git a/pkgs/tools/compression/orz/default.nix b/pkgs/by-name/or/orz/package.nix
similarity index 100%
rename from pkgs/tools/compression/orz/default.nix
rename to pkgs/by-name/or/orz/package.nix
diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/by-name/os/os-prober/package.nix
similarity index 100%
rename from pkgs/tools/misc/os-prober/default.nix
rename to pkgs/by-name/os/os-prober/package.nix
diff --git a/pkgs/tools/misc/oscclip/default.nix b/pkgs/by-name/os/oscclip/package.nix
similarity index 100%
rename from pkgs/tools/misc/oscclip/default.nix
rename to pkgs/by-name/os/oscclip/package.nix
diff --git a/pkgs/applications/audio/osdlyrics/default.nix b/pkgs/by-name/os/osdlyrics/package.nix
similarity index 100%
rename from pkgs/applications/audio/osdlyrics/default.nix
rename to pkgs/by-name/os/osdlyrics/package.nix
diff --git a/pkgs/development/tools/oshka/default.nix b/pkgs/by-name/os/oshka/package.nix
similarity index 100%
rename from pkgs/development/tools/oshka/default.nix
rename to pkgs/by-name/os/oshka/package.nix
diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/by-name/os/osi/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/osi/default.nix
rename to pkgs/by-name/os/osi/package.nix
diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/by-name/os/osinfo-db-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/osinfo-db-tools/default.nix
rename to pkgs/by-name/os/osinfo-db-tools/package.nix
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/by-name/os/osinfo-db/package.nix
similarity index 100%
rename from pkgs/data/misc/osinfo-db/default.nix
rename to pkgs/by-name/os/osinfo-db/package.nix
diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/by-name/os/osm-gps-map/package.nix
similarity index 100%
rename from pkgs/development/libraries/osm-gps-map/default.nix
rename to pkgs/by-name/os/osm-gps-map/package.nix
diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/by-name/os/osm2xmap/package.nix
similarity index 100%
rename from pkgs/applications/misc/osm2xmap/default.nix
rename to pkgs/by-name/os/osm2xmap/package.nix
diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/by-name/os/osmctools/package.nix
similarity index 100%
rename from pkgs/applications/misc/osmctools/default.nix
rename to pkgs/by-name/os/osmctools/package.nix
diff --git a/pkgs/applications/audio/osmid/default.nix b/pkgs/by-name/os/osmid/package.nix
similarity index 100%
rename from pkgs/applications/audio/osmid/default.nix
rename to pkgs/by-name/os/osmid/package.nix
diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/by-name/os/osmium-tool/package.nix
similarity index 100%
rename from pkgs/applications/misc/osmium-tool/default.nix
rename to pkgs/by-name/os/osmium-tool/package.nix
diff --git a/pkgs/servers/osmocom/osmo-bsc/default.nix b/pkgs/by-name/os/osmo-bsc/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-bsc/default.nix
rename to pkgs/by-name/os/osmo-bsc/package.nix
diff --git a/pkgs/servers/osmocom/osmo-bts/default.nix b/pkgs/by-name/os/osmo-bts/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-bts/default.nix
rename to pkgs/by-name/os/osmo-bts/package.nix
diff --git a/pkgs/servers/osmocom/osmo-ggsn/default.nix b/pkgs/by-name/os/osmo-ggsn/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-ggsn/default.nix
rename to pkgs/by-name/os/osmo-ggsn/package.nix
diff --git a/pkgs/servers/osmocom/osmo-hlr/default.nix b/pkgs/by-name/os/osmo-hlr/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-hlr/default.nix
rename to pkgs/by-name/os/osmo-hlr/package.nix
diff --git a/pkgs/servers/osmocom/osmo-hnbgw/default.nix b/pkgs/by-name/os/osmo-hnbgw/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-hnbgw/default.nix
rename to pkgs/by-name/os/osmo-hnbgw/package.nix
diff --git a/pkgs/servers/osmocom/osmo-hnodeb/default.nix b/pkgs/by-name/os/osmo-hnodeb/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-hnodeb/default.nix
rename to pkgs/by-name/os/osmo-hnodeb/package.nix
diff --git a/pkgs/servers/osmocom/osmo-iuh/default.nix b/pkgs/by-name/os/osmo-iuh/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-iuh/default.nix
rename to pkgs/by-name/os/osmo-iuh/package.nix
diff --git a/pkgs/servers/osmocom/osmo-mgw/default.nix b/pkgs/by-name/os/osmo-mgw/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-mgw/default.nix
rename to pkgs/by-name/os/osmo-mgw/package.nix
diff --git a/pkgs/servers/osmocom/osmo-msc/default.nix b/pkgs/by-name/os/osmo-msc/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-msc/default.nix
rename to pkgs/by-name/os/osmo-msc/package.nix
diff --git a/pkgs/servers/osmocom/osmo-pcu/default.nix b/pkgs/by-name/os/osmo-pcu/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-pcu/default.nix
rename to pkgs/by-name/os/osmo-pcu/package.nix
diff --git a/pkgs/servers/osmocom/osmo-sgsn/default.nix b/pkgs/by-name/os/osmo-sgsn/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-sgsn/default.nix
rename to pkgs/by-name/os/osmo-sgsn/package.nix
diff --git a/pkgs/servers/osmocom/osmo-sip-connector/default.nix b/pkgs/by-name/os/osmo-sip-connector/package.nix
similarity index 100%
rename from pkgs/servers/osmocom/osmo-sip-connector/default.nix
rename to pkgs/by-name/os/osmo-sip-connector/package.nix
diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/by-name/os/osmo/package.nix
similarity index 100%
rename from pkgs/applications/office/osmo/default.nix
rename to pkgs/by-name/os/osmo/package.nix
diff --git a/pkgs/applications/misc/osmtogeojson/package-lock.json b/pkgs/by-name/os/osmtogeojson/package-lock.json
similarity index 100%
rename from pkgs/applications/misc/osmtogeojson/package-lock.json
rename to pkgs/by-name/os/osmtogeojson/package-lock.json
diff --git a/pkgs/applications/misc/osmtogeojson/default.nix b/pkgs/by-name/os/osmtogeojson/package.nix
similarity index 100%
rename from pkgs/applications/misc/osmtogeojson/default.nix
rename to pkgs/by-name/os/osmtogeojson/package.nix
diff --git a/pkgs/tools/security/ospd-openvas/default.nix b/pkgs/by-name/os/ospd-openvas/package.nix
similarity index 100%
rename from pkgs/tools/security/ospd-openvas/default.nix
rename to pkgs/by-name/os/ospd-openvas/package.nix
diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/by-name/os/osqp/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/osqp/default.nix
rename to pkgs/by-name/os/osqp/package.nix
diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/by-name/os/osslsigncode/package.nix
similarity index 100%
rename from pkgs/development/tools/osslsigncode/default.nix
rename to pkgs/by-name/os/osslsigncode/package.nix
diff --git a/pkgs/tools/admin/ossutil/default.nix b/pkgs/by-name/os/ossutil/package.nix
similarity index 100%
rename from pkgs/tools/admin/ossutil/default.nix
rename to pkgs/by-name/os/ossutil/package.nix
diff --git a/pkgs/tools/misc/ostree-rs-ext/Cargo.lock b/pkgs/by-name/os/ostree-rs-ext/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/ostree-rs-ext/Cargo.lock
rename to pkgs/by-name/os/ostree-rs-ext/Cargo.lock
diff --git a/pkgs/tools/misc/ostree-rs-ext/default.nix b/pkgs/by-name/os/ostree-rs-ext/package.nix
similarity index 100%
rename from pkgs/tools/misc/ostree-rs-ext/default.nix
rename to pkgs/by-name/os/ostree-rs-ext/package.nix
diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/by-name/os/ostree/package.nix
similarity index 100%
rename from pkgs/tools/misc/ostree/default.nix
rename to pkgs/by-name/os/ostree/package.nix
diff --git a/pkgs/data/fonts/ostrich-sans/default.nix b/pkgs/by-name/os/ostrich-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/ostrich-sans/default.nix
rename to pkgs/by-name/os/ostrich-sans/package.nix
diff --git a/pkgs/tools/security/osv-detector/default.nix b/pkgs/by-name/os/osv-detector/package.nix
similarity index 100%
rename from pkgs/tools/security/osv-detector/default.nix
rename to pkgs/by-name/os/osv-detector/package.nix
diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/by-name/os/osv-scanner/package.nix
similarity index 100%
rename from pkgs/tools/security/osv-scanner/default.nix
rename to pkgs/by-name/os/osv-scanner/package.nix
diff --git a/pkgs/os-specific/darwin/osxsnarf/default.nix b/pkgs/by-name/os/osxsnarf/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/osxsnarf/default.nix
rename to pkgs/by-name/os/osxsnarf/package.nix
diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/by-name/ot/otel-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/otel-cli/default.nix
rename to pkgs/by-name/ot/otel-cli/package.nix
diff --git a/pkgs/tools/misc/otel-cli/patches/bin-echo-patch.patch b/pkgs/by-name/ot/otel-cli/patches/bin-echo-patch.patch
similarity index 100%
rename from pkgs/tools/misc/otel-cli/patches/bin-echo-patch.patch
rename to pkgs/by-name/ot/otel-cli/patches/bin-echo-patch.patch
diff --git a/pkgs/applications/misc/otf2bdf/default.nix b/pkgs/by-name/ot/otf2bdf/package.nix
similarity index 100%
rename from pkgs/applications/misc/otf2bdf/default.nix
rename to pkgs/by-name/ot/otf2bdf/package.nix
diff --git a/pkgs/tools/misc/otfcc/fix-aarch64.patch b/pkgs/by-name/ot/otfcc/fix-aarch64.patch
similarity index 100%
rename from pkgs/tools/misc/otfcc/fix-aarch64.patch
rename to pkgs/by-name/ot/otfcc/fix-aarch64.patch
diff --git a/pkgs/tools/misc/otfcc/move-makefiles.patch b/pkgs/by-name/ot/otfcc/move-makefiles.patch
similarity index 100%
rename from pkgs/tools/misc/otfcc/move-makefiles.patch
rename to pkgs/by-name/ot/otfcc/move-makefiles.patch
diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/by-name/ot/otfcc/package.nix
similarity index 100%
rename from pkgs/tools/misc/otfcc/default.nix
rename to pkgs/by-name/ot/otfcc/package.nix
diff --git a/pkgs/tools/security/otpauth/default.nix b/pkgs/by-name/ot/otpauth/package.nix
similarity index 100%
rename from pkgs/tools/security/otpauth/default.nix
rename to pkgs/by-name/ot/otpauth/package.nix
diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/by-name/ot/otpclient/package.nix
similarity index 100%
rename from pkgs/applications/misc/otpclient/default.nix
rename to pkgs/by-name/ot/otpclient/package.nix
diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/by-name/ot/otpw/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/otpw/default.nix
rename to pkgs/by-name/ot/otpw/package.nix
diff --git a/pkgs/tools/security/ots/default.nix b/pkgs/by-name/ot/ots/package.nix
similarity index 100%
rename from pkgs/tools/security/ots/default.nix
rename to pkgs/by-name/ot/ots/package.nix
diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/by-name/ot/ott/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/ott/default.nix
rename to pkgs/by-name/ot/ott/package.nix
diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/by-name/ot/otto-matic/package.nix
similarity index 100%
rename from pkgs/games/otto-matic/default.nix
rename to pkgs/by-name/ot/otto-matic/package.nix
diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/by-name/ou/ouch/package.nix
similarity index 100%
rename from pkgs/tools/compression/ouch/default.nix
rename to pkgs/by-name/ou/ouch/package.nix
diff --git a/pkgs/tools/networking/oui/default.nix b/pkgs/by-name/ou/oui/package.nix
similarity index 100%
rename from pkgs/tools/networking/oui/default.nix
rename to pkgs/by-name/ou/oui/package.nix
diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/by-name/ou/out-of-tree/package.nix
similarity index 100%
rename from pkgs/development/tools/out-of-tree/default.nix
rename to pkgs/by-name/ou/out-of-tree/package.nix
diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/by-name/ov/ov/package.nix
similarity index 100%
rename from pkgs/tools/text/ov/default.nix
rename to pkgs/by-name/ov/ov/package.nix
diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/by-name/ov/oven-media-engine/package.nix
similarity index 100%
rename from pkgs/servers/misc/oven-media-engine/default.nix
rename to pkgs/by-name/ov/oven-media-engine/package.nix
diff --git a/pkgs/servers/misc/oven-media-engine/support-ffmpeg-7.patch b/pkgs/by-name/ov/oven-media-engine/support-ffmpeg-7.patch
similarity index 100%
rename from pkgs/servers/misc/oven-media-engine/support-ffmpeg-7.patch
rename to pkgs/by-name/ov/oven-media-engine/support-ffmpeg-7.patch
diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/by-name/ov/overmind/package.nix
similarity index 100%
rename from pkgs/applications/misc/overmind/default.nix
rename to pkgs/by-name/ov/overmind/package.nix
diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/by-name/ov/overpass/package.nix
similarity index 100%
rename from pkgs/data/fonts/overpass/default.nix
rename to pkgs/by-name/ov/overpass/package.nix
diff --git a/pkgs/applications/misc/oversteer/default.nix b/pkgs/by-name/ov/oversteer/package.nix
similarity index 100%
rename from pkgs/applications/misc/oversteer/default.nix
rename to pkgs/by-name/ov/oversteer/package.nix
diff --git a/pkgs/tools/virtualization/ovftool/installCheckPhase.ova b/pkgs/by-name/ov/ovftool/installCheckPhase.ova
similarity index 100%
rename from pkgs/tools/virtualization/ovftool/installCheckPhase.ova
rename to pkgs/by-name/ov/ovftool/installCheckPhase.ova
diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/by-name/ov/ovftool/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/ovftool/default.nix
rename to pkgs/by-name/ov/ovftool/package.nix
diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/by-name/ow/owamp/package.nix
similarity index 100%
rename from pkgs/applications/networking/owamp/default.nix
rename to pkgs/by-name/ow/owamp/package.nix
diff --git a/pkgs/applications/window-managers/owl/mac/MainMenu.nib b/pkgs/by-name/ow/owl-compositor/mac/MainMenu.nib
similarity index 100%
rename from pkgs/applications/window-managers/owl/mac/MainMenu.nib
rename to pkgs/by-name/ow/owl-compositor/mac/MainMenu.nib
diff --git a/pkgs/applications/window-managers/owl/mac/OwlPreferences.nib b/pkgs/by-name/ow/owl-compositor/mac/OwlPreferences.nib
similarity index 100%
rename from pkgs/applications/window-managers/owl/mac/OwlPreferences.nib
rename to pkgs/by-name/ow/owl-compositor/mac/OwlPreferences.nib
diff --git a/pkgs/applications/window-managers/owl/default.nix b/pkgs/by-name/ow/owl-compositor/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/owl/default.nix
rename to pkgs/by-name/ow/owl-compositor/package.nix
diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/by-name/ow/owl-lisp/package.nix
similarity index 100%
rename from pkgs/development/compilers/owl-lisp/default.nix
rename to pkgs/by-name/ow/owl-lisp/package.nix
diff --git a/pkgs/tools/networking/owl/default.nix b/pkgs/by-name/ow/owl/package.nix
similarity index 100%
rename from pkgs/tools/networking/owl/default.nix
rename to pkgs/by-name/ow/owl/package.nix
diff --git a/pkgs/servers/owncast/default.nix b/pkgs/by-name/ow/owncast/package.nix
similarity index 100%
rename from pkgs/servers/owncast/default.nix
rename to pkgs/by-name/ow/owncast/package.nix
diff --git a/pkgs/servers/owntracks-recorder/default.nix b/pkgs/by-name/ow/owntracks-recorder/package.nix
similarity index 100%
rename from pkgs/servers/owntracks-recorder/default.nix
rename to pkgs/by-name/ow/owntracks-recorder/package.nix
diff --git a/pkgs/applications/editors/ox/default.nix b/pkgs/by-name/ox/ox/package.nix
similarity index 100%
rename from pkgs/applications/editors/ox/default.nix
rename to pkgs/by-name/ox/ox/package.nix
diff --git a/pkgs/applications/audio/oxefmsynth/default.nix b/pkgs/by-name/ox/oxefmsynth/package.nix
similarity index 100%
rename from pkgs/applications/audio/oxefmsynth/default.nix
rename to pkgs/by-name/ox/oxefmsynth/package.nix
diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/by-name/ox/oxipng/package.nix
similarity index 100%
rename from pkgs/tools/graphics/oxipng/default.nix
rename to pkgs/by-name/ox/oxipng/package.nix
diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/by-name/ox/oxker/package.nix
similarity index 100%
rename from pkgs/applications/misc/oxker/default.nix
rename to pkgs/by-name/ox/oxker/package.nix
diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/by-name/ox/oxlint/package.nix
similarity index 100%
rename from pkgs/development/tools/oxlint/default.nix
rename to pkgs/by-name/ox/oxlint/package.nix
diff --git a/pkgs/os-specific/linux/oxtools/default.nix b/pkgs/by-name/ox/oxtools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/oxtools/default.nix
rename to pkgs/by-name/ox/oxtools/package.nix
diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/by-name/ox/oxygenfonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/oxygenfonts/default.nix
rename to pkgs/by-name/ox/oxygenfonts/package.nix
diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/by-name/p0/p0f/package.nix
similarity index 100%
rename from pkgs/tools/security/p0f/default.nix
rename to pkgs/by-name/p0/p0f/package.nix
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/by-name/p1/p11-kit/package.nix
similarity index 100%
rename from pkgs/development/libraries/p11-kit/default.nix
rename to pkgs/by-name/p1/p11-kit/package.nix
diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/by-name/p2/p2pool/package.nix
similarity index 100%
rename from pkgs/applications/misc/p2pool/default.nix
rename to pkgs/by-name/p2/p2pool/package.nix
diff --git a/pkgs/applications/version-management/p4d/default.nix b/pkgs/by-name/p4/p4d/package.nix
similarity index 100%
rename from pkgs/applications/version-management/p4d/default.nix
rename to pkgs/by-name/p4/p4d/package.nix
diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/by-name/p9/p910nd/package.nix
similarity index 100%
rename from pkgs/servers/p910nd/default.nix
rename to pkgs/by-name/p9/p910nd/package.nix
diff --git a/pkgs/tools/audio/pa-applet/default.nix b/pkgs/by-name/pa/pa_applet/package.nix
similarity index 100%
rename from pkgs/tools/audio/pa-applet/default.nix
rename to pkgs/by-name/pa/pa_applet/package.nix
diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/by-name/pa/pacemaker/package.nix
similarity index 100%
rename from pkgs/misc/logging/pacemaker/default.nix
rename to pkgs/by-name/pa/pacemaker/package.nix
diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/by-name/pa/pachyderm/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/pachyderm/default.nix
rename to pkgs/by-name/pa/pachyderm/package.nix
diff --git a/pkgs/development/tools/package-project-cmake/default.nix b/pkgs/by-name/pa/package-project-cmake/package.nix
similarity index 100%
rename from pkgs/development/tools/package-project-cmake/default.nix
rename to pkgs/by-name/pa/package-project-cmake/package.nix
diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/by-name/pa/packcc/package.nix
similarity index 100%
rename from pkgs/development/tools/packcc/default.nix
rename to pkgs/by-name/pa/packcc/package.nix
diff --git a/pkgs/development/tools/packet-sd/default.nix b/pkgs/by-name/pa/packet-sd/package.nix
similarity index 100%
rename from pkgs/development/tools/packet-sd/default.nix
rename to pkgs/by-name/pa/packet-sd/package.nix
diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/by-name/pa/packetdrill/package.nix
similarity index 100%
rename from pkgs/tools/networking/packetdrill/default.nix
rename to pkgs/by-name/pa/packetdrill/package.nix
diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/by-name/pa/packr/package.nix
similarity index 100%
rename from pkgs/development/libraries/packr/default.nix
rename to pkgs/by-name/pa/packr/package.nix
diff --git a/pkgs/tools/games/minecraft/packwiz/default.nix b/pkgs/by-name/pa/packwiz/package.nix
similarity index 100%
rename from pkgs/tools/games/minecraft/packwiz/default.nix
rename to pkgs/by-name/pa/packwiz/package.nix
diff --git a/pkgs/tools/package-management/pacman/dont-create-empty-dirs.patch b/pkgs/by-name/pa/pacman/dont-create-empty-dirs.patch
similarity index 100%
rename from pkgs/tools/package-management/pacman/dont-create-empty-dirs.patch
rename to pkgs/by-name/pa/pacman/dont-create-empty-dirs.patch
diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/by-name/pa/pacman/package.nix
similarity index 100%
rename from pkgs/tools/package-management/pacman/default.nix
rename to pkgs/by-name/pa/pacman/package.nix
diff --git a/pkgs/development/compilers/paco/default.nix b/pkgs/by-name/pa/paco/package.nix
similarity index 100%
rename from pkgs/development/compilers/paco/default.nix
rename to pkgs/by-name/pa/paco/package.nix
diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/by-name/pa/pacparser/package.nix
similarity index 100%
rename from pkgs/tools/networking/pacparser/default.nix
rename to pkgs/by-name/pa/pacparser/package.nix
diff --git a/pkgs/tools/package-management/pacup/default.nix b/pkgs/by-name/pa/pacup/package.nix
similarity index 100%
rename from pkgs/tools/package-management/pacup/default.nix
rename to pkgs/by-name/pa/pacup/package.nix
diff --git a/pkgs/games/pacvim/default.nix b/pkgs/by-name/pa/pacvim/package.nix
similarity index 100%
rename from pkgs/games/pacvim/default.nix
rename to pkgs/by-name/pa/pacvim/package.nix
diff --git a/pkgs/tools/security/padbuster/default.nix b/pkgs/by-name/pa/padbuster/package.nix
similarity index 100%
rename from pkgs/tools/security/padbuster/default.nix
rename to pkgs/by-name/pa/padbuster/package.nix
diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/by-name/pa/page/package.nix
similarity index 100%
rename from pkgs/tools/misc/page/default.nix
rename to pkgs/by-name/pa/page/package.nix
diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/by-name/pa/pagemon/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pagemon/default.nix
rename to pkgs/by-name/pa/pagemon/package.nix
diff --git a/pkgs/development/tools/paging-calculator/default.nix b/pkgs/by-name/pa/paging-calculator/package.nix
similarity index 100%
rename from pkgs/development/tools/paging-calculator/default.nix
rename to pkgs/by-name/pa/paging-calculator/package.nix
diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/by-name/pa/pagmo2/package.nix
similarity index 100%
rename from pkgs/development/libraries/pagmo2/default.nix
rename to pkgs/by-name/pa/pagmo2/package.nix
diff --git a/pkgs/applications/science/math/pagsuite/default.nix b/pkgs/by-name/pa/pagsuite/package.nix
similarity index 100%
rename from pkgs/applications/science/math/pagsuite/default.nix
rename to pkgs/by-name/pa/pagsuite/package.nix
diff --git a/pkgs/development/libraries/paho-mqtt-c/default.nix b/pkgs/by-name/pa/paho-mqtt-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/paho-mqtt-c/default.nix
rename to pkgs/by-name/pa/paho-mqtt-c/package.nix
diff --git a/pkgs/applications/misc/pairdrop/default.nix b/pkgs/by-name/pa/pairdrop/package.nix
similarity index 100%
rename from pkgs/applications/misc/pairdrop/default.nix
rename to pkgs/by-name/pa/pairdrop/package.nix
diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/by-name/pa/pal/package.nix
similarity index 100%
rename from pkgs/tools/misc/pal/default.nix
rename to pkgs/by-name/pa/pal/package.nix
diff --git a/pkgs/applications/graphics/paleta/default.nix b/pkgs/by-name/pa/paleta/package.nix
similarity index 100%
rename from pkgs/applications/graphics/paleta/default.nix
rename to pkgs/by-name/pa/paleta/package.nix
diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/by-name/pa/palp/package.nix
similarity index 100%
rename from pkgs/applications/science/math/palp/default.nix
rename to pkgs/by-name/pa/palp/package.nix
diff --git a/pkgs/os-specific/darwin/pam-reattach/default.nix b/pkgs/by-name/pa/pam-reattach/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/pam-reattach/default.nix
rename to pkgs/by-name/pa/pam-reattach/package.nix
diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/by-name/pa/pam_ccreds/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_ccreds/default.nix
rename to pkgs/by-name/pa/pam_ccreds/package.nix
diff --git a/pkgs/os-specific/linux/pam_dp9ik/default.nix b/pkgs/by-name/pa/pam_dp9ik/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_dp9ik/default.nix
rename to pkgs/by-name/pa/pam_dp9ik/package.nix
diff --git a/pkgs/os-specific/linux/pam_gnupg/default.nix b/pkgs/by-name/pa/pam_gnupg/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_gnupg/default.nix
rename to pkgs/by-name/pa/pam_gnupg/package.nix
diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/by-name/pa/pam_krb5/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_krb5/default.nix
rename to pkgs/by-name/pa/pam_krb5/package.nix
diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/by-name/pa/pam_ldap/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_ldap/default.nix
rename to pkgs/by-name/pa/pam_ldap/package.nix
diff --git a/pkgs/os-specific/linux/pam_mktemp/default.nix b/pkgs/by-name/pa/pam_mktemp/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_mktemp/default.nix
rename to pkgs/by-name/pa/pam_mktemp/package.nix
diff --git a/pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch b/pkgs/by-name/pa/pam_mount/insert_utillinux_path_hooks.patch
similarity index 100%
rename from pkgs/os-specific/linux/pam_mount/insert_utillinux_path_hooks.patch
rename to pkgs/by-name/pa/pam_mount/insert_utillinux_path_hooks.patch
diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/by-name/pa/pam_mount/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_mount/default.nix
rename to pkgs/by-name/pa/pam_mount/package.nix
diff --git a/pkgs/os-specific/linux/pam_mysql/default.nix b/pkgs/by-name/pa/pam_mysql/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_mysql/default.nix
rename to pkgs/by-name/pa/pam_mysql/package.nix
diff --git a/pkgs/os-specific/linux/pam_p11/default.nix b/pkgs/by-name/pa/pam_p11/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_p11/default.nix
rename to pkgs/by-name/pa/pam_p11/package.nix
diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/by-name/pa/pam_pgsql/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_pgsql/default.nix
rename to pkgs/by-name/pa/pam_pgsql/package.nix
diff --git a/pkgs/os-specific/linux/pam_rssh/default.nix b/pkgs/by-name/pa/pam_rssh/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_rssh/default.nix
rename to pkgs/by-name/pa/pam_rssh/package.nix
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/edcsa-crash-fix.patch b/pkgs/by-name/pa/pam_ssh_agent_auth/edcsa-crash-fix.patch
similarity index 100%
rename from pkgs/os-specific/linux/pam_ssh_agent_auth/edcsa-crash-fix.patch
rename to pkgs/by-name/pa/pam_ssh_agent_auth/edcsa-crash-fix.patch
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/pkgs/by-name/pa/pam_ssh_agent_auth/multiple-key-files.patch
similarity index 100%
rename from pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
rename to pkgs/by-name/pa/pam_ssh_agent_auth/multiple-key-files.patch
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
rename to pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
diff --git a/pkgs/os-specific/linux/pam_tmpdir/default.nix b/pkgs/by-name/pa/pam_tmpdir/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_tmpdir/default.nix
rename to pkgs/by-name/pa/pam_tmpdir/package.nix
diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/by-name/pa/pam_u2f/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_u2f/default.nix
rename to pkgs/by-name/pa/pam_u2f/package.nix
diff --git a/pkgs/os-specific/linux/pam_ussh/go.mod b/pkgs/by-name/pa/pam_ussh/go.mod
similarity index 100%
rename from pkgs/os-specific/linux/pam_ussh/go.mod
rename to pkgs/by-name/pa/pam_ussh/go.mod
diff --git a/pkgs/os-specific/linux/pam_ussh/go.sum b/pkgs/by-name/pa/pam_ussh/go.sum
similarity index 100%
rename from pkgs/os-specific/linux/pam_ussh/go.sum
rename to pkgs/by-name/pa/pam_ussh/go.sum
diff --git a/pkgs/os-specific/linux/pam_ussh/default.nix b/pkgs/by-name/pa/pam_ussh/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pam_ussh/default.nix
rename to pkgs/by-name/pa/pam_ussh/package.nix
diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/by-name/pa/pamix/package.nix
similarity index 100%
rename from pkgs/applications/audio/pamix/default.nix
rename to pkgs/by-name/pa/pamix/package.nix
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/by-name/pa/pamixer/package.nix
similarity index 100%
rename from pkgs/applications/audio/pamixer/default.nix
rename to pkgs/by-name/pa/pamixer/package.nix
diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/by-name/pa/paml/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/paml/default.nix
rename to pkgs/by-name/pa/paml/package.nix
diff --git a/pkgs/tools/security/pamtester/default.nix b/pkgs/by-name/pa/pamtester/package.nix
similarity index 100%
rename from pkgs/tools/security/pamtester/default.nix
rename to pkgs/by-name/pa/pamtester/package.nix
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/by-name/pa/pan/package.nix
similarity index 100%
rename from pkgs/applications/networking/newsreaders/pan/default.nix
rename to pkgs/by-name/pa/pan/package.nix
diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/by-name/pa/panamax/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/panamax/default.nix
rename to pkgs/by-name/pa/panamax/package.nix
diff --git a/pkgs/tools/misc/pandoc-katex/default.nix b/pkgs/by-name/pa/pandoc-katex/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-katex/default.nix
rename to pkgs/by-name/pa/pandoc-katex/package.nix
diff --git a/pkgs/tools/misc/pandoc-lua-filters/default.nix b/pkgs/by-name/pa/pandoc-lua-filters/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-lua-filters/default.nix
rename to pkgs/by-name/pa/pandoc-lua-filters/package.nix
diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/by-name/pa/pandoc/package.nix
similarity index 100%
rename from pkgs/development/tools/pandoc/default.nix
rename to pkgs/by-name/pa/pandoc/package.nix
diff --git a/pkgs/tools/misc/panicparse/default.nix b/pkgs/by-name/pa/panicparse/package.nix
similarity index 100%
rename from pkgs/tools/misc/panicparse/default.nix
rename to pkgs/by-name/pa/panicparse/package.nix
diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/by-name/pa/panoply/package.nix
similarity index 100%
rename from pkgs/tools/misc/panoply/default.nix
rename to pkgs/by-name/pa/panoply/package.nix
diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/by-name/pa/panopticon/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/panopticon/default.nix
rename to pkgs/by-name/pa/panopticon/package.nix
diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/by-name/pa/panotools/package.nix
similarity index 100%
rename from pkgs/applications/graphics/panotools/default.nix
rename to pkgs/by-name/pa/panotools/package.nix
diff --git a/pkgs/misc/drivers/pantum-driver/default.nix b/pkgs/by-name/pa/pantum-driver/package.nix
similarity index 100%
rename from pkgs/misc/drivers/pantum-driver/default.nix
rename to pkgs/by-name/pa/pantum-driver/package.nix
diff --git a/pkgs/tools/text/papeer/default.nix b/pkgs/by-name/pa/papeer/package.nix
similarity index 100%
rename from pkgs/tools/text/papeer/default.nix
rename to pkgs/by-name/pa/papeer/package.nix
diff --git a/pkgs/data/themes/paper-gtk/default.nix b/pkgs/by-name/pa/paper-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/paper-gtk/default.nix
rename to pkgs/by-name/pa/paper-gtk-theme/package.nix
diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/by-name/pa/paper-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/paper-icon-theme/default.nix
rename to pkgs/by-name/pa/paper-icon-theme/package.nix
diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
similarity index 100%
rename from pkgs/applications/office/paperless-ngx/default.nix
rename to pkgs/by-name/pa/paperless-ngx/package.nix
diff --git a/pkgs/tools/misc/paperlike-go/default.nix b/pkgs/by-name/pa/paperlike-go/package.nix
similarity index 100%
rename from pkgs/tools/misc/paperlike-go/default.nix
rename to pkgs/by-name/pa/paperlike-go/package.nix
diff --git a/pkgs/tools/text/papertrail/Gemfile b/pkgs/by-name/pa/papertrail/Gemfile
similarity index 100%
rename from pkgs/tools/text/papertrail/Gemfile
rename to pkgs/by-name/pa/papertrail/Gemfile
diff --git a/pkgs/tools/text/papertrail/Gemfile.lock b/pkgs/by-name/pa/papertrail/Gemfile.lock
similarity index 100%
rename from pkgs/tools/text/papertrail/Gemfile.lock
rename to pkgs/by-name/pa/papertrail/Gemfile.lock
diff --git a/pkgs/tools/text/papertrail/gemset.nix b/pkgs/by-name/pa/papertrail/gemset.nix
similarity index 100%
rename from pkgs/tools/text/papertrail/gemset.nix
rename to pkgs/by-name/pa/papertrail/gemset.nix
diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/by-name/pa/papertrail/package.nix
similarity index 100%
rename from pkgs/tools/text/papertrail/default.nix
rename to pkgs/by-name/pa/papertrail/package.nix
diff --git a/pkgs/tools/X11/paperview/default.nix b/pkgs/by-name/pa/paperview/package.nix
similarity index 100%
rename from pkgs/tools/X11/paperview/default.nix
rename to pkgs/by-name/pa/paperview/package.nix
diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/by-name/pa/papi/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/benchmark/papi/default.nix
rename to pkgs/by-name/pa/papi/package.nix
diff --git a/pkgs/data/misc/papirus-folders/default.nix b/pkgs/by-name/pa/papirus-folders/package.nix
similarity index 100%
rename from pkgs/data/misc/papirus-folders/default.nix
rename to pkgs/by-name/pa/papirus-folders/package.nix
diff --git a/pkgs/data/icons/papirus-nord/default.nix b/pkgs/by-name/pa/papirus-nord/package.nix
similarity index 100%
rename from pkgs/data/icons/papirus-nord/default.nix
rename to pkgs/by-name/pa/papirus-nord/package.nix
diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/by-name/pa/paprefs/package.nix
similarity index 100%
rename from pkgs/applications/audio/paprefs/default.nix
rename to pkgs/by-name/pa/paprefs/package.nix
diff --git a/pkgs/tools/misc/paps/default.nix b/pkgs/by-name/pa/paps/package.nix
similarity index 100%
rename from pkgs/tools/misc/paps/default.nix
rename to pkgs/by-name/pa/paps/package.nix
diff --git a/pkgs/tools/text/par/default.nix b/pkgs/by-name/pa/par/package.nix
similarity index 100%
rename from pkgs/tools/text/par/default.nix
rename to pkgs/by-name/pa/par/package.nix
diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/by-name/pa/par2cmdline/package.nix
similarity index 100%
rename from pkgs/tools/networking/par2cmdline/default.nix
rename to pkgs/by-name/pa/par2cmdline/package.nix
diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/by-name/pa/parastoo-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/parastoo-fonts/default.nix
rename to pkgs/by-name/pa/parastoo-fonts/package.nix
diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/by-name/pa/pari-galdata/package.nix
similarity index 100%
rename from pkgs/data/misc/pari-galdata/default.nix
rename to pkgs/by-name/pa/pari-galdata/package.nix
diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/by-name/pa/pari-seadata-small/package.nix
similarity index 100%
rename from pkgs/data/misc/pari-seadata-small/default.nix
rename to pkgs/by-name/pa/pari-seadata-small/package.nix
diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/by-name/pa/parinfer-rust/package.nix
similarity index 100%
rename from pkgs/development/tools/parinfer-rust/default.nix
rename to pkgs/by-name/pa/parinfer-rust/package.nix
diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/by-name/pa/parlatype/package.nix
similarity index 100%
rename from pkgs/applications/audio/parlatype/default.nix
rename to pkgs/by-name/pa/parlatype/package.nix
diff --git a/pkgs/tools/misc/parquet-tools/moto5.patch b/pkgs/by-name/pa/parquet-tools/moto5.patch
similarity index 100%
rename from pkgs/tools/misc/parquet-tools/moto5.patch
rename to pkgs/by-name/pa/parquet-tools/moto5.patch
diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/by-name/pa/parquet-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/parquet-tools/default.nix
rename to pkgs/by-name/pa/parquet-tools/package.nix
diff --git a/pkgs/development/tools/parse-cli-bin/default.nix b/pkgs/by-name/pa/parse-cli-bin/package.nix
similarity index 100%
rename from pkgs/development/tools/parse-cli-bin/default.nix
rename to pkgs/by-name/pa/parse-cli-bin/package.nix
diff --git a/pkgs/tools/security/parsero/default.nix b/pkgs/by-name/pa/parsero/package.nix
similarity index 100%
rename from pkgs/tools/security/parsero/default.nix
rename to pkgs/by-name/pa/parsero/package.nix
diff --git a/pkgs/development/libraries/parson/default.nix b/pkgs/by-name/pa/parson/package.nix
similarity index 100%
rename from pkgs/development/libraries/parson/default.nix
rename to pkgs/by-name/pa/parson/package.nix
diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/by-name/pa/partclone/package.nix
similarity index 100%
rename from pkgs/tools/backup/partclone/default.nix
rename to pkgs/by-name/pa/partclone/package.nix
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/by-name/pa/parted/package.nix
similarity index 100%
rename from pkgs/tools/misc/parted/default.nix
rename to pkgs/by-name/pa/parted/package.nix
diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/by-name/pa/particl-core/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/particl-core/default.nix
rename to pkgs/by-name/pa/particl-core/package.nix
diff --git a/pkgs/tools/backup/partimage/gentoos-zlib.patch b/pkgs/by-name/pa/partimage/gentoos-zlib.patch
similarity index 100%
rename from pkgs/tools/backup/partimage/gentoos-zlib.patch
rename to pkgs/by-name/pa/partimage/gentoos-zlib.patch
diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/by-name/pa/partimage/package.nix
similarity index 100%
rename from pkgs/tools/backup/partimage/default.nix
rename to pkgs/by-name/pa/partimage/package.nix
diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/by-name/pa/partio/package.nix
similarity index 100%
rename from pkgs/development/libraries/partio/default.nix
rename to pkgs/by-name/pa/partio/package.nix
diff --git a/pkgs/applications/misc/pass-secret-service/default.nix b/pkgs/by-name/pa/pass-secret-service/package.nix
similarity index 100%
rename from pkgs/applications/misc/pass-secret-service/default.nix
rename to pkgs/by-name/pa/pass-secret-service/package.nix
diff --git a/pkgs/tools/security/passage/darwin-getopt-path.patch b/pkgs/by-name/pa/passage/darwin-getopt-path.patch
similarity index 100%
rename from pkgs/tools/security/passage/darwin-getopt-path.patch
rename to pkgs/by-name/pa/passage/darwin-getopt-path.patch
diff --git a/pkgs/tools/security/passage/default.nix b/pkgs/by-name/pa/passage/package.nix
similarity index 100%
rename from pkgs/tools/security/passage/default.nix
rename to pkgs/by-name/pa/passage/package.nix
diff --git a/pkgs/development/compilers/passerine/default.nix b/pkgs/by-name/pa/passerine/package.nix
similarity index 100%
rename from pkgs/development/compilers/passerine/default.nix
rename to pkgs/by-name/pa/passerine/package.nix
diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/by-name/pa/passff-host/package.nix
similarity index 100%
rename from pkgs/tools/security/passff-host/default.nix
rename to pkgs/by-name/pa/passff-host/package.nix
diff --git a/pkgs/tools/networking/passh/default.nix b/pkgs/by-name/pa/passh/package.nix
similarity index 100%
rename from pkgs/tools/networking/passh/default.nix
rename to pkgs/by-name/pa/passh/package.nix
diff --git a/pkgs/applications/misc/passky-desktop/default.nix b/pkgs/by-name/pa/passky-desktop/package.nix
similarity index 100%
rename from pkgs/applications/misc/passky-desktop/default.nix
rename to pkgs/by-name/pa/passky-desktop/package.nix
diff --git a/pkgs/tools/security/passphrase2pgp/default.nix b/pkgs/by-name/pa/passphrase2pgp/package.nix
similarity index 100%
rename from pkgs/tools/security/passphrase2pgp/default.nix
rename to pkgs/by-name/pa/passphrase2pgp/package.nix
diff --git a/pkgs/tools/misc/past-time/default.nix b/pkgs/by-name/pa/past-time/package.nix
similarity index 100%
rename from pkgs/tools/misc/past-time/default.nix
rename to pkgs/by-name/pa/past-time/package.nix
diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/by-name/pa/pastebinit/package.nix
similarity index 100%
rename from pkgs/tools/misc/pastebinit/default.nix
rename to pkgs/by-name/pa/pastebinit/package.nix
diff --git a/pkgs/tools/misc/pastebinit/use-drv-etc.patch b/pkgs/by-name/pa/pastebinit/use-drv-etc.patch
similarity index 100%
rename from pkgs/tools/misc/pastebinit/use-drv-etc.patch
rename to pkgs/by-name/pa/pastebinit/use-drv-etc.patch
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/by-name/pa/pasystray/package.nix
similarity index 100%
rename from pkgs/tools/audio/pasystray/default.nix
rename to pkgs/by-name/pa/pasystray/package.nix
diff --git a/pkgs/development/tools/patatt/default.nix b/pkgs/by-name/pa/patatt/package.nix
similarity index 100%
rename from pkgs/development/tools/patatt/default.nix
rename to pkgs/by-name/pa/patatt/package.nix
diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/default.nix b/pkgs/by-name/pa/patchPpdFilesHook/package.nix
similarity index 100%
rename from pkgs/build-support/setup-hooks/patch-ppd-files/default.nix
rename to pkgs/by-name/pa/patchPpdFilesHook/package.nix
diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh b/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-hook.sh
rename to pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-hook.sh
diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-lines.awk b/pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-lines.awk
similarity index 100%
rename from pkgs/build-support/setup-hooks/patch-ppd-files/patch-ppd-lines.awk
rename to pkgs/by-name/pa/patchPpdFilesHook/patch-ppd-lines.awk
diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/test.nix b/pkgs/by-name/pa/patchPpdFilesHook/test.nix
similarity index 100%
rename from pkgs/build-support/setup-hooks/patch-ppd-files/test.nix
rename to pkgs/by-name/pa/patchPpdFilesHook/test.nix
diff --git a/pkgs/build-support/setup-hooks/patch-ppd-files/test.ppd b/pkgs/by-name/pa/patchPpdFilesHook/test.ppd
similarity index 100%
rename from pkgs/build-support/setup-hooks/patch-ppd-files/test.ppd
rename to pkgs/by-name/pa/patchPpdFilesHook/test.ppd
diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/by-name/pa/patchage/package.nix
similarity index 100%
rename from pkgs/applications/audio/patchage/default.nix
rename to pkgs/by-name/pa/patchage/package.nix
diff --git a/pkgs/development/tools/patcher9x/default.nix b/pkgs/by-name/pa/patcher9x/package.nix
similarity index 100%
rename from pkgs/development/tools/patcher9x/default.nix
rename to pkgs/by-name/pa/patcher9x/package.nix
diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/by-name/pa/pathvector/package.nix
similarity index 100%
rename from pkgs/tools/networking/pathvector/default.nix
rename to pkgs/by-name/pa/pathvector/package.nix
diff --git a/pkgs/tools/audio/patray/default.nix b/pkgs/by-name/pa/patray/package.nix
similarity index 100%
rename from pkgs/tools/audio/patray/default.nix
rename to pkgs/by-name/pa/patray/package.nix
diff --git a/pkgs/development/tools/misc/patsh/default.nix b/pkgs/by-name/pa/patsh/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/patsh/default.nix
rename to pkgs/by-name/pa/patsh/package.nix
diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/by-name/pa/paulstretch/package.nix
similarity index 100%
rename from pkgs/applications/audio/paulstretch/default.nix
rename to pkgs/by-name/pa/paulstretch/package.nix
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/by-name/pa/pavucontrol/package.nix
similarity index 100%
rename from pkgs/applications/audio/pavucontrol/default.nix
rename to pkgs/by-name/pa/pavucontrol/package.nix
diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/by-name/pa/pax-rs/package.nix
similarity index 100%
rename from pkgs/development/tools/pax-rs/default.nix
rename to pkgs/by-name/pa/pax-rs/package.nix
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/by-name/pa/pax-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pax-utils/default.nix
rename to pkgs/by-name/pa/pax-utils/package.nix
diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/by-name/pa/paxctl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/paxctl/default.nix
rename to pkgs/by-name/pa/paxctl/package.nix
diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/by-name/pa/paxtest/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/paxtest/default.nix
rename to pkgs/by-name/pa/paxtest/package.nix
diff --git a/pkgs/tools/archivers/payload-dumper-go/default.nix b/pkgs/by-name/pa/payload-dumper-go/package.nix
similarity index 100%
rename from pkgs/tools/archivers/payload-dumper-go/default.nix
rename to pkgs/by-name/pa/payload-dumper-go/package.nix
diff --git a/pkgs/tools/archivers/payload_dumper/default.nix b/pkgs/by-name/pa/payload_dumper/package.nix
similarity index 100%
rename from pkgs/tools/archivers/payload_dumper/default.nix
rename to pkgs/by-name/pa/payload_dumper/package.nix
diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/by-name/pa/pazi/package.nix
similarity index 100%
rename from pkgs/tools/misc/pazi/default.nix
rename to pkgs/by-name/pa/pazi/package.nix
diff --git a/pkgs/tools/misc/pb_cli/default.nix b/pkgs/by-name/pb/pb_cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/pb_cli/default.nix
rename to pkgs/by-name/pb/pb_cli/package.nix
diff --git a/pkgs/tools/text/pbgopy/default.nix b/pkgs/by-name/pb/pbgopy/package.nix
similarity index 100%
rename from pkgs/tools/text/pbgopy/default.nix
rename to pkgs/by-name/pb/pbgopy/package.nix
diff --git a/pkgs/tools/admin/pbm/default.nix b/pkgs/by-name/pb/pbm/package.nix
similarity index 100%
rename from pkgs/tools/admin/pbm/default.nix
rename to pkgs/by-name/pb/pbm/package.nix
diff --git a/pkgs/applications/audio/pbpctrl/default.nix b/pkgs/by-name/pb/pbpctrl/package.nix
similarity index 100%
rename from pkgs/applications/audio/pbpctrl/default.nix
rename to pkgs/by-name/pb/pbpctrl/package.nix
diff --git a/pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch b/pkgs/by-name/pb/pbrt/openexr-cmake-3.12.patch
similarity index 100%
rename from pkgs/applications/graphics/pbrt/openexr-cmake-3.12.patch
rename to pkgs/by-name/pb/pbrt/openexr-cmake-3.12.patch
diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/by-name/pb/pbrt/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pbrt/default.nix
rename to pkgs/by-name/pb/pbrt/package.nix
diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/by-name/pb/pbzip2/package.nix
similarity index 100%
rename from pkgs/tools/compression/pbzip2/default.nix
rename to pkgs/by-name/pb/pbzip2/package.nix
diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/by-name/pb/pbzx/package.nix
similarity index 100%
rename from pkgs/tools/compression/pbzx/default.nix
rename to pkgs/by-name/pb/pbzx/package.nix
diff --git a/pkgs/tools/compression/pbzx/stdin.patch b/pkgs/by-name/pb/pbzx/stdin.patch
similarity index 100%
rename from pkgs/tools/compression/pbzx/stdin.patch
rename to pkgs/by-name/pb/pbzx/stdin.patch
diff --git a/pkgs/tools/misc/pc/default.nix b/pkgs/by-name/pc/pc/package.nix
similarity index 100%
rename from pkgs/tools/misc/pc/default.nix
rename to pkgs/by-name/pc/pc/package.nix
diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/by-name/pc/pcalc/package.nix
similarity index 100%
rename from pkgs/applications/science/math/pcalc/default.nix
rename to pkgs/by-name/pc/pcalc/package.nix
diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/by-name/pc/pcapc/package.nix
similarity index 100%
rename from pkgs/tools/networking/pcapc/default.nix
rename to pkgs/by-name/pc/pcapc/package.nix
diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/by-name/pc/pcapfix/package.nix
similarity index 100%
rename from pkgs/tools/networking/pcapfix/default.nix
rename to pkgs/by-name/pc/pcapfix/package.nix
diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/by-name/pc/pcaudiolib/package.nix
similarity index 100%
rename from pkgs/development/libraries/pcaudiolib/default.nix
rename to pkgs/by-name/pc/pcaudiolib/package.nix
diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/by-name/pc/pcb/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/pcb/default.nix
rename to pkgs/by-name/pc/pcb/package.nix
diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/by-name/pc/pcb2gcode/package.nix
similarity index 100%
rename from pkgs/tools/misc/pcb2gcode/default.nix
rename to pkgs/by-name/pc/pcb2gcode/package.nix
diff --git a/pkgs/applications/emulators/pcem/default.nix b/pkgs/by-name/pc/pcem/package.nix
similarity index 100%
rename from pkgs/applications/emulators/pcem/default.nix
rename to pkgs/by-name/pc/pcem/package.nix
diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/by-name/pc/pcg_c/package.nix
similarity index 100%
rename from pkgs/development/libraries/pcg-c/default.nix
rename to pkgs/by-name/pc/pcg_c/package.nix
diff --git a/pkgs/development/libraries/pcg-c/prefix-variable.patch b/pkgs/by-name/pc/pcg_c/prefix-variable.patch
similarity index 100%
rename from pkgs/development/libraries/pcg-c/prefix-variable.patch
rename to pkgs/by-name/pc/pcg_c/prefix-variable.patch
diff --git a/pkgs/os-specific/linux/pcimem/default.nix b/pkgs/by-name/pc/pcimem/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pcimem/default.nix
rename to pkgs/by-name/pc/pcimem/package.nix
diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/by-name/pc/pcloud/package.nix
similarity index 100%
rename from pkgs/applications/networking/pcloud/default.nix
rename to pkgs/by-name/pc/pcloud/package.nix
diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/by-name/pc/pcm/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pcm/default.nix
rename to pkgs/by-name/pc/pcm/package.nix
diff --git a/pkgs/applications/file-managers/pcmanfm/default.nix b/pkgs/by-name/pc/pcmanfm/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/pcmanfm/default.nix
rename to pkgs/by-name/pc/pcmanfm/package.nix
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/by-name/pc/pcmanx-gtk2/package.nix
similarity index 100%
rename from pkgs/applications/misc/pcmanx-gtk2/default.nix
rename to pkgs/by-name/pc/pcmanx-gtk2/package.nix
diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/by-name/pc/pcmciaUtils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pcmciautils/default.nix
rename to pkgs/by-name/pc/pcmciaUtils/package.nix
diff --git a/pkgs/development/libraries/pcmsolver/default.nix b/pkgs/by-name/pc/pcmsolver/package.nix
similarity index 100%
rename from pkgs/development/libraries/pcmsolver/default.nix
rename to pkgs/by-name/pc/pcmsolver/package.nix
diff --git a/pkgs/tools/misc/pcp/default.nix b/pkgs/by-name/pc/pcp/package.nix
similarity index 100%
rename from pkgs/tools/misc/pcp/default.nix
rename to pkgs/by-name/pc/pcp/package.nix
diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/by-name/pc/pcsc-cyberjack/package.nix
similarity index 100%
rename from pkgs/tools/security/pcsc-cyberjack/default.nix
rename to pkgs/by-name/pc/pcsc-cyberjack/package.nix
diff --git a/pkgs/tools/security/pcsc-safenet/default.nix b/pkgs/by-name/pc/pcsc-safenet/package.nix
similarity index 100%
rename from pkgs/tools/security/pcsc-safenet/default.nix
rename to pkgs/by-name/pc/pcsc-safenet/package.nix
diff --git a/pkgs/tools/security/pcsc-scm-scl011/eid.patch b/pkgs/by-name/pc/pcsc-scm-scl011/eid.patch
similarity index 100%
rename from pkgs/tools/security/pcsc-scm-scl011/eid.patch
rename to pkgs/by-name/pc/pcsc-scm-scl011/eid.patch
diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/by-name/pc/pcsc-scm-scl011/package.nix
similarity index 100%
rename from pkgs/tools/security/pcsc-scm-scl011/default.nix
rename to pkgs/by-name/pc/pcsc-scm-scl011/package.nix
diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/by-name/pc/pcstat/package.nix
similarity index 100%
rename from pkgs/tools/system/pcstat/default.nix
rename to pkgs/by-name/pc/pcstat/package.nix
diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/by-name/pd/pdal/package.nix
similarity index 100%
rename from pkgs/development/libraries/pdal/default.nix
rename to pkgs/by-name/pd/pdal/package.nix
diff --git a/pkgs/development/libraries/pdal/tests.nix b/pkgs/by-name/pd/pdal/tests.nix
similarity index 100%
rename from pkgs/development/libraries/pdal/tests.nix
rename to pkgs/by-name/pd/pdal/tests.nix
diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/by-name/pd/pdf-parser/package.nix
similarity index 100%
rename from pkgs/tools/misc/pdf-parser/default.nix
rename to pkgs/by-name/pd/pdf-parser/package.nix
diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/by-name/pd/pdf-quench/package.nix
similarity index 100%
rename from pkgs/applications/misc/pdf-quench/default.nix
rename to pkgs/by-name/pd/pdf-quench/package.nix
diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/by-name/pd/pdf2djvu/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/pdf2djvu/default.nix
rename to pkgs/by-name/pd/pdf2djvu/package.nix
diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/by-name/pd/pdf2svg/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pdf2svg/default.nix
rename to pkgs/by-name/pd/pdf2svg/package.nix
diff --git a/pkgs/tools/typesetting/pdfchain/default.nix b/pkgs/by-name/pd/pdfchain/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/pdfchain/default.nix
rename to pkgs/by-name/pd/pdfchain/package.nix
diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/by-name/pd/pdfcpu/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pdfcpu/default.nix
rename to pkgs/by-name/pd/pdfcpu/package.nix
diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/by-name/pd/pdfcrack/package.nix
similarity index 100%
rename from pkgs/tools/security/pdfcrack/default.nix
rename to pkgs/by-name/pd/pdfcrack/package.nix
diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/by-name/pd/pdfdiff/package.nix
similarity index 100%
rename from pkgs/applications/misc/pdfdiff/default.nix
rename to pkgs/by-name/pd/pdfdiff/package.nix
diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/by-name/pd/pdfgrep/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/pdfgrep/default.nix
rename to pkgs/by-name/pd/pdfgrep/package.nix
diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/by-name/pd/pdfmm/package.nix
similarity index 100%
rename from pkgs/applications/office/pdfmm/default.nix
rename to pkgs/by-name/pd/pdfmm/package.nix
diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/by-name/pd/pdfsandwich/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/pdfsandwich/default.nix
rename to pkgs/by-name/pd/pdfsandwich/package.nix
diff --git a/pkgs/applications/misc/pdfslicer/default.nix b/pkgs/by-name/pd/pdfslicer/package.nix
similarity index 100%
rename from pkgs/applications/misc/pdfslicer/default.nix
rename to pkgs/by-name/pd/pdfslicer/package.nix
diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/by-name/pd/pdftag/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pdftag/default.nix
rename to pkgs/by-name/pd/pdftag/package.nix
diff --git a/pkgs/tools/typesetting/pdftk/deps.json b/pkgs/by-name/pd/pdftk/deps.json
similarity index 100%
rename from pkgs/tools/typesetting/pdftk/deps.json
rename to pkgs/by-name/pd/pdftk/deps.json
diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/by-name/pd/pdftk/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/pdftk/default.nix
rename to pkgs/by-name/pd/pdftk/package.nix
diff --git a/pkgs/tools/graphics/pdftoipe/default.nix b/pkgs/by-name/pd/pdftoipe/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pdftoipe/default.nix
rename to pkgs/by-name/pd/pdftoipe/package.nix
diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/by-name/pd/pdm/package.nix
similarity index 100%
rename from pkgs/tools/package-management/pdm/default.nix
rename to pkgs/by-name/pd/pdm/package.nix
diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/by-name/pd/pdns/package.nix
similarity index 100%
rename from pkgs/servers/dns/pdns/default.nix
rename to pkgs/by-name/pd/pdns/package.nix
diff --git a/pkgs/servers/dns/pdns/version.patch b/pkgs/by-name/pd/pdns/version.patch
similarity index 100%
rename from pkgs/servers/dns/pdns/version.patch
rename to pkgs/by-name/pd/pdns/version.patch
diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/by-name/pd/pdnsd/package.nix
similarity index 100%
rename from pkgs/tools/networking/pdnsd/default.nix
rename to pkgs/by-name/pd/pdnsd/package.nix
diff --git a/pkgs/development/libraries/pe-parse/default.nix b/pkgs/by-name/pe/pe-parse/package.nix
similarity index 100%
rename from pkgs/development/libraries/pe-parse/default.nix
rename to pkgs/by-name/pe/pe-parse/package.nix
diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/by-name/pe/pebble/package.nix
similarity index 100%
rename from pkgs/tools/admin/pebble/default.nix
rename to pkgs/by-name/pe/pebble/package.nix
diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/by-name/pe/pecita/package.nix
similarity index 100%
rename from pkgs/data/fonts/pecita/default.nix
rename to pkgs/by-name/pe/pecita/package.nix
diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/by-name/pe/peco/package.nix
similarity index 100%
rename from pkgs/tools/text/peco/default.nix
rename to pkgs/by-name/pe/peco/package.nix
diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/by-name/pe/peek/package.nix
similarity index 100%
rename from pkgs/applications/video/peek/default.nix
rename to pkgs/by-name/pe/peek/package.nix
diff --git a/pkgs/tools/misc/peep/default.nix b/pkgs/by-name/pe/peep/package.nix
similarity index 100%
rename from pkgs/tools/misc/peep/default.nix
rename to pkgs/by-name/pe/peep/package.nix
diff --git a/pkgs/servers/web-apps/peering-manager/fix-pyixapi-0.2.3-compatibility.patch b/pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
similarity index 100%
rename from pkgs/servers/web-apps/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
rename to pkgs/by-name/pe/peering-manager/fix-pyixapi-0.2.3-compatibility.patch
diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/by-name/pe/peering-manager/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/peering-manager/default.nix
rename to pkgs/by-name/pe/peering-manager/package.nix
diff --git a/pkgs/development/tools/parsing/peg/default.nix b/pkgs/by-name/pe/peg/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/peg/default.nix
rename to pkgs/by-name/pe/peg/package.nix
diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/by-name/pe/pell/package.nix
similarity index 100%
rename from pkgs/applications/misc/pell/default.nix
rename to pkgs/by-name/pe/pell/package.nix
diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/by-name/pe/penna/package.nix
similarity index 100%
rename from pkgs/data/fonts/penna/default.nix
rename to pkgs/by-name/pe/penna/package.nix
diff --git a/pkgs/tools/security/pentestgpt/default.nix b/pkgs/by-name/pe/pentestgpt/package.nix
similarity index 100%
rename from pkgs/tools/security/pentestgpt/default.nix
rename to pkgs/by-name/pe/pentestgpt/package.nix
diff --git a/pkgs/tools/misc/perccli/default.nix b/pkgs/by-name/pe/perccli/package.nix
similarity index 100%
rename from pkgs/tools/misc/perccli/default.nix
rename to pkgs/by-name/pe/perccli/package.nix
diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/by-name/pe/perceptualdiff/package.nix
similarity index 100%
rename from pkgs/tools/graphics/perceptualdiff/default.nix
rename to pkgs/by-name/pe/perceptualdiff/package.nix
diff --git a/pkgs/tools/text/percollate/default.nix b/pkgs/by-name/pe/percollate/package.nix
similarity index 100%
rename from pkgs/tools/text/percollate/default.nix
rename to pkgs/by-name/pe/percollate/package.nix
diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/by-name/pe/perf-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/perf-tools/default.nix
rename to pkgs/by-name/pe/perf-tools/package.nix
diff --git a/pkgs/development/tools/misc/perfect-hash/default.nix b/pkgs/by-name/pe/perfect-hash/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/perfect-hash/default.nix
rename to pkgs/by-name/pe/perfect-hash/package.nix
diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/by-name/pe/perkeep/package.nix
similarity index 100%
rename from pkgs/applications/misc/perkeep/default.nix
rename to pkgs/by-name/pe/perkeep/package.nix
diff --git a/pkgs/development/tools/language-servers/perlnavigator/default.nix b/pkgs/by-name/pe/perlnavigator/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/perlnavigator/default.nix
rename to pkgs/by-name/pe/perlnavigator/package.nix
diff --git a/pkgs/applications/networking/peroxide/default.nix b/pkgs/by-name/pe/peroxide/package.nix
similarity index 100%
rename from pkgs/applications/networking/peroxide/default.nix
rename to pkgs/by-name/pe/peroxide/package.nix
diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/by-name/pe/perseus/package.nix
similarity index 100%
rename from pkgs/applications/science/math/perseus/default.nix
rename to pkgs/by-name/pe/perseus/package.nix
diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/by-name/pe/peru/package.nix
similarity index 100%
rename from pkgs/applications/version-management/peru/default.nix
rename to pkgs/by-name/pe/peru/package.nix
diff --git a/pkgs/development/tools/misc/pest-ide-tools/default.nix b/pkgs/by-name/pe/pest-ide-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/pest-ide-tools/default.nix
rename to pkgs/by-name/pe/pest-ide-tools/package.nix
diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/by-name/pe/pet/package.nix
similarity index 100%
rename from pkgs/development/tools/pet/default.nix
rename to pkgs/by-name/pe/pet/package.nix
diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/by-name/pe/petidomo/package.nix
similarity index 100%
rename from pkgs/servers/mail/petidomo/default.nix
rename to pkgs/by-name/pe/petidomo/package.nix
diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/by-name/pe/pev/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/pev/default.nix
rename to pkgs/by-name/pe/pev/package.nix
diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/by-name/pe/pew/package.nix
similarity index 100%
rename from pkgs/development/tools/pew/default.nix
rename to pkgs/by-name/pe/pew/package.nix
diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/by-name/pf/pferd/package.nix
similarity index 100%
rename from pkgs/tools/misc/pferd/default.nix
rename to pkgs/by-name/pf/pferd/package.nix
diff --git a/pkgs/tools/misc/pfetch-rs/default.nix b/pkgs/by-name/pf/pfetch-rs/package.nix
similarity index 100%
rename from pkgs/tools/misc/pfetch-rs/default.nix
rename to pkgs/by-name/pf/pfetch-rs/package.nix
diff --git a/pkgs/tools/misc/pfetch/default.nix b/pkgs/by-name/pf/pfetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/pfetch/default.nix
rename to pkgs/by-name/pf/pfetch/package.nix
diff --git a/pkgs/development/libraries/pffft/default.nix b/pkgs/by-name/pf/pffft/package.nix
similarity index 100%
rename from pkgs/development/libraries/pffft/default.nix
rename to pkgs/by-name/pf/pffft/package.nix
diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/by-name/pf/pflask/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pflask/default.nix
rename to pkgs/by-name/pf/pflask/package.nix
diff --git a/pkgs/tools/misc/pfsshell/default.nix b/pkgs/by-name/pf/pfsshell/package.nix
similarity index 100%
rename from pkgs/tools/misc/pfsshell/default.nix
rename to pkgs/by-name/pf/pfsshell/package.nix
diff --git a/pkgs/development/tools/database/pg_activity/default.nix b/pkgs/by-name/pg/pg_activity/package.nix
similarity index 100%
rename from pkgs/development/tools/database/pg_activity/default.nix
rename to pkgs/by-name/pg/pg_activity/package.nix
diff --git a/pkgs/development/tools/database/pg_checksums/default.nix b/pkgs/by-name/pg/pg_checksums/package.nix
similarity index 100%
rename from pkgs/development/tools/database/pg_checksums/default.nix
rename to pkgs/by-name/pg/pg_checksums/package.nix
diff --git a/pkgs/servers/geospatial/pg_featureserv/default.nix b/pkgs/by-name/pg/pg_featureserv/package.nix
similarity index 100%
rename from pkgs/servers/geospatial/pg_featureserv/default.nix
rename to pkgs/by-name/pg/pg_featureserv/package.nix
diff --git a/pkgs/tools/misc/pg_flame/default.nix b/pkgs/by-name/pg/pg_flame/package.nix
similarity index 100%
rename from pkgs/tools/misc/pg_flame/default.nix
rename to pkgs/by-name/pg/pg_flame/package.nix
diff --git a/pkgs/servers/geospatial/pg_tileserv/default.nix b/pkgs/by-name/pg/pg_tileserv/package.nix
similarity index 100%
rename from pkgs/servers/geospatial/pg_tileserv/default.nix
rename to pkgs/by-name/pg/pg_tileserv/package.nix
diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/by-name/pg/pg_top/package.nix
similarity index 100%
rename from pkgs/tools/misc/pg_top/default.nix
rename to pkgs/by-name/pg/pg_top/package.nix
diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/by-name/pg/pgbackrest/package.nix
similarity index 100%
rename from pkgs/tools/backup/pgbackrest/default.nix
rename to pkgs/by-name/pg/pgbackrest/package.nix
diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/by-name/pg/pgbouncer/package.nix
similarity index 100%
rename from pkgs/servers/sql/pgbouncer/default.nix
rename to pkgs/by-name/pg/pgbouncer/package.nix
diff --git a/pkgs/servers/sql/pgcat/default.nix b/pkgs/by-name/pg/pgcat/package.nix
similarity index 100%
rename from pkgs/servers/sql/pgcat/default.nix
rename to pkgs/by-name/pg/pgcat/package.nix
diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/by-name/pg/pgcenter/package.nix
similarity index 100%
rename from pkgs/tools/misc/pgcenter/default.nix
rename to pkgs/by-name/pg/pgcenter/package.nix
diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/by-name/pg/pgf_graphics/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pgf/default.nix
rename to pkgs/by-name/pg/pgf_graphics/package.nix
diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/by-name/pg/pgformatter/package.nix
similarity index 100%
rename from pkgs/development/tools/pgformatter/default.nix
rename to pkgs/by-name/pg/pgformatter/package.nix
diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/by-name/pg/pgloader/package.nix
similarity index 100%
rename from pkgs/development/tools/pgloader/default.nix
rename to pkgs/by-name/pg/pgloader/package.nix
diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/by-name/pg/pgmanage/package.nix
similarity index 100%
rename from pkgs/applications/misc/pgmanage/default.nix
rename to pkgs/by-name/pg/pgmanage/package.nix
diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/by-name/pg/pgmetrics/package.nix
similarity index 100%
rename from pkgs/tools/misc/pgmetrics/default.nix
rename to pkgs/by-name/pg/pgmetrics/package.nix
diff --git a/pkgs/applications/networking/cluster/pgo-client/default.nix b/pkgs/by-name/pg/pgo-client/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/pgo-client/default.nix
rename to pkgs/by-name/pg/pgo-client/package.nix
diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/by-name/pg/pgpdump/package.nix
similarity index 100%
rename from pkgs/tools/security/pgpdump/default.nix
rename to pkgs/by-name/pg/pgpdump/package.nix
diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/by-name/pg/pgpkeyserver-lite/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
rename to pkgs/by-name/pg/pgpkeyserver-lite/package.nix
diff --git a/pkgs/servers/sql/pgpool/darwin-strlcpy.patch b/pkgs/by-name/pg/pgpool/darwin-strlcpy.patch
similarity index 100%
rename from pkgs/servers/sql/pgpool/darwin-strlcpy.patch
rename to pkgs/by-name/pg/pgpool/darwin-strlcpy.patch
diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/by-name/pg/pgpool/package.nix
similarity index 100%
rename from pkgs/servers/sql/pgpool/default.nix
rename to pkgs/by-name/pg/pgpool/package.nix
diff --git a/pkgs/development/tools/pgtop/default.nix b/pkgs/by-name/pg/pgtop/package.nix
similarity index 100%
rename from pkgs/development/tools/pgtop/default.nix
rename to pkgs/by-name/pg/pgtop/package.nix
diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/by-name/pg/pgweb/package.nix
similarity index 100%
rename from pkgs/development/tools/database/pgweb/default.nix
rename to pkgs/by-name/pg/pgweb/package.nix
diff --git a/pkgs/tools/networking/phantomsocks/default.nix b/pkgs/by-name/ph/phantomsocks/package.nix
similarity index 100%
rename from pkgs/tools/networking/phantomsocks/default.nix
rename to pkgs/by-name/ph/phantomsocks/package.nix
diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/by-name/ph/phash/package.nix
similarity index 100%
rename from pkgs/development/libraries/phash/default.nix
rename to pkgs/by-name/ph/phash/package.nix
diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/by-name/ph/phd2/package.nix
similarity index 100%
rename from pkgs/applications/science/astronomy/phd2/default.nix
rename to pkgs/by-name/ph/phd2/package.nix
diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/by-name/ph/phinger-cursors/package.nix
similarity index 100%
rename from pkgs/data/icons/phinger-cursors/default.nix
rename to pkgs/by-name/ph/phinger-cursors/package.nix
diff --git a/pkgs/servers/monitoring/phlare/default.nix b/pkgs/by-name/ph/phlare/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/phlare/default.nix
rename to pkgs/by-name/ph/phlare/package.nix
diff --git a/pkgs/applications/misc/phockup/default.nix b/pkgs/by-name/ph/phockup/package.nix
similarity index 100%
rename from pkgs/applications/misc/phockup/default.nix
rename to pkgs/by-name/ph/phockup/package.nix
diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/by-name/ph/phodav/package.nix
similarity index 100%
rename from pkgs/tools/networking/phodav/default.nix
rename to pkgs/by-name/ph/phodav/package.nix
diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/by-name/ph/phoronix-test-suite/package.nix
similarity index 100%
rename from pkgs/tools/misc/phoronix-test-suite/default.nix
rename to pkgs/by-name/ph/phoronix-test-suite/package.nix
diff --git a/pkgs/tools/misc/phoronix-test-suite/tests.nix b/pkgs/by-name/ph/phoronix-test-suite/tests.nix
similarity index 100%
rename from pkgs/tools/misc/phoronix-test-suite/tests.nix
rename to pkgs/by-name/ph/phoronix-test-suite/tests.nix
diff --git a/pkgs/servers/photofield/default.nix b/pkgs/by-name/ph/photofield/package.nix
similarity index 100%
rename from pkgs/servers/photofield/default.nix
rename to pkgs/by-name/ph/photofield/package.nix
diff --git a/pkgs/applications/networking/feedreaders/photon/default.nix b/pkgs/by-name/ph/photon-rss/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/photon/default.nix
rename to pkgs/by-name/ph/photon-rss/package.nix
diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/by-name/ph/photon/package.nix
similarity index 100%
rename from pkgs/tools/networking/photon/default.nix
rename to pkgs/by-name/ph/photon/package.nix
diff --git a/pkgs/servers/photoprism/backend.nix b/pkgs/by-name/ph/photoprism/backend.nix
similarity index 100%
rename from pkgs/servers/photoprism/backend.nix
rename to pkgs/by-name/ph/photoprism/backend.nix
diff --git a/pkgs/servers/photoprism/frontend.nix b/pkgs/by-name/ph/photoprism/frontend.nix
similarity index 100%
rename from pkgs/servers/photoprism/frontend.nix
rename to pkgs/by-name/ph/photoprism/frontend.nix
diff --git a/pkgs/servers/photoprism/libtensorflow.nix b/pkgs/by-name/ph/photoprism/libtensorflow.nix
similarity index 100%
rename from pkgs/servers/photoprism/libtensorflow.nix
rename to pkgs/by-name/ph/photoprism/libtensorflow.nix
diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/by-name/ph/photoprism/package.nix
similarity index 100%
rename from pkgs/servers/photoprism/default.nix
rename to pkgs/by-name/ph/photoprism/package.nix
diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/by-name/ph/phrase-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/phrase-cli/default.nix
rename to pkgs/by-name/ph/phrase-cli/package.nix
diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/by-name/ph/phrasendrescher/package.nix
similarity index 100%
rename from pkgs/tools/security/phrasendrescher/default.nix
rename to pkgs/by-name/ph/phrasendrescher/package.nix
diff --git a/pkgs/servers/web-apps/phylactery/default.nix b/pkgs/by-name/ph/phylactery/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/phylactery/default.nix
rename to pkgs/by-name/ph/phylactery/package.nix
diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/by-name/ph/physlock/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/physlock/default.nix
rename to pkgs/by-name/ph/physlock/package.nix
diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/by-name/pi/pianobar/package.nix
similarity index 100%
rename from pkgs/applications/audio/pianobar/default.nix
rename to pkgs/by-name/pi/pianobar/package.nix
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/by-name/pi/picard-tools/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/picard-tools/default.nix
rename to pkgs/by-name/pi/picard-tools/package.nix
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/by-name/pi/picard/package.nix
similarity index 100%
rename from pkgs/applications/audio/picard/default.nix
rename to pkgs/by-name/pi/picard/package.nix
diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/by-name/pi/picat/package.nix
similarity index 100%
rename from pkgs/development/compilers/picat/default.nix
rename to pkgs/by-name/pi/picat/package.nix
diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/by-name/pi/pick/package.nix
similarity index 100%
rename from pkgs/tools/misc/pick/default.nix
rename to pkgs/by-name/pi/pick/package.nix
diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/by-name/pi/pico-sdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/pico-sdk/default.nix
rename to pkgs/by-name/pi/pico-sdk/package.nix
diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/by-name/pi/picoc/package.nix
similarity index 100%
rename from pkgs/development/interpreters/picoc/default.nix
rename to pkgs/by-name/pi/picoc/package.nix
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/by-name/pi/picolisp/package.nix
similarity index 100%
rename from pkgs/development/interpreters/picolisp/default.nix
rename to pkgs/by-name/pi/picolisp/package.nix
diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/by-name/pi/picoloop/package.nix
similarity index 100%
rename from pkgs/applications/audio/picoloop/default.nix
rename to pkgs/by-name/pi/picoloop/package.nix
diff --git a/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix b/pkgs/by-name/pi/picoprobe-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/picoprobe-udev-rules/default.nix
rename to pkgs/by-name/pi/picoprobe-udev-rules/package.nix
diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/by-name/pi/picosat/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/picosat/default.nix
rename to pkgs/by-name/pi/picosat/package.nix
diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/by-name/pi/picoscope/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/picoscope/default.nix
rename to pkgs/by-name/pi/picoscope/package.nix
diff --git a/pkgs/applications/science/electronics/picoscope/sources.json b/pkgs/by-name/pi/picoscope/sources.json
similarity index 100%
rename from pkgs/applications/science/electronics/picoscope/sources.json
rename to pkgs/by-name/pi/picoscope/sources.json
diff --git a/pkgs/applications/science/electronics/picoscope/update.py b/pkgs/by-name/pi/picoscope/update.py
similarity index 100%
rename from pkgs/applications/science/electronics/picoscope/update.py
rename to pkgs/by-name/pi/picoscope/update.py
diff --git a/pkgs/tools/networking/picosnitch/default.nix b/pkgs/by-name/pi/picosnitch/package.nix
similarity index 100%
rename from pkgs/tools/networking/picosnitch/default.nix
rename to pkgs/by-name/pi/picosnitch/package.nix
diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/by-name/pi/picotool/package.nix
similarity index 100%
rename from pkgs/development/tools/picotool/default.nix
rename to pkgs/by-name/pi/picotool/package.nix
diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/by-name/pi/picotts/package.nix
similarity index 100%
rename from pkgs/tools/audio/picotts/default.nix
rename to pkgs/by-name/pi/picotts/package.nix
diff --git a/pkgs/servers/web-apps/pict-rs/0.3.nix b/pkgs/by-name/pi/pict-rs/0.3.nix
similarity index 100%
rename from pkgs/servers/web-apps/pict-rs/0.3.nix
rename to pkgs/by-name/pi/pict-rs/0.3.nix
diff --git a/pkgs/servers/web-apps/pict-rs/Cargo-0.3.lock b/pkgs/by-name/pi/pict-rs/Cargo-0.3.lock
similarity index 100%
rename from pkgs/servers/web-apps/pict-rs/Cargo-0.3.lock
rename to pkgs/by-name/pi/pict-rs/Cargo-0.3.lock
diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/by-name/pi/pict-rs/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/pict-rs/default.nix
rename to pkgs/by-name/pi/pict-rs/package.nix
diff --git a/pkgs/servers/pies/default.nix b/pkgs/by-name/pi/pies/package.nix
similarity index 100%
rename from pkgs/servers/pies/default.nix
rename to pkgs/by-name/pi/pies/package.nix
diff --git a/pkgs/development/tools/pifpaf/default.nix b/pkgs/by-name/pi/pifpaf/package.nix
similarity index 100%
rename from pkgs/development/tools/pifpaf/default.nix
rename to pkgs/by-name/pi/pifpaf/package.nix
diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/by-name/pi/pig/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/pig/default.nix
rename to pkgs/by-name/pi/pig/package.nix
diff --git a/pkgs/tools/graphics/piglit/default.nix b/pkgs/by-name/pi/piglit/package.nix
similarity index 100%
rename from pkgs/tools/graphics/piglit/default.nix
rename to pkgs/by-name/pi/piglit/package.nix
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/by-name/pi/pigz/package.nix
similarity index 100%
rename from pkgs/tools/compression/pigz/default.nix
rename to pkgs/by-name/pi/pigz/package.nix
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/by-name/pi/pijul/package.nix
similarity index 100%
rename from pkgs/applications/version-management/pijul/default.nix
rename to pkgs/by-name/pi/pijul/package.nix
diff --git a/pkgs/applications/backup/pika-backup/borg-path.patch b/pkgs/by-name/pi/pika-backup/borg-path.patch
similarity index 100%
rename from pkgs/applications/backup/pika-backup/borg-path.patch
rename to pkgs/by-name/pi/pika-backup/borg-path.patch
diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/by-name/pi/pika-backup/package.nix
similarity index 100%
rename from pkgs/applications/backup/pika-backup/default.nix
rename to pkgs/by-name/pi/pika-backup/package.nix
diff --git a/pkgs/applications/graphics/pika/default.nix b/pkgs/by-name/pi/pika/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pika/default.nix
rename to pkgs/by-name/pi/pika/package.nix
diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/by-name/pi/pikchr/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pikchr/default.nix
rename to pkgs/by-name/pi/pikchr/package.nix
diff --git a/pkgs/tools/networking/piknik/default.nix b/pkgs/by-name/pi/piknik/package.nix
similarity index 100%
rename from pkgs/tools/networking/piknik/default.nix
rename to pkgs/by-name/pi/piknik/package.nix
diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/by-name/pi/pikopixel/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pikopixel/default.nix
rename to pkgs/by-name/pi/pikopixel/package.nix
diff --git a/pkgs/servers/pim6sd/default.nix b/pkgs/by-name/pi/pim6sd/package.nix
similarity index 100%
rename from pkgs/servers/pim6sd/default.nix
rename to pkgs/by-name/pi/pim6sd/package.nix
diff --git a/pkgs/games/pinball/default.nix b/pkgs/by-name/pi/pinball/package.nix
similarity index 100%
rename from pkgs/games/pinball/default.nix
rename to pkgs/by-name/pi/pinball/package.nix
diff --git a/pkgs/tools/security/pinentry-bemenu/default.nix b/pkgs/by-name/pi/pinentry-bemenu/package.nix
similarity index 100%
rename from pkgs/tools/security/pinentry-bemenu/default.nix
rename to pkgs/by-name/pi/pinentry-bemenu/package.nix
diff --git a/pkgs/tools/security/pinentry-rofi/default.nix b/pkgs/by-name/pi/pinentry-rofi/package.nix
similarity index 100%
rename from pkgs/tools/security/pinentry-rofi/default.nix
rename to pkgs/by-name/pi/pinentry-rofi/package.nix
diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/by-name/pi/pinfo/package.nix
similarity index 100%
rename from pkgs/applications/misc/pinfo/default.nix
rename to pkgs/by-name/pi/pinfo/package.nix
diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/by-name/pi/pingtcp/package.nix
similarity index 100%
rename from pkgs/tools/networking/pingtcp/default.nix
rename to pkgs/by-name/pi/pingtcp/package.nix
diff --git a/pkgs/games/pingus/default.nix b/pkgs/by-name/pi/pingus/package.nix
similarity index 100%
rename from pkgs/games/pingus/default.nix
rename to pkgs/by-name/pi/pingus/package.nix
diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/by-name/pi/pinniped/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/pinniped/default.nix
rename to pkgs/by-name/pi/pinniped/package.nix
diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/by-name/pi/pinpoint/package.nix
similarity index 100%
rename from pkgs/applications/office/pinpoint/default.nix
rename to pkgs/by-name/pi/pinpoint/package.nix
diff --git a/pkgs/tools/misc/pinsel/default.nix b/pkgs/by-name/pi/pinsel/package.nix
similarity index 100%
rename from pkgs/tools/misc/pinsel/default.nix
rename to pkgs/by-name/pi/pinsel/package.nix
diff --git a/pkgs/games/pioneer/default.nix b/pkgs/by-name/pi/pioneer/package.nix
similarity index 100%
rename from pkgs/games/pioneer/default.nix
rename to pkgs/by-name/pi/pioneer/package.nix
diff --git a/pkgs/games/pioneers/default.nix b/pkgs/by-name/pi/pioneers/package.nix
similarity index 100%
rename from pkgs/games/pioneers/default.nix
rename to pkgs/by-name/pi/pioneers/package.nix
diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/by-name/pi/pip-audit/package.nix
similarity index 100%
rename from pkgs/development/tools/pip-audit/default.nix
rename to pkgs/by-name/pi/pip-audit/package.nix
diff --git a/pkgs/tools/misc/pipe-rename/default.nix b/pkgs/by-name/pi/pipe-rename/package.nix
similarity index 100%
rename from pkgs/tools/misc/pipe-rename/default.nix
rename to pkgs/by-name/pi/pipe-rename/package.nix
diff --git a/pkgs/tools/misc/pipectl/default.nix b/pkgs/by-name/pi/pipectl/package.nix
similarity index 100%
rename from pkgs/tools/misc/pipectl/default.nix
rename to pkgs/by-name/pi/pipectl/package.nix
diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/by-name/pi/pipenv/package.nix
similarity index 100%
rename from pkgs/development/tools/pipenv/default.nix
rename to pkgs/by-name/pi/pipenv/package.nix
diff --git a/pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch b/pkgs/by-name/pi/piper-phonemize/espeak-mbrola.patch
similarity index 100%
rename from pkgs/development/libraries/piper-phonemize/espeak-mbrola.patch
rename to pkgs/by-name/pi/piper-phonemize/espeak-mbrola.patch
diff --git a/pkgs/development/libraries/piper-phonemize/default.nix b/pkgs/by-name/pi/piper-phonemize/package.nix
similarity index 100%
rename from pkgs/development/libraries/piper-phonemize/default.nix
rename to pkgs/by-name/pi/piper-phonemize/package.nix
diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/by-name/pi/piper/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/piper/default.nix
rename to pkgs/by-name/pi/piper/package.nix
diff --git a/pkgs/misc/screensavers/pipes-rs/default.nix b/pkgs/by-name/pi/pipes-rs/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/pipes-rs/default.nix
rename to pkgs/by-name/pi/pipes-rs/package.nix
diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/by-name/pi/pipes/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/pipes/default.nix
rename to pkgs/by-name/pi/pipes/package.nix
diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/by-name/pi/pipework/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pipework/default.nix
rename to pkgs/by-name/pi/pipework/package.nix
diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/by-name/pi/pipr/package.nix
similarity index 100%
rename from pkgs/applications/misc/pipr/default.nix
rename to pkgs/by-name/pi/pipr/package.nix
diff --git a/pkgs/tools/misc/pipreqs/default.nix b/pkgs/by-name/pi/pipreqs/package.nix
similarity index 100%
rename from pkgs/tools/misc/pipreqs/default.nix
rename to pkgs/by-name/pi/pipreqs/package.nix
diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/by-name/pi/pirate-get/package.nix
similarity index 100%
rename from pkgs/tools/networking/pirate-get/default.nix
rename to pkgs/by-name/pi/pirate-get/package.nix
diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/by-name/pi/pistol/package.nix
similarity index 100%
rename from pkgs/tools/misc/pistol/default.nix
rename to pkgs/by-name/pi/pistol/package.nix
diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/by-name/pi/piston-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/piston-cli/default.nix
rename to pkgs/by-name/pi/piston-cli/package.nix
diff --git a/pkgs/data/themes/pitch-black/default.nix b/pkgs/by-name/pi/pitch-black/package.nix
similarity index 100%
rename from pkgs/data/themes/pitch-black/default.nix
rename to pkgs/by-name/pi/pitch-black/package.nix
diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/by-name/pi/pitivi/package.nix
similarity index 100%
rename from pkgs/applications/video/pitivi/default.nix
rename to pkgs/by-name/pi/pitivi/package.nix
diff --git a/pkgs/applications/video/pitivi/prevent-closure-contamination.patch b/pkgs/by-name/pi/pitivi/prevent-closure-contamination.patch
similarity index 100%
rename from pkgs/applications/video/pitivi/prevent-closure-contamination.patch
rename to pkgs/by-name/pi/pitivi/prevent-closure-contamination.patch
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/by-name/pi/pius/package.nix
similarity index 100%
rename from pkgs/tools/security/pius/default.nix
rename to pkgs/by-name/pi/pius/package.nix
diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/by-name/pi/pixd/package.nix
similarity index 100%
rename from pkgs/tools/misc/pixd/default.nix
rename to pkgs/by-name/pi/pixd/package.nix
diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/by-name/pi/pixelfed/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/pixelfed/default.nix
rename to pkgs/by-name/pi/pixelfed/package.nix
diff --git a/pkgs/applications/graphics/pixelnuke/default.nix b/pkgs/by-name/pi/pixelnuke/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pixelnuke/default.nix
rename to pkgs/by-name/pi/pixelnuke/package.nix
diff --git a/pkgs/applications/graphics/pixeluvo/default.nix b/pkgs/by-name/pi/pixeluvo/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pixeluvo/default.nix
rename to pkgs/by-name/pi/pixeluvo/package.nix
diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/by-name/pi/pixiecore/package.nix
similarity index 100%
rename from pkgs/tools/networking/pixiecore/default.nix
rename to pkgs/by-name/pi/pixiecore/package.nix
diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/by-name/pi/pixiewps/package.nix
similarity index 100%
rename from pkgs/tools/networking/pixiewps/default.nix
rename to pkgs/by-name/pi/pixiewps/package.nix
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/by-name/pi/pixman/package.nix
similarity index 100%
rename from pkgs/development/libraries/pixman/default.nix
rename to pkgs/by-name/pi/pixman/package.nix
diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/by-name/pi/pixz/package.nix
similarity index 100%
rename from pkgs/tools/compression/pixz/default.nix
rename to pkgs/by-name/pi/pixz/package.nix
diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/by-name/pi/pizarra/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pizarra/default.nix
rename to pkgs/by-name/pi/pizarra/package.nix
diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/by-name/pk/pk2cmd/package.nix
similarity index 100%
rename from pkgs/tools/misc/pk2cmd/default.nix
rename to pkgs/by-name/pk/pk2cmd/package.nix
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/by-name/pk/pkcs11helper/package.nix
similarity index 100%
rename from pkgs/development/libraries/pkcs11helper/default.nix
rename to pkgs/by-name/pk/pkcs11helper/package.nix
diff --git a/pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch b/pkgs/by-name/pk/pkg-config-unwrapped/2.36.3-not-win32.patch
similarity index 100%
rename from pkgs/development/tools/misc/pkg-config/2.36.3-not-win32.patch
rename to pkgs/by-name/pk/pkg-config-unwrapped/2.36.3-not-win32.patch
diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/by-name/pk/pkg-config-unwrapped/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/pkg-config/default.nix
rename to pkgs/by-name/pk/pkg-config-unwrapped/package.nix
diff --git a/pkgs/development/tools/misc/pkg-config/requires-private.patch b/pkgs/by-name/pk/pkg-config-unwrapped/requires-private.patch
similarity index 100%
rename from pkgs/development/tools/misc/pkg-config/requires-private.patch
rename to pkgs/by-name/pk/pkg-config-unwrapped/requires-private.patch
diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/by-name/pk/pkg/package.nix
similarity index 100%
rename from pkgs/tools/package-management/pkg/default.nix
rename to pkgs/by-name/pk/pkg/package.nix
diff --git a/pkgs/tools/misc/pkgdiff/default.nix b/pkgs/by-name/pk/pkgdiff/package.nix
similarity index 100%
rename from pkgs/tools/misc/pkgdiff/default.nix
rename to pkgs/by-name/pk/pkgdiff/package.nix
diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/by-name/pk/pkger/package.nix
similarity index 100%
rename from pkgs/development/libraries/pkger/default.nix
rename to pkgs/by-name/pk/pkger/package.nix
diff --git a/pkgs/tools/misc/pkgtop/default.nix b/pkgs/by-name/pk/pkgtop/package.nix
similarity index 100%
rename from pkgs/tools/misc/pkgtop/default.nix
rename to pkgs/by-name/pk/pkgtop/package.nix
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/by-name/pk/pktgen/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pktgen/default.nix
rename to pkgs/by-name/pk/pktgen/package.nix
diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/by-name/pl/planarity/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/planarity/default.nix
rename to pkgs/by-name/pl/planarity/package.nix
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/by-name/pl/planetary_annihilation/package.nix
similarity index 100%
rename from pkgs/games/planetaryannihilation/default.nix
rename to pkgs/by-name/pl/planetary_annihilation/package.nix
diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/by-name/pl/planify/package.nix
similarity index 100%
rename from pkgs/applications/office/planify/default.nix
rename to pkgs/by-name/pl/planify/package.nix
diff --git a/pkgs/applications/misc/plank/hide-in-pantheon.patch b/pkgs/by-name/pl/plank/hide-in-pantheon.patch
similarity index 100%
rename from pkgs/applications/misc/plank/hide-in-pantheon.patch
rename to pkgs/by-name/pl/plank/hide-in-pantheon.patch
diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/by-name/pl/plank/package.nix
similarity index 100%
rename from pkgs/applications/misc/plank/default.nix
rename to pkgs/by-name/pl/plank/package.nix
diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/by-name/pl/planner/package.nix
similarity index 100%
rename from pkgs/applications/office/planner/default.nix
rename to pkgs/by-name/pl/planner/package.nix
diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/by-name/pl/plano-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/plano/default.nix
rename to pkgs/by-name/pl/plano-theme/package.nix
diff --git a/pkgs/development/tools/misc/planus/default.nix b/pkgs/by-name/pl/planus/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/planus/default.nix
rename to pkgs/by-name/pl/planus/package.nix
diff --git a/pkgs/misc/plasma-hud/default.nix b/pkgs/by-name/pl/plasma-hud/package.nix
similarity index 100%
rename from pkgs/misc/plasma-hud/default.nix
rename to pkgs/by-name/pl/plasma-hud/package.nix
diff --git a/pkgs/data/themes/plasma-overdose-kde-theme/default.nix b/pkgs/by-name/pl/plasma-overdose-kde-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/plasma-overdose-kde-theme/default.nix
rename to pkgs/by-name/pl/plasma-overdose-kde-theme/package.nix
diff --git a/pkgs/development/libraries/platform-folders/default.nix b/pkgs/by-name/pl/platform-folders/package.nix
similarity index 100%
rename from pkgs/development/libraries/platform-folders/default.nix
rename to pkgs/by-name/pl/platform-folders/package.nix
diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/by-name/pl/platinum-searcher/package.nix
similarity index 100%
rename from pkgs/tools/text/platinum-searcher/default.nix
rename to pkgs/by-name/pl/platinum-searcher/package.nix
diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/by-name/pl/platypus/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/platypus/default.nix
rename to pkgs/by-name/pl/platypus/package.nix
diff --git a/pkgs/tools/video/play-with-mpv/default.nix b/pkgs/by-name/pl/play-with-mpv/package.nix
similarity index 100%
rename from pkgs/tools/video/play-with-mpv/default.nix
rename to pkgs/by-name/pl/play-with-mpv/package.nix
diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/by-name/pl/playerctl/package.nix
similarity index 100%
rename from pkgs/tools/audio/playerctl/default.nix
rename to pkgs/by-name/pl/playerctl/package.nix
diff --git a/pkgs/applications/misc/please-cli/default.nix b/pkgs/by-name/pl/please-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/please-cli/default.nix
rename to pkgs/by-name/pl/please-cli/package.nix
diff --git a/pkgs/tools/security/please/nixos-specific.patch b/pkgs/by-name/pl/please/nixos-specific.patch
similarity index 100%
rename from pkgs/tools/security/please/nixos-specific.patch
rename to pkgs/by-name/pl/please/nixos-specific.patch
diff --git a/pkgs/tools/security/please/default.nix b/pkgs/by-name/pl/please/package.nix
similarity index 100%
rename from pkgs/tools/security/please/default.nix
rename to pkgs/by-name/pl/please/package.nix
diff --git a/pkgs/tools/security/plecost/default.nix b/pkgs/by-name/pl/plecost/package.nix
similarity index 100%
rename from pkgs/tools/security/plecost/default.nix
rename to pkgs/by-name/pl/plecost/package.nix
diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/by-name/pl/plib/package.nix
similarity index 100%
rename from pkgs/development/libraries/plib/default.nix
rename to pkgs/by-name/pl/plib/package.nix
diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/by-name/pl/plink-ng/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/plink-ng/default.nix
rename to pkgs/by-name/pl/plink-ng/package.nix
diff --git a/pkgs/os-specific/darwin/plistwatch/go-modules.patch b/pkgs/by-name/pl/plistwatch/go-modules.patch
similarity index 100%
rename from pkgs/os-specific/darwin/plistwatch/go-modules.patch
rename to pkgs/by-name/pl/plistwatch/go-modules.patch
diff --git a/pkgs/os-specific/darwin/plistwatch/default.nix b/pkgs/by-name/pl/plistwatch/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/plistwatch/default.nix
rename to pkgs/by-name/pl/plistwatch/package.nix
diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/by-name/pl/plm/package.nix
similarity index 100%
rename from pkgs/applications/science/programming/plm/default.nix
rename to pkgs/by-name/pl/plm/package.nix
diff --git a/pkgs/tools/misc/plocate/default.nix b/pkgs/by-name/pl/plocate/package.nix
similarity index 100%
rename from pkgs/tools/misc/plocate/default.nix
rename to pkgs/by-name/pl/plocate/package.nix
diff --git a/pkgs/development/libraries/plog/default.nix b/pkgs/by-name/pl/plog/package.nix
similarity index 100%
rename from pkgs/development/libraries/plog/default.nix
rename to pkgs/by-name/pl/plog/package.nix
diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/by-name/pl/ploticus/package.nix
similarity index 100%
rename from pkgs/tools/graphics/ploticus/default.nix
rename to pkgs/by-name/pl/ploticus/package.nix
diff --git a/pkgs/tools/graphics/ploticus/ploticus-install.patch b/pkgs/by-name/pl/ploticus/ploticus-install.patch
similarity index 100%
rename from pkgs/tools/graphics/ploticus/ploticus-install.patch
rename to pkgs/by-name/pl/ploticus/ploticus-install.patch
diff --git a/pkgs/tools/graphics/ploticus/set-prefabs-dir.patch b/pkgs/by-name/pl/ploticus/set-prefabs-dir.patch
similarity index 100%
rename from pkgs/tools/graphics/ploticus/set-prefabs-dir.patch
rename to pkgs/by-name/pl/ploticus/set-prefabs-dir.patch
diff --git a/pkgs/tools/graphics/ploticus/use-gd-package.patch b/pkgs/by-name/pl/ploticus/use-gd-package.patch
similarity index 100%
rename from pkgs/tools/graphics/ploticus/use-gd-package.patch
rename to pkgs/by-name/pl/ploticus/use-gd-package.patch
diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/by-name/pl/plotinus/package.nix
similarity index 100%
rename from pkgs/tools/misc/plotinus/default.nix
rename to pkgs/by-name/pl/plotinus/package.nix
diff --git a/pkgs/applications/misc/plots/default.nix b/pkgs/by-name/pl/plots/package.nix
similarity index 100%
rename from pkgs/applications/misc/plots/default.nix
rename to pkgs/by-name/pl/plots/package.nix
diff --git a/pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch b/pkgs/by-name/pl/plotutils/c++17-register-usage-fix.patch
similarity index 100%
rename from pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch
rename to pkgs/by-name/pl/plotutils/c++17-register-usage-fix.patch
diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/pkgs/by-name/pl/plotutils/debian-patches.nix
similarity index 100%
rename from pkgs/tools/graphics/plotutils/debian-patches.nix
rename to pkgs/by-name/pl/plotutils/debian-patches.nix
diff --git a/pkgs/tools/graphics/plotutils/debian-patches.txt b/pkgs/by-name/pl/plotutils/debian-patches.txt
similarity index 100%
rename from pkgs/tools/graphics/plotutils/debian-patches.txt
rename to pkgs/by-name/pl/plotutils/debian-patches.txt
diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/by-name/pl/plotutils/package.nix
similarity index 100%
rename from pkgs/tools/graphics/plotutils/default.nix
rename to pkgs/by-name/pl/plotutils/package.nix
diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/by-name/pl/plowshare/package.nix
similarity index 100%
rename from pkgs/tools/misc/plowshare/default.nix
rename to pkgs/by-name/pl/plowshare/package.nix
diff --git a/pkgs/applications/audio/plugdata/default.nix b/pkgs/by-name/pl/plugdata/package.nix
similarity index 100%
rename from pkgs/applications/audio/plugdata/default.nix
rename to pkgs/by-name/pl/plugdata/package.nix
diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/by-name/pl/plugin-torture/package.nix
similarity index 100%
rename from pkgs/applications/audio/plugin-torture/default.nix
rename to pkgs/by-name/pl/plugin-torture/package.nix
diff --git a/pkgs/applications/audio/plujain-ramp/default.nix b/pkgs/by-name/pl/plujain-ramp/package.nix
similarity index 100%
rename from pkgs/applications/audio/plujain-ramp/default.nix
rename to pkgs/by-name/pl/plujain-ramp/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/plumed/default.nix b/pkgs/by-name/pl/plumed/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/plumed/default.nix
rename to pkgs/by-name/pl/plumed/package.nix
diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/by-name/pl/pluto/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/pluto/default.nix
rename to pkgs/by-name/pl/pluto/package.nix
diff --git a/pkgs/os-specific/linux/plymouth/add-runtime-plugin-path.patch b/pkgs/by-name/pl/plymouth/add-runtime-plugin-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/plymouth/add-runtime-plugin-path.patch
rename to pkgs/by-name/pl/plymouth/add-runtime-plugin-path.patch
diff --git a/pkgs/os-specific/linux/plymouth/dont-create-broken-symlink.patch b/pkgs/by-name/pl/plymouth/dont-create-broken-symlink.patch
similarity index 100%
rename from pkgs/os-specific/linux/plymouth/dont-create-broken-symlink.patch
rename to pkgs/by-name/pl/plymouth/dont-create-broken-symlink.patch
diff --git a/pkgs/os-specific/linux/plymouth/fix-paths.patch b/pkgs/by-name/pl/plymouth/fix-paths.patch
similarity index 100%
rename from pkgs/os-specific/linux/plymouth/fix-paths.patch
rename to pkgs/by-name/pl/plymouth/fix-paths.patch
diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/by-name/pl/plymouth/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/plymouth/default.nix
rename to pkgs/by-name/pl/plymouth/package.nix
diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/by-name/pm/pmacct/package.nix
similarity index 100%
rename from pkgs/tools/networking/pmacct/default.nix
rename to pkgs/by-name/pm/pmacct/package.nix
diff --git a/pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch b/pkgs/by-name/pm/pmccabe/getopt_on_darwin.patch
similarity index 100%
rename from pkgs/development/tools/misc/pmccabe/getopt_on_darwin.patch
rename to pkgs/by-name/pm/pmccabe/getopt_on_darwin.patch
diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/by-name/pm/pmccabe/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/pmccabe/default.nix
rename to pkgs/by-name/pm/pmccabe/package.nix
diff --git a/pkgs/tools/X11/pmenu/default.nix b/pkgs/by-name/pm/pmenu/package.nix
similarity index 100%
rename from pkgs/tools/X11/pmenu/default.nix
rename to pkgs/by-name/pm/pmenu/package.nix
diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/by-name/pm/pmidi/package.nix
similarity index 100%
rename from pkgs/applications/audio/pmidi/default.nix
rename to pkgs/by-name/pm/pmidi/package.nix
diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/by-name/pm/pmix/package.nix
similarity index 100%
rename from pkgs/development/libraries/pmix/default.nix
rename to pkgs/by-name/pm/pmix/package.nix
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/by-name/pm/pmount/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pmount/default.nix
rename to pkgs/by-name/pm/pmount/package.nix
diff --git a/pkgs/applications/audio/pms/default.nix b/pkgs/by-name/pm/pms/package.nix
similarity index 100%
rename from pkgs/applications/audio/pms/default.nix
rename to pkgs/by-name/pm/pms/package.nix
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/by-name/pm/pmutils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pm-utils/default.nix
rename to pkgs/by-name/pm/pmutils/package.nix
diff --git a/pkgs/tools/text/pn/default.nix b/pkgs/by-name/pn/pn/package.nix
similarity index 100%
rename from pkgs/tools/text/pn/default.nix
rename to pkgs/by-name/pn/pn/package.nix
diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/by-name/pn/pngcheck/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngcheck/default.nix
rename to pkgs/by-name/pn/pngcheck/package.nix
diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/by-name/pn/pngcrush/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngcrush/default.nix
rename to pkgs/by-name/pn/pngcrush/package.nix
diff --git a/pkgs/tools/graphics/pngloss/default.nix b/pkgs/by-name/pn/pngloss/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngloss/default.nix
rename to pkgs/by-name/pn/pngloss/package.nix
diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/by-name/pn/pngnq/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngnq/default.nix
rename to pkgs/by-name/pn/pngnq/package.nix
diff --git a/pkgs/tools/graphics/pngoptimizer/default.nix b/pkgs/by-name/pn/pngoptimizer/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngoptimizer/default.nix
rename to pkgs/by-name/pn/pngoptimizer/package.nix
diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/by-name/pn/pngout/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngout/default.nix
rename to pkgs/by-name/pn/pngout/package.nix
diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/by-name/pn/pngpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/png++/default.nix
rename to pkgs/by-name/pn/pngpp/package.nix
diff --git a/pkgs/tools/graphics/pngquant/add-Cargo.lock.patch b/pkgs/by-name/pn/pngquant/add-Cargo.lock.patch
similarity index 100%
rename from pkgs/tools/graphics/pngquant/add-Cargo.lock.patch
rename to pkgs/by-name/pn/pngquant/add-Cargo.lock.patch
diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/by-name/pn/pngquant/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngquant/default.nix
rename to pkgs/by-name/pn/pngquant/package.nix
diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/by-name/pn/pngtoico/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngtoico/default.nix
rename to pkgs/by-name/pn/pngtoico/package.nix
diff --git a/pkgs/tools/graphics/pngtools/default.nix b/pkgs/by-name/pn/pngtools/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pngtools/default.nix
rename to pkgs/by-name/pn/pngtools/package.nix
diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/by-name/pn/pnmixer/package.nix
similarity index 100%
rename from pkgs/tools/audio/pnmixer/default.nix
rename to pkgs/by-name/pn/pnmixer/package.nix
diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/by-name/po/pocketbase/package.nix
similarity index 100%
rename from pkgs/servers/pocketbase/default.nix
rename to pkgs/by-name/po/pocketbase/package.nix
diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/by-name/po/poco/package.nix
similarity index 100%
rename from pkgs/development/libraries/poco/default.nix
rename to pkgs/by-name/po/poco/package.nix
diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/by-name/po/pod2mdoc/package.nix
similarity index 100%
rename from pkgs/tools/misc/pod2mdoc/default.nix
rename to pkgs/by-name/po/pod2mdoc/package.nix
diff --git a/pkgs/servers/misc/podgrab/default.nix b/pkgs/by-name/po/podgrab/package.nix
similarity index 100%
rename from pkgs/servers/misc/podgrab/default.nix
rename to pkgs/by-name/po/podgrab/package.nix
diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/by-name/po/podiff/package.nix
similarity index 100%
rename from pkgs/tools/text/podiff/default.nix
rename to pkgs/by-name/po/podiff/package.nix
diff --git a/pkgs/applications/virtualization/podman/hardcode-paths.patch b/pkgs/by-name/po/podman/hardcode-paths.patch
similarity index 100%
rename from pkgs/applications/virtualization/podman/hardcode-paths.patch
rename to pkgs/by-name/po/podman/hardcode-paths.patch
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/by-name/po/podman/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/podman/default.nix
rename to pkgs/by-name/po/podman/package.nix
diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/by-name/po/podman/rm-podman-mac-helper-msg.patch
similarity index 100%
rename from pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch
rename to pkgs/by-name/po/podman/rm-podman-mac-helper-msg.patch
diff --git a/pkgs/applications/virtualization/pods/Cargo.lock b/pkgs/by-name/po/pods/Cargo.lock
similarity index 100%
rename from pkgs/applications/virtualization/pods/Cargo.lock
rename to pkgs/by-name/po/pods/Cargo.lock
diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/by-name/po/pods/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/pods/default.nix
rename to pkgs/by-name/po/pods/package.nix
diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/by-name/po/poetry/package.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry/default.nix
rename to pkgs/by-name/po/poetry/package.nix
diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix b/pkgs/by-name/po/poetry/plugins/poetry-audit-plugin.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry/plugins/poetry-audit-plugin.nix
rename to pkgs/by-name/po/poetry/plugins/poetry-audit-plugin.nix
diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-export.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
rename to pkgs/by-name/po/poetry/plugins/poetry-plugin-export.nix
diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-poeblix.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry/plugins/poetry-plugin-poeblix.nix
rename to pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix
diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix
rename to pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix
diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry/unwrapped.nix
rename to pkgs/by-name/po/poetry/unwrapped.nix
diff --git a/pkgs/tools/package-management/poetry2conda/default.nix b/pkgs/by-name/po/poetry2conda/package.nix
similarity index 100%
rename from pkgs/tools/package-management/poetry2conda/default.nix
rename to pkgs/by-name/po/poetry2conda/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/by-name/po/poezio/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/poezio/default.nix
rename to pkgs/by-name/po/poezio/package.nix
diff --git a/pkgs/tools/misc/pokeget-rs/default.nix b/pkgs/by-name/po/pokeget-rs/package.nix
similarity index 100%
rename from pkgs/tools/misc/pokeget-rs/default.nix
rename to pkgs/by-name/po/pokeget-rs/package.nix
diff --git a/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix b/pkgs/by-name/po/pokemon-colorscripts-mac/package.nix
similarity index 100%
rename from pkgs/applications/misc/pokemon-colorscripts-mac/default.nix
rename to pkgs/by-name/po/pokemon-colorscripts-mac/package.nix
diff --git a/pkgs/tools/misc/pokemonsay/default.nix b/pkgs/by-name/po/pokemonsay/package.nix
similarity index 100%
rename from pkgs/tools/misc/pokemonsay/default.nix
rename to pkgs/by-name/po/pokemonsay/package.nix
diff --git a/pkgs/games/pokete/default.nix b/pkgs/by-name/po/pokete/package.nix
similarity index 100%
rename from pkgs/games/pokete/default.nix
rename to pkgs/by-name/po/pokete/package.nix
diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/by-name/po/polar-bookshelf/package.nix
similarity index 100%
rename from pkgs/applications/misc/polar-bookshelf/default.nix
rename to pkgs/by-name/po/polar-bookshelf/package.nix
diff --git a/pkgs/applications/misc/polar-bookshelf1/default.nix b/pkgs/by-name/po/polar-bookshelf1/package.nix
similarity index 100%
rename from pkgs/applications/misc/polar-bookshelf1/default.nix
rename to pkgs/by-name/po/polar-bookshelf1/package.nix
diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/by-name/po/policycoreutils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/policycoreutils/default.nix
rename to pkgs/by-name/po/policycoreutils/package.nix
diff --git a/pkgs/servers/polipo/default.nix b/pkgs/by-name/po/polipo/package.nix
similarity index 100%
rename from pkgs/servers/polipo/default.nix
rename to pkgs/by-name/po/polipo/package.nix
diff --git a/pkgs/development/libraries/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch b/pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch
similarity index 100%
rename from pkgs/development/libraries/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch
rename to pkgs/by-name/po/polkit/0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch
diff --git a/pkgs/development/libraries/polkit/elogind.patch b/pkgs/by-name/po/polkit/elogind.patch
similarity index 100%
rename from pkgs/development/libraries/polkit/elogind.patch
rename to pkgs/by-name/po/polkit/elogind.patch
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/by-name/po/polkit/package.nix
similarity index 100%
rename from pkgs/development/libraries/polkit/default.nix
rename to pkgs/by-name/po/polkit/package.nix
diff --git a/pkgs/development/libraries/polkit/system_bus.conf b/pkgs/by-name/po/polkit/system_bus.conf
similarity index 100%
rename from pkgs/development/libraries/polkit/system_bus.conf
rename to pkgs/by-name/po/polkit/system_bus.conf
diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/by-name/po/poly/package.nix
similarity index 100%
rename from pkgs/data/fonts/poly/default.nix
rename to pkgs/by-name/po/poly/package.nix
diff --git a/pkgs/development/libraries/poly2tri-c/default.nix b/pkgs/by-name/po/poly2tri-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/poly2tri-c/default.nix
rename to pkgs/by-name/po/poly2tri-c/package.nix
diff --git a/pkgs/tools/networking/polygon-cli/default.nix b/pkgs/by-name/po/polygon-cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/polygon-cli/default.nix
rename to pkgs/by-name/po/polygon-cli/package.nix
diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/by-name/po/polygraph/package.nix
similarity index 100%
rename from pkgs/tools/networking/polygraph/default.nix
rename to pkgs/by-name/po/polygraph/package.nix
diff --git a/pkgs/development/tools/misc/polylith/default.nix b/pkgs/by-name/po/polylith/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/polylith/default.nix
rename to pkgs/by-name/po/polylith/package.nix
diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/by-name/po/polymake/package.nix
similarity index 100%
rename from pkgs/applications/science/math/polymake/default.nix
rename to pkgs/by-name/po/polymake/package.nix
diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/by-name/po/polypane/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/polypane/default.nix
rename to pkgs/by-name/po/polypane/package.nix
diff --git a/pkgs/data/misc/polytopes_db/default.nix b/pkgs/by-name/po/polytopes_db/package.nix
similarity index 100%
rename from pkgs/data/misc/polytopes_db/default.nix
rename to pkgs/by-name/po/polytopes_db/package.nix
diff --git a/pkgs/tools/security/pomerium-cli/default.nix b/pkgs/by-name/po/pomerium-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/pomerium-cli/default.nix
rename to pkgs/by-name/po/pomerium-cli/package.nix
diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/by-name/po/pommed_light/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pommed-light/default.nix
rename to pkgs/by-name/po/pommed_light/package.nix
diff --git a/pkgs/tools/text/pomsky/Cargo.lock b/pkgs/by-name/po/pomsky/Cargo.lock
similarity index 100%
rename from pkgs/tools/text/pomsky/Cargo.lock
rename to pkgs/by-name/po/pomsky/Cargo.lock
diff --git a/pkgs/tools/text/pomsky/default.nix b/pkgs/by-name/po/pomsky/package.nix
similarity index 100%
rename from pkgs/tools/text/pomsky/default.nix
rename to pkgs/by-name/po/pomsky/package.nix
diff --git a/pkgs/games/pong3d/default.nix b/pkgs/by-name/po/pong3d/package.nix
similarity index 100%
rename from pkgs/games/pong3d/default.nix
rename to pkgs/by-name/po/pong3d/package.nix
diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/by-name/po/ponymix/package.nix
similarity index 100%
rename from pkgs/applications/audio/ponymix/default.nix
rename to pkgs/by-name/po/ponymix/package.nix
diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/by-name/po/ponysay/package.nix
similarity index 100%
rename from pkgs/tools/misc/ponysay/default.nix
rename to pkgs/by-name/po/ponysay/package.nix
diff --git a/pkgs/tools/misc/poop/default.nix b/pkgs/by-name/po/poop/package.nix
similarity index 100%
rename from pkgs/tools/misc/poop/default.nix
rename to pkgs/by-name/po/poop/package.nix
diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/by-name/po/pop-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/pop-gtk/default.nix
rename to pkgs/by-name/po/pop-gtk-theme/package.nix
diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/by-name/po/pop-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/pop-icon-theme/default.nix
rename to pkgs/by-name/po/pop-icon-theme/package.nix
diff --git a/pkgs/applications/misc/pop/default.nix b/pkgs/by-name/po/pop/package.nix
similarity index 100%
rename from pkgs/applications/misc/pop/default.nix
rename to pkgs/by-name/po/pop/package.nix
diff --git a/pkgs/servers/mail/popa3d/enable-standalone-mode.patch b/pkgs/by-name/po/popa3d/enable-standalone-mode.patch
similarity index 100%
rename from pkgs/servers/mail/popa3d/enable-standalone-mode.patch
rename to pkgs/by-name/po/popa3d/enable-standalone-mode.patch
diff --git a/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch b/pkgs/by-name/po/popa3d/fix-mail-spool-path.patch
similarity index 100%
rename from pkgs/servers/mail/popa3d/fix-mail-spool-path.patch
rename to pkgs/by-name/po/popa3d/fix-mail-spool-path.patch
diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/by-name/po/popa3d/package.nix
similarity index 100%
rename from pkgs/servers/mail/popa3d/default.nix
rename to pkgs/by-name/po/popa3d/package.nix
diff --git a/pkgs/servers/mail/popa3d/use-glibc-crypt.patch b/pkgs/by-name/po/popa3d/use-glibc-crypt.patch
similarity index 100%
rename from pkgs/servers/mail/popa3d/use-glibc-crypt.patch
rename to pkgs/by-name/po/popa3d/use-glibc-crypt.patch
diff --git a/pkgs/servers/mail/popa3d/use-openssl.patch b/pkgs/by-name/po/popa3d/use-openssl.patch
similarity index 100%
rename from pkgs/servers/mail/popa3d/use-openssl.patch
rename to pkgs/by-name/po/popa3d/use-openssl.patch
diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/by-name/po/popeye/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/popeye/default.nix
rename to pkgs/by-name/po/popeye/package.nix
diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/by-name/po/popfile/package.nix
similarity index 100%
rename from pkgs/tools/text/popfile/default.nix
rename to pkgs/by-name/po/popfile/package.nix
diff --git a/pkgs/development/libraries/popl/default.nix b/pkgs/by-name/po/popl/package.nix
similarity index 100%
rename from pkgs/development/libraries/popl/default.nix
rename to pkgs/by-name/po/popl/package.nix
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/by-name/po/poppler_data/package.nix
similarity index 100%
rename from pkgs/data/misc/poppler-data/default.nix
rename to pkgs/by-name/po/poppler_data/package.nix
diff --git a/pkgs/tools/misc/popsicle/Cargo.lock b/pkgs/by-name/po/popsicle/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/popsicle/Cargo.lock
rename to pkgs/by-name/po/popsicle/Cargo.lock
diff --git a/pkgs/tools/misc/popsicle/default.nix b/pkgs/by-name/po/popsicle/package.nix
similarity index 100%
rename from pkgs/tools/misc/popsicle/default.nix
rename to pkgs/by-name/po/popsicle/package.nix
diff --git a/pkgs/development/libraries/popt/1.16-cygwin.patch b/pkgs/by-name/po/popt/1.16-cygwin.patch
similarity index 100%
rename from pkgs/development/libraries/popt/1.16-cygwin.patch
rename to pkgs/by-name/po/popt/1.16-cygwin.patch
diff --git a/pkgs/development/libraries/popt/1.16-vpath.patch b/pkgs/by-name/po/popt/1.16-vpath.patch
similarity index 100%
rename from pkgs/development/libraries/popt/1.16-vpath.patch
rename to pkgs/by-name/po/popt/1.16-vpath.patch
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/by-name/po/popt/package.nix
similarity index 100%
rename from pkgs/development/libraries/popt/default.nix
rename to pkgs/by-name/po/popt/package.nix
diff --git a/pkgs/tools/networking/popura/default.nix b/pkgs/by-name/po/popura/package.nix
similarity index 100%
rename from pkgs/tools/networking/popura/default.nix
rename to pkgs/by-name/po/popura/package.nix
diff --git a/pkgs/applications/misc/porsmo/default.nix b/pkgs/by-name/po/porsmo/package.nix
similarity index 100%
rename from pkgs/applications/misc/porsmo/default.nix
rename to pkgs/by-name/po/porsmo/package.nix
diff --git a/pkgs/tools/misc/portal/default.nix b/pkgs/by-name/po/portal/package.nix
similarity index 100%
rename from pkgs/tools/misc/portal/default.nix
rename to pkgs/by-name/po/portal/package.nix
diff --git a/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/pkgs/by-name/po/portfolio-filemanager/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/portfolio-filemanager/default.nix
rename to pkgs/by-name/po/portfolio-filemanager/package.nix
diff --git a/pkgs/games/portmod/default.nix b/pkgs/by-name/po/portmod/package.nix
similarity index 100%
rename from pkgs/games/portmod/default.nix
rename to pkgs/by-name/po/portmod/package.nix
diff --git a/pkgs/servers/portunus/default.nix b/pkgs/by-name/po/portunus/package.nix
similarity index 100%
rename from pkgs/servers/portunus/default.nix
rename to pkgs/by-name/po/portunus/package.nix
diff --git a/pkgs/tools/security/posteid-seed-extractor/default.nix b/pkgs/by-name/po/posteid-seed-extractor/package.nix
similarity index 100%
rename from pkgs/tools/security/posteid-seed-extractor/default.nix
rename to pkgs/by-name/po/posteid-seed-extractor/package.nix
diff --git a/pkgs/servers/postfixadmin/default.nix b/pkgs/by-name/po/postfixadmin/package.nix
similarity index 100%
rename from pkgs/servers/postfixadmin/default.nix
rename to pkgs/by-name/po/postfixadmin/package.nix
diff --git a/pkgs/development/tools/language-servers/postgres-lsp/default.nix b/pkgs/by-name/po/postgres-lsp/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/postgres-lsp/default.nix
rename to pkgs/by-name/po/postgres-lsp/package.nix
diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/default.nix b/pkgs/by-name/po/postgresqlTestHook/package.nix
similarity index 100%
rename from pkgs/build-support/setup-hooks/postgresql-test-hook/default.nix
rename to pkgs/by-name/po/postgresqlTestHook/package.nix
diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh b/pkgs/by-name/po/postgresqlTestHook/postgresql-test-hook.sh
similarity index 100%
rename from pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh
rename to pkgs/by-name/po/postgresqlTestHook/postgresql-test-hook.sh
diff --git a/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix b/pkgs/by-name/po/postgresqlTestHook/test.nix
similarity index 100%
rename from pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix
rename to pkgs/by-name/po/postgresqlTestHook/test.nix
diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/by-name/po/postgresql_jdbc/package.nix
similarity index 100%
rename from pkgs/development/java-modules/postgresql_jdbc/default.nix
rename to pkgs/by-name/po/postgresql_jdbc/package.nix
diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/by-name/po/postgrey/package.nix
similarity index 100%
rename from pkgs/servers/mail/postgrey/default.nix
rename to pkgs/by-name/po/postgrey/package.nix
diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/by-name/po/postiats-utilities/package.nix
similarity index 100%
rename from pkgs/development/tools/postiats-utilities/default.nix
rename to pkgs/by-name/po/postiats-utilities/package.nix
diff --git a/pkgs/development/web/postman/darwin.nix b/pkgs/by-name/po/postman/darwin.nix
similarity index 100%
rename from pkgs/development/web/postman/darwin.nix
rename to pkgs/by-name/po/postman/darwin.nix
diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/by-name/po/postman/linux.nix
similarity index 100%
rename from pkgs/development/web/postman/linux.nix
rename to pkgs/by-name/po/postman/linux.nix
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/by-name/po/postman/package.nix
similarity index 100%
rename from pkgs/development/web/postman/default.nix
rename to pkgs/by-name/po/postman/package.nix
diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/by-name/po/postscript-lexmark/package.nix
similarity index 100%
rename from pkgs/misc/drivers/postscript-lexmark/default.nix
rename to pkgs/by-name/po/postscript-lexmark/package.nix
diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/by-name/po/postsrsd/package.nix
similarity index 100%
rename from pkgs/servers/mail/postsrsd/default.nix
rename to pkgs/by-name/po/postsrsd/package.nix
diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/by-name/po/potrace/package.nix
similarity index 100%
rename from pkgs/applications/graphics/potrace/default.nix
rename to pkgs/by-name/po/potrace/package.nix
diff --git a/pkgs/applications/graphics/potreeconverter/default.nix b/pkgs/by-name/po/potreeconverter/package.nix
similarity index 100%
rename from pkgs/applications/graphics/potreeconverter/default.nix
rename to pkgs/by-name/po/potreeconverter/package.nix
diff --git a/pkgs/tools/misc/pouf/default.nix b/pkgs/by-name/po/pouf/package.nix
similarity index 100%
rename from pkgs/tools/misc/pouf/default.nix
rename to pkgs/by-name/po/pouf/package.nix
diff --git a/pkgs/servers/pounce/default.nix b/pkgs/by-name/po/pounce/package.nix
similarity index 100%
rename from pkgs/servers/pounce/default.nix
rename to pkgs/by-name/po/pounce/package.nix
diff --git a/pkgs/os-specific/linux/power-calibrate/default.nix b/pkgs/by-name/po/power-calibrate/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/power-calibrate/default.nix
rename to pkgs/by-name/po/power-calibrate/package.nix
diff --git a/pkgs/tools/misc/poweralertd/default.nix b/pkgs/by-name/po/poweralertd/package.nix
similarity index 100%
rename from pkgs/tools/misc/poweralertd/default.nix
rename to pkgs/by-name/po/poweralertd/package.nix
diff --git a/pkgs/os-specific/linux/powercap/default.nix b/pkgs/by-name/po/powercap/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/powercap/default.nix
rename to pkgs/by-name/po/powercap/package.nix
diff --git a/pkgs/applications/networking/powerdns-admin/0001-Fix-flask-2.3-issue.patch b/pkgs/by-name/po/powerdns-admin/0001-Fix-flask-2.3-issue.patch
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/0001-Fix-flask-2.3-issue.patch
rename to pkgs/by-name/po/powerdns-admin/0001-Fix-flask-2.3-issue.patch
diff --git a/pkgs/applications/networking/powerdns-admin/0002-Remove-cssrewrite-filter.patch b/pkgs/by-name/po/powerdns-admin/0002-Remove-cssrewrite-filter.patch
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/0002-Remove-cssrewrite-filter.patch
rename to pkgs/by-name/po/powerdns-admin/0002-Remove-cssrewrite-filter.patch
diff --git a/pkgs/applications/networking/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch b/pkgs/by-name/po/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch
rename to pkgs/by-name/po/powerdns-admin/0003-Fix-flask-migrate-4.0-compatibility.patch
diff --git a/pkgs/applications/networking/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch b/pkgs/by-name/po/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch
rename to pkgs/by-name/po/powerdns-admin/0004-Fix-flask-session-and-powerdns-admin-compatibility.patch
diff --git a/pkgs/applications/networking/powerdns-admin/0005-Use-app-context-to-create-routes.patch b/pkgs/by-name/po/powerdns-admin/0005-Use-app-context-to-create-routes.patch
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/0005-Use-app-context-to-create-routes.patch
rename to pkgs/by-name/po/powerdns-admin/0005-Use-app-context-to-create-routes.patch
diff --git a/pkgs/applications/networking/powerdns-admin/0006-Register-modules-before-starting.patch b/pkgs/by-name/po/powerdns-admin/0006-Register-modules-before-starting.patch
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/0006-Register-modules-before-starting.patch
rename to pkgs/by-name/po/powerdns-admin/0006-Register-modules-before-starting.patch
diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/by-name/po/powerdns-admin/package.nix
similarity index 100%
rename from pkgs/applications/networking/powerdns-admin/default.nix
rename to pkgs/by-name/po/powerdns-admin/package.nix
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/by-name/po/powerline-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/powerline-fonts/default.nix
rename to pkgs/by-name/po/powerline-fonts/package.nix
diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/by-name/po/powerline-go/package.nix
similarity index 100%
rename from pkgs/tools/misc/powerline-go/default.nix
rename to pkgs/by-name/po/powerline-go/package.nix
diff --git a/pkgs/data/fonts/powerline-symbols/default.nix b/pkgs/by-name/po/powerline-symbols/package.nix
similarity index 100%
rename from pkgs/data/fonts/powerline-symbols/default.nix
rename to pkgs/by-name/po/powerline-symbols/package.nix
diff --git a/pkgs/games/powermanga/default.nix b/pkgs/by-name/po/powermanga/package.nix
similarity index 100%
rename from pkgs/games/powermanga/default.nix
rename to pkgs/by-name/po/powermanga/package.nix
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/by-name/po/powershell/package.nix
similarity index 100%
rename from pkgs/shells/powershell/default.nix
rename to pkgs/by-name/po/powershell/package.nix
diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/by-name/po/powerstat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/powerstat/default.nix
rename to pkgs/by-name/po/powerstat/package.nix
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/by-name/pp/ppl/package.nix
similarity index 100%
rename from pkgs/development/libraries/ppl/default.nix
rename to pkgs/by-name/pp/ppl/package.nix
diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/pkgs/by-name/pp/pplatex/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/tex/pplatex/default.nix
rename to pkgs/by-name/pp/pplatex/package.nix
diff --git a/pkgs/development/libraries/pplite/default.nix b/pkgs/by-name/pp/pplite/package.nix
similarity index 100%
rename from pkgs/development/libraries/pplite/default.nix
rename to pkgs/by-name/pp/pplite/package.nix
diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/by-name/pp/ppp/package.nix
similarity index 100%
rename from pkgs/tools/networking/ppp/default.nix
rename to pkgs/by-name/pp/ppp/package.nix
diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/by-name/pp/pprof/package.nix
similarity index 100%
rename from pkgs/development/tools/profiling/pprof/default.nix
rename to pkgs/by-name/pp/pprof/package.nix
diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/by-name/pp/pps-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pps-tools/default.nix
rename to pkgs/by-name/pp/pps-tools/package.nix
diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/by-name/pp/pptp/package.nix
similarity index 100%
rename from pkgs/tools/networking/pptp/default.nix
rename to pkgs/by-name/pp/pptp/package.nix
diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/by-name/pp/pptpd/package.nix
similarity index 100%
rename from pkgs/tools/networking/pptpd/default.nix
rename to pkgs/by-name/pp/pptpd/package.nix
diff --git a/pkgs/tools/networking/pptpd/ppp-2.5.0-compat.patch b/pkgs/by-name/pp/pptpd/ppp-2.5.0-compat.patch
similarity index 100%
rename from pkgs/tools/networking/pptpd/ppp-2.5.0-compat.patch
rename to pkgs/by-name/pp/pptpd/ppp-2.5.0-compat.patch
diff --git a/pkgs/development/tools/pqrs/default.nix b/pkgs/by-name/pq/pqrs/package.nix
similarity index 100%
rename from pkgs/development/tools/pqrs/default.nix
rename to pkgs/by-name/pq/pqrs/package.nix
diff --git a/pkgs/servers/pr-tracker/default.nix b/pkgs/by-name/pr/pr-tracker/package.nix
similarity index 100%
rename from pkgs/servers/pr-tracker/default.nix
rename to pkgs/by-name/pr/pr-tracker/package.nix
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/by-name/pr/praat/package.nix
similarity index 100%
rename from pkgs/applications/audio/praat/default.nix
rename to pkgs/by-name/pr/praat/package.nix
diff --git a/pkgs/games/doom-ports/prboom-plus/default.nix b/pkgs/by-name/pr/prboom-plus/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/prboom-plus/default.nix
rename to pkgs/by-name/pr/prboom-plus/package.nix
diff --git a/pkgs/tools/misc/pre-commit-hook-ensure-sops/default.nix b/pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix
similarity index 100%
rename from pkgs/tools/misc/pre-commit-hook-ensure-sops/default.nix
rename to pkgs/by-name/pr/pre-commit-hook-ensure-sops/package.nix
diff --git a/pkgs/tools/misc/pre-commit/hook-tmpl.patch b/pkgs/by-name/pr/pre-commit/hook-tmpl.patch
similarity index 100%
rename from pkgs/tools/misc/pre-commit/hook-tmpl.patch
rename to pkgs/by-name/pr/pre-commit/hook-tmpl.patch
diff --git a/pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/pkgs/by-name/pr/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
similarity index 100%
rename from pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
rename to pkgs/by-name/pr/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch
diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/by-name/pr/pre-commit/package.nix
similarity index 100%
rename from pkgs/tools/misc/pre-commit/default.nix
rename to pkgs/by-name/pr/pre-commit/package.nix
diff --git a/pkgs/tools/misc/pre-commit/pygrep-pythonpath.patch b/pkgs/by-name/pr/pre-commit/pygrep-pythonpath.patch
similarity index 100%
rename from pkgs/tools/misc/pre-commit/pygrep-pythonpath.patch
rename to pkgs/by-name/pr/pre-commit/pygrep-pythonpath.patch
diff --git a/pkgs/tools/misc/precice-config-visualizer/default.nix b/pkgs/by-name/pr/precice-config-visualizer/package.nix
similarity index 100%
rename from pkgs/tools/misc/precice-config-visualizer/default.nix
rename to pkgs/by-name/pr/precice-config-visualizer/package.nix
diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/by-name/pr/precice/package.nix
similarity index 100%
rename from pkgs/development/libraries/precice/default.nix
rename to pkgs/by-name/pr/precice/package.nix
diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/by-name/pr/prelink/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/prelink/default.nix
rename to pkgs/by-name/pr/prelink/package.nix
diff --git a/pkgs/applications/misc/premid/default.nix b/pkgs/by-name/pr/premid/package.nix
similarity index 100%
rename from pkgs/applications/misc/premid/default.nix
rename to pkgs/by-name/pr/premid/package.nix
diff --git a/pkgs/development/libraries/presage/fixed-cppunit-detection.patch b/pkgs/by-name/pr/presage/fixed-cppunit-detection.patch
similarity index 100%
rename from pkgs/development/libraries/presage/fixed-cppunit-detection.patch
rename to pkgs/by-name/pr/presage/fixed-cppunit-detection.patch
diff --git a/pkgs/development/libraries/presage/default.nix b/pkgs/by-name/pr/presage/package.nix
similarity index 100%
rename from pkgs/development/libraries/presage/default.nix
rename to pkgs/by-name/pr/presage/package.nix
diff --git a/pkgs/tools/misc/present-cli/default.nix b/pkgs/by-name/pr/present-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/present-cli/default.nix
rename to pkgs/by-name/pr/present-cli/package.nix
diff --git a/pkgs/misc/present/default.nix b/pkgs/by-name/pr/present/package.nix
similarity index 100%
rename from pkgs/misc/present/default.nix
rename to pkgs/by-name/pr/present/package.nix
diff --git a/pkgs/tools/security/pretender/default.nix b/pkgs/by-name/pr/pretender/package.nix
similarity index 100%
rename from pkgs/tools/security/pretender/default.nix
rename to pkgs/by-name/pr/pretender/package.nix
diff --git a/pkgs/development/tools/pretty-simple/default.nix b/pkgs/by-name/pr/pretty-simple/package.nix
similarity index 100%
rename from pkgs/development/tools/pretty-simple/default.nix
rename to pkgs/by-name/pr/pretty-simple/package.nix
diff --git a/pkgs/tools/networking/prettyping/default.nix b/pkgs/by-name/pr/prettyping/package.nix
similarity index 100%
rename from pkgs/tools/networking/prettyping/default.nix
rename to pkgs/by-name/pr/prettyping/package.nix
diff --git a/pkgs/tools/misc/pridecat/fix_install.patch b/pkgs/by-name/pr/pridecat/fix_install.patch
similarity index 100%
rename from pkgs/tools/misc/pridecat/fix_install.patch
rename to pkgs/by-name/pr/pridecat/fix_install.patch
diff --git a/pkgs/tools/misc/pridecat/default.nix b/pkgs/by-name/pr/pridecat/package.nix
similarity index 100%
rename from pkgs/tools/misc/pridecat/default.nix
rename to pkgs/by-name/pr/pridecat/package.nix
diff --git a/pkgs/tools/misc/pridefetch/default.nix b/pkgs/by-name/pr/pridefetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/pridefetch/default.nix
rename to pkgs/by-name/pr/pridefetch/package.nix
diff --git a/pkgs/development/libraries/prime-server/default.nix b/pkgs/by-name/pr/prime-server/package.nix
similarity index 100%
rename from pkgs/development/libraries/prime-server/default.nix
rename to pkgs/by-name/pr/prime-server/package.nix
diff --git a/pkgs/games/principia/default.nix b/pkgs/by-name/pr/principia/package.nix
similarity index 100%
rename from pkgs/games/principia/default.nix
rename to pkgs/by-name/pr/principia/package.nix
diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/by-name/pr/printrun/package.nix
similarity index 100%
rename from pkgs/applications/misc/printrun/default.nix
rename to pkgs/by-name/pr/printrun/package.nix
diff --git a/pkgs/applications/video/prism/default.nix b/pkgs/by-name/pr/prism/package.nix
similarity index 100%
rename from pkgs/applications/video/prism/default.nix
rename to pkgs/by-name/pr/prism/package.nix
diff --git a/pkgs/tools/networking/pritunl-ssh/default.nix b/pkgs/by-name/pr/pritunl-ssh/package.nix
similarity index 100%
rename from pkgs/tools/networking/pritunl-ssh/default.nix
rename to pkgs/by-name/pr/pritunl-ssh/package.nix
diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/by-name/pr/procdump/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/procdump/default.nix
rename to pkgs/by-name/pr/procdump/package.nix
diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/by-name/pr/process-compose/package.nix
similarity index 100%
rename from pkgs/applications/misc/process-compose/default.nix
rename to pkgs/by-name/pr/process-compose/package.nix
diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/by-name/pr/process-viewer/package.nix
similarity index 100%
rename from pkgs/applications/misc/process-viewer/default.nix
rename to pkgs/by-name/pr/process-viewer/package.nix
diff --git a/pkgs/data/fonts/prociono/default.nix b/pkgs/by-name/pr/prociono/package.nix
similarity index 100%
rename from pkgs/data/fonts/prociono/default.nix
rename to pkgs/by-name/pr/prociono/package.nix
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/by-name/pr/procmail/package.nix
similarity index 100%
rename from pkgs/applications/misc/procmail/default.nix
rename to pkgs/by-name/pr/procmail/package.nix
diff --git a/pkgs/tools/misc/procyon/default.nix b/pkgs/by-name/pr/procyon/package.nix
similarity index 100%
rename from pkgs/tools/misc/procyon/default.nix
rename to pkgs/by-name/pr/procyon/package.nix
diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/pkgs/by-name/pr/prodigal/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/prodigal/default.nix
rename to pkgs/by-name/pr/prodigal/package.nix
diff --git a/pkgs/applications/science/physics/professor/default.nix b/pkgs/by-name/pr/professor/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/professor/default.nix
rename to pkgs/by-name/pr/professor/package.nix
diff --git a/pkgs/tools/misc/profetch/default.nix b/pkgs/by-name/pr/profetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/profetch/default.nix
rename to pkgs/by-name/pr/profetch/package.nix
diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/by-name/pr/profile-cleaner/package.nix
similarity index 100%
rename from pkgs/tools/misc/profile-cleaner/default.nix
rename to pkgs/by-name/pr/profile-cleaner/package.nix
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/by-name/pr/profile-sync-daemon/package.nix
similarity index 100%
rename from pkgs/tools/misc/profile-sync-daemon/default.nix
rename to pkgs/by-name/pr/profile-sync-daemon/package.nix
diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/by-name/pr/proggyfonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/proggyfonts/default.nix
rename to pkgs/by-name/pr/proggyfonts/package.nix
diff --git a/pkgs/applications/science/math/programmer-calculator/default.nix b/pkgs/by-name/pr/programmer-calculator/package.nix
similarity index 100%
rename from pkgs/applications/science/math/programmer-calculator/default.nix
rename to pkgs/by-name/pr/programmer-calculator/package.nix
diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/by-name/pr/progress/package.nix
similarity index 100%
rename from pkgs/tools/misc/progress/default.nix
rename to pkgs/by-name/pr/progress/package.nix
diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/by-name/pr/proj-datumgrid/package.nix
similarity index 100%
rename from pkgs/development/libraries/proj-datumgrid/default.nix
rename to pkgs/by-name/pr/proj-datumgrid/package.nix
diff --git a/pkgs/applications/file-managers/projectable/default.nix b/pkgs/by-name/pr/projectable/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/projectable/default.nix
rename to pkgs/by-name/pr/projectable/package.nix
diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/by-name/pr/prometheus-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/prometheus-cpp/default.nix
rename to pkgs/by-name/pr/prometheus-cpp/package.nix
diff --git a/pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in b/pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in
similarity index 100%
rename from pkgs/development/libraries/prometheus-cpp/prometheus-cpp.pc.in
rename to pkgs/by-name/pr/prometheus-cpp/prometheus-cpp.pc.in
diff --git a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix
rename to pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
diff --git a/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix b/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix
rename to pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix
diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter/add-go-mod.patch b/pkgs/by-name/pr/prometheus-surfboard-exporter/add-go-mod.patch
similarity index 100%
rename from pkgs/servers/monitoring/prometheus/surfboard-exporter/add-go-mod.patch
rename to pkgs/by-name/pr/prometheus-surfboard-exporter/add-go-mod.patch
diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter/default.nix b/pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/prometheus/surfboard-exporter/default.nix
rename to pkgs/by-name/pr/prometheus-surfboard-exporter/package.nix
diff --git a/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/by-name/pr/promscale/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/prometheus/promscale/default.nix
rename to pkgs/by-name/pr/promscale/package.nix
diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/by-name/pr/proot/package.nix
similarity index 100%
rename from pkgs/tools/system/proot/default.nix
rename to pkgs/by-name/pr/proot/package.nix
diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/by-name/pr/properties-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/properties-cpp/default.nix
rename to pkgs/by-name/pr/properties-cpp/package.nix
diff --git a/pkgs/servers/xmpp/prosody-filer/default.nix b/pkgs/by-name/pr/prosody-filer/package.nix
similarity index 100%
rename from pkgs/servers/xmpp/prosody-filer/default.nix
rename to pkgs/by-name/pr/prosody-filer/package.nix
diff --git a/pkgs/development/web/protege-distribution/disable-console-log.patch b/pkgs/by-name/pr/protege-distribution/disable-console-log.patch
similarity index 100%
rename from pkgs/development/web/protege-distribution/disable-console-log.patch
rename to pkgs/by-name/pr/protege-distribution/disable-console-log.patch
diff --git a/pkgs/development/web/protege-distribution/default.nix b/pkgs/by-name/pr/protege-distribution/package.nix
similarity index 100%
rename from pkgs/development/web/protege-distribution/default.nix
rename to pkgs/by-name/pr/protege-distribution/package.nix
diff --git a/pkgs/development/web/protege-distribution/static-path.patch b/pkgs/by-name/pr/protege-distribution/static-path.patch
similarity index 100%
rename from pkgs/development/web/protege-distribution/static-path.patch
rename to pkgs/by-name/pr/protege-distribution/static-path.patch
diff --git a/pkgs/applications/audio/proteus/default.nix b/pkgs/by-name/pr/proteus/package.nix
similarity index 100%
rename from pkgs/applications/audio/proteus/default.nix
rename to pkgs/by-name/pr/proteus/package.nix
diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/by-name/pr/proto-contrib/package.nix
similarity index 100%
rename from pkgs/development/tools/proto-contrib/default.nix
rename to pkgs/by-name/pr/proto-contrib/package.nix
diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/by-name/pr/protobufc/package.nix
similarity index 100%
rename from pkgs/development/libraries/protobufc/default.nix
rename to pkgs/by-name/pr/protobufc/package.nix
diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-connect-go/default.nix
rename to pkgs/by-name/pr/protoc-gen-connect-go/package.nix
diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/by-name/pr/protoc-gen-doc/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-doc/default.nix
rename to pkgs/by-name/pr/protoc-gen-doc/package.nix
diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-entgrpc/default.nix
rename to pkgs/by-name/pr/protoc-gen-entgrpc/package.nix
diff --git a/pkgs/development/tools/protoc-gen-go-grpc/default.nix b/pkgs/by-name/pr/protoc-gen-go-grpc/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-go-grpc/default.nix
rename to pkgs/by-name/pr/protoc-gen-go-grpc/package.nix
diff --git a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix b/pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-go-vtproto/default.nix
rename to pkgs/by-name/pr/protoc-gen-go-vtproto/package.nix
diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-go/default.nix
rename to pkgs/by-name/pr/protoc-gen-go/package.nix
diff --git a/pkgs/development/tools/protoc-gen-twirp/default.nix b/pkgs/by-name/pr/protoc-gen-twirp/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-twirp/default.nix
rename to pkgs/by-name/pr/protoc-gen-twirp/package.nix
diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/by-name/pr/protoc-gen-twirp_php/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-twirp_php/default.nix
rename to pkgs/by-name/pr/protoc-gen-twirp_php/package.nix
diff --git a/pkgs/development/tools/protoc-gen-twirp_swagger/default.nix b/pkgs/by-name/pr/protoc-gen-twirp_swagger/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-twirp_swagger/default.nix
rename to pkgs/by-name/pr/protoc-gen-twirp_swagger/package.nix
diff --git a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/pkgs/by-name/pr/protoc-gen-twirp_typescript/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-twirp_typescript/default.nix
rename to pkgs/by-name/pr/protoc-gen-twirp_typescript/package.nix
diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/by-name/pr/protoc-gen-validate/package.nix
similarity index 100%
rename from pkgs/development/tools/protoc-gen-validate/default.nix
rename to pkgs/by-name/pr/protoc-gen-validate/package.nix
diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/by-name/pr/protocol/package.nix
similarity index 100%
rename from pkgs/applications/networking/protocol/default.nix
rename to pkgs/by-name/pr/protocol/package.nix
diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/by-name/pr/protolint/package.nix
similarity index 100%
rename from pkgs/development/tools/protolint/default.nix
rename to pkgs/by-name/pr/protolint/package.nix
diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/by-name/pr/protolock/package.nix
similarity index 100%
rename from pkgs/development/libraries/protolock/default.nix
rename to pkgs/by-name/pr/protolock/package.nix
diff --git a/pkgs/applications/emulators/proton-caller/default.nix b/pkgs/by-name/pr/proton-caller/package.nix
similarity index 100%
rename from pkgs/applications/emulators/proton-caller/default.nix
rename to pkgs/by-name/pr/proton-caller/package.nix
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/by-name/pr/protonmail-bridge/package.nix
similarity index 100%
rename from pkgs/applications/networking/protonmail-bridge/default.nix
rename to pkgs/by-name/pr/protonmail-bridge/package.nix
diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/by-name/pr/prototool/package.nix
similarity index 100%
rename from pkgs/development/tools/prototool/default.nix
rename to pkgs/by-name/pr/prototool/package.nix
diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/by-name/pr/prototypejs/package.nix
similarity index 100%
rename from pkgs/development/libraries/prototypejs/default.nix
rename to pkgs/by-name/pr/prototypejs/package.nix
diff --git a/pkgs/development/tools/misc/protox/default.nix b/pkgs/by-name/pr/protox/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/protox/default.nix
rename to pkgs/by-name/pr/protox/package.nix
diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/by-name/pr/protozero/package.nix
similarity index 100%
rename from pkgs/development/libraries/protozero/default.nix
rename to pkgs/by-name/pr/protozero/package.nix
diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/by-name/pr/prover9/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/prover9/default.nix
rename to pkgs/by-name/pr/prover9/package.nix
diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/by-name/pr/proverif/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/proverif/default.nix
rename to pkgs/by-name/pr/proverif/package.nix
diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/by-name/pr/proxify/package.nix
similarity index 100%
rename from pkgs/tools/networking/proxify/default.nix
rename to pkgs/by-name/pr/proxify/package.nix
diff --git a/pkgs/tools/misc/proximity-sort/default.nix b/pkgs/by-name/pr/proximity-sort/package.nix
similarity index 100%
rename from pkgs/tools/misc/proximity-sort/default.nix
rename to pkgs/by-name/pr/proximity-sort/package.nix
diff --git a/pkgs/tools/admin/proxmove/default.nix b/pkgs/by-name/pr/proxmove/package.nix
similarity index 100%
rename from pkgs/tools/admin/proxmove/default.nix
rename to pkgs/by-name/pr/proxmove/package.nix
diff --git a/pkgs/applications/backup/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch b/pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
similarity index 100%
rename from pkgs/applications/backup/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
rename to pkgs/by-name/pr/proxmox-backup-client/0001-docs-Add-target-path-fixup-variable.patch
diff --git a/pkgs/applications/backup/proxmox-backup-client/Cargo.lock b/pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
similarity index 100%
rename from pkgs/applications/backup/proxmox-backup-client/Cargo.lock
rename to pkgs/by-name/pr/proxmox-backup-client/Cargo.lock
diff --git a/pkgs/applications/backup/proxmox-backup-client/default.nix b/pkgs/by-name/pr/proxmox-backup-client/package.nix
similarity index 100%
rename from pkgs/applications/backup/proxmox-backup-client/default.nix
rename to pkgs/by-name/pr/proxmox-backup-client/package.nix
diff --git a/pkgs/tools/networking/proxychains-ng/default.nix b/pkgs/by-name/pr/proxychains-ng/package.nix
similarity index 100%
rename from pkgs/tools/networking/proxychains-ng/default.nix
rename to pkgs/by-name/pr/proxychains-ng/package.nix
diff --git a/pkgs/tools/networking/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch b/pkgs/by-name/pr/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch
similarity index 100%
rename from pkgs/tools/networking/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch
rename to pkgs/by-name/pr/proxychains-ng/swap-priority-4-and-5-in-get_config_path.patch
diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/by-name/pr/proxychains/package.nix
similarity index 100%
rename from pkgs/tools/networking/proxychains/default.nix
rename to pkgs/by-name/pr/proxychains/package.nix
diff --git a/pkgs/tools/networking/proxychains/swap-priority-4-and-5-in-get_config_path.patch b/pkgs/by-name/pr/proxychains/swap-priority-4-and-5-in-get_config_path.patch
similarity index 100%
rename from pkgs/tools/networking/proxychains/swap-priority-4-and-5-in-get_config_path.patch
rename to pkgs/by-name/pr/proxychains/swap-priority-4-and-5-in-get_config_path.patch
diff --git a/pkgs/servers/sql/proxysql/dont-phone-home.patch b/pkgs/by-name/pr/proxysql/dont-phone-home.patch
similarity index 100%
rename from pkgs/servers/sql/proxysql/dont-phone-home.patch
rename to pkgs/by-name/pr/proxysql/dont-phone-home.patch
diff --git a/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/by-name/pr/proxysql/makefiles.patch
similarity index 100%
rename from pkgs/servers/sql/proxysql/makefiles.patch
rename to pkgs/by-name/pr/proxysql/makefiles.patch
diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/by-name/pr/proxysql/package.nix
similarity index 100%
rename from pkgs/servers/sql/proxysql/default.nix
rename to pkgs/by-name/pr/proxysql/package.nix
diff --git a/pkgs/tools/wayland/proycon-wayout/default.nix b/pkgs/by-name/pr/proycon-wayout/package.nix
similarity index 100%
rename from pkgs/tools/wayland/proycon-wayout/default.nix
rename to pkgs/by-name/pr/proycon-wayout/package.nix
diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/by-name/pr/prqlc/package.nix
similarity index 100%
rename from pkgs/development/tools/database/prqlc/default.nix
rename to pkgs/by-name/pr/prqlc/package.nix
diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/by-name/pr/prs/package.nix
similarity index 100%
rename from pkgs/tools/security/prs/default.nix
rename to pkgs/by-name/pr/prs/package.nix
diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/by-name/ps/ps2client/package.nix
similarity index 100%
rename from pkgs/applications/networking/ps2client/default.nix
rename to pkgs/by-name/ps/ps2client/package.nix
diff --git a/pkgs/tools/typesetting/ps2eps/hardcode-deps.patch b/pkgs/by-name/ps/ps2eps/hardcode-deps.patch
similarity index 100%
rename from pkgs/tools/typesetting/ps2eps/hardcode-deps.patch
rename to pkgs/by-name/ps/ps2eps/hardcode-deps.patch
diff --git a/pkgs/tools/typesetting/ps2eps/default.nix b/pkgs/by-name/ps/ps2eps/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/ps2eps/default.nix
rename to pkgs/by-name/ps/ps2eps/package.nix
diff --git a/pkgs/tools/games/ps3-disc-dumper/deps.nix b/pkgs/by-name/ps/ps3-disc-dumper/deps.nix
similarity index 100%
rename from pkgs/tools/games/ps3-disc-dumper/deps.nix
rename to pkgs/by-name/ps/ps3-disc-dumper/deps.nix
diff --git a/pkgs/tools/games/ps3-disc-dumper/default.nix b/pkgs/by-name/ps/ps3-disc-dumper/package.nix
similarity index 100%
rename from pkgs/tools/games/ps3-disc-dumper/default.nix
rename to pkgs/by-name/ps/ps3-disc-dumper/package.nix
diff --git a/pkgs/tools/games/ps3iso-utils/default.nix b/pkgs/by-name/ps/ps3iso-utils/package.nix
similarity index 100%
rename from pkgs/tools/games/ps3iso-utils/default.nix
rename to pkgs/by-name/ps/ps3iso-utils/package.nix
diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/by-name/ps/ps3netsrv/package.nix
similarity index 100%
rename from pkgs/servers/ps3netsrv/default.nix
rename to pkgs/by-name/ps/ps3netsrv/package.nix
diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/by-name/ps/psc-package/package.nix
similarity index 100%
rename from pkgs/development/compilers/purescript/psc-package/default.nix
rename to pkgs/by-name/ps/psc-package/package.nix
diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/by-name/ps/pscale/package.nix
similarity index 100%
rename from pkgs/development/tools/pscale/default.nix
rename to pkgs/by-name/ps/pscale/package.nix
diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/by-name/ps/pscircle/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/pscircle/default.nix
rename to pkgs/by-name/ps/pscircle/package.nix
diff --git a/pkgs/os-specific/linux/psftools/default.nix b/pkgs/by-name/ps/psftools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/psftools/default.nix
rename to pkgs/by-name/ps/psftools/package.nix
diff --git a/pkgs/applications/misc/psi-notify/default.nix b/pkgs/by-name/ps/psi-notify/package.nix
similarity index 100%
rename from pkgs/applications/misc/psi-notify/default.nix
rename to pkgs/by-name/ps/psi-notify/package.nix
diff --git a/pkgs/applications/system/psitop/default.nix b/pkgs/by-name/ps/psitop/package.nix
similarity index 100%
rename from pkgs/applications/system/psitop/default.nix
rename to pkgs/by-name/ps/psitop/package.nix
diff --git a/pkgs/servers/psitransfer/default.nix b/pkgs/by-name/ps/psitransfer/package.nix
similarity index 100%
rename from pkgs/servers/psitransfer/default.nix
rename to pkgs/by-name/ps/psitransfer/package.nix
diff --git a/pkgs/development/libraries/pslib/default.nix b/pkgs/by-name/ps/pslib/package.nix
similarity index 100%
rename from pkgs/development/libraries/pslib/default.nix
rename to pkgs/by-name/ps/pslib/package.nix
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/by-name/ps/psmisc/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/psmisc/default.nix
rename to pkgs/by-name/ps/psmisc/package.nix
diff --git a/pkgs/development/libraries/psol/default.nix b/pkgs/by-name/ps/psol/package.nix
similarity index 100%
rename from pkgs/development/libraries/psol/default.nix
rename to pkgs/by-name/ps/psol/package.nix
diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/by-name/ps/pspg/package.nix
similarity index 100%
rename from pkgs/tools/misc/pspg/default.nix
rename to pkgs/by-name/ps/pspg/package.nix
diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/by-name/ps/pspp/package.nix
similarity index 100%
rename from pkgs/applications/science/math/pspp/default.nix
rename to pkgs/by-name/ps/pspp/package.nix
diff --git a/pkgs/tools/misc/psql2csv/default.nix b/pkgs/by-name/ps/psql2csv/package.nix
similarity index 100%
rename from pkgs/tools/misc/psql2csv/default.nix
rename to pkgs/by-name/ps/psql2csv/package.nix
diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/by-name/ps/psqlodbc/package.nix
similarity index 100%
rename from pkgs/development/libraries/psqlodbc/default.nix
rename to pkgs/by-name/ps/psqlodbc/package.nix
diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/by-name/ps/pssh/package.nix
similarity index 100%
rename from pkgs/tools/networking/pssh/default.nix
rename to pkgs/by-name/ps/pssh/package.nix
diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/by-name/ps/psstop/package.nix
similarity index 100%
rename from pkgs/tools/system/psstop/default.nix
rename to pkgs/by-name/ps/psstop/package.nix
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/by-name/ps/pstoedit/package.nix
similarity index 100%
rename from pkgs/tools/graphics/pstoedit/default.nix
rename to pkgs/by-name/ps/pstoedit/package.nix
diff --git a/pkgs/development/libraries/pstreams/default.nix b/pkgs/by-name/ps/pstreams/package.nix
similarity index 100%
rename from pkgs/development/libraries/pstreams/default.nix
rename to pkgs/by-name/ps/pstreams/package.nix
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/by-name/ps/pstree/package.nix
similarity index 100%
rename from pkgs/applications/misc/pstree/default.nix
rename to pkgs/by-name/ps/pstree/package.nix
diff --git a/pkgs/tools/security/psudohash/default.nix b/pkgs/by-name/ps/psudohash/package.nix
similarity index 100%
rename from pkgs/tools/security/psudohash/default.nix
rename to pkgs/by-name/ps/psudohash/package.nix
diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/by-name/ps/psutils/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/psutils/default.nix
rename to pkgs/by-name/ps/psutils/package.nix
diff --git a/pkgs/tools/misc/psw/default.nix b/pkgs/by-name/ps/psw/package.nix
similarity index 100%
rename from pkgs/tools/misc/psw/default.nix
rename to pkgs/by-name/ps/psw/package.nix
diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/by-name/pt/pt2-clone/package.nix
similarity index 100%
rename from pkgs/applications/audio/pt2-clone/default.nix
rename to pkgs/by-name/pt/pt2-clone/package.nix
diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/by-name/pt/ptags/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/ptags/default.nix
rename to pkgs/by-name/pt/ptags/package.nix
diff --git a/pkgs/applications/misc/ptask/json_c_is_error.patch b/pkgs/by-name/pt/ptask/json_c_is_error.patch
similarity index 100%
rename from pkgs/applications/misc/ptask/json_c_is_error.patch
rename to pkgs/by-name/pt/ptask/json_c_is_error.patch
diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/by-name/pt/ptask/package.nix
similarity index 100%
rename from pkgs/applications/misc/ptask/default.nix
rename to pkgs/by-name/pt/ptask/package.nix
diff --git a/pkgs/applications/misc/ptask/tw-version.patch b/pkgs/by-name/pt/ptask/tw-version.patch
similarity index 100%
rename from pkgs/applications/misc/ptask/tw-version.patch
rename to pkgs/by-name/pt/ptask/tw-version.patch
diff --git a/pkgs/development/libraries/ptex/default.nix b/pkgs/by-name/pt/ptex/package.nix
similarity index 100%
rename from pkgs/development/libraries/ptex/default.nix
rename to pkgs/by-name/pt/ptex/package.nix
diff --git a/pkgs/misc/ptouch-print/default.nix b/pkgs/by-name/pt/ptouch-print/package.nix
similarity index 100%
rename from pkgs/misc/ptouch-print/default.nix
rename to pkgs/by-name/pt/ptouch-print/package.nix
diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/by-name/pu/public-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/public-sans/default.nix
rename to pkgs/by-name/pu/public-sans/package.nix
diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix
similarity index 100%
rename from pkgs/data/misc/publicsuffix-list/default.nix
rename to pkgs/by-name/pu/publicsuffix-list/package.nix
diff --git a/pkgs/development/web/publii/default.nix b/pkgs/by-name/pu/publii/package.nix
similarity index 100%
rename from pkgs/development/web/publii/default.nix
rename to pkgs/by-name/pu/publii/package.nix
diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/by-name/pu/pubs/package.nix
similarity index 100%
rename from pkgs/tools/misc/pubs/default.nix
rename to pkgs/by-name/pu/pubs/package.nix
diff --git a/pkgs/servers/pufferpanel/deps.patch b/pkgs/by-name/pu/pufferpanel/deps.patch
similarity index 100%
rename from pkgs/servers/pufferpanel/deps.patch
rename to pkgs/by-name/pu/pufferpanel/deps.patch
diff --git a/pkgs/servers/pufferpanel/disable-group-checks.patch b/pkgs/by-name/pu/pufferpanel/disable-group-checks.patch
similarity index 100%
rename from pkgs/servers/pufferpanel/disable-group-checks.patch
rename to pkgs/by-name/pu/pufferpanel/disable-group-checks.patch
diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/by-name/pu/pufferpanel/package.nix
similarity index 100%
rename from pkgs/servers/pufferpanel/default.nix
rename to pkgs/by-name/pu/pufferpanel/package.nix
diff --git a/pkgs/servers/pufferpanel/skip-network-tests.patch b/pkgs/by-name/pu/pufferpanel/skip-network-tests.patch
similarity index 100%
rename from pkgs/servers/pufferpanel/skip-network-tests.patch
rename to pkgs/by-name/pu/pufferpanel/skip-network-tests.patch
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/by-name/pu/pugixml/package.nix
similarity index 100%
rename from pkgs/development/libraries/pugixml/default.nix
rename to pkgs/by-name/pu/pugixml/package.nix
diff --git a/pkgs/tools/typesetting/pulldown-cmark/default.nix b/pkgs/by-name/pu/pulldown-cmark/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/pulldown-cmark/default.nix
rename to pkgs/by-name/pu/pulldown-cmark/package.nix
diff --git a/pkgs/tools/admin/pulsarctl/default.nix b/pkgs/by-name/pu/pulsarctl/package.nix
similarity index 100%
rename from pkgs/tools/admin/pulsarctl/default.nix
rename to pkgs/by-name/pu/pulsarctl/package.nix
diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/by-name/pu/pulseaudio-ctl/package.nix
similarity index 100%
rename from pkgs/applications/audio/pulseaudio-ctl/default.nix
rename to pkgs/by-name/pu/pulseaudio-ctl/package.nix
diff --git a/pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch b/pkgs/by-name/pu/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch
similarity index 100%
rename from pkgs/applications/audio/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch
rename to pkgs/by-name/pu/pulseaudio-dlna/0001-setup.py-remove-dbus-python-from-list.patch
diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/by-name/pu/pulseaudio-dlna/package.nix
similarity index 100%
rename from pkgs/applications/audio/pulseaudio-dlna/default.nix
rename to pkgs/by-name/pu/pulseaudio-dlna/package.nix
diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/by-name/pu/pulseaudio-dlna/zeroconf.nix
similarity index 100%
rename from pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
rename to pkgs/by-name/pu/pulseaudio-dlna/zeroconf.nix
diff --git a/pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix
rename to pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix
diff --git a/pkgs/applications/audio/pulseeffects-legacy/default.nix b/pkgs/by-name/pu/pulseeffects-legacy/package.nix
similarity index 100%
rename from pkgs/applications/audio/pulseeffects-legacy/default.nix
rename to pkgs/by-name/pu/pulseeffects-legacy/package.nix
diff --git a/pkgs/tools/audio/pulsemixer/default.nix b/pkgs/by-name/pu/pulsemixer/package.nix
similarity index 100%
rename from pkgs/tools/audio/pulsemixer/default.nix
rename to pkgs/by-name/pu/pulsemixer/package.nix
diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/by-name/pu/pulumi/package.nix
similarity index 100%
rename from pkgs/tools/admin/pulumi/default.nix
rename to pkgs/by-name/pu/pulumi/package.nix
diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/by-name/pu/pulumictl/package.nix
similarity index 100%
rename from pkgs/development/tools/pulumictl/default.nix
rename to pkgs/by-name/pu/pulumictl/package.nix
diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/by-name/pu/pup/package.nix
similarity index 100%
rename from pkgs/development/tools/pup/default.nix
rename to pkgs/by-name/pu/pup/package.nix
diff --git a/pkgs/tools/graphics/puppeteer-cli/default.nix b/pkgs/by-name/pu/puppeteer-cli/package.nix
similarity index 100%
rename from pkgs/tools/graphics/puppeteer-cli/default.nix
rename to pkgs/by-name/pu/puppeteer-cli/package.nix
diff --git a/pkgs/development/tools/pur/default.nix b/pkgs/by-name/pu/pur/package.nix
similarity index 100%
rename from pkgs/development/tools/pur/default.nix
rename to pkgs/by-name/pu/pur/package.nix
diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/by-name/pu/pure-ftpd/package.nix
similarity index 100%
rename from pkgs/servers/ftp/pure-ftpd/default.nix
rename to pkgs/by-name/pu/pure-ftpd/package.nix
diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/by-name/pu/pure-prompt/package.nix
similarity index 100%
rename from pkgs/shells/zsh/pure-prompt/default.nix
rename to pkgs/by-name/pu/pure-prompt/package.nix
diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/by-name/pu/puremapping/package.nix
similarity index 100%
rename from pkgs/applications/audio/pd-plugins/puremapping/default.nix
rename to pkgs/by-name/pu/puremapping/package.nix
diff --git a/pkgs/applications/graphics/pureref/default.nix b/pkgs/by-name/pu/pureref/package.nix
similarity index 100%
rename from pkgs/applications/graphics/pureref/default.nix
rename to pkgs/by-name/pu/pureref/package.nix
diff --git a/pkgs/games/purpur/default.nix b/pkgs/by-name/pu/purpur/package.nix
similarity index 100%
rename from pkgs/games/purpur/default.nix
rename to pkgs/by-name/pu/purpur/package.nix
diff --git a/pkgs/applications/misc/pw-viz/Cargo.lock b/pkgs/by-name/pw/pw-viz/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/pw-viz/Cargo.lock
rename to pkgs/by-name/pw/pw-viz/Cargo.lock
diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/by-name/pw/pw-viz/package.nix
similarity index 100%
rename from pkgs/applications/misc/pw-viz/default.nix
rename to pkgs/by-name/pw/pw-viz/package.nix
diff --git a/pkgs/tools/audio/pw-volume/default.nix b/pkgs/by-name/pw/pw-volume/package.nix
similarity index 100%
rename from pkgs/tools/audio/pw-volume/default.nix
rename to pkgs/by-name/pw/pw-volume/package.nix
diff --git a/pkgs/tools/security/pwdsafety/default.nix b/pkgs/by-name/pw/pwdsafety/package.nix
similarity index 100%
rename from pkgs/tools/security/pwdsafety/default.nix
rename to pkgs/by-name/pw/pwdsafety/package.nix
diff --git a/pkgs/tools/security/pwgen-secure/default.nix b/pkgs/by-name/pw/pwgen-secure/package.nix
similarity index 100%
rename from pkgs/tools/security/pwgen-secure/default.nix
rename to pkgs/by-name/pw/pwgen-secure/package.nix
diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/by-name/pw/pwgen/package.nix
similarity index 100%
rename from pkgs/tools/security/pwgen/default.nix
rename to pkgs/by-name/pw/pwgen/package.nix
diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/by-name/pw/pwnat/package.nix
similarity index 100%
rename from pkgs/tools/networking/pwnat/default.nix
rename to pkgs/by-name/pw/pwnat/package.nix
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/by-name/pw/pwsafe/package.nix
similarity index 100%
rename from pkgs/applications/misc/pwsafe/default.nix
rename to pkgs/by-name/pw/pwsafe/package.nix
diff --git a/pkgs/applications/audio/pwvucontrol/Cargo.lock b/pkgs/by-name/pw/pwvucontrol/Cargo.lock
similarity index 100%
rename from pkgs/applications/audio/pwvucontrol/Cargo.lock
rename to pkgs/by-name/pw/pwvucontrol/Cargo.lock
diff --git a/pkgs/applications/audio/pwvucontrol/default.nix b/pkgs/by-name/pw/pwvucontrol/package.nix
similarity index 100%
rename from pkgs/applications/audio/pwvucontrol/default.nix
rename to pkgs/by-name/pw/pwvucontrol/package.nix
diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/by-name/px/pxattr/package.nix
similarity index 100%
rename from pkgs/tools/archivers/pxattr/default.nix
rename to pkgs/by-name/px/pxattr/package.nix
diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/by-name/px/pxlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/pxlib/default.nix
rename to pkgs/by-name/px/pxlib/package.nix
diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/by-name/px/pxview/package.nix
similarity index 100%
rename from pkgs/development/tools/pxview/default.nix
rename to pkgs/by-name/px/pxview/package.nix
diff --git a/pkgs/tools/compression/pxz/flush-stdout-help-version.patch b/pkgs/by-name/px/pxz/flush-stdout-help-version.patch
similarity index 100%
rename from pkgs/tools/compression/pxz/flush-stdout-help-version.patch
rename to pkgs/by-name/px/pxz/flush-stdout-help-version.patch
diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/by-name/px/pxz/package.nix
similarity index 100%
rename from pkgs/tools/compression/pxz/default.nix
rename to pkgs/by-name/px/pxz/package.nix
diff --git a/pkgs/development/libraries/py3c/default.nix b/pkgs/by-name/py/py3c/package.nix
similarity index 100%
rename from pkgs/development/libraries/py3c/default.nix
rename to pkgs/by-name/py/py3c/package.nix
diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/by-name/py/pyCA/package.nix
similarity index 100%
rename from pkgs/applications/video/pyca/default.nix
rename to pkgs/by-name/py/pyCA/package.nix
diff --git a/pkgs/applications/misc/pydf/default.nix b/pkgs/by-name/py/pydf/package.nix
similarity index 100%
rename from pkgs/applications/misc/pydf/default.nix
rename to pkgs/by-name/py/pydf/package.nix
diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/by-name/py/pyenv/package.nix
similarity index 100%
rename from pkgs/development/tools/pyenv/default.nix
rename to pkgs/by-name/py/pyenv/package.nix
diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/by-name/py/pykms/package.nix
similarity index 100%
rename from pkgs/tools/networking/pykms/default.nix
rename to pkgs/by-name/py/pykms/package.nix
diff --git a/pkgs/development/tools/pylint-exit/default.nix b/pkgs/by-name/py/pylint-exit/package.nix
similarity index 100%
rename from pkgs/development/tools/pylint-exit/default.nix
rename to pkgs/by-name/py/pylint-exit/package.nix
diff --git a/pkgs/applications/networking/pyload-ng/declarative-default-user.patch b/pkgs/by-name/py/pyload-ng/declarative-default-user.patch
similarity index 100%
rename from pkgs/applications/networking/pyload-ng/declarative-default-user.patch
rename to pkgs/by-name/py/pyload-ng/declarative-default-user.patch
diff --git a/pkgs/applications/networking/pyload-ng/declarative-env-config.patch b/pkgs/by-name/py/pyload-ng/declarative-env-config.patch
similarity index 100%
rename from pkgs/applications/networking/pyload-ng/declarative-env-config.patch
rename to pkgs/by-name/py/pyload-ng/declarative-env-config.patch
diff --git a/pkgs/applications/networking/pyload-ng/default.nix b/pkgs/by-name/py/pyload-ng/package.nix
similarity index 100%
rename from pkgs/applications/networking/pyload-ng/default.nix
rename to pkgs/by-name/py/pyload-ng/package.nix
diff --git a/pkgs/misc/pylode/default.nix b/pkgs/by-name/py/pylode/package.nix
similarity index 100%
rename from pkgs/misc/pylode/default.nix
rename to pkgs/by-name/py/pylode/package.nix
diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/by-name/py/pympress/package.nix
similarity index 100%
rename from pkgs/applications/office/pympress/default.nix
rename to pkgs/by-name/py/pympress/package.nix
diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/by-name/py/pynac/package.nix
similarity index 100%
rename from pkgs/applications/science/math/pynac/default.nix
rename to pkgs/by-name/py/pynac/package.nix
diff --git a/pkgs/development/tools/pypi-mirror/default.nix b/pkgs/by-name/py/pypi-mirror/package.nix
similarity index 100%
rename from pkgs/development/tools/pypi-mirror/default.nix
rename to pkgs/by-name/py/pypi-mirror/package.nix
diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/by-name/py/pyrosimple/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/pyrosimple/default.nix
rename to pkgs/by-name/py/pyrosimple/package.nix
diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/by-name/py/pyrseas/package.nix
similarity index 100%
rename from pkgs/development/tools/database/pyrseas/default.nix
rename to pkgs/by-name/py/pyrseas/package.nix
diff --git a/pkgs/applications/misc/pysentation/default.nix b/pkgs/by-name/py/pysentation/package.nix
similarity index 100%
rename from pkgs/applications/misc/pysentation/default.nix
rename to pkgs/by-name/py/pysentation/package.nix
diff --git a/pkgs/development/libraries/pystring/default.nix b/pkgs/by-name/py/pystring/package.nix
similarity index 100%
rename from pkgs/development/libraries/pystring/default.nix
rename to pkgs/by-name/py/pystring/package.nix
diff --git a/pkgs/development/interpreters/python-cosmopolitan/default.nix b/pkgs/by-name/py/python-cosmopolitan/package.nix
similarity index 100%
rename from pkgs/development/interpreters/python-cosmopolitan/default.nix
rename to pkgs/by-name/py/python-cosmopolitan/package.nix
diff --git a/pkgs/development/tools/misc/python-launcher/default.nix b/pkgs/by-name/py/python-launcher/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/python-launcher/default.nix
rename to pkgs/by-name/py/python-launcher/package.nix
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/by-name/py/pytrainer/package.nix
similarity index 100%
rename from pkgs/applications/misc/pytrainer/default.nix
rename to pkgs/by-name/py/pytrainer/package.nix
diff --git a/pkgs/tools/misc/q-text-as-data/default.nix b/pkgs/by-name/q-/q-text-as-data/package.nix
similarity index 100%
rename from pkgs/tools/misc/q-text-as-data/default.nix
rename to pkgs/by-name/q-/q-text-as-data/package.nix
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix
similarity index 100%
rename from pkgs/applications/science/math/qalculate-gtk/default.nix
rename to pkgs/by-name/qa/qalculate-gtk/package.nix
diff --git a/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch b/pkgs/by-name/qb/qbe/001-dont-hardcode-tmp.patch
similarity index 100%
rename from pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch
rename to pkgs/by-name/qb/qbe/001-dont-hardcode-tmp.patch
diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/by-name/qb/qbe/package.nix
similarity index 100%
rename from pkgs/development/compilers/qbe/default.nix
rename to pkgs/by-name/qb/qbe/package.nix
diff --git a/pkgs/development/compilers/qbe/test-can-run-hello-world.nix b/pkgs/by-name/qb/qbe/test-can-run-hello-world.nix
similarity index 100%
rename from pkgs/development/compilers/qbe/test-can-run-hello-world.nix
rename to pkgs/by-name/qb/qbe/test-can-run-hello-world.nix
diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/by-name/qb/qbec/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/qbec/default.nix
rename to pkgs/by-name/qb/qbec/package.nix
diff --git a/pkgs/development/tools/qc/default.nix b/pkgs/by-name/qc/qc/package.nix
similarity index 100%
rename from pkgs/development/tools/qc/default.nix
rename to pkgs/by-name/qc/qc/package.nix
diff --git a/pkgs/tools/networking/qcard/default.nix b/pkgs/by-name/qc/qcard/package.nix
similarity index 100%
rename from pkgs/tools/networking/qcard/default.nix
rename to pkgs/by-name/qc/qcard/package.nix
diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/by-name/qc/qcdnum/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/qcdnum/default.nix
rename to pkgs/by-name/qc/qcdnum/package.nix
diff --git a/pkgs/tools/misc/qdl/default.nix b/pkgs/by-name/qd/qdl/package.nix
similarity index 100%
rename from pkgs/tools/misc/qdl/default.nix
rename to pkgs/by-name/qd/qdl/package.nix
diff --git a/pkgs/applications/editors/qemacs/default.nix b/pkgs/by-name/qe/qemacs/package.nix
similarity index 100%
rename from pkgs/applications/editors/qemacs/default.nix
rename to pkgs/by-name/qe/qemacs/package.nix
diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/by-name/qh/qhull/package.nix
similarity index 100%
rename from pkgs/development/libraries/qhull/default.nix
rename to pkgs/by-name/qh/qhull/package.nix
diff --git a/pkgs/development/libraries/audio/qm-dsp/default.nix b/pkgs/by-name/qm/qm-dsp/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/qm-dsp/default.nix
rename to pkgs/by-name/qm/qm-dsp/package.nix
diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/by-name/qm/qmidiarp/package.nix
similarity index 100%
rename from pkgs/applications/audio/qmidiarp/default.nix
rename to pkgs/by-name/qm/qmidiarp/package.nix
diff --git a/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/pkgs/by-name/qm/qmk-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/qmk-udev-rules/default.nix
rename to pkgs/by-name/qm/qmk-udev-rules/package.nix
diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/by-name/qm/qmk/package.nix
similarity index 100%
rename from pkgs/tools/misc/qmk/default.nix
rename to pkgs/by-name/qm/qmk/package.nix
diff --git a/pkgs/tools/misc/qmk_hid/default.nix b/pkgs/by-name/qm/qmk_hid/package.nix
similarity index 100%
rename from pkgs/tools/misc/qmk_hid/default.nix
rename to pkgs/by-name/qm/qmk_hid/package.nix
diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/by-name/qo/qogir-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/qogir-icon-theme/default.nix
rename to pkgs/by-name/qo/qogir-icon-theme/package.nix
diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/by-name/qo/qogir-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/qogir/default.nix
rename to pkgs/by-name/qo/qogir-theme/package.nix
diff --git a/pkgs/development/libraries/qoi/default.nix b/pkgs/by-name/qo/qoi/package.nix
similarity index 100%
rename from pkgs/development/libraries/qoi/default.nix
rename to pkgs/by-name/qo/qoi/package.nix
diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/by-name/qo/qovery-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/qovery-cli/default.nix
rename to pkgs/by-name/qo/qovery-cli/package.nix
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/by-name/qp/qpdf/package.nix
similarity index 100%
rename from pkgs/development/libraries/qpdf/default.nix
rename to pkgs/by-name/qp/qpdf/package.nix
diff --git a/pkgs/os-specific/linux/qperf/default.nix b/pkgs/by-name/qp/qperf/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/qperf/default.nix
rename to pkgs/by-name/qp/qperf/package.nix
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/by-name/qp/qpid-cpp/package.nix
similarity index 100%
rename from pkgs/servers/amqp/qpid-cpp/default.nix
rename to pkgs/by-name/qp/qpid-cpp/package.nix
diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/by-name/qp/qprint/package.nix
similarity index 100%
rename from pkgs/tools/text/qprint/default.nix
rename to pkgs/by-name/qp/qprint/package.nix
diff --git a/pkgs/games/qqwing/default.nix b/pkgs/by-name/qq/qqwing/package.nix
similarity index 100%
rename from pkgs/games/qqwing/default.nix
rename to pkgs/by-name/qq/qqwing/package.nix
diff --git a/pkgs/tools/misc/qrscan/default.nix b/pkgs/by-name/qr/qrscan/package.nix
similarity index 100%
rename from pkgs/tools/misc/qrscan/default.nix
rename to pkgs/by-name/qr/qrscan/package.nix
diff --git a/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch b/pkgs/by-name/qr/qrupdate/disable-zch1dn-test.patch
similarity index 100%
rename from pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch
rename to pkgs/by-name/qr/qrupdate/disable-zch1dn-test.patch
diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/by-name/qr/qrupdate/package.nix
similarity index 100%
rename from pkgs/development/libraries/qrupdate/default.nix
rename to pkgs/by-name/qr/qrupdate/package.nix
diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/by-name/qu/QuadProgpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/QuadProgpp/default.nix
rename to pkgs/by-name/qu/QuadProgpp/package.nix
diff --git a/pkgs/applications/audio/quadrafuzz/default.nix b/pkgs/by-name/qu/quadrafuzz/package.nix
similarity index 100%
rename from pkgs/applications/audio/quadrafuzz/default.nix
rename to pkgs/by-name/qu/quadrafuzz/package.nix
diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/by-name/qu/quake3e/package.nix
similarity index 100%
rename from pkgs/games/quake3/quake3e/default.nix
rename to pkgs/by-name/qu/quake3e/package.nix
diff --git a/pkgs/development/libraries/quantlib/default.nix b/pkgs/by-name/qu/quantlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/quantlib/default.nix
rename to pkgs/by-name/qu/quantlib/package.nix
diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/by-name/qu/quantomatic/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/quantomatic/default.nix
rename to pkgs/by-name/qu/quantomatic/package.nix
diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/by-name/qu/quantumminigolf/package.nix
similarity index 100%
rename from pkgs/games/quantumminigolf/default.nix
rename to pkgs/by-name/qu/quantumminigolf/package.nix
diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/by-name/qu/quark-engine/package.nix
similarity index 100%
rename from pkgs/tools/security/quark-engine/default.nix
rename to pkgs/by-name/qu/quark-engine/package.nix
diff --git a/pkgs/servers/http/quark/default.nix b/pkgs/by-name/qu/quark/package.nix
similarity index 100%
rename from pkgs/servers/http/quark/default.nix
rename to pkgs/by-name/qu/quark/package.nix
diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/by-name/qu/quartus-prime-lite/package.nix
similarity index 100%
rename from pkgs/applications/editors/quartus-prime/default.nix
rename to pkgs/by-name/qu/quartus-prime-lite/package.nix
diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
similarity index 100%
rename from pkgs/applications/editors/quartus-prime/quartus.nix
rename to pkgs/by-name/qu/quartus-prime-lite/quartus.nix
diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/by-name/qu/quast/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/quast/default.nix
rename to pkgs/by-name/qu/quast/package.nix
diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/by-name/qu/quattrocento-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/quattrocento-sans/default.nix
rename to pkgs/by-name/qu/quattrocento-sans/package.nix
diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/by-name/qu/quattrocento/package.nix
similarity index 100%
rename from pkgs/data/fonts/quattrocento/default.nix
rename to pkgs/by-name/qu/quattrocento/package.nix
diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/by-name/qu/qubes-core-vchan-xen/package.nix
similarity index 100%
rename from pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
rename to pkgs/by-name/qu/qubes-core-vchan-xen/package.nix
diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/by-name/qu/quesoglc/package.nix
similarity index 100%
rename from pkgs/development/libraries/quesoglc/default.nix
rename to pkgs/by-name/qu/quesoglc/package.nix
diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/by-name/qu/questdb/package.nix
similarity index 100%
rename from pkgs/servers/nosql/questdb/default.nix
rename to pkgs/by-name/qu/questdb/package.nix
diff --git a/pkgs/tools/misc/quich/default.nix b/pkgs/by-name/qu/quich/package.nix
similarity index 100%
rename from pkgs/tools/misc/quich/default.nix
rename to pkgs/by-name/qu/quich/package.nix
diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/by-name/qu/quick-lint-js/package.nix
similarity index 100%
rename from pkgs/development/tools/quick-lint-js/default.nix
rename to pkgs/by-name/qu/quick-lint-js/package.nix
diff --git a/pkgs/development/libraries/quickfix/disableUnitTests.patch b/pkgs/by-name/qu/quickfix/disableUnitTests.patch
similarity index 100%
rename from pkgs/development/libraries/quickfix/disableUnitTests.patch
rename to pkgs/by-name/qu/quickfix/disableUnitTests.patch
diff --git a/pkgs/development/libraries/quickfix/default.nix b/pkgs/by-name/qu/quickfix/package.nix
similarity index 100%
rename from pkgs/development/libraries/quickfix/default.nix
rename to pkgs/by-name/qu/quickfix/package.nix
diff --git a/pkgs/applications/virtualization/quickgui/default.nix b/pkgs/by-name/qu/quickgui/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/quickgui/default.nix
rename to pkgs/by-name/qu/quickgui/package.nix
diff --git a/pkgs/applications/virtualization/quickgui/pubspec.lock.json b/pkgs/by-name/qu/quickgui/pubspec.lock.json
similarity index 100%
rename from pkgs/applications/virtualization/quickgui/pubspec.lock.json
rename to pkgs/by-name/qu/quickgui/pubspec.lock.json
diff --git a/pkgs/development/libraries/quickmem/default.nix b/pkgs/by-name/qu/quickmem/package.nix
similarity index 100%
rename from pkgs/development/libraries/quickmem/default.nix
rename to pkgs/by-name/qu/quickmem/package.nix
diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/by-name/qu/quickserve/package.nix
similarity index 100%
rename from pkgs/tools/networking/quickserve/default.nix
rename to pkgs/by-name/qu/quickserve/package.nix
diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/by-name/qu/quicksynergy/package.nix
similarity index 100%
rename from pkgs/applications/misc/quicksynergy/default.nix
rename to pkgs/by-name/qu/quicksynergy/package.nix
diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/by-name/qu/quicktemplate/package.nix
similarity index 100%
rename from pkgs/development/tools/quicktemplate/default.nix
rename to pkgs/by-name/qu/quicktemplate/package.nix
diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/by-name/qu/quicktun/package.nix
similarity index 100%
rename from pkgs/tools/networking/quicktun/default.nix
rename to pkgs/by-name/qu/quicktun/package.nix
diff --git a/pkgs/tools/networking/quicktun/tar-1.30.diff b/pkgs/by-name/qu/quicktun/tar-1.30.diff
similarity index 100%
rename from pkgs/tools/networking/quicktun/tar-1.30.diff
rename to pkgs/by-name/qu/quicktun/tar-1.30.diff
diff --git a/pkgs/tools/security/quill-qr/default.nix b/pkgs/by-name/qu/quill-qr/package.nix
similarity index 100%
rename from pkgs/tools/security/quill-qr/default.nix
rename to pkgs/by-name/qu/quill-qr/package.nix
diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/by-name/qu/quilt/package.nix
similarity index 100%
rename from pkgs/development/tools/quilt/default.nix
rename to pkgs/by-name/qu/quilt/package.nix
diff --git a/pkgs/data/icons/quintom-cursor-theme/default.nix b/pkgs/by-name/qu/quintom-cursor-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/quintom-cursor-theme/default.nix
rename to pkgs/by-name/qu/quintom-cursor-theme/package.nix
diff --git a/pkgs/tools/graphics/quirc/0001-Don-t-build-demos.patch b/pkgs/by-name/qu/quirc/0001-Don-t-build-demos.patch
similarity index 100%
rename from pkgs/tools/graphics/quirc/0001-Don-t-build-demos.patch
rename to pkgs/by-name/qu/quirc/0001-Don-t-build-demos.patch
diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/by-name/qu/quirc/package.nix
similarity index 100%
rename from pkgs/tools/graphics/quirc/default.nix
rename to pkgs/by-name/qu/quirc/package.nix
diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/by-name/qu/quisk/package.nix
similarity index 100%
rename from pkgs/applications/radio/quisk/default.nix
rename to pkgs/by-name/qu/quisk/package.nix
diff --git a/pkgs/data/fonts/quivira/default.nix b/pkgs/by-name/qu/quivira/package.nix
similarity index 100%
rename from pkgs/data/fonts/quivira/default.nix
rename to pkgs/by-name/qu/quivira/package.nix
diff --git a/pkgs/applications/blockchains/quorum/default.nix b/pkgs/by-name/qu/quorum/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/quorum/default.nix
rename to pkgs/by-name/qu/quorum/package.nix
diff --git a/pkgs/applications/audio/r128gain/ffmpeg-location.patch b/pkgs/by-name/r1/r128gain/ffmpeg-location.patch
similarity index 100%
rename from pkgs/applications/audio/r128gain/ffmpeg-location.patch
rename to pkgs/by-name/r1/r128gain/ffmpeg-location.patch
diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/by-name/r1/r128gain/package.nix
similarity index 100%
rename from pkgs/applications/audio/r128gain/default.nix
rename to pkgs/by-name/r1/r128gain/package.nix
diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/by-name/r2/r2mod_cli/package.nix
similarity index 100%
rename from pkgs/games/r2mod_cli/default.nix
rename to pkgs/by-name/r2/r2mod_cli/package.nix
diff --git a/pkgs/games/r2modman/default.nix b/pkgs/by-name/r2/r2modman/package.nix
similarity index 100%
rename from pkgs/games/r2modman/default.nix
rename to pkgs/by-name/r2/r2modman/package.nix
diff --git a/pkgs/games/r2modman/steam-launch-fix.patch b/pkgs/by-name/r2/r2modman/steam-launch-fix.patch
similarity index 100%
rename from pkgs/games/r2modman/steam-launch-fix.patch
rename to pkgs/by-name/r2/r2modman/steam-launch-fix.patch
diff --git a/pkgs/applications/networking/r53-ddns/default.nix b/pkgs/by-name/r5/r53-ddns/package.nix
similarity index 100%
rename from pkgs/applications/networking/r53-ddns/default.nix
rename to pkgs/by-name/r5/r53-ddns/package.nix
diff --git a/pkgs/development/tools/rust/ra-multiplex/default.nix b/pkgs/by-name/ra/ra-multiplex/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/ra-multiplex/default.nix
rename to pkgs/by-name/ra/ra-multiplex/package.nix
diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/by-name/ra/rabbitmq-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/rabbitmq-c/default.nix
rename to pkgs/by-name/ra/rabbitmq-c/package.nix
diff --git a/pkgs/tools/networking/rabtap/default.nix b/pkgs/by-name/ra/rabtap/package.nix
similarity index 100%
rename from pkgs/tools/networking/rabtap/default.nix
rename to pkgs/by-name/ra/rabtap/package.nix
diff --git a/pkgs/games/racer/mkdir.patch b/pkgs/by-name/ra/racer/mkdir.patch
similarity index 100%
rename from pkgs/games/racer/mkdir.patch
rename to pkgs/by-name/ra/racer/mkdir.patch
diff --git a/pkgs/games/racer/default.nix b/pkgs/by-name/ra/racer/package.nix
similarity index 100%
rename from pkgs/games/racer/default.nix
rename to pkgs/by-name/ra/racer/package.nix
diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/by-name/ra/radamsa/package.nix
similarity index 100%
rename from pkgs/tools/security/radamsa/default.nix
rename to pkgs/by-name/ra/radamsa/package.nix
diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/by-name/ra/radeontools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/radeontools/default.nix
rename to pkgs/by-name/ra/radeontools/package.nix
diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/by-name/ra/radeontop/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/radeontop/default.nix
rename to pkgs/by-name/ra/radeontop/package.nix
diff --git a/pkgs/applications/audio/radioboat/default.nix b/pkgs/by-name/ra/radioboat/package.nix
similarity index 100%
rename from pkgs/applications/audio/radioboat/default.nix
rename to pkgs/by-name/ra/radioboat/package.nix
diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/by-name/ra/radsecproxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/radsecproxy/default.nix
rename to pkgs/by-name/ra/radsecproxy/package.nix
diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/by-name/ra/radvd/package.nix
similarity index 100%
rename from pkgs/tools/networking/radvd/default.nix
rename to pkgs/by-name/ra/radvd/package.nix
diff --git a/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch b/pkgs/by-name/ra/raft-canonical/disable-missing-dir-test.patch
similarity index 100%
rename from pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch
rename to pkgs/by-name/ra/raft-canonical/disable-missing-dir-test.patch
diff --git a/pkgs/development/libraries/raft-canonical/disable-net-tests.patch b/pkgs/by-name/ra/raft-canonical/disable-net-tests.patch
similarity index 100%
rename from pkgs/development/libraries/raft-canonical/disable-net-tests.patch
rename to pkgs/by-name/ra/raft-canonical/disable-net-tests.patch
diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/by-name/ra/raft-canonical/package.nix
similarity index 100%
rename from pkgs/development/libraries/raft-canonical/default.nix
rename to pkgs/by-name/ra/raft-canonical/package.nix
diff --git a/pkgs/applications/window-managers/ragnarwm/default.nix b/pkgs/by-name/ra/ragnarwm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/ragnarwm/default.nix
rename to pkgs/by-name/ra/ragnarwm/package.nix
diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/by-name/ra/rain/package.nix
similarity index 100%
rename from pkgs/development/tools/rain/default.nix
rename to pkgs/by-name/ra/rain/package.nix
diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/by-name/ra/raiseorlaunch/package.nix
similarity index 100%
rename from pkgs/applications/misc/raiseorlaunch/default.nix
rename to pkgs/by-name/ra/raiseorlaunch/package.nix
diff --git a/pkgs/development/tools/rakkess/default.nix b/pkgs/by-name/ra/rakkess/package.nix
similarity index 100%
rename from pkgs/development/tools/rakkess/default.nix
rename to pkgs/by-name/ra/rakkess/package.nix
diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/by-name/ra/raleway/package.nix
similarity index 100%
rename from pkgs/data/fonts/raleway/default.nix
rename to pkgs/by-name/ra/raleway/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/by-name/ra/rambox/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/rambox/default.nix
rename to pkgs/by-name/ra/rambox/package.nix
diff --git a/pkgs/tools/misc/ramfetch/default.nix b/pkgs/by-name/ra/ramfetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/ramfetch/default.nix
rename to pkgs/by-name/ra/ramfetch/package.nix
diff --git a/pkgs/servers/http/ran/default.nix b/pkgs/by-name/ra/ran/package.nix
similarity index 100%
rename from pkgs/servers/http/ran/default.nix
rename to pkgs/by-name/ra/ran/package.nix
diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/by-name/ra/rancher/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/rancher/default.nix
rename to pkgs/by-name/ra/rancher/package.nix
diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/by-name/ra/randoop/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/randoop/default.nix
rename to pkgs/by-name/ra/randoop/package.nix
diff --git a/pkgs/games/randtype/default.nix b/pkgs/by-name/ra/randtype/package.nix
similarity index 100%
rename from pkgs/games/randtype/default.nix
rename to pkgs/by-name/ra/randtype/package.nix
diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/by-name/ra/rang/package.nix
similarity index 100%
rename from pkgs/development/libraries/rang/default.nix
rename to pkgs/by-name/ra/rang/package.nix
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/by-name/ra/range-v3/package.nix
similarity index 100%
rename from pkgs/development/libraries/range-v3/default.nix
rename to pkgs/by-name/ra/range-v3/package.nix
diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/by-name/ra/ranger/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/ranger/default.nix
rename to pkgs/by-name/ra/ranger/package.nix
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/by-name/ra/rankwidth/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/rankwidth/default.nix
rename to pkgs/by-name/ra/rankwidth/package.nix
diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/by-name/ra/rapidcheck/package.nix
similarity index 100%
rename from pkgs/development/libraries/rapidcheck/default.nix
rename to pkgs/by-name/ra/rapidcheck/package.nix
diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/by-name/ra/rapidfuzz-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/rapidfuzz-cpp/default.nix
rename to pkgs/by-name/ra/rapidfuzz-cpp/package.nix
diff --git a/pkgs/applications/version-management/rapidsvn/fix-build.patch b/pkgs/by-name/ra/rapidsvn/fix-build.patch
similarity index 100%
rename from pkgs/applications/version-management/rapidsvn/fix-build.patch
rename to pkgs/by-name/ra/rapidsvn/fix-build.patch
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/by-name/ra/rapidsvn/package.nix
similarity index 100%
rename from pkgs/applications/version-management/rapidsvn/default.nix
rename to pkgs/by-name/ra/rapidsvn/package.nix
diff --git a/pkgs/development/libraries/rapidxml/default.nix b/pkgs/by-name/ra/rapidxml/package.nix
similarity index 100%
rename from pkgs/development/libraries/rapidxml/default.nix
rename to pkgs/by-name/ra/rapidxml/package.nix
diff --git a/pkgs/development/libraries/rapidyaml/default.nix b/pkgs/by-name/ra/rapidyaml/package.nix
similarity index 100%
rename from pkgs/development/libraries/rapidyaml/default.nix
rename to pkgs/by-name/ra/rapidyaml/package.nix
diff --git a/pkgs/development/misc/rappel/default.nix b/pkgs/by-name/ra/rappel/package.nix
similarity index 100%
rename from pkgs/development/misc/rappel/default.nix
rename to pkgs/by-name/ra/rappel/package.nix
diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/by-name/ra/rar2fs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/rar2fs/default.nix
rename to pkgs/by-name/ra/rar2fs/package.nix
diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/by-name/ra/rarcrack/package.nix
similarity index 100%
rename from pkgs/tools/security/rarcrack/default.nix
rename to pkgs/by-name/ra/rarcrack/package.nix
diff --git a/pkgs/tools/text/rare-regex/default.nix b/pkgs/by-name/ra/rare-regex/package.nix
similarity index 100%
rename from pkgs/tools/text/rare-regex/default.nix
rename to pkgs/by-name/ra/rare-regex/package.nix
diff --git a/pkgs/tools/misc/rargs/default.nix b/pkgs/by-name/ra/rargs/package.nix
similarity index 100%
rename from pkgs/tools/misc/rargs/default.nix
rename to pkgs/by-name/ra/rargs/package.nix
diff --git a/pkgs/development/tools/rars/default.nix b/pkgs/by-name/ra/rars/package.nix
similarity index 100%
rename from pkgs/development/tools/rars/default.nix
rename to pkgs/by-name/ra/rars/package.nix
diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/by-name/ra/rascal/package.nix
similarity index 100%
rename from pkgs/development/interpreters/rascal/default.nix
rename to pkgs/by-name/ra/rascal/package.nix
diff --git a/pkgs/os-specific/linux/rasdaemon/default.nix b/pkgs/by-name/ra/rasdaemon/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/rasdaemon/default.nix
rename to pkgs/by-name/ra/rasdaemon/package.nix
diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix
rename to pkgs/by-name/ra/raspberrypiWirelessFirmware/package.nix
diff --git a/pkgs/tools/networking/ratman/default.nix b/pkgs/by-name/ra/ratman/package.nix
similarity index 100%
rename from pkgs/tools/networking/ratman/default.nix
rename to pkgs/by-name/ra/ratman/package.nix
diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/by-name/ra/ratmen/package.nix
similarity index 100%
rename from pkgs/tools/X11/ratmen/default.nix
rename to pkgs/by-name/ra/ratmen/package.nix
diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/by-name/ra/ratools/package.nix
similarity index 100%
rename from pkgs/tools/networking/ratools/default.nix
rename to pkgs/by-name/ra/ratools/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/by-name/ra/ratox/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/ratox/default.nix
rename to pkgs/by-name/ra/ratox/package.nix
diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/by-name/ra/ratpoints/package.nix
similarity index 100%
rename from pkgs/applications/science/math/ratpoints/default.nix
rename to pkgs/by-name/ra/ratpoints/package.nix
diff --git a/pkgs/applications/misc/ratt/default.nix b/pkgs/by-name/ra/ratt/package.nix
similarity index 100%
rename from pkgs/applications/misc/ratt/default.nix
rename to pkgs/by-name/ra/ratt/package.nix
diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/by-name/ra/rauc/package.nix
similarity index 100%
rename from pkgs/tools/misc/rauc/default.nix
rename to pkgs/by-name/ra/rauc/package.nix
diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/by-name/ra/raul/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/raul/default.nix
rename to pkgs/by-name/ra/raul/package.nix
diff --git a/pkgs/development/tools/rust/ravedude/default.nix b/pkgs/by-name/ra/ravedude/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/ravedude/default.nix
rename to pkgs/by-name/ra/ravedude/package.nix
diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/by-name/ra/raven-reader/package.nix
similarity index 100%
rename from pkgs/applications/networking/newsreaders/raven-reader/default.nix
rename to pkgs/by-name/ra/raven-reader/package.nix
diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/by-name/ra/raxml/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/raxml/default.nix
rename to pkgs/by-name/ra/raxml/package.nix
diff --git a/pkgs/games/raylib-games/default.nix b/pkgs/by-name/ra/raylib-games/package.nix
similarity index 100%
rename from pkgs/games/raylib-games/default.nix
rename to pkgs/by-name/ra/raylib-games/package.nix
diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/by-name/ra/raylib/package.nix
similarity index 100%
rename from pkgs/development/libraries/raylib/default.nix
rename to pkgs/by-name/ra/raylib/package.nix
diff --git a/pkgs/games/doom-ports/rbdoom-3-bfg/default.nix b/pkgs/by-name/rb/rbdoom-3-bfg/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/rbdoom-3-bfg/default.nix
rename to pkgs/by-name/rb/rbdoom-3-bfg/package.nix
diff --git a/pkgs/development/ruby-modules/rbenv/default.nix b/pkgs/by-name/rb/rbenv/package.nix
similarity index 100%
rename from pkgs/development/ruby-modules/rbenv/default.nix
rename to pkgs/by-name/rb/rbenv/package.nix
diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/by-name/rb/rbw/package.nix
similarity index 100%
rename from pkgs/tools/security/rbw/default.nix
rename to pkgs/by-name/rb/rbw/package.nix
diff --git a/pkgs/shells/rc-9front/default.nix b/pkgs/by-name/rc/rc-9front/package.nix
similarity index 100%
rename from pkgs/shells/rc-9front/default.nix
rename to pkgs/by-name/rc/rc-9front/package.nix
diff --git a/pkgs/shells/rc-9front/path.patch b/pkgs/by-name/rc/rc-9front/path.patch
similarity index 100%
rename from pkgs/shells/rc-9front/path.patch
rename to pkgs/by-name/rc/rc-9front/path.patch
diff --git a/pkgs/development/tools/rcodesign/disable-sign-for-notarization-test.patch b/pkgs/by-name/rc/rcodesign/disable-sign-for-notarization-test.patch
similarity index 100%
rename from pkgs/development/tools/rcodesign/disable-sign-for-notarization-test.patch
rename to pkgs/by-name/rc/rcodesign/disable-sign-for-notarization-test.patch
diff --git a/pkgs/development/tools/rcodesign/fix-verbosity-level.patch b/pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch
similarity index 100%
rename from pkgs/development/tools/rcodesign/fix-verbosity-level.patch
rename to pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch
diff --git a/pkgs/development/tools/rcodesign/default.nix b/pkgs/by-name/rc/rcodesign/package.nix
similarity index 100%
rename from pkgs/development/tools/rcodesign/default.nix
rename to pkgs/by-name/rc/rcodesign/package.nix
diff --git a/pkgs/development/tools/rcodesign/update-time-rs-in-cargo-lock.patch b/pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch
similarity index 100%
rename from pkgs/development/tools/rcodesign/update-time-rs-in-cargo-lock.patch
rename to pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch
diff --git a/pkgs/tools/networking/rcon/default.nix b/pkgs/by-name/rc/rcon/package.nix
similarity index 100%
rename from pkgs/tools/networking/rcon/default.nix
rename to pkgs/by-name/rc/rcon/package.nix
diff --git a/pkgs/tools/networking/rconc/default.nix b/pkgs/by-name/rc/rconc/package.nix
similarity index 100%
rename from pkgs/tools/networking/rconc/default.nix
rename to pkgs/by-name/rc/rconc/package.nix
diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/by-name/rc/rcs/package.nix
similarity index 100%
rename from pkgs/applications/version-management/rcs/default.nix
rename to pkgs/by-name/rc/rcs/package.nix
diff --git a/pkgs/applications/version-management/rcshist/default.nix b/pkgs/by-name/rc/rcshist/package.nix
similarity index 100%
rename from pkgs/applications/version-management/rcshist/default.nix
rename to pkgs/by-name/rc/rcshist/package.nix
diff --git a/pkgs/tools/networking/rdap/default.nix b/pkgs/by-name/rd/rdap/package.nix
similarity index 100%
rename from pkgs/tools/networking/rdap/default.nix
rename to pkgs/by-name/rd/rdap/package.nix
diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/by-name/rd/rdesktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/rdesktop/default.nix
rename to pkgs/by-name/rd/rdesktop/package.nix
diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/by-name/rd/rdfind/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/rdfind/default.nix
rename to pkgs/by-name/rd/rdfind/package.nix
diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/by-name/rd/rdiff-backup/package.nix
similarity index 100%
rename from pkgs/tools/backup/rdiff-backup/default.nix
rename to pkgs/by-name/rd/rdiff-backup/package.nix
diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/by-name/rd/rdkafka/package.nix
similarity index 100%
rename from pkgs/development/libraries/rdkafka/default.nix
rename to pkgs/by-name/rd/rdkafka/package.nix
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/by-name/rd/rdma-core/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/rdma-core/default.nix
rename to pkgs/by-name/rd/rdma-core/package.nix
diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/by-name/rd/rdocker/package.nix
similarity index 100%
rename from pkgs/development/tools/rdocker/default.nix
rename to pkgs/by-name/rd/rdocker/package.nix
diff --git a/pkgs/tools/networking/rdrview/default.nix b/pkgs/by-name/rd/rdrview/package.nix
similarity index 100%
rename from pkgs/tools/networking/rdrview/default.nix
rename to pkgs/by-name/rd/rdrview/package.nix
diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/by-name/rd/rdup/package.nix
similarity index 100%
rename from pkgs/tools/backup/rdup/default.nix
rename to pkgs/by-name/rd/rdup/package.nix
diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/by-name/re/re-flex/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/re-flex/default.nix
rename to pkgs/by-name/re/re-flex/package.nix
diff --git a/pkgs/applications/search/re-isearch/default.nix b/pkgs/by-name/re/re-isearch/package.nix
similarity index 100%
rename from pkgs/applications/search/re-isearch/default.nix
rename to pkgs/by-name/re/re-isearch/package.nix
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/by-name/re/re2/package.nix
similarity index 100%
rename from pkgs/development/libraries/re2/default.nix
rename to pkgs/by-name/re/re2/package.nix
diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/by-name/re/re2c/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/re2c/default.nix
rename to pkgs/by-name/re/re2c/package.nix
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/by-name/re/react-native-debugger/package.nix
similarity index 100%
rename from pkgs/development/tools/react-native-debugger/default.nix
rename to pkgs/by-name/re/react-native-debugger/package.nix
diff --git a/pkgs/development/tools/react-static/package.json b/pkgs/by-name/re/react-static/package.json
similarity index 100%
rename from pkgs/development/tools/react-static/package.json
rename to pkgs/by-name/re/react-static/package.json
diff --git a/pkgs/development/tools/react-static/default.nix b/pkgs/by-name/re/react-static/package.nix
similarity index 100%
rename from pkgs/development/tools/react-static/default.nix
rename to pkgs/by-name/re/react-static/package.nix
diff --git a/pkgs/os-specific/linux/read-edid/fno-common.patch b/pkgs/by-name/re/read-edid/fno-common.patch
similarity index 100%
rename from pkgs/os-specific/linux/read-edid/fno-common.patch
rename to pkgs/by-name/re/read-edid/fno-common.patch
diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/by-name/re/read-edid/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/read-edid/default.nix
rename to pkgs/by-name/re/read-edid/package.nix
diff --git a/pkgs/tools/text/readability-cli/default.nix b/pkgs/by-name/re/readability-cli/package.nix
similarity index 100%
rename from pkgs/tools/text/readability-cli/default.nix
rename to pkgs/by-name/re/readability-cli/package.nix
diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/by-name/re/readosm/package.nix
similarity index 100%
rename from pkgs/development/libraries/readosm/default.nix
rename to pkgs/by-name/re/readosm/package.nix
diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/by-name/re/readstat/package.nix
similarity index 100%
rename from pkgs/applications/science/math/readstat/default.nix
rename to pkgs/by-name/re/readstat/package.nix
diff --git a/pkgs/applications/audio/real_time_config_quick_scan/default.nix b/pkgs/by-name/re/real_time_config_quick_scan/package.nix
similarity index 100%
rename from pkgs/applications/audio/real_time_config_quick_scan/default.nix
rename to pkgs/by-name/re/real_time_config_quick_scan/package.nix
diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch b/pkgs/by-name/re/realesrgan-ncnn-vulkan/cmakelists.patch
similarity index 100%
rename from pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch
rename to pkgs/by-name/re/realesrgan-ncnn-vulkan/cmakelists.patch
diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch b/pkgs/by-name/re/realesrgan-ncnn-vulkan/models_path.patch
similarity index 100%
rename from pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch
rename to pkgs/by-name/re/realesrgan-ncnn-vulkan/models_path.patch
diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix
similarity index 100%
rename from pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix
rename to pkgs/by-name/re/realesrgan-ncnn-vulkan/package.nix
diff --git a/pkgs/os-specific/linux/reap/default.nix b/pkgs/by-name/re/reap/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/reap/default.nix
rename to pkgs/by-name/re/reap/package.nix
diff --git a/pkgs/applications/science/misc/reason-shell/default.nix b/pkgs/by-name/re/reason-shell/package.nix
similarity index 100%
rename from pkgs/applications/science/misc/reason-shell/default.nix
rename to pkgs/by-name/re/reason-shell/package.nix
diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/by-name/re/reaverwps-t6x/package.nix
similarity index 100%
rename from pkgs/tools/networking/reaver-wps-t6x/default.nix
rename to pkgs/by-name/re/reaverwps-t6x/package.nix
diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/by-name/re/reaverwps/package.nix
similarity index 100%
rename from pkgs/tools/networking/reaver-wps/default.nix
rename to pkgs/by-name/re/reaverwps/package.nix
diff --git a/pkgs/tools/networking/reaver-wps/parallel-build.patch b/pkgs/by-name/re/reaverwps/parallel-build.patch
similarity index 100%
rename from pkgs/tools/networking/reaver-wps/parallel-build.patch
rename to pkgs/by-name/re/reaverwps/parallel-build.patch
diff --git a/pkgs/applications/video/recapp/default.nix b/pkgs/by-name/re/recapp/package.nix
similarity index 100%
rename from pkgs/applications/video/recapp/default.nix
rename to pkgs/by-name/re/recapp/package.nix
diff --git a/pkgs/development/libraries/recastnavigation/default.nix b/pkgs/by-name/re/recastnavigation/package.nix
similarity index 100%
rename from pkgs/development/libraries/recastnavigation/default.nix
rename to pkgs/by-name/re/recastnavigation/package.nix
diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/by-name/re/recode/package.nix
similarity index 100%
rename from pkgs/tools/text/recode/default.nix
rename to pkgs/by-name/re/recode/package.nix
diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/by-name/re/recoverjpeg/package.nix
similarity index 100%
rename from pkgs/tools/misc/recoverjpeg/default.nix
rename to pkgs/by-name/re/recoverjpeg/package.nix
diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/by-name/re/recursive/package.nix
similarity index 100%
rename from pkgs/data/fonts/recursive/default.nix
rename to pkgs/by-name/re/recursive/package.nix
diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/by-name/re/red/package.nix
similarity index 100%
rename from pkgs/development/interpreters/red/default.nix
rename to pkgs/by-name/re/red/package.nix
diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/by-name/re/redeclipse/package.nix
similarity index 100%
rename from pkgs/games/redeclipse/default.nix
rename to pkgs/by-name/re/redeclipse/package.nix
diff --git a/pkgs/tools/networking/redfang/default.nix b/pkgs/by-name/re/redfang/package.nix
similarity index 100%
rename from pkgs/tools/networking/redfang/default.nix
rename to pkgs/by-name/re/redfang/package.nix
diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/by-name/re/redhat-official-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/redhat-official/default.nix
rename to pkgs/by-name/re/redhat-official-fonts/package.nix
diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/by-name/re/redir/package.nix
similarity index 100%
rename from pkgs/tools/networking/redir/default.nix
rename to pkgs/by-name/re/redir/package.nix
diff --git a/pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch b/pkgs/by-name/re/redis-plus-plus/0001-Fix-pkg-config-paths.patch
similarity index 100%
rename from pkgs/development/libraries/redis-plus-plus/0001-Fix-pkg-config-paths.patch
rename to pkgs/by-name/re/redis-plus-plus/0001-Fix-pkg-config-paths.patch
diff --git a/pkgs/development/libraries/redis-plus-plus/default.nix b/pkgs/by-name/re/redis-plus-plus/package.nix
similarity index 100%
rename from pkgs/development/libraries/redis-plus-plus/default.nix
rename to pkgs/by-name/re/redis-plus-plus/package.nix
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/by-name/re/redis/package.nix
similarity index 100%
rename from pkgs/servers/nosql/redis/default.nix
rename to pkgs/by-name/re/redis/package.nix
diff --git a/pkgs/development/tools/redisinsight/default.nix b/pkgs/by-name/re/redisinsight/package.nix
similarity index 100%
rename from pkgs/development/tools/redisinsight/default.nix
rename to pkgs/by-name/re/redisinsight/package.nix
diff --git a/pkgs/tools/networking/redli/default.nix b/pkgs/by-name/re/redli/package.nix
similarity index 100%
rename from pkgs/tools/networking/redli/default.nix
rename to pkgs/by-name/re/redli/package.nix
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/by-name/re/redo-apenwarr/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/redo-apenwarr/default.nix
rename to pkgs/by-name/re/redo-apenwarr/package.nix
diff --git a/pkgs/development/tools/build-managers/redo-c/Makefile b/pkgs/by-name/re/redo-c/Makefile
similarity index 100%
rename from pkgs/development/tools/build-managers/redo-c/Makefile
rename to pkgs/by-name/re/redo-c/Makefile
diff --git a/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/by-name/re/redo-c/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/redo-c/default.nix
rename to pkgs/by-name/re/redo-c/package.nix
diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/by-name/re/redo-sh/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/redo-sh/default.nix
rename to pkgs/by-name/re/redo-sh/package.nix
diff --git a/pkgs/development/tools/redoc-cli/default.nix b/pkgs/by-name/re/redoc-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/redoc-cli/default.nix
rename to pkgs/by-name/re/redoc-cli/package.nix
diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/by-name/re/redoflacs/package.nix
similarity index 100%
rename from pkgs/applications/audio/redoflacs/default.nix
rename to pkgs/by-name/re/redoflacs/package.nix
diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/by-name/re/redpanda-client/package.nix
similarity index 100%
rename from pkgs/servers/redpanda/default.nix
rename to pkgs/by-name/re/redpanda-client/package.nix
diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/by-name/re/redprl/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/redprl/default.nix
rename to pkgs/by-name/re/redprl/package.nix
diff --git a/pkgs/development/java-modules/redshift_jdbc/default.nix b/pkgs/by-name/re/redshift_jdbc/package.nix
similarity index 100%
rename from pkgs/development/java-modules/redshift_jdbc/default.nix
rename to pkgs/by-name/re/redshift_jdbc/package.nix
diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/by-name/re/redsocks/package.nix
similarity index 100%
rename from pkgs/tools/networking/redsocks/default.nix
rename to pkgs/by-name/re/redsocks/package.nix
diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/by-name/re/redstore/package.nix
similarity index 100%
rename from pkgs/servers/http/redstore/default.nix
rename to pkgs/by-name/re/redstore/package.nix
diff --git a/pkgs/applications/audio/redux/default.nix b/pkgs/by-name/re/redux/package.nix
similarity index 100%
rename from pkgs/applications/audio/redux/default.nix
rename to pkgs/by-name/re/redux/package.nix
diff --git a/pkgs/tools/security/redwax-tool/default.nix b/pkgs/by-name/re/redwax-tool/package.nix
similarity index 100%
rename from pkgs/tools/security/redwax-tool/default.nix
rename to pkgs/by-name/re/redwax-tool/package.nix
diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/by-name/re/reflex/package.nix
similarity index 100%
rename from pkgs/development/tools/reflex/default.nix
rename to pkgs/by-name/re/reflex/package.nix
diff --git a/pkgs/development/tools/refmt/default.nix b/pkgs/by-name/re/refmt/package.nix
similarity index 100%
rename from pkgs/development/tools/refmt/default.nix
rename to pkgs/by-name/re/refmt/package.nix
diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/by-name/re/reftools/package.nix
similarity index 100%
rename from pkgs/development/tools/reftools/default.nix
rename to pkgs/by-name/re/reftools/package.nix
diff --git a/pkgs/development/tools/refurb/default.nix b/pkgs/by-name/re/refurb/package.nix
similarity index 100%
rename from pkgs/development/tools/refurb/default.nix
rename to pkgs/by-name/re/refurb/package.nix
diff --git a/pkgs/tools/virtualization/reg/default.nix b/pkgs/by-name/re/reg/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/reg/default.nix
rename to pkgs/by-name/re/reg/package.nix
diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/by-name/re/regclient/package.nix
similarity index 100%
rename from pkgs/development/tools/regclient/default.nix
rename to pkgs/by-name/re/regclient/package.nix
diff --git a/pkgs/development/tools/knightos/regenkfs/default.nix b/pkgs/by-name/re/regenkfs/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/regenkfs/default.nix
rename to pkgs/by-name/re/regenkfs/package.nix
diff --git a/pkgs/development/tools/misc/regex-cli/default.nix b/pkgs/by-name/re/regex-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/regex-cli/default.nix
rename to pkgs/by-name/re/regex-cli/package.nix
diff --git a/pkgs/tools/security/regexploit/default.nix b/pkgs/by-name/re/regexploit/package.nix
similarity index 100%
rename from pkgs/tools/security/regexploit/default.nix
rename to pkgs/by-name/re/regexploit/package.nix
diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/by-name/re/regextester/package.nix
similarity index 100%
rename from pkgs/applications/misc/regextester/default.nix
rename to pkgs/by-name/re/regextester/package.nix
diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/by-name/re/regionset/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/regionset/default.nix
rename to pkgs/by-name/re/regionset/package.nix
diff --git a/pkgs/tools/security/regpg/default.nix b/pkgs/by-name/re/regpg/package.nix
similarity index 100%
rename from pkgs/tools/security/regpg/default.nix
rename to pkgs/by-name/re/regpg/package.nix
diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/by-name/re/rehex/package.nix
similarity index 100%
rename from pkgs/applications/editors/rehex/default.nix
rename to pkgs/by-name/re/rehex/package.nix
diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/by-name/re/reindeer/package.nix
similarity index 100%
rename from pkgs/development/tools/reindeer/default.nix
rename to pkgs/by-name/re/reindeer/package.nix
diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/by-name/re/reiser4progs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/reiser4progs/default.nix
rename to pkgs/by-name/re/reiser4progs/package.nix
diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/by-name/re/reiserfsprogs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/reiserfsprogs/default.nix
rename to pkgs/by-name/re/reiserfsprogs/package.nix
diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/by-name/re/relic/package.nix
similarity index 100%
rename from pkgs/development/tools/relic/default.nix
rename to pkgs/by-name/re/relic/package.nix
diff --git a/pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch b/pkgs/by-name/re/remake/glibc-2.27-glob.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/remake/glibc-2.27-glob.patch
rename to pkgs/by-name/re/remake/glibc-2.27-glob.patch
diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/by-name/re/remake/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/remake/default.nix
rename to pkgs/by-name/re/remake/package.nix
diff --git a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/by-name/re/remarkable-toolchain/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix
rename to pkgs/by-name/re/remarkable-toolchain/package.nix
diff --git a/pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix b/pkgs/by-name/re/remarkable2-toolchain/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/remarkable/remarkable2-toolchain/default.nix
rename to pkgs/by-name/re/remarkable2-toolchain/package.nix
diff --git a/pkgs/development/tools/knightos/remkrom/default.nix b/pkgs/by-name/re/remkrom/package.nix
similarity index 100%
rename from pkgs/development/tools/knightos/remkrom/default.nix
rename to pkgs/by-name/re/remkrom/package.nix
diff --git a/pkgs/applications/misc/remontoire/default.nix b/pkgs/by-name/re/remontoire/package.nix
similarity index 100%
rename from pkgs/applications/misc/remontoire/default.nix
rename to pkgs/by-name/re/remontoire/package.nix
diff --git a/pkgs/tools/inputmethods/remote-touchpad/default.nix b/pkgs/by-name/re/remote-touchpad/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/remote-touchpad/default.nix
rename to pkgs/by-name/re/remote-touchpad/package.nix
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/by-name/re/remotebox/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/remotebox/default.nix
rename to pkgs/by-name/re/remotebox/package.nix
diff --git a/pkgs/tools/misc/rename/default.nix b/pkgs/by-name/re/rename/package.nix
similarity index 100%
rename from pkgs/tools/misc/rename/default.nix
rename to pkgs/by-name/re/rename/package.nix
diff --git a/pkgs/tools/misc/renameutils/install-exec.patch b/pkgs/by-name/re/renameutils/install-exec.patch
similarity index 100%
rename from pkgs/tools/misc/renameutils/install-exec.patch
rename to pkgs/by-name/re/renameutils/install-exec.patch
diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/by-name/re/renameutils/package.nix
similarity index 100%
rename from pkgs/tools/misc/renameutils/default.nix
rename to pkgs/by-name/re/renameutils/package.nix
diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/by-name/re/renderizer/package.nix
similarity index 100%
rename from pkgs/development/tools/renderizer/default.nix
rename to pkgs/by-name/re/renderizer/package.nix
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/by-name/re/renoise/package.nix
similarity index 100%
rename from pkgs/applications/audio/renoise/default.nix
rename to pkgs/by-name/re/renoise/package.nix
diff --git a/pkgs/development/tools/rep/default.nix b/pkgs/by-name/re/rep/package.nix
similarity index 100%
rename from pkgs/development/tools/rep/default.nix
rename to pkgs/by-name/re/rep/package.nix
diff --git a/pkgs/tools/text/repgrep/default.nix b/pkgs/by-name/re/repgrep/package.nix
similarity index 100%
rename from pkgs/tools/text/repgrep/default.nix
rename to pkgs/by-name/re/repgrep/package.nix
diff --git a/pkgs/tools/text/replace/malloc.patch b/pkgs/by-name/re/replace/malloc.patch
similarity index 100%
rename from pkgs/tools/text/replace/malloc.patch
rename to pkgs/by-name/re/replace/malloc.patch
diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/by-name/re/replace/package.nix
similarity index 100%
rename from pkgs/tools/text/replace/default.nix
rename to pkgs/by-name/re/replace/package.nix
diff --git a/pkgs/development/tools/misc/replacement/default.nix b/pkgs/by-name/re/replacement/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/replacement/default.nix
rename to pkgs/by-name/re/replacement/package.nix
diff --git a/pkgs/applications/version-management/reposurgeon/fix-makefile.patch b/pkgs/by-name/re/reposurgeon/fix-makefile.patch
similarity index 100%
rename from pkgs/applications/version-management/reposurgeon/fix-makefile.patch
rename to pkgs/by-name/re/reposurgeon/fix-makefile.patch
diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/by-name/re/reposurgeon/package.nix
similarity index 100%
rename from pkgs/applications/version-management/reposurgeon/default.nix
rename to pkgs/by-name/re/reposurgeon/package.nix
diff --git a/pkgs/tools/package-management/repro-get/default.nix b/pkgs/by-name/re/repro-get/package.nix
similarity index 100%
rename from pkgs/tools/package-management/repro-get/default.nix
rename to pkgs/by-name/re/repro-get/package.nix
diff --git a/pkgs/development/libraries/reproc/default.nix b/pkgs/by-name/re/reproc/package.nix
similarity index 100%
rename from pkgs/development/libraries/reproc/default.nix
rename to pkgs/by-name/re/reproc/package.nix
diff --git a/pkgs/applications/science/biology/repseek/default.nix b/pkgs/by-name/re/repseek/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/repseek/default.nix
rename to pkgs/by-name/re/repseek/package.nix
diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/by-name/re/reptyr/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/reptyr/default.nix
rename to pkgs/by-name/re/reptyr/package.nix
diff --git a/pkgs/tools/networking/requestly/default.nix b/pkgs/by-name/re/requestly/package.nix
similarity index 100%
rename from pkgs/tools/networking/requestly/default.nix
rename to pkgs/by-name/re/requestly/package.nix
diff --git a/pkgs/tools/misc/reredirect/default.nix b/pkgs/by-name/re/reredirect/package.nix
similarity index 100%
rename from pkgs/tools/misc/reredirect/default.nix
rename to pkgs/by-name/re/reredirect/package.nix
diff --git a/pkgs/servers/resgate/default.nix b/pkgs/by-name/re/resgate/package.nix
similarity index 100%
rename from pkgs/servers/resgate/default.nix
rename to pkgs/by-name/re/resgate/package.nix
diff --git a/pkgs/development/tools/reshape/default.nix b/pkgs/by-name/re/reshape/package.nix
similarity index 100%
rename from pkgs/development/tools/reshape/default.nix
rename to pkgs/by-name/re/reshape/package.nix
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/by-name/re/resilio-sync/package.nix
similarity index 100%
rename from pkgs/applications/networking/resilio-sync/default.nix
rename to pkgs/by-name/re/resilio-sync/package.nix
diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/by-name/re/resolv_wrapper/package.nix
similarity index 100%
rename from pkgs/development/libraries/resolv_wrapper/default.nix
rename to pkgs/by-name/re/resolv_wrapper/package.nix
diff --git a/pkgs/development/tools/resolve-march-native/default.nix b/pkgs/by-name/re/resolve-march-native/package.nix
similarity index 100%
rename from pkgs/development/tools/resolve-march-native/default.nix
rename to pkgs/by-name/re/resolve-march-native/package.nix
diff --git a/pkgs/tools/security/responder/default.nix b/pkgs/by-name/re/responder/package.nix
similarity index 100%
rename from pkgs/tools/security/responder/default.nix
rename to pkgs/by-name/re/responder/package.nix
diff --git a/pkgs/applications/backup/restic-integrity/default.nix b/pkgs/by-name/re/restic-integrity/package.nix
similarity index 100%
rename from pkgs/applications/backup/restic-integrity/default.nix
rename to pkgs/by-name/re/restic-integrity/package.nix
diff --git a/pkgs/tools/networking/restish/default.nix b/pkgs/by-name/re/restish/package.nix
similarity index 100%
rename from pkgs/tools/networking/restish/default.nix
rename to pkgs/by-name/re/restish/package.nix
diff --git a/pkgs/os-specific/linux/restool/default.nix b/pkgs/by-name/re/restool/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/restool/default.nix
rename to pkgs/by-name/re/restool/package.nix
diff --git a/pkgs/applications/misc/remarkable/restream/default.nix b/pkgs/by-name/re/restream/package.nix
similarity index 100%
rename from pkgs/applications/misc/remarkable/restream/default.nix
rename to pkgs/by-name/re/restream/package.nix
diff --git a/pkgs/applications/misc/resumed/default.nix b/pkgs/by-name/re/resumed/package.nix
similarity index 100%
rename from pkgs/applications/misc/resumed/default.nix
rename to pkgs/by-name/re/resumed/package.nix
diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/by-name/re/resvg/package.nix
similarity index 100%
rename from pkgs/tools/graphics/resvg/default.nix
rename to pkgs/by-name/re/resvg/package.nix
diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/by-name/re/retdec/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/retdec/default.nix
rename to pkgs/by-name/re/retdec/package.nix
diff --git a/pkgs/development/libraries/retro-gtk/gio-unix.patch b/pkgs/by-name/re/retro-gtk/gio-unix.patch
similarity index 100%
rename from pkgs/development/libraries/retro-gtk/gio-unix.patch
rename to pkgs/by-name/re/retro-gtk/gio-unix.patch
diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/by-name/re/retro-gtk/package.nix
similarity index 100%
rename from pkgs/development/libraries/retro-gtk/default.nix
rename to pkgs/by-name/re/retro-gtk/package.nix
diff --git a/pkgs/applications/emulators/retrofe/default.nix b/pkgs/by-name/re/retrofe/package.nix
similarity index 100%
rename from pkgs/applications/emulators/retrofe/default.nix
rename to pkgs/by-name/re/retrofe/package.nix
diff --git a/pkgs/tools/system/retry/default.nix b/pkgs/by-name/re/retry/package.nix
similarity index 100%
rename from pkgs/tools/system/retry/default.nix
rename to pkgs/by-name/re/retry/package.nix
diff --git a/pkgs/applications/misc/revanced-cli/default.nix b/pkgs/by-name/re/revanced-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/revanced-cli/default.nix
rename to pkgs/by-name/re/revanced-cli/package.nix
diff --git a/pkgs/tools/text/reveal-md/default.nix b/pkgs/by-name/re/reveal-md/package.nix
similarity index 100%
rename from pkgs/tools/text/reveal-md/default.nix
rename to pkgs/by-name/re/reveal-md/package.nix
diff --git a/pkgs/data/icons/reversal-icon-theme/default.nix b/pkgs/by-name/re/reversal-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/reversal-icon-theme/default.nix
rename to pkgs/by-name/re/reversal-icon-theme/package.nix
diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/by-name/re/reviewdog/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/reviewdog/default.nix
rename to pkgs/by-name/re/reviewdog/package.nix
diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/by-name/re/revive/package.nix
similarity index 100%
rename from pkgs/development/tools/revive/default.nix
rename to pkgs/by-name/re/revive/package.nix
diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/by-name/re/rewritefs/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/rewritefs/default.nix
rename to pkgs/by-name/re/rewritefs/package.nix
diff --git a/pkgs/tools/networking/rewrk/Cargo.lock b/pkgs/by-name/re/rewrk/Cargo.lock
similarity index 100%
rename from pkgs/tools/networking/rewrk/Cargo.lock
rename to pkgs/by-name/re/rewrk/Cargo.lock
diff --git a/pkgs/tools/networking/rewrk/default.nix b/pkgs/by-name/re/rewrk/package.nix
similarity index 100%
rename from pkgs/tools/networking/rewrk/default.nix
rename to pkgs/by-name/re/rewrk/package.nix
diff --git a/pkgs/tools/system/rex/default.nix b/pkgs/by-name/re/rex/package.nix
similarity index 100%
rename from pkgs/tools/system/rex/default.nix
rename to pkgs/by-name/re/rex/package.nix
diff --git a/pkgs/tools/typesetting/rfc-bibtex/default.nix b/pkgs/by-name/rf/rfc-bibtex/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/rfc-bibtex/default.nix
rename to pkgs/by-name/rf/rfc-bibtex/package.nix
diff --git a/pkgs/tools/misc/rfc/default.nix b/pkgs/by-name/rf/rfc/package.nix
similarity index 100%
rename from pkgs/tools/misc/rfc/default.nix
rename to pkgs/by-name/rf/rfc/package.nix
diff --git a/pkgs/games/rftg/default.nix b/pkgs/by-name/rf/rftg/package.nix
similarity index 100%
rename from pkgs/games/rftg/default.nix
rename to pkgs/by-name/rf/rftg/package.nix
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/by-name/rg/rgbds/package.nix
similarity index 100%
rename from pkgs/development/compilers/rgbds/default.nix
rename to pkgs/by-name/rg/rgbds/package.nix
diff --git a/pkgs/tools/text/rgxg/default.nix b/pkgs/by-name/rg/rgxg/package.nix
similarity index 100%
rename from pkgs/tools/text/rgxg/default.nix
rename to pkgs/by-name/rg/rgxg/package.nix
diff --git a/pkgs/development/tools/rust/rhack/default.nix b/pkgs/by-name/rh/rhack/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/rhack/default.nix
rename to pkgs/by-name/rh/rhack/package.nix
diff --git a/pkgs/development/tools/misc/rhai-doc/default.nix b/pkgs/by-name/rh/rhai-doc/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rhai-doc/default.nix
rename to pkgs/by-name/rh/rhai-doc/package.nix
diff --git a/pkgs/tools/security/rhash/do-link-so.patch b/pkgs/by-name/rh/rhash/do-link-so.patch
similarity index 100%
rename from pkgs/tools/security/rhash/do-link-so.patch
rename to pkgs/by-name/rh/rhash/do-link-so.patch
diff --git a/pkgs/tools/security/rhash/dont-fail-ln.patch b/pkgs/by-name/rh/rhash/dont-fail-ln.patch
similarity index 100%
rename from pkgs/tools/security/rhash/dont-fail-ln.patch
rename to pkgs/by-name/rh/rhash/dont-fail-ln.patch
diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/by-name/rh/rhash/package.nix
similarity index 100%
rename from pkgs/tools/security/rhash/default.nix
rename to pkgs/by-name/rh/rhash/package.nix
diff --git a/pkgs/tools/admin/rhoas/default.nix b/pkgs/by-name/rh/rhoas/package.nix
similarity index 100%
rename from pkgs/tools/admin/rhoas/default.nix
rename to pkgs/by-name/rh/rhoas/package.nix
diff --git a/pkgs/data/fonts/rhodium-libre/default.nix b/pkgs/by-name/rh/rhodium-libre/package.nix
similarity index 100%
rename from pkgs/data/fonts/rhodium-libre/default.nix
rename to pkgs/by-name/rh/rhodium-libre/package.nix
diff --git a/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/pkgs/by-name/rh/rhvoice/honor_nix_environment.patch
similarity index 100%
rename from pkgs/applications/audio/rhvoice/honor_nix_environment.patch
rename to pkgs/by-name/rh/rhvoice/honor_nix_environment.patch
diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/by-name/rh/rhvoice/package.nix
similarity index 100%
rename from pkgs/applications/audio/rhvoice/default.nix
rename to pkgs/by-name/rh/rhvoice/package.nix
diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/by-name/rh/rhythmbox/package.nix
similarity index 100%
rename from pkgs/applications/audio/rhythmbox/default.nix
rename to pkgs/by-name/rh/rhythmbox/package.nix
diff --git a/pkgs/misc/rich-cli/default.nix b/pkgs/by-name/ri/rich-cli/package.nix
similarity index 100%
rename from pkgs/misc/rich-cli/default.nix
rename to pkgs/by-name/ri/rich-cli/package.nix
diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/by-name/ri/richgo/package.nix
similarity index 100%
rename from pkgs/development/tools/richgo/default.nix
rename to pkgs/by-name/ri/richgo/package.nix
diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/by-name/ri/ricty/package.nix
similarity index 100%
rename from pkgs/data/fonts/ricty/default.nix
rename to pkgs/by-name/ri/ricty/package.nix
diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/by-name/ri/rictydiminished-with-firacode/package.nix
similarity index 100%
rename from pkgs/data/fonts/rictydiminished-with-firacode/default.nix
rename to pkgs/by-name/ri/rictydiminished-with-firacode/package.nix
diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/by-name/ri/riemann/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/riemann/default.nix
rename to pkgs/by-name/ri/riemann/package.nix
diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/by-name/ri/riemann_c_client/package.nix
similarity index 100%
rename from pkgs/tools/misc/riemann-c-client/default.nix
rename to pkgs/by-name/ri/riemann_c_client/package.nix
diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/by-name/ri/ries/package.nix
similarity index 100%
rename from pkgs/applications/science/math/ries/default.nix
rename to pkgs/by-name/ri/ries/package.nix
diff --git a/pkgs/development/tools/misc/riff/default.nix b/pkgs/by-name/ri/riff/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/riff/default.nix
rename to pkgs/by-name/ri/riff/package.nix
diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/by-name/ri/rig/package.nix
similarity index 100%
rename from pkgs/tools/misc/rig/default.nix
rename to pkgs/by-name/ri/rig/package.nix
diff --git a/pkgs/tools/misc/rig/rig_1.11-1.diff b/pkgs/by-name/ri/rig/rig_1.11-1.diff
similarity index 100%
rename from pkgs/tools/misc/rig/rig_1.11-1.diff
rename to pkgs/by-name/ri/rig/rig_1.11-1.diff
diff --git a/pkgs/games/rigsofrods-bin/default.nix b/pkgs/by-name/ri/rigsofrods-bin/package.nix
similarity index 100%
rename from pkgs/games/rigsofrods-bin/default.nix
rename to pkgs/by-name/ri/rigsofrods-bin/package.nix
diff --git a/pkgs/games/riko4/default.nix b/pkgs/by-name/ri/riko4/package.nix
similarity index 100%
rename from pkgs/games/riko4/default.nix
rename to pkgs/by-name/ri/riko4/package.nix
diff --git a/pkgs/games/rili/moderinze_cpp.patch b/pkgs/by-name/ri/rili/moderinze_cpp.patch
similarity index 100%
rename from pkgs/games/rili/moderinze_cpp.patch
rename to pkgs/by-name/ri/rili/moderinze_cpp.patch
diff --git a/pkgs/games/rili/default.nix b/pkgs/by-name/ri/rili/package.nix
similarity index 100%
rename from pkgs/games/rili/default.nix
rename to pkgs/by-name/ri/rili/package.nix
diff --git a/pkgs/applications/office/rime-cli/default.nix b/pkgs/by-name/ri/rime-cli/package.nix
similarity index 100%
rename from pkgs/applications/office/rime-cli/default.nix
rename to pkgs/by-name/ri/rime-cli/package.nix
diff --git a/pkgs/data/misc/rime-data/fetchSchema.nix b/pkgs/by-name/ri/rime-data/fetchSchema.nix
similarity index 100%
rename from pkgs/data/misc/rime-data/fetchSchema.nix
rename to pkgs/by-name/ri/rime-data/fetchSchema.nix
diff --git a/pkgs/data/misc/rime-data/generateFetchSchema.sh b/pkgs/by-name/ri/rime-data/generateFetchSchema.sh
similarity index 100%
rename from pkgs/data/misc/rime-data/generateFetchSchema.sh
rename to pkgs/by-name/ri/rime-data/generateFetchSchema.sh
diff --git a/pkgs/data/misc/rime-data/default.nix b/pkgs/by-name/ri/rime-data/package.nix
similarity index 100%
rename from pkgs/data/misc/rime-data/default.nix
rename to pkgs/by-name/ri/rime-data/package.nix
diff --git a/pkgs/servers/rinetd/default.nix b/pkgs/by-name/ri/rinetd/package.nix
similarity index 100%
rename from pkgs/servers/rinetd/default.nix
rename to pkgs/by-name/ri/rinetd/package.nix
diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/by-name/ri/rinutils/package.nix
similarity index 100%
rename from pkgs/development/libraries/rinutils/default.nix
rename to pkgs/by-name/ri/rinutils/package.nix
diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/by-name/ri/rio/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/rio/default.nix
rename to pkgs/by-name/ri/rio/package.nix
diff --git a/pkgs/development/tools/riot-redis/default.nix b/pkgs/by-name/ri/riot-redis/package.nix
similarity index 100%
rename from pkgs/development/tools/riot-redis/default.nix
rename to pkgs/by-name/ri/riot-redis/package.nix
diff --git a/pkgs/tools/misc/ripdrag/default.nix b/pkgs/by-name/ri/ripdrag/package.nix
similarity index 100%
rename from pkgs/tools/misc/ripdrag/default.nix
rename to pkgs/by-name/ri/ripdrag/package.nix
diff --git a/pkgs/tools/networking/ripe-atlas-tools/default.nix b/pkgs/by-name/ri/ripe-atlas-tools/package.nix
similarity index 100%
rename from pkgs/tools/networking/ripe-atlas-tools/default.nix
rename to pkgs/by-name/ri/ripe-atlas-tools/package.nix
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/by-name/ri/ripgrep/package.nix
similarity index 100%
rename from pkgs/tools/text/ripgrep/default.nix
rename to pkgs/by-name/ri/ripgrep/package.nix
diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/by-name/ri/ripmime/package.nix
similarity index 100%
rename from pkgs/tools/networking/ripmime/default.nix
rename to pkgs/by-name/ri/ripmime/package.nix
diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/by-name/ri/ripser/package.nix
similarity index 100%
rename from pkgs/applications/science/math/ripser/default.nix
rename to pkgs/by-name/ri/ripser/package.nix
diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/by-name/ri/riscv-pk/package.nix
similarity index 100%
rename from pkgs/misc/riscv-pk/default.nix
rename to pkgs/by-name/ri/riscv-pk/package.nix
diff --git a/pkgs/development/interpreters/risor/default.nix b/pkgs/by-name/ri/risor/package.nix
similarity index 100%
rename from pkgs/development/interpreters/risor/default.nix
rename to pkgs/by-name/ri/risor/package.nix
diff --git a/pkgs/tools/misc/ristate/default.nix b/pkgs/by-name/ri/ristate/package.nix
similarity index 100%
rename from pkgs/tools/misc/ristate/default.nix
rename to pkgs/by-name/ri/ristate/package.nix
diff --git a/pkgs/misc/rivalcfg/default.nix b/pkgs/by-name/ri/rivalcfg/package.nix
similarity index 100%
rename from pkgs/misc/rivalcfg/default.nix
rename to pkgs/by-name/ri/rivalcfg/package.nix
diff --git a/pkgs/applications/misc/river-luatile/default.nix b/pkgs/by-name/ri/river-luatile/package.nix
similarity index 100%
rename from pkgs/applications/misc/river-luatile/default.nix
rename to pkgs/by-name/ri/river-luatile/package.nix
diff --git a/pkgs/applications/misc/river-tag-overlay/default.nix b/pkgs/by-name/ri/river-tag-overlay/package.nix
similarity index 100%
rename from pkgs/applications/misc/river-tag-overlay/default.nix
rename to pkgs/by-name/ri/river-tag-overlay/package.nix
diff --git a/pkgs/applications/misc/rivercarro/deps.nix b/pkgs/by-name/ri/rivercarro/deps.nix
similarity index 100%
rename from pkgs/applications/misc/rivercarro/deps.nix
rename to pkgs/by-name/ri/rivercarro/deps.nix
diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/by-name/ri/rivercarro/package.nix
similarity index 100%
rename from pkgs/applications/misc/rivercarro/default.nix
rename to pkgs/by-name/ri/rivercarro/package.nix
diff --git a/pkgs/misc/rkdeveloptool-pine64/default.nix b/pkgs/by-name/rk/rkdeveloptool-pine64/package.nix
similarity index 100%
rename from pkgs/misc/rkdeveloptool-pine64/default.nix
rename to pkgs/by-name/rk/rkdeveloptool-pine64/package.nix
diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/by-name/rk/rkdeveloptool/package.nix
similarity index 100%
rename from pkgs/misc/rkdeveloptool/default.nix
rename to pkgs/by-name/rk/rkdeveloptool/package.nix
diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/by-name/rk/rke/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/rke/default.nix
rename to pkgs/by-name/rk/rke/package.nix
diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/by-name/rk/rkflashtool/package.nix
similarity index 100%
rename from pkgs/tools/misc/rkflashtool/default.nix
rename to pkgs/by-name/rk/rkflashtool/package.nix
diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/by-name/rk/rkrlv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/rkrlv2/default.nix
rename to pkgs/by-name/rk/rkrlv2/package.nix
diff --git a/pkgs/tools/misc/rkvm/default.nix b/pkgs/by-name/rk/rkvm/package.nix
similarity index 100%
rename from pkgs/tools/misc/rkvm/default.nix
rename to pkgs/by-name/rk/rkvm/package.nix
diff --git a/pkgs/applications/misc/rlaunch/default.nix b/pkgs/by-name/rl/rlaunch/package.nix
similarity index 100%
rename from pkgs/applications/misc/rlaunch/default.nix
rename to pkgs/by-name/rl/rlaunch/package.nix
diff --git a/pkgs/development/interpreters/rlci/default.nix b/pkgs/by-name/rl/rlci/package.nix
similarity index 100%
rename from pkgs/development/interpreters/rlci/default.nix
rename to pkgs/by-name/rl/rlci/package.nix
diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/by-name/rl/rlog/package.nix
similarity index 100%
rename from pkgs/development/libraries/rlog/default.nix
rename to pkgs/by-name/rl/rlog/package.nix
diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/by-name/rl/rlottie/package.nix
similarity index 100%
rename from pkgs/development/libraries/rlottie/default.nix
rename to pkgs/by-name/rl/rlottie/package.nix
diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/by-name/rl/rlwrap/package.nix
similarity index 100%
rename from pkgs/tools/misc/rlwrap/default.nix
rename to pkgs/by-name/rl/rlwrap/package.nix
diff --git a/pkgs/applications/misc/rm-improved/Cargo.lock.patch b/pkgs/by-name/rm/rm-improved/Cargo.lock.patch
similarity index 100%
rename from pkgs/applications/misc/rm-improved/Cargo.lock.patch
rename to pkgs/by-name/rm/rm-improved/Cargo.lock.patch
diff --git a/pkgs/applications/misc/rm-improved/default.nix b/pkgs/by-name/rm/rm-improved/package.nix
similarity index 100%
rename from pkgs/applications/misc/rm-improved/default.nix
rename to pkgs/by-name/rm/rm-improved/package.nix
diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/by-name/rm/rman/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rman/default.nix
rename to pkgs/by-name/rm/rman/package.nix
diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/by-name/rm/rmapi/package.nix
similarity index 100%
rename from pkgs/applications/misc/remarkable/rmapi/default.nix
rename to pkgs/by-name/rm/rmapi/package.nix
diff --git a/pkgs/tools/misc/rmate-sh/default.nix b/pkgs/by-name/rm/rmate-sh/package.nix
similarity index 100%
rename from pkgs/tools/misc/rmate-sh/default.nix
rename to pkgs/by-name/rm/rmate-sh/package.nix
diff --git a/pkgs/tools/filesystems/rmfuse/default.nix b/pkgs/by-name/rm/rmfuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/rmfuse/default.nix
rename to pkgs/by-name/rm/rmfuse/package.nix
diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/by-name/rm/rmount/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/rmount/default.nix
rename to pkgs/by-name/rm/rmount/package.nix
diff --git a/pkgs/tools/misc/rmtrash/default.nix b/pkgs/by-name/rm/rmtrash/package.nix
similarity index 100%
rename from pkgs/tools/misc/rmtrash/default.nix
rename to pkgs/by-name/rm/rmtrash/package.nix
diff --git a/pkgs/tools/misc/rmw/default.nix b/pkgs/by-name/rm/rmw/package.nix
similarity index 100%
rename from pkgs/tools/misc/rmw/default.nix
rename to pkgs/by-name/rm/rmw/package.nix
diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/by-name/rn/rng-tools/package.nix
similarity index 100%
rename from pkgs/tools/security/rng-tools/default.nix
rename to pkgs/by-name/rn/rng-tools/package.nix
diff --git a/pkgs/tools/nix/rnix-hashes/default.nix b/pkgs/by-name/rn/rnix-hashes/package.nix
similarity index 100%
rename from pkgs/tools/nix/rnix-hashes/default.nix
rename to pkgs/by-name/rn/rnix-hashes/package.nix
diff --git a/pkgs/tools/filesystems/rnm/default.nix b/pkgs/by-name/rn/rnm/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/rnm/default.nix
rename to pkgs/by-name/rn/rnm/package.nix
diff --git a/pkgs/development/libraries/rnnoise/model-version.json b/pkgs/by-name/rn/rnnoise/model-version.json
similarity index 100%
rename from pkgs/development/libraries/rnnoise/model-version.json
rename to pkgs/by-name/rn/rnnoise/model-version.json
diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/by-name/rn/rnnoise/package.nix
similarity index 100%
rename from pkgs/development/libraries/rnnoise/default.nix
rename to pkgs/by-name/rn/rnnoise/package.nix
diff --git a/pkgs/tools/security/rnp/default.nix b/pkgs/by-name/rn/rnp/package.nix
similarity index 100%
rename from pkgs/tools/security/rnp/default.nix
rename to pkgs/by-name/rn/rnp/package.nix
diff --git a/pkgs/tools/text/rnr/default.nix b/pkgs/by-name/rn/rnr/package.nix
similarity index 100%
rename from pkgs/tools/text/rnr/default.nix
rename to pkgs/by-name/rn/rnr/package.nix
diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/by-name/rn/rnv/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/rnv/default.nix
rename to pkgs/by-name/rn/rnv/package.nix
diff --git a/pkgs/servers/roadrunner/default.nix b/pkgs/by-name/ro/roadrunner/package.nix
similarity index 100%
rename from pkgs/servers/roadrunner/default.nix
rename to pkgs/by-name/ro/roadrunner/package.nix
diff --git a/pkgs/applications/office/roam-research/common.nix b/pkgs/by-name/ro/roam-research/common.nix
similarity index 100%
rename from pkgs/applications/office/roam-research/common.nix
rename to pkgs/by-name/ro/roam-research/common.nix
diff --git a/pkgs/applications/office/roam-research/darwin.nix b/pkgs/by-name/ro/roam-research/darwin.nix
similarity index 100%
rename from pkgs/applications/office/roam-research/darwin.nix
rename to pkgs/by-name/ro/roam-research/darwin.nix
diff --git a/pkgs/applications/office/roam-research/linux.nix b/pkgs/by-name/ro/roam-research/linux.nix
similarity index 100%
rename from pkgs/applications/office/roam-research/linux.nix
rename to pkgs/by-name/ro/roam-research/linux.nix
diff --git a/pkgs/applications/office/roam-research/default.nix b/pkgs/by-name/ro/roam-research/package.nix
similarity index 100%
rename from pkgs/applications/office/roam-research/default.nix
rename to pkgs/by-name/ro/roam-research/package.nix
diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/by-name/ro/robin-map/package.nix
similarity index 100%
rename from pkgs/development/libraries/robin-map/default.nix
rename to pkgs/by-name/ro/robin-map/package.nix
diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/by-name/ro/robo3t/package.nix
similarity index 100%
rename from pkgs/applications/misc/robo3t/default.nix
rename to pkgs/by-name/ro/robo3t/package.nix
diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/by-name/ro/roboto-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/roboto-mono/default.nix
rename to pkgs/by-name/ro/roboto-mono/package.nix
diff --git a/pkgs/data/fonts/roboto-serif/default.nix b/pkgs/by-name/ro/roboto-serif/package.nix
similarity index 100%
rename from pkgs/data/fonts/roboto-serif/default.nix
rename to pkgs/by-name/ro/roboto-serif/package.nix
diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/by-name/ro/roboto-slab/package.nix
similarity index 100%
rename from pkgs/data/fonts/roboto-slab/default.nix
rename to pkgs/by-name/ro/roboto-slab/package.nix
diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/by-name/ro/roboto/package.nix
similarity index 100%
rename from pkgs/data/fonts/roboto/default.nix
rename to pkgs/by-name/ro/roboto/package.nix
diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/by-name/ro/robustirc-bridge/package.nix
similarity index 100%
rename from pkgs/servers/irc/robustirc-bridge/default.nix
rename to pkgs/by-name/ro/robustirc-bridge/package.nix
diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/by-name/ro/roc-toolkit/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/roc-toolkit/default.nix
rename to pkgs/by-name/ro/roc-toolkit/package.nix
diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/by-name/ro/roccat-tools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/roccat-tools/default.nix
rename to pkgs/by-name/ro/roccat-tools/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix
rename to pkgs/by-name/ro/rocketchat-desktop/package.nix
diff --git a/pkgs/development/libraries/rocksdb/fix-findliburing.patch b/pkgs/by-name/ro/rocksdb/fix-findliburing.patch
similarity index 100%
rename from pkgs/development/libraries/rocksdb/fix-findliburing.patch
rename to pkgs/by-name/ro/rocksdb/fix-findliburing.patch
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/by-name/ro/rocksdb/package.nix
similarity index 100%
rename from pkgs/development/libraries/rocksdb/default.nix
rename to pkgs/by-name/ro/rocksdb/package.nix
diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/by-name/ro/rocksndiamonds/package.nix
similarity index 100%
rename from pkgs/games/rocksndiamonds/default.nix
rename to pkgs/by-name/ro/rocksndiamonds/package.nix
diff --git a/pkgs/applications/misc/rofi-bluetooth/default.nix b/pkgs/by-name/ro/rofi-bluetooth/package.nix
similarity index 100%
rename from pkgs/applications/misc/rofi-bluetooth/default.nix
rename to pkgs/by-name/ro/rofi-bluetooth/package.nix
diff --git a/pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch b/pkgs/by-name/ro/rofi-calc/0001-Patch-plugindir-to-output.patch
similarity index 100%
rename from pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch
rename to pkgs/by-name/ro/rofi-calc/0001-Patch-plugindir-to-output.patch
diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/by-name/ro/rofi-calc/package.nix
similarity index 100%
rename from pkgs/applications/science/math/rofi-calc/default.nix
rename to pkgs/by-name/ro/rofi-calc/package.nix
diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/by-name/ro/rofi-file-browser/package.nix
similarity index 100%
rename from pkgs/applications/misc/rofi-file-browser/default.nix
rename to pkgs/by-name/ro/rofi-file-browser/package.nix
diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/by-name/ro/rofi-menugen/package.nix
similarity index 100%
rename from pkgs/applications/misc/rofi-menugen/default.nix
rename to pkgs/by-name/ro/rofi-menugen/package.nix
diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/by-name/ro/rofi-mpd/package.nix
similarity index 100%
rename from pkgs/applications/audio/rofi-mpd/default.nix
rename to pkgs/by-name/ro/rofi-mpd/package.nix
diff --git a/pkgs/applications/misc/rofi-power-menu/default.nix b/pkgs/by-name/ro/rofi-power-menu/package.nix
similarity index 100%
rename from pkgs/applications/misc/rofi-power-menu/default.nix
rename to pkgs/by-name/ro/rofi-power-menu/package.nix
diff --git a/pkgs/applications/audio/rofi-pulse-select/default.nix b/pkgs/by-name/ro/rofi-pulse-select/package.nix
similarity index 100%
rename from pkgs/applications/audio/rofi-pulse-select/default.nix
rename to pkgs/by-name/ro/rofi-pulse-select/package.nix
diff --git a/pkgs/applications/misc/rofi-screenshot/default.nix b/pkgs/by-name/ro/rofi-screenshot/package.nix
similarity index 100%
rename from pkgs/applications/misc/rofi-screenshot/default.nix
rename to pkgs/by-name/ro/rofi-screenshot/package.nix
diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/by-name/ro/rofi-systemd/package.nix
similarity index 100%
rename from pkgs/tools/system/rofi-systemd/default.nix
rename to pkgs/by-name/ro/rofi-systemd/package.nix
diff --git a/pkgs/applications/misc/rofi-top/0001-Patch-plugindir-to-output.patch b/pkgs/by-name/ro/rofi-top/0001-Patch-plugindir-to-output.patch
similarity index 100%
rename from pkgs/applications/misc/rofi-top/0001-Patch-plugindir-to-output.patch
rename to pkgs/by-name/ro/rofi-top/0001-Patch-plugindir-to-output.patch
diff --git a/pkgs/applications/misc/rofi-top/0002-Patch-add-cairo.patch b/pkgs/by-name/ro/rofi-top/0002-Patch-add-cairo.patch
similarity index 100%
rename from pkgs/applications/misc/rofi-top/0002-Patch-add-cairo.patch
rename to pkgs/by-name/ro/rofi-top/0002-Patch-add-cairo.patch
diff --git a/pkgs/applications/misc/rofi-top/default.nix b/pkgs/by-name/ro/rofi-top/package.nix
similarity index 100%
rename from pkgs/applications/misc/rofi-top/default.nix
rename to pkgs/by-name/ro/rofi-top/package.nix
diff --git a/pkgs/applications/networking/rofi-vpn/default.nix b/pkgs/by-name/ro/rofi-vpn/package.nix
similarity index 100%
rename from pkgs/applications/networking/rofi-vpn/default.nix
rename to pkgs/by-name/ro/rofi-vpn/package.nix
diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/by-name/ro/rojo/package.nix
similarity index 100%
rename from pkgs/development/tools/rojo/default.nix
rename to pkgs/by-name/ro/rojo/package.nix
diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/by-name/ro/rolespec/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rolespec/default.nix
rename to pkgs/by-name/ro/rolespec/package.nix
diff --git a/pkgs/development/tools/rust/roogle/default.nix b/pkgs/by-name/ro/roogle/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/roogle/default.nix
rename to pkgs/by-name/ro/roogle/package.nix
diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/by-name/ro/roomeqwizard/package.nix
similarity index 100%
rename from pkgs/applications/audio/roomeqwizard/default.nix
rename to pkgs/by-name/ro/roomeqwizard/package.nix
diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/by-name/ro/roon-bridge/package.nix
similarity index 100%
rename from pkgs/servers/roon-bridge/default.nix
rename to pkgs/by-name/ro/roon-bridge/package.nix
diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/by-name/ro/roon-server/package.nix
similarity index 100%
rename from pkgs/servers/roon-server/default.nix
rename to pkgs/by-name/ro/roon-server/package.nix
diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/by-name/ro/rootlesskit/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/rootlesskit/default.nix
rename to pkgs/by-name/ro/rootlesskit/package.nix
diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/by-name/ro/rose-pine-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/rose-pine-gtk/default.nix
rename to pkgs/by-name/ro/rose-pine-gtk-theme/package.nix
diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/by-name/ro/rose-pine-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/rose-pine/default.nix
rename to pkgs/by-name/ro/rose-pine-icon-theme/package.nix
diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/by-name/ro/rosie/package.nix
similarity index 100%
rename from pkgs/tools/text/rosie/default.nix
rename to pkgs/by-name/ro/rosie/package.nix
diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/by-name/ro/roslyn/deps.nix
similarity index 100%
rename from pkgs/development/compilers/roslyn/deps.nix
rename to pkgs/by-name/ro/roslyn/deps.nix
diff --git a/pkgs/development/compilers/roslyn/default.nix b/pkgs/by-name/ro/roslyn/package.nix
similarity index 100%
rename from pkgs/development/compilers/roslyn/default.nix
rename to pkgs/by-name/ro/roslyn/package.nix
diff --git a/pkgs/development/tools/roswell/0001-get-image-from-environment.patch b/pkgs/by-name/ro/roswell/0001-get-image-from-environment.patch
similarity index 100%
rename from pkgs/development/tools/roswell/0001-get-image-from-environment.patch
rename to pkgs/by-name/ro/roswell/0001-get-image-from-environment.patch
diff --git a/pkgs/development/tools/roswell/default.nix b/pkgs/by-name/ro/roswell/package.nix
similarity index 100%
rename from pkgs/development/tools/roswell/default.nix
rename to pkgs/by-name/ro/roswell/package.nix
diff --git a/pkgs/tools/misc/rot8/default.nix b/pkgs/by-name/ro/rot8/package.nix
similarity index 100%
rename from pkgs/tools/misc/rot8/default.nix
rename to pkgs/by-name/ro/rot8/package.nix
diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/by-name/ro/rotate-backups/package.nix
similarity index 100%
rename from pkgs/tools/backup/rotate-backups/default.nix
rename to pkgs/by-name/ro/rotate-backups/package.nix
diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/by-name/ro/rote/package.nix
similarity index 100%
rename from pkgs/development/libraries/rote/default.nix
rename to pkgs/by-name/ro/rote/package.nix
diff --git a/pkgs/games/rotp/0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch b/pkgs/by-name/ro/rotp/0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch
similarity index 100%
rename from pkgs/games/rotp/0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch
rename to pkgs/by-name/ro/rotp/0001-store-config-and-saves-in-XDG_CONFIG_HOME.patch
diff --git a/pkgs/games/rotp/default.nix b/pkgs/by-name/ro/rotp/package.nix
similarity index 100%
rename from pkgs/games/rotp/default.nix
rename to pkgs/by-name/ro/rotp/package.nix
diff --git a/pkgs/applications/graphics/round/default.nix b/pkgs/by-name/ro/round/package.nix
similarity index 100%
rename from pkgs/applications/graphics/round/default.nix
rename to pkgs/by-name/ro/round/package.nix
diff --git a/pkgs/data/fonts/rounded-mgenplus/default.nix b/pkgs/by-name/ro/rounded-mgenplus/package.nix
similarity index 100%
rename from pkgs/data/fonts/rounded-mgenplus/default.nix
rename to pkgs/by-name/ro/rounded-mgenplus/package.nix
diff --git a/pkgs/tools/misc/roundup/default.nix b/pkgs/by-name/ro/roundup/package.nix
similarity index 100%
rename from pkgs/tools/misc/roundup/default.nix
rename to pkgs/by-name/ro/roundup/package.nix
diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/by-name/ro/route159/package.nix
similarity index 100%
rename from pkgs/data/fonts/route159/default.nix
rename to pkgs/by-name/ro/route159/package.nix
diff --git a/pkgs/tools/networking/routedns/default.nix b/pkgs/by-name/ro/routedns/package.nix
similarity index 100%
rename from pkgs/tools/networking/routedns/default.nix
rename to pkgs/by-name/ro/routedns/package.nix
diff --git a/pkgs/servers/http/router/librusty_v8.nix b/pkgs/by-name/ro/router/librusty_v8.nix
similarity index 100%
rename from pkgs/servers/http/router/librusty_v8.nix
rename to pkgs/by-name/ro/router/librusty_v8.nix
diff --git a/pkgs/servers/http/router/default.nix b/pkgs/by-name/ro/router/package.nix
similarity index 100%
rename from pkgs/servers/http/router/default.nix
rename to pkgs/by-name/ro/router/package.nix
diff --git a/pkgs/tools/security/routersploit/default.nix b/pkgs/by-name/ro/routersploit/package.nix
similarity index 100%
rename from pkgs/tools/security/routersploit/default.nix
rename to pkgs/by-name/ro/routersploit/package.nix
diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/by-name/ro/routino/package.nix
similarity index 100%
rename from pkgs/tools/misc/routino/default.nix
rename to pkgs/by-name/ro/routino/package.nix
diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/by-name/ro/rowhammer-test/package.nix
similarity index 100%
rename from pkgs/tools/system/rowhammer-test/default.nix
rename to pkgs/by-name/ro/rowhammer-test/package.nix
diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/by-name/rp/rpPPPoE/package.nix
similarity index 100%
rename from pkgs/tools/networking/rp-pppoe/default.nix
rename to pkgs/by-name/rp/rpPPPoE/package.nix
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/by-name/rp/rpcbind/package.nix
similarity index 100%
rename from pkgs/servers/rpcbind/default.nix
rename to pkgs/by-name/rp/rpcbind/package.nix
diff --git a/pkgs/servers/rpcbind/sunrpc.patch b/pkgs/by-name/rp/rpcbind/sunrpc.patch
similarity index 100%
rename from pkgs/servers/rpcbind/sunrpc.patch
rename to pkgs/by-name/rp/rpcbind/sunrpc.patch
diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/by-name/rp/rpcsvc-proto/package.nix
similarity index 100%
rename from pkgs/tools/misc/rpcsvc-proto/default.nix
rename to pkgs/by-name/rp/rpcsvc-proto/package.nix
diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/by-name/rp/rpg-cli/package.nix
similarity index 100%
rename from pkgs/games/rpg-cli/default.nix
rename to pkgs/by-name/rp/rpg-cli/package.nix
diff --git a/pkgs/servers/rpiplay/default.nix b/pkgs/by-name/rp/rpiplay/package.nix
similarity index 100%
rename from pkgs/servers/rpiplay/default.nix
rename to pkgs/by-name/rp/rpiplay/package.nix
diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/by-name/rp/rpl/package.nix
similarity index 100%
rename from pkgs/tools/text/rpl/default.nix
rename to pkgs/by-name/rp/rpl/package.nix
diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/by-name/rp/rpm-ostree/package.nix
similarity index 100%
rename from pkgs/tools/misc/rpm-ostree/default.nix
rename to pkgs/by-name/rp/rpm-ostree/package.nix
diff --git a/pkgs/tools/archivers/rpm2targz/default.nix b/pkgs/by-name/rp/rpm2targz/package.nix
similarity index 100%
rename from pkgs/tools/archivers/rpm2targz/default.nix
rename to pkgs/by-name/rp/rpm2targz/package.nix
diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/by-name/rp/rpmextract/package.nix
similarity index 100%
rename from pkgs/tools/archivers/rpmextract/default.nix
rename to pkgs/by-name/rp/rpmextract/package.nix
diff --git a/pkgs/tools/archivers/rpmextract/rpmextract.sh b/pkgs/by-name/rp/rpmextract/rpmextract.sh
similarity index 100%
rename from pkgs/tools/archivers/rpmextract/rpmextract.sh
rename to pkgs/by-name/rp/rpmextract/rpmextract.sh
diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/by-name/rq/rq/package.nix
similarity index 100%
rename from pkgs/development/tools/rq/default.nix
rename to pkgs/by-name/rq/rq/package.nix
diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/by-name/rq/rqlite/package.nix
similarity index 100%
rename from pkgs/servers/sql/rqlite/default.nix
rename to pkgs/by-name/rq/rqlite/package.nix
diff --git a/pkgs/games/rrootage/default.nix b/pkgs/by-name/rr/rrootage/package.nix
similarity index 100%
rename from pkgs/games/rrootage/default.nix
rename to pkgs/by-name/rr/rrootage/package.nix
diff --git a/pkgs/applications/version-management/rs-git-fsmonitor/default.nix b/pkgs/by-name/rs/rs-git-fsmonitor/package.nix
similarity index 100%
rename from pkgs/applications/version-management/rs-git-fsmonitor/default.nix
rename to pkgs/by-name/rs/rs-git-fsmonitor/package.nix
diff --git a/pkgs/development/tools/misc/rsass/default.nix b/pkgs/by-name/rs/rsass/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rsass/default.nix
rename to pkgs/by-name/rs/rsass/package.nix
diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/by-name/rs/rsbep/package.nix
similarity index 100%
rename from pkgs/tools/backup/rsbep/default.nix
rename to pkgs/by-name/rs/rsbep/package.nix
diff --git a/pkgs/tools/text/rsbkb/default.nix b/pkgs/by-name/rs/rsbkb/package.nix
similarity index 100%
rename from pkgs/tools/text/rsbkb/default.nix
rename to pkgs/by-name/rs/rsbkb/package.nix
diff --git a/pkgs/tools/text/rsbkb/time.patch b/pkgs/by-name/rs/rsbkb/time.patch
similarity index 100%
rename from pkgs/tools/text/rsbkb/time.patch
rename to pkgs/by-name/rs/rsbkb/time.patch
diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/by-name/rs/rsclock/package.nix
similarity index 100%
rename from pkgs/applications/misc/rsclock/default.nix
rename to pkgs/by-name/rs/rsclock/package.nix
diff --git a/pkgs/applications/radio/rscw/default.nix b/pkgs/by-name/rs/rscw/package.nix
similarity index 100%
rename from pkgs/applications/radio/rscw/default.nix
rename to pkgs/by-name/rs/rscw/package.nix
diff --git a/pkgs/tools/admin/rset/default.nix b/pkgs/by-name/rs/rset/package.nix
similarity index 100%
rename from pkgs/tools/admin/rset/default.nix
rename to pkgs/by-name/rs/rset/package.nix
diff --git a/pkgs/tools/admin/rset/paths.patch b/pkgs/by-name/rs/rset/paths.patch
similarity index 100%
rename from pkgs/tools/admin/rset/paths.patch
rename to pkgs/by-name/rs/rset/paths.patch
diff --git a/pkgs/tools/networking/rshijack/default.nix b/pkgs/by-name/rs/rshijack/package.nix
similarity index 100%
rename from pkgs/tools/networking/rshijack/default.nix
rename to pkgs/by-name/rs/rshijack/package.nix
diff --git a/pkgs/tools/misc/rshim-user-space/default.nix b/pkgs/by-name/rs/rshim-user-space/package.nix
similarity index 100%
rename from pkgs/tools/misc/rshim-user-space/default.nix
rename to pkgs/by-name/rs/rshim-user-space/package.nix
diff --git a/pkgs/tools/security/rsign2/default.nix b/pkgs/by-name/rs/rsign2/package.nix
similarity index 100%
rename from pkgs/tools/security/rsign2/default.nix
rename to pkgs/by-name/rs/rsign2/package.nix
diff --git a/pkgs/development/tools/rslint/default.nix b/pkgs/by-name/rs/rslint/package.nix
similarity index 100%
rename from pkgs/development/tools/rslint/default.nix
rename to pkgs/by-name/rs/rslint/package.nix
diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/by-name/rs/rsnapshot/package.nix
similarity index 100%
rename from pkgs/tools/backup/rsnapshot/default.nix
rename to pkgs/by-name/rs/rsnapshot/package.nix
diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/by-name/rs/rsonpath/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rsonpath/default.nix
rename to pkgs/by-name/rs/rsonpath/package.nix
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/by-name/rs/rspamd/package.nix
similarity index 100%
rename from pkgs/servers/mail/rspamd/default.nix
rename to pkgs/by-name/rs/rspamd/package.nix
diff --git a/pkgs/applications/misc/rss-bridge-cli/default.nix b/pkgs/by-name/rs/rss-bridge-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/rss-bridge-cli/default.nix
rename to pkgs/by-name/rs/rss-bridge-cli/package.nix
diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/by-name/rs/rss-bridge/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/rss-bridge/default.nix
rename to pkgs/by-name/rs/rss-bridge/package.nix
diff --git a/pkgs/misc/screensavers/rss-glx/cstddef.patch b/pkgs/by-name/rs/rss-glx/cstddef.patch
similarity index 100%
rename from pkgs/misc/screensavers/rss-glx/cstddef.patch
rename to pkgs/by-name/rs/rss-glx/cstddef.patch
diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/by-name/rs/rss-glx/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/rss-glx/default.nix
rename to pkgs/by-name/rs/rss-glx/package.nix
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/by-name/rs/rsstail/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/rsstail/default.nix
rename to pkgs/by-name/rs/rsstail/package.nix
diff --git a/pkgs/development/tools/rstfmt/default.nix b/pkgs/by-name/rs/rstfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/rstfmt/default.nix
rename to pkgs/by-name/rs/rstfmt/package.nix
diff --git a/pkgs/os-specific/linux/rt-tests/default.nix b/pkgs/by-name/rt/rt-tests/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/rt-tests/default.nix
rename to pkgs/by-name/rt/rt-tests/package.nix
diff --git a/pkgs/servers/rt/dont-check-users_groups.patch b/pkgs/by-name/rt/rt/dont-check-users_groups.patch
similarity index 100%
rename from pkgs/servers/rt/dont-check-users_groups.patch
rename to pkgs/by-name/rt/rt/dont-check-users_groups.patch
diff --git a/pkgs/servers/rt/override-generated.patch b/pkgs/by-name/rt/rt/override-generated.patch
similarity index 100%
rename from pkgs/servers/rt/override-generated.patch
rename to pkgs/by-name/rt/rt/override-generated.patch
diff --git a/pkgs/servers/rt/default.nix b/pkgs/by-name/rt/rt/package.nix
similarity index 100%
rename from pkgs/servers/rt/default.nix
rename to pkgs/by-name/rt/rt/package.nix
diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/by-name/rt/rt5677-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/rt5677/default.nix
rename to pkgs/by-name/rt/rt5677-firmware/package.nix
diff --git a/pkgs/applications/misc/rtfm/enable-write-permissions.patch b/pkgs/by-name/rt/rtfm/enable-write-permissions.patch
similarity index 100%
rename from pkgs/applications/misc/rtfm/enable-write-permissions.patch
rename to pkgs/by-name/rt/rtfm/enable-write-permissions.patch
diff --git a/pkgs/applications/misc/rtfm/make.patch b/pkgs/by-name/rt/rtfm/make.patch
similarity index 100%
rename from pkgs/applications/misc/rtfm/make.patch
rename to pkgs/by-name/rt/rtfm/make.patch
diff --git a/pkgs/applications/misc/rtfm/default.nix b/pkgs/by-name/rt/rtfm/package.nix
similarity index 100%
rename from pkgs/applications/misc/rtfm/default.nix
rename to pkgs/by-name/rt/rtfm/package.nix
diff --git a/pkgs/applications/misc/rtfm/shards.nix b/pkgs/by-name/rt/rtfm/shards.nix
similarity index 100%
rename from pkgs/applications/misc/rtfm/shards.nix
rename to pkgs/by-name/rt/rtfm/shards.nix
diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/by-name/rt/rtkit/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/rtkit/default.nix
rename to pkgs/by-name/rt/rtkit/package.nix
diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/by-name/rt/rtl-ais/package.nix
similarity index 100%
rename from pkgs/applications/radio/rtl-ais/default.nix
rename to pkgs/by-name/rt/rtl-ais/package.nix
diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/by-name/rt/rtl8192su-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix
rename to pkgs/by-name/rt/rtl8192su-firmware/package.nix
diff --git a/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix b/pkgs/by-name/rt/rtl8761b-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix
rename to pkgs/by-name/rt/rtl8761b-firmware/package.nix
diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/by-name/rt/rtl_433/package.nix
similarity index 100%
rename from pkgs/applications/radio/rtl_433/default.nix
rename to pkgs/by-name/rt/rtl_433/package.nix
diff --git a/pkgs/development/libraries/rtlcss/default.nix b/pkgs/by-name/rt/rtlcss/package.nix
similarity index 100%
rename from pkgs/development/libraries/rtlcss/default.nix
rename to pkgs/by-name/rt/rtlcss/package.nix
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/by-name/rt/rtmpdump/package.nix
similarity index 100%
rename from pkgs/tools/video/rtmpdump/default.nix
rename to pkgs/by-name/rt/rtmpdump/package.nix
diff --git a/pkgs/tools/networking/rtptools/default.nix b/pkgs/by-name/rt/rtptools/package.nix
similarity index 100%
rename from pkgs/tools/networking/rtptools/default.nix
rename to pkgs/by-name/rt/rtptools/package.nix
diff --git a/pkgs/development/libraries/rtrlib/default.nix b/pkgs/by-name/rt/rtrlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/rtrlib/default.nix
rename to pkgs/by-name/rt/rtrlib/package.nix
diff --git a/pkgs/development/tools/misc/rtss/default.nix b/pkgs/by-name/rt/rtss/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rtss/default.nix
rename to pkgs/by-name/rt/rtss/package.nix
diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/by-name/rt/rttr/package.nix
similarity index 100%
rename from pkgs/development/libraries/rttr/default.nix
rename to pkgs/by-name/rt/rttr/package.nix
diff --git a/pkgs/tools/misc/rtz/Cargo.lock b/pkgs/by-name/rt/rtz/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/rtz/Cargo.lock
rename to pkgs/by-name/rt/rtz/Cargo.lock
diff --git a/pkgs/tools/misc/rtz/default.nix b/pkgs/by-name/rt/rtz/package.nix
similarity index 100%
rename from pkgs/tools/misc/rtz/default.nix
rename to pkgs/by-name/rt/rtz/package.nix
diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/by-name/ru/rubber/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/rubber/default.nix
rename to pkgs/by-name/ru/rubber/package.nix
diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/by-name/ru/rubberband/package.nix
similarity index 100%
rename from pkgs/development/libraries/rubberband/default.nix
rename to pkgs/by-name/ru/rubberband/package.nix
diff --git a/pkgs/data/fonts/rubik/default.nix b/pkgs/by-name/ru/rubik/package.nix
similarity index 100%
rename from pkgs/data/fonts/rubik/default.nix
rename to pkgs/by-name/ru/rubik/package.nix
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/by-name/ru/rubiks/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/rubiks/default.nix
rename to pkgs/by-name/ru/rubiks/package.nix
diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/by-name/ru/rubyripper/package.nix
similarity index 100%
rename from pkgs/applications/audio/rubyripper/default.nix
rename to pkgs/by-name/ru/rubyripper/package.nix
diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/by-name/ru/rucksack/package.nix
similarity index 100%
rename from pkgs/development/tools/rucksack/default.nix
rename to pkgs/by-name/ru/rucksack/package.nix
diff --git a/pkgs/applications/emulators/ruffle/Cargo.lock b/pkgs/by-name/ru/ruffle/Cargo.lock
similarity index 100%
rename from pkgs/applications/emulators/ruffle/Cargo.lock
rename to pkgs/by-name/ru/ruffle/Cargo.lock
diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/by-name/ru/ruffle/package.nix
similarity index 100%
rename from pkgs/applications/emulators/ruffle/default.nix
rename to pkgs/by-name/ru/ruffle/package.nix
diff --git a/pkgs/tools/security/ruler/default.nix b/pkgs/by-name/ru/ruler/package.nix
similarity index 100%
rename from pkgs/tools/security/ruler/default.nix
rename to pkgs/by-name/ru/ruler/package.nix
diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/by-name/ru/run-scaled/package.nix
similarity index 100%
rename from pkgs/tools/X11/run-scaled/default.nix
rename to pkgs/by-name/ru/run-scaled/package.nix
diff --git a/pkgs/development/tools/run/default.nix b/pkgs/by-name/ru/run/package.nix
similarity index 100%
rename from pkgs/development/tools/run/default.nix
rename to pkgs/by-name/ru/run/package.nix
diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/by-name/ru/runc/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/runc/default.nix
rename to pkgs/by-name/ru/runc/package.nix
diff --git a/pkgs/development/tools/rund/default.nix b/pkgs/by-name/ru/rund/package.nix
similarity index 100%
rename from pkgs/development/tools/rund/default.nix
rename to pkgs/by-name/ru/rund/package.nix
diff --git a/pkgs/development/tools/language-servers/rune-languageserver/default.nix b/pkgs/by-name/ru/rune-languageserver/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/rune-languageserver/default.nix
rename to pkgs/by-name/ru/rune-languageserver/package.nix
diff --git a/pkgs/development/interpreters/rune/default.nix b/pkgs/by-name/ru/rune/package.nix
similarity index 100%
rename from pkgs/development/interpreters/rune/default.nix
rename to pkgs/by-name/ru/rune/package.nix
diff --git a/pkgs/games/runelite/default.nix b/pkgs/by-name/ru/runelite/package.nix
similarity index 100%
rename from pkgs/games/runelite/default.nix
rename to pkgs/by-name/ru/runelite/package.nix
diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/by-name/ru/runescape/package.nix
similarity index 100%
rename from pkgs/games/runescape-launcher/default.nix
rename to pkgs/by-name/ru/runescape/package.nix
diff --git a/pkgs/tools/text/runiq/Cargo.lock b/pkgs/by-name/ru/runiq/Cargo.lock
similarity index 100%
rename from pkgs/tools/text/runiq/Cargo.lock
rename to pkgs/by-name/ru/runiq/Cargo.lock
diff --git a/pkgs/tools/text/runiq/default.nix b/pkgs/by-name/ru/runiq/package.nix
similarity index 100%
rename from pkgs/tools/text/runiq/default.nix
rename to pkgs/by-name/ru/runiq/package.nix
diff --git a/pkgs/tools/system/runit/fix-ar-ranlib.patch b/pkgs/by-name/ru/runit/fix-ar-ranlib.patch
similarity index 100%
rename from pkgs/tools/system/runit/fix-ar-ranlib.patch
rename to pkgs/by-name/ru/runit/fix-ar-ranlib.patch
diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/by-name/ru/runit/package.nix
similarity index 100%
rename from pkgs/tools/system/runit/default.nix
rename to pkgs/by-name/ru/runit/package.nix
diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/by-name/ru/runitor/package.nix
similarity index 100%
rename from pkgs/tools/system/runitor/default.nix
rename to pkgs/by-name/ru/runitor/package.nix
diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/by-name/ru/runningx/package.nix
similarity index 100%
rename from pkgs/tools/X11/runningx/default.nix
rename to pkgs/by-name/ru/runningx/package.nix
diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/by-name/ru/runzip/package.nix
similarity index 100%
rename from pkgs/tools/archivers/runzip/default.nix
rename to pkgs/by-name/ru/runzip/package.nix
diff --git a/pkgs/shells/rush/default.nix b/pkgs/by-name/ru/rush/package.nix
similarity index 100%
rename from pkgs/shells/rush/default.nix
rename to pkgs/by-name/ru/rush/package.nix
diff --git a/pkgs/development/tools/rust/rust-audit-info/default.nix b/pkgs/by-name/ru/rust-audit-info/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/rust-audit-info/default.nix
rename to pkgs/by-name/ru/rust-audit-info/package.nix
diff --git a/pkgs/development/tools/rust-code-analysis/default.nix b/pkgs/by-name/ru/rust-code-analysis/package.nix
similarity index 100%
rename from pkgs/development/tools/rust-code-analysis/default.nix
rename to pkgs/by-name/ru/rust-code-analysis/package.nix
diff --git a/pkgs/tools/text/rust-petname/default.nix b/pkgs/by-name/ru/rust-petname/package.nix
similarity index 100%
rename from pkgs/tools/text/rust-petname/default.nix
rename to pkgs/by-name/ru/rust-petname/package.nix
diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/by-name/ru/rust-script/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/rust-script/default.nix
rename to pkgs/by-name/ru/rust-script/package.nix
diff --git a/pkgs/applications/misc/rust-traverse/default.nix b/pkgs/by-name/ru/rust-traverse/package.nix
similarity index 100%
rename from pkgs/applications/misc/rust-traverse/default.nix
rename to pkgs/by-name/ru/rust-traverse/package.nix
diff --git a/pkgs/development/libraries/rustc-demangle/Cargo.lock b/pkgs/by-name/ru/rustc-demangle/Cargo.lock
similarity index 100%
rename from pkgs/development/libraries/rustc-demangle/Cargo.lock
rename to pkgs/by-name/ru/rustc-demangle/Cargo.lock
diff --git a/pkgs/development/libraries/rustc-demangle/default.nix b/pkgs/by-name/ru/rustc-demangle/package.nix
similarity index 100%
rename from pkgs/development/libraries/rustc-demangle/default.nix
rename to pkgs/by-name/ru/rustc-demangle/package.nix
diff --git a/pkgs/development/tools/rust/rustfilt/default.nix b/pkgs/by-name/ru/rustfilt/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/rustfilt/default.nix
rename to pkgs/by-name/ru/rustfilt/package.nix
diff --git a/pkgs/development/tools/rust/rusty-man/default.nix b/pkgs/by-name/ru/rusty-man/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/rusty-man/default.nix
rename to pkgs/by-name/ru/rusty-man/package.nix
diff --git a/pkgs/applications/misc/rusty-psn/fix-cargo-lock.patch b/pkgs/by-name/ru/rusty-psn/fix-cargo-lock.patch
similarity index 100%
rename from pkgs/applications/misc/rusty-psn/fix-cargo-lock.patch
rename to pkgs/by-name/ru/rusty-psn/fix-cargo-lock.patch
diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/by-name/ru/rusty-psn/package.nix
similarity index 100%
rename from pkgs/applications/misc/rusty-psn/default.nix
rename to pkgs/by-name/ru/rusty-psn/package.nix
diff --git a/pkgs/development/tools/rust/rustycli/default.nix b/pkgs/by-name/ru/rustycli/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/rustycli/default.nix
rename to pkgs/by-name/ru/rustycli/package.nix
diff --git a/pkgs/tools/misc/rustypaste-cli/default.nix b/pkgs/by-name/ru/rustypaste-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/rustypaste-cli/default.nix
rename to pkgs/by-name/ru/rustypaste-cli/package.nix
diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/by-name/ru/rustypaste/package.nix
similarity index 100%
rename from pkgs/servers/rustypaste/default.nix
rename to pkgs/by-name/ru/rustypaste/package.nix
diff --git a/pkgs/development/tools/misc/rustywind/default.nix b/pkgs/by-name/ru/rustywind/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/rustywind/default.nix
rename to pkgs/by-name/ru/rustywind/package.nix
diff --git a/pkgs/development/libraries/rutabaga_gfx/darwin-install.patch b/pkgs/by-name/ru/rutabaga_gfx/darwin-install.patch
similarity index 100%
rename from pkgs/development/libraries/rutabaga_gfx/darwin-install.patch
rename to pkgs/by-name/ru/rutabaga_gfx/darwin-install.patch
diff --git a/pkgs/development/libraries/rutabaga_gfx/default.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix
similarity index 100%
rename from pkgs/development/libraries/rutabaga_gfx/default.nix
rename to pkgs/by-name/ru/rutabaga_gfx/package.nix
diff --git a/pkgs/data/fonts/ruwudu/default.nix b/pkgs/by-name/ru/ruwudu/package.nix
similarity index 100%
rename from pkgs/data/fonts/ruwudu/default.nix
rename to pkgs/by-name/ru/ruwudu/package.nix
diff --git a/pkgs/applications/virtualization/rvvm/default.nix b/pkgs/by-name/rv/rvvm/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/rvvm/default.nix
rename to pkgs/by-name/rv/rvvm/package.nix
diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/by-name/rw/rw/package.nix
similarity index 100%
rename from pkgs/tools/misc/rw/default.nix
rename to pkgs/by-name/rw/rw/package.nix
diff --git a/pkgs/tools/system/rwc/default.nix b/pkgs/by-name/rw/rwc/package.nix
similarity index 100%
rename from pkgs/tools/system/rwc/default.nix
rename to pkgs/by-name/rw/rwc/package.nix
diff --git a/pkgs/tools/video/rwedid/default.nix b/pkgs/by-name/rw/rwedid/package.nix
similarity index 100%
rename from pkgs/tools/video/rwedid/default.nix
rename to pkgs/by-name/rw/rwedid/package.nix
diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/by-name/rx/rx/package.nix
similarity index 100%
rename from pkgs/applications/graphics/rx/default.nix
rename to pkgs/by-name/rx/rx/package.nix
diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/by-name/rx/rxp/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/rxp/default.nix
rename to pkgs/by-name/rx/rxp/package.nix
diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/by-name/ry/rymcast/package.nix
similarity index 100%
rename from pkgs/applications/audio/rymcast/default.nix
rename to pkgs/by-name/ry/rymcast/package.nix
diff --git a/pkgs/os-specific/linux/ryzenadj/default.nix b/pkgs/by-name/ry/ryzenadj/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ryzenadj/default.nix
rename to pkgs/by-name/ry/ryzenadj/package.nix
diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/by-name/rz/rzip/package.nix
similarity index 100%
rename from pkgs/tools/compression/rzip/default.nix
rename to pkgs/by-name/rz/rzip/package.nix
diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/by-name/s-/s-tar/package.nix
similarity index 100%
rename from pkgs/tools/archivers/s-tar/default.nix
rename to pkgs/by-name/s-/s-tar/package.nix
diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/by-name/s-/s-tui/package.nix
similarity index 100%
rename from pkgs/tools/system/s-tui/default.nix
rename to pkgs/by-name/s-/s-tui/package.nix
diff --git a/pkgs/development/libraries/s2geometry/default.nix b/pkgs/by-name/s2/s2geometry/package.nix
similarity index 100%
rename from pkgs/development/libraries/s2geometry/default.nix
rename to pkgs/by-name/s2/s2geometry/package.nix
diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/by-name/s2/s2n-tls/package.nix
similarity index 100%
rename from pkgs/development/libraries/s2n-tls/default.nix
rename to pkgs/by-name/s2/s2n-tls/package.nix
diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/by-name/s2/s2png/package.nix
similarity index 100%
rename from pkgs/tools/graphics/s2png/default.nix
rename to pkgs/by-name/s2/s2png/package.nix
diff --git a/pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch b/pkgs/by-name/s3/s3backer/fix-darwin-builds.patch
similarity index 100%
rename from pkgs/tools/filesystems/s3backer/fix-darwin-builds.patch
rename to pkgs/by-name/s3/s3backer/fix-darwin-builds.patch
diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/by-name/s3/s3backer/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/s3backer/default.nix
rename to pkgs/by-name/s3/s3backer/package.nix
diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/by-name/s3/s3bro/package.nix
similarity index 100%
rename from pkgs/tools/admin/s3bro/default.nix
rename to pkgs/by-name/s3/s3bro/package.nix
diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/by-name/s3/s3ql/package.nix
similarity index 100%
rename from pkgs/tools/backup/s3ql/default.nix
rename to pkgs/by-name/s3/s3ql/package.nix
diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/by-name/s4/s4cmd/package.nix
similarity index 100%
rename from pkgs/tools/networking/s4cmd/default.nix
rename to pkgs/by-name/s4/s4cmd/package.nix
diff --git a/pkgs/tools/security/s5/default.nix b/pkgs/by-name/s5/s5/package.nix
similarity index 100%
rename from pkgs/tools/security/s5/default.nix
rename to pkgs/by-name/s5/s5/package.nix
diff --git a/pkgs/tools/networking/s5cmd/default.nix b/pkgs/by-name/s5/s5cmd/package.nix
similarity index 100%
rename from pkgs/tools/networking/s5cmd/default.nix
rename to pkgs/by-name/s5/s5cmd/package.nix
diff --git a/pkgs/development/interpreters/s9fes/default.nix b/pkgs/by-name/s9/s9fes/package.nix
similarity index 100%
rename from pkgs/development/interpreters/s9fes/default.nix
rename to pkgs/by-name/s9/s9fes/package.nix
diff --git a/pkgs/tools/misc/sacad/default.nix b/pkgs/by-name/sa/sacad/package.nix
similarity index 100%
rename from pkgs/tools/misc/sacad/default.nix
rename to pkgs/by-name/sa/sacad/package.nix
diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/by-name/sa/sacc/package.nix
similarity index 100%
rename from pkgs/applications/networking/gopher/sacc/default.nix
rename to pkgs/by-name/sa/sacc/package.nix
diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/by-name/sa/sacd/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/sacd/default.nix
rename to pkgs/by-name/sa/sacd/package.nix
diff --git a/pkgs/applications/science/physics/sacrifice/compat.patch b/pkgs/by-name/sa/sacrifice/compat.patch
similarity index 100%
rename from pkgs/applications/science/physics/sacrifice/compat.patch
rename to pkgs/by-name/sa/sacrifice/compat.patch
diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/by-name/sa/sacrifice/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/sacrifice/default.nix
rename to pkgs/by-name/sa/sacrifice/package.nix
diff --git a/pkgs/applications/science/physics/sacrifice/pythia83xx.patch b/pkgs/by-name/sa/sacrifice/pythia83xx.patch
similarity index 100%
rename from pkgs/applications/science/physics/sacrifice/pythia83xx.patch
rename to pkgs/by-name/sa/sacrifice/pythia83xx.patch
diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/by-name/sa/sad/package.nix
similarity index 100%
rename from pkgs/tools/text/sad/default.nix
rename to pkgs/by-name/sa/sad/package.nix
diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/by-name/sa/safe-rm/package.nix
similarity index 100%
rename from pkgs/tools/system/safe-rm/default.nix
rename to pkgs/by-name/sa/safe-rm/package.nix
diff --git a/pkgs/tools/security/safe/default.nix b/pkgs/by-name/sa/safe/package.nix
similarity index 100%
rename from pkgs/tools/security/safe/default.nix
rename to pkgs/by-name/sa/safe/package.nix
diff --git a/pkgs/applications/misc/safecloset/default.nix b/pkgs/by-name/sa/safecloset/package.nix
similarity index 100%
rename from pkgs/applications/misc/safecloset/default.nix
rename to pkgs/by-name/sa/safecloset/package.nix
diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/by-name/sa/safecopy/package.nix
similarity index 100%
rename from pkgs/tools/system/safecopy/default.nix
rename to pkgs/by-name/sa/safecopy/package.nix
diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/by-name/sa/safeeyes/package.nix
similarity index 100%
rename from pkgs/applications/misc/safeeyes/default.nix
rename to pkgs/by-name/sa/safeeyes/package.nix
diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/by-name/sa/safefile/package.nix
similarity index 100%
rename from pkgs/development/libraries/safefile/default.nix
rename to pkgs/by-name/sa/safefile/package.nix
diff --git a/pkgs/applications/science/math/sage/README.md b/pkgs/by-name/sa/sage/README.md
similarity index 100%
rename from pkgs/applications/science/math/sage/README.md
rename to pkgs/by-name/sa/sage/README.md
diff --git a/pkgs/applications/science/math/sage/dist-tests.nix b/pkgs/by-name/sa/sage/dist-tests.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/dist-tests.nix
rename to pkgs/by-name/sa/sage/dist-tests.nix
diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/by-name/sa/sage/env-locations.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/env-locations.nix
rename to pkgs/by-name/sa/sage/env-locations.nix
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/by-name/sa/sage/package.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/default.nix
rename to pkgs/by-name/sa/sage/package.nix
diff --git a/pkgs/applications/science/math/sage/patches/disable-singular-doctest.patch b/pkgs/by-name/sa/sage/patches/disable-singular-doctest.patch
similarity index 100%
rename from pkgs/applications/science/math/sage/patches/disable-singular-doctest.patch
rename to pkgs/by-name/sa/sage/patches/disable-singular-doctest.patch
diff --git a/pkgs/applications/science/math/sage/patches/gap-element-crash.patch b/pkgs/by-name/sa/sage/patches/gap-element-crash.patch
similarity index 100%
rename from pkgs/applications/science/math/sage/patches/gap-element-crash.patch
rename to pkgs/by-name/sa/sage/patches/gap-element-crash.patch
diff --git a/pkgs/applications/science/math/sage/patches/silence-linker.patch b/pkgs/by-name/sa/sage/patches/silence-linker.patch
similarity index 100%
rename from pkgs/applications/science/math/sage/patches/silence-linker.patch
rename to pkgs/by-name/sa/sage/patches/silence-linker.patch
diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch
similarity index 100%
rename from pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch
rename to pkgs/by-name/sa/sage/patches/sphinx-docbuild-subprocesses.patch
diff --git a/pkgs/applications/science/math/sage/patches/sympow-cache.patch b/pkgs/by-name/sa/sage/patches/sympow-cache.patch
similarity index 100%
rename from pkgs/applications/science/math/sage/patches/sympow-cache.patch
rename to pkgs/by-name/sa/sage/patches/sympow-cache.patch
diff --git a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix b/pkgs/by-name/sa/sage/python-modules/sage-docbuild.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix
rename to pkgs/by-name/sa/sage/python-modules/sage-docbuild.nix
diff --git a/pkgs/applications/science/math/sage/python-modules/sage-setup.nix b/pkgs/by-name/sa/sage/python-modules/sage-setup.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/python-modules/sage-setup.nix
rename to pkgs/by-name/sa/sage/python-modules/sage-setup.nix
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/by-name/sa/sage/sage-env.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sage-env.nix
rename to pkgs/by-name/sa/sage/sage-env.nix
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sage-src.nix
rename to pkgs/by-name/sa/sage/sage-src.nix
diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/by-name/sa/sage/sage-tests.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sage-tests.nix
rename to pkgs/by-name/sa/sage/sage-tests.nix
diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/by-name/sa/sage/sage-with-env.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sage-with-env.nix
rename to pkgs/by-name/sa/sage/sage-with-env.nix
diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/by-name/sa/sage/sage.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sage.nix
rename to pkgs/by-name/sa/sage/sage.nix
diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/by-name/sa/sage/sagedoc.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sagedoc.nix
rename to pkgs/by-name/sa/sage/sagedoc.nix
diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/by-name/sa/sage/sagelib.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/sagelib.nix
rename to pkgs/by-name/sa/sage/sagelib.nix
diff --git a/pkgs/applications/science/math/sage/threejs-sage.nix b/pkgs/by-name/sa/sage/threejs-sage.nix
similarity index 100%
rename from pkgs/applications/science/math/sage/threejs-sage.nix
rename to pkgs/by-name/sa/sage/threejs-sage.nix
diff --git a/pkgs/misc/sagetex/default.nix b/pkgs/by-name/sa/sagetex/package.nix
similarity index 100%
rename from pkgs/misc/sagetex/default.nix
rename to pkgs/by-name/sa/sagetex/package.nix
diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/by-name/sa/sagittarius-scheme/package.nix
similarity index 100%
rename from pkgs/development/compilers/sagittarius-scheme/default.nix
rename to pkgs/by-name/sa/sagittarius-scheme/package.nix
diff --git a/pkgs/tools/misc/sagoin/default.nix b/pkgs/by-name/sa/sagoin/package.nix
similarity index 100%
rename from pkgs/tools/misc/sagoin/default.nix
rename to pkgs/by-name/sa/sagoin/package.nix
diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/by-name/sa/sahel-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/sahel-fonts/default.nix
rename to pkgs/by-name/sa/sahel-fonts/package.nix
diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/by-name/sa/sailsd/package.nix
similarity index 100%
rename from pkgs/misc/sailsd/default.nix
rename to pkgs/by-name/sa/sailsd/package.nix
diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/by-name/sa/saldl/package.nix
similarity index 100%
rename from pkgs/tools/networking/saldl/default.nix
rename to pkgs/by-name/sa/saldl/package.nix
diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/saleae-logic-2/default.nix
rename to pkgs/by-name/sa/saleae-logic-2/package.nix
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/by-name/sa/saleae-logic/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/saleae-logic/default.nix
rename to pkgs/by-name/sa/saleae-logic/package.nix
diff --git a/pkgs/development/tools/misc/saleae-logic/preload.c b/pkgs/by-name/sa/saleae-logic/preload.c
similarity index 100%
rename from pkgs/development/tools/misc/saleae-logic/preload.c
rename to pkgs/by-name/sa/saleae-logic/preload.c
diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/by-name/sa/salt/fix-libcrypto-loading.patch
similarity index 100%
rename from pkgs/tools/admin/salt/fix-libcrypto-loading.patch
rename to pkgs/by-name/sa/salt/fix-libcrypto-loading.patch
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/by-name/sa/salt/package.nix
similarity index 100%
rename from pkgs/tools/admin/salt/default.nix
rename to pkgs/by-name/sa/salt/package.nix
diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/by-name/sa/sam-ba/package.nix
similarity index 100%
rename from pkgs/tools/misc/sam-ba/default.nix
rename to pkgs/by-name/sa/sam-ba/package.nix
diff --git a/pkgs/applications/science/biology/sambamba/default.nix b/pkgs/by-name/sa/sambamba/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/sambamba/default.nix
rename to pkgs/by-name/sa/sambamba/package.nix
diff --git a/pkgs/applications/science/biology/samblaster/default.nix b/pkgs/by-name/sa/samblaster/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/samblaster/default.nix
rename to pkgs/by-name/sa/samblaster/package.nix
diff --git a/pkgs/applications/emulators/sameboy/default.nix b/pkgs/by-name/sa/sameboy/package.nix
similarity index 100%
rename from pkgs/applications/emulators/sameboy/default.nix
rename to pkgs/by-name/sa/sameboy/package.nix
diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/by-name/sa/samim-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/samim-fonts/default.nix
rename to pkgs/by-name/sa/samim-fonts/package.nix
diff --git a/pkgs/tools/security/sammler/default.nix b/pkgs/by-name/sa/sammler/package.nix
similarity index 100%
rename from pkgs/tools/security/sammler/default.nix
rename to pkgs/by-name/sa/sammler/package.nix
diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/by-name/sa/sampler/package.nix
similarity index 100%
rename from pkgs/applications/misc/sampler/default.nix
rename to pkgs/by-name/sa/sampler/package.nix
diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/by-name/sa/samplicator/package.nix
similarity index 100%
rename from pkgs/tools/networking/samplicator/default.nix
rename to pkgs/by-name/sa/samplicator/package.nix
diff --git a/pkgs/development/tools/misc/samply/default.nix b/pkgs/by-name/sa/samply/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/samply/default.nix
rename to pkgs/by-name/sa/samply/package.nix
diff --git a/pkgs/data/fonts/sampradaya/default.nix b/pkgs/by-name/sa/sampradaya/package.nix
similarity index 100%
rename from pkgs/data/fonts/sampradaya/default.nix
rename to pkgs/by-name/sa/sampradaya/package.nix
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/module.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/samsung/1.00.36/module.nix
rename to pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/module.nix
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
rename to pkgs/by-name/sa/samsung-unified-linux-driver_1_00_36/package.nix
diff --git a/pkgs/tools/misc/sanctity/default.nix b/pkgs/by-name/sa/sanctity/package.nix
similarity index 100%
rename from pkgs/tools/misc/sanctity/default.nix
rename to pkgs/by-name/sa/sanctity/package.nix
diff --git a/pkgs/applications/graphics/sane/backends/airscan/default.nix b/pkgs/by-name/sa/sane-airscan/package.nix
similarity index 100%
rename from pkgs/applications/graphics/sane/backends/airscan/default.nix
rename to pkgs/by-name/sa/sane-airscan/package.nix
diff --git a/pkgs/tools/backup/sanoid/default.nix b/pkgs/by-name/sa/sanoid/package.nix
similarity index 100%
rename from pkgs/tools/backup/sanoid/default.nix
rename to pkgs/by-name/sa/sanoid/package.nix
diff --git a/pkgs/data/fonts/sarabun/default.nix b/pkgs/by-name/sa/sarabun-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/sarabun/default.nix
rename to pkgs/by-name/sa/sarabun-font/package.nix
diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/by-name/sa/sassc/package.nix
similarity index 100%
rename from pkgs/development/tools/sassc/default.nix
rename to pkgs/by-name/sa/sassc/package.nix
diff --git a/pkgs/os-specific/linux/sasutils/default.nix b/pkgs/by-name/sa/sasutils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sasutils/default.nix
rename to pkgs/by-name/sa/sasutils/package.nix
diff --git a/pkgs/tools/misc/savepagenow/default.nix b/pkgs/by-name/sa/savepagenow/package.nix
similarity index 100%
rename from pkgs/tools/misc/savepagenow/default.nix
rename to pkgs/by-name/sa/savepagenow/package.nix
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/by-name/sa/saw-tools/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/saw-tools/default.nix
rename to pkgs/by-name/sa/saw-tools/package.nix
diff --git a/pkgs/development/tools/java/sawjap/default.nix b/pkgs/by-name/sa/sawjap/package.nix
similarity index 100%
rename from pkgs/development/tools/java/sawjap/default.nix
rename to pkgs/by-name/sa/sawjap/package.nix
diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/by-name/sb/sbagen/package.nix
similarity index 100%
rename from pkgs/applications/misc/sbagen/default.nix
rename to pkgs/by-name/sb/sbagen/package.nix
diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/by-name/sb/sbc/package.nix
similarity index 100%
rename from pkgs/development/libraries/sbc/default.nix
rename to pkgs/by-name/sb/sbc/package.nix
diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/by-name/sb/sblim-sfcc/package.nix
similarity index 100%
rename from pkgs/development/libraries/sblim-sfcc/default.nix
rename to pkgs/by-name/sb/sblim-sfcc/package.nix
diff --git a/pkgs/tools/X11/sbs/default.nix b/pkgs/by-name/sb/sbs/package.nix
similarity index 100%
rename from pkgs/tools/X11/sbs/default.nix
rename to pkgs/by-name/sb/sbs/package.nix
diff --git a/pkgs/tools/security/sbsigntool/autoconf.patch b/pkgs/by-name/sb/sbsigntool/autoconf.patch
similarity index 100%
rename from pkgs/tools/security/sbsigntool/autoconf.patch
rename to pkgs/by-name/sb/sbsigntool/autoconf.patch
diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/by-name/sb/sbsigntool/package.nix
similarity index 100%
rename from pkgs/tools/security/sbsigntool/default.nix
rename to pkgs/by-name/sb/sbsigntool/package.nix
diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/by-name/sb/sbt-extras/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/sbt-extras/default.nix
rename to pkgs/by-name/sb/sbt-extras/package.nix
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/by-name/sc/sc-im/package.nix
similarity index 100%
rename from pkgs/applications/misc/sc-im/default.nix
rename to pkgs/by-name/sc/sc-im/package.nix
diff --git a/pkgs/applications/audio/sc68/default.nix b/pkgs/by-name/sc/sc68/package.nix
similarity index 100%
rename from pkgs/applications/audio/sc68/default.nix
rename to pkgs/by-name/sc/sc68/package.nix
diff --git a/pkgs/development/tools/sca2d/default.nix b/pkgs/by-name/sc/sca2d/package.nix
similarity index 100%
rename from pkgs/development/tools/sca2d/default.nix
rename to pkgs/by-name/sc/sca2d/package.nix
diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/by-name/sc/scalafmt/package.nix
similarity index 100%
rename from pkgs/development/tools/scalafmt/default.nix
rename to pkgs/by-name/sc/scalafmt/package.nix
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/by-name/sc/scalapack/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/scalapack/default.nix
rename to pkgs/by-name/sc/scalapack/package.nix
diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/by-name/sc/scaleft/package.nix
similarity index 100%
rename from pkgs/applications/networking/scaleft/default.nix
rename to pkgs/by-name/sc/scaleft/package.nix
diff --git a/pkgs/applications/science/math/scalp/default.nix b/pkgs/by-name/sc/scalp/package.nix
similarity index 100%
rename from pkgs/applications/science/math/scalp/default.nix
rename to pkgs/by-name/sc/scalp/package.nix
diff --git a/pkgs/tools/admin/scalr-cli/default.nix b/pkgs/by-name/sc/scalr-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/scalr-cli/default.nix
rename to pkgs/by-name/sc/scalr-cli/package.nix
diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/by-name/sc/scanbd/package.nix
similarity index 100%
rename from pkgs/tools/graphics/scanbd/default.nix
rename to pkgs/by-name/sc/scanbd/package.nix
diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/by-name/sc/scanmem/package.nix
similarity index 100%
rename from pkgs/tools/misc/scanmem/default.nix
rename to pkgs/by-name/sc/scanmem/package.nix
diff --git a/pkgs/servers/scaphandre/default.nix b/pkgs/by-name/sc/scaphandre/package.nix
similarity index 100%
rename from pkgs/servers/scaphandre/default.nix
rename to pkgs/by-name/sc/scaphandre/package.nix
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/by-name/sc/sccache/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/sccache/default.nix
rename to pkgs/by-name/sc/sccache/package.nix
diff --git a/pkgs/tools/misc/scdl/default.nix b/pkgs/by-name/sc/scdl/package.nix
similarity index 100%
rename from pkgs/tools/misc/scdl/default.nix
rename to pkgs/by-name/sc/scdl/package.nix
diff --git a/pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch b/pkgs/by-name/sc/scenebuilder/fix-default-maven-plugin-versions.patch
similarity index 100%
rename from pkgs/development/tools/scenebuilder/fix-default-maven-plugin-versions.patch
rename to pkgs/by-name/sc/scenebuilder/fix-default-maven-plugin-versions.patch
diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/by-name/sc/scenebuilder/package.nix
similarity index 100%
rename from pkgs/development/tools/scenebuilder/default.nix
rename to pkgs/by-name/sc/scenebuilder/package.nix
diff --git a/pkgs/development/tools/scenebuilder/pom-remove-javafx.patch b/pkgs/by-name/sc/scenebuilder/pom-remove-javafx.patch
similarity index 100%
rename from pkgs/development/tools/scenebuilder/pom-remove-javafx.patch
rename to pkgs/by-name/sc/scenebuilder/pom-remove-javafx.patch
diff --git a/pkgs/development/tools/scenic-view/deps.json b/pkgs/by-name/sc/scenic-view/deps.json
similarity index 100%
rename from pkgs/development/tools/scenic-view/deps.json
rename to pkgs/by-name/sc/scenic-view/deps.json
diff --git a/pkgs/development/tools/scenic-view/default.nix b/pkgs/by-name/sc/scenic-view/package.nix
similarity index 100%
rename from pkgs/development/tools/scenic-view/default.nix
rename to pkgs/by-name/sc/scenic-view/package.nix
diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/by-name/sc/schedtool/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/schedtool/default.nix
rename to pkgs/by-name/sc/schedtool/package.nix
diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/by-name/sc/schema2ldif/package.nix
similarity index 100%
rename from pkgs/tools/text/schema2ldif/default.nix
rename to pkgs/by-name/sc/schema2ldif/package.nix
diff --git a/pkgs/development/tools/schemacrawler/default.nix b/pkgs/by-name/sc/schemacrawler/package.nix
similarity index 100%
rename from pkgs/development/tools/schemacrawler/default.nix
rename to pkgs/by-name/sc/schemacrawler/package.nix
diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/by-name/sc/scheme-bytestructures/package.nix
similarity index 100%
rename from pkgs/development/scheme-modules/scheme-bytestructures/default.nix
rename to pkgs/by-name/sc/scheme-bytestructures/package.nix
diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/by-name/sc/scheme-manpages/package.nix
similarity index 100%
rename from pkgs/data/documentation/scheme-manpages/default.nix
rename to pkgs/by-name/sc/scheme-manpages/package.nix
diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/by-name/sc/scheme48/package.nix
similarity index 100%
rename from pkgs/development/interpreters/scheme48/default.nix
rename to pkgs/by-name/sc/scheme48/package.nix
diff --git a/pkgs/applications/misc/schemes/default.nix b/pkgs/by-name/sc/schemes/package.nix
similarity index 100%
rename from pkgs/applications/misc/schemes/default.nix
rename to pkgs/by-name/sc/schemes/package.nix
diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/by-name/sc/scid-vs-pc/package.nix
similarity index 100%
rename from pkgs/games/scid-vs-pc/default.nix
rename to pkgs/by-name/sc/scid-vs-pc/package.nix
diff --git a/pkgs/games/scid/default.nix b/pkgs/by-name/sc/scid/package.nix
similarity index 100%
rename from pkgs/games/scid/default.nix
rename to pkgs/by-name/sc/scid/package.nix
diff --git a/pkgs/data/fonts/scientifica/default.nix b/pkgs/by-name/sc/scientifica/package.nix
similarity index 100%
rename from pkgs/data/fonts/scientifica/default.nix
rename to pkgs/by-name/sc/scientifica/package.nix
diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/by-name/sc/scilab-bin/package.nix
similarity index 100%
rename from pkgs/applications/science/math/scilab-bin/default.nix
rename to pkgs/by-name/sc/scilab-bin/package.nix
diff --git a/pkgs/tools/security/scilla/default.nix b/pkgs/by-name/sc/scilla/package.nix
similarity index 100%
rename from pkgs/tools/security/scilla/default.nix
rename to pkgs/by-name/sc/scilla/package.nix
diff --git a/pkgs/development/tools/misc/scip/default.nix b/pkgs/by-name/sc/scip/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/scip/default.nix
rename to pkgs/by-name/sc/scip/package.nix
diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/by-name/sc/scli/package.nix
similarity index 100%
rename from pkgs/applications/misc/scli/default.nix
rename to pkgs/by-name/sc/scli/package.nix
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/by-name/sc/scmccid/package.nix
similarity index 100%
rename from pkgs/development/libraries/scmccid/default.nix
rename to pkgs/by-name/sc/scmccid/package.nix
diff --git a/pkgs/applications/version-management/scmpuff/default.nix b/pkgs/by-name/sc/scmpuff/package.nix
similarity index 100%
rename from pkgs/applications/version-management/scmpuff/default.nix
rename to pkgs/by-name/sc/scmpuff/package.nix
diff --git a/pkgs/development/libraries/scope-lite/default.nix b/pkgs/by-name/sc/scope-lite/package.nix
similarity index 100%
rename from pkgs/development/libraries/scope-lite/default.nix
rename to pkgs/by-name/sc/scope-lite/package.nix
diff --git a/pkgs/games/scorched3d/file-existence.patch b/pkgs/by-name/sc/scorched3d/file-existence.patch
similarity index 100%
rename from pkgs/games/scorched3d/file-existence.patch
rename to pkgs/by-name/sc/scorched3d/file-existence.patch
diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/by-name/sc/scorched3d/package.nix
similarity index 100%
rename from pkgs/games/scorched3d/default.nix
rename to pkgs/by-name/sc/scorched3d/package.nix
diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/by-name/sc/scorecard/package.nix
similarity index 100%
rename from pkgs/tools/security/scorecard/default.nix
rename to pkgs/by-name/sc/scorecard/package.nix
diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/by-name/sc/scowl/package.nix
similarity index 100%
rename from pkgs/data/misc/scowl/default.nix
rename to pkgs/by-name/sc/scowl/package.nix
diff --git a/pkgs/shells/scponly/default.nix b/pkgs/by-name/sc/scponly/package.nix
similarity index 100%
rename from pkgs/shells/scponly/default.nix
rename to pkgs/by-name/sc/scponly/package.nix
diff --git a/pkgs/shells/scponly/scponly-fix-make.patch b/pkgs/by-name/sc/scponly/scponly-fix-make.patch
similarity index 100%
rename from pkgs/shells/scponly/scponly-fix-make.patch
rename to pkgs/by-name/sc/scponly/scponly-fix-make.patch
diff --git a/pkgs/tools/text/scraper/default.nix b/pkgs/by-name/sc/scraper/package.nix
similarity index 100%
rename from pkgs/tools/text/scraper/default.nix
rename to pkgs/by-name/sc/scraper/package.nix
diff --git a/pkgs/applications/audio/scream/default.nix b/pkgs/by-name/sc/scream/package.nix
similarity index 100%
rename from pkgs/applications/audio/scream/default.nix
rename to pkgs/by-name/sc/scream/package.nix
diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/by-name/sc/screen-message/package.nix
similarity index 100%
rename from pkgs/tools/X11/screen-message/default.nix
rename to pkgs/by-name/sc/screen-message/package.nix
diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/by-name/sc/screenfetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/screenfetch/default.nix
rename to pkgs/by-name/sc/screenfetch/package.nix
diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/by-name/sc/screenkey/package.nix
similarity index 100%
rename from pkgs/applications/video/screenkey/default.nix
rename to pkgs/by-name/sc/screenkey/package.nix
diff --git a/pkgs/tools/misc/script-directory/default.nix b/pkgs/by-name/sc/script-directory/package.nix
similarity index 100%
rename from pkgs/tools/misc/script-directory/default.nix
rename to pkgs/by-name/sc/script-directory/package.nix
diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/by-name/sc/scriptaculous/package.nix
similarity index 100%
rename from pkgs/development/libraries/scriptaculous/default.nix
rename to pkgs/by-name/sc/scriptaculous/package.nix
diff --git a/pkgs/development/tools/misc/scriptisto/default.nix b/pkgs/by-name/sc/scriptisto/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/scriptisto/default.nix
rename to pkgs/by-name/sc/scriptisto/package.nix
diff --git a/pkgs/games/scrolls/default.nix b/pkgs/by-name/sc/scrolls/package.nix
similarity index 100%
rename from pkgs/games/scrolls/default.nix
rename to pkgs/by-name/sc/scrolls/package.nix
diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/by-name/sc/scrot/package.nix
similarity index 100%
rename from pkgs/tools/graphics/scrot/default.nix
rename to pkgs/by-name/sc/scrot/package.nix
diff --git a/pkgs/tools/misc/scrub/default.nix b/pkgs/by-name/sc/scrub/package.nix
similarity index 100%
rename from pkgs/tools/misc/scrub/default.nix
rename to pkgs/by-name/sc/scrub/package.nix
diff --git a/pkgs/development/compilers/scryer-prolog/Cargo.lock b/pkgs/by-name/sc/scryer-prolog/Cargo.lock
similarity index 100%
rename from pkgs/development/compilers/scryer-prolog/Cargo.lock
rename to pkgs/by-name/sc/scryer-prolog/Cargo.lock
diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/by-name/sc/scryer-prolog/package.nix
similarity index 100%
rename from pkgs/development/compilers/scryer-prolog/default.nix
rename to pkgs/by-name/sc/scryer-prolog/package.nix
diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/by-name/sc/scrypt/package.nix
similarity index 100%
rename from pkgs/tools/security/scrypt/default.nix
rename to pkgs/by-name/sc/scrypt/package.nix
diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/by-name/sc/scsh/package.nix
similarity index 100%
rename from pkgs/development/interpreters/scsh/default.nix
rename to pkgs/by-name/sc/scsh/package.nix
diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/by-name/sc/sct/package.nix
similarity index 100%
rename from pkgs/tools/X11/sct/default.nix
rename to pkgs/by-name/sc/sct/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/by-name/sc/scudcloud/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/scudcloud/default.nix
rename to pkgs/by-name/sc/scudcloud/package.nix
diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/by-name/sd/sd-local/package.nix
similarity index 100%
rename from pkgs/development/tools/sd-local/default.nix
rename to pkgs/by-name/sd/sd-local/package.nix
diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/by-name/sd/sd-switch/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sd-switch/default.nix
rename to pkgs/by-name/sd/sd-switch/package.nix
diff --git a/pkgs/tools/filesystems/sdat2img/default.nix b/pkgs/by-name/sd/sdat2img/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/sdat2img/default.nix
rename to pkgs/by-name/sd/sdat2img/package.nix
diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/by-name/sd/sdate/package.nix
similarity index 100%
rename from pkgs/tools/misc/sdate/default.nix
rename to pkgs/by-name/sd/sdate/package.nix
diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/by-name/sd/sdcv/package.nix
similarity index 100%
rename from pkgs/applications/misc/sdcv/default.nix
rename to pkgs/by-name/sd/sdcv/package.nix
diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/by-name/sd/sdl-jstest/package.nix
similarity index 100%
rename from pkgs/tools/misc/sdl-jstest/default.nix
rename to pkgs/by-name/sd/sdl-jstest/package.nix
diff --git a/pkgs/tools/security/sdlookup/default.nix b/pkgs/by-name/sd/sdlookup/package.nix
similarity index 100%
rename from pkgs/tools/security/sdlookup/default.nix
rename to pkgs/by-name/sd/sdlookup/package.nix
diff --git a/pkgs/games/sdlpop/default.nix b/pkgs/by-name/sd/sdlpop/package.nix
similarity index 100%
rename from pkgs/games/sdlpop/default.nix
rename to pkgs/by-name/sd/sdlpop/package.nix
diff --git a/pkgs/games/sdlpop/prince.sh b/pkgs/by-name/sd/sdlpop/prince.sh
similarity index 100%
rename from pkgs/games/sdlpop/prince.sh
rename to pkgs/by-name/sd/sdlpop/prince.sh
diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/by-name/sd/sdparm/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sdparm/default.nix
rename to pkgs/by-name/sd/sdparm/package.nix
diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/by-name/sd/sdrplay/package.nix
similarity index 100%
rename from pkgs/applications/radio/sdrplay/default.nix
rename to pkgs/by-name/sd/sdrplay/package.nix
diff --git a/pkgs/development/tools/sea-orm-cli/default.nix b/pkgs/by-name/se/sea-orm-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/sea-orm-cli/default.nix
rename to pkgs/by-name/se/sea-orm-cli/package.nix
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/by-name/se/seafile-shared/package.nix
similarity index 100%
rename from pkgs/misc/seafile-shared/default.nix
rename to pkgs/by-name/se/seafile-shared/package.nix
diff --git a/pkgs/development/libraries/sealcurses/default.nix b/pkgs/by-name/se/sealcurses/package.nix
similarity index 100%
rename from pkgs/development/libraries/sealcurses/default.nix
rename to pkgs/by-name/se/sealcurses/package.nix
diff --git a/pkgs/applications/misc/seashells/default.nix b/pkgs/by-name/se/seashells/package.nix
similarity index 100%
rename from pkgs/applications/misc/seashells/default.nix
rename to pkgs/by-name/se/seashells/package.nix
diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/by-name/se/seasocks/package.nix
similarity index 100%
rename from pkgs/development/libraries/seasocks/default.nix
rename to pkgs/by-name/se/seasocks/package.nix
diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/by-name/se/seatd/package.nix
similarity index 100%
rename from pkgs/applications/misc/seatd/default.nix
rename to pkgs/by-name/se/seatd/package.nix
diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/by-name/se/seaview/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/seaview/default.nix
rename to pkgs/by-name/se/seaview/package.nix
diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/by-name/se/seaweedfs/package.nix
similarity index 100%
rename from pkgs/applications/networking/seaweedfs/default.nix
rename to pkgs/by-name/se/seaweedfs/package.nix
diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/by-name/se/sec/package.nix
similarity index 100%
rename from pkgs/tools/admin/sec/default.nix
rename to pkgs/by-name/se/sec/package.nix
diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/by-name/se/seccure/package.nix
similarity index 100%
rename from pkgs/tools/security/seccure/default.nix
rename to pkgs/by-name/se/seccure/package.nix
diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/by-name/se/secp256k1/package.nix
similarity index 100%
rename from pkgs/tools/security/secp256k1/default.nix
rename to pkgs/by-name/se/secp256k1/package.nix
diff --git a/pkgs/tools/security/secrets-extractor/default.nix b/pkgs/by-name/se/secrets-extractor/package.nix
similarity index 100%
rename from pkgs/tools/security/secrets-extractor/default.nix
rename to pkgs/by-name/se/secrets-extractor/package.nix
diff --git a/pkgs/tools/security/secretscanner/default.nix b/pkgs/by-name/se/secretscanner/package.nix
similarity index 100%
rename from pkgs/tools/security/secretscanner/default.nix
rename to pkgs/by-name/se/secretscanner/package.nix
diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/by-name/se/sedutil/package.nix
similarity index 100%
rename from pkgs/tools/security/sedutil/default.nix
rename to pkgs/by-name/se/sedutil/package.nix
diff --git a/pkgs/tools/misc/see/default.nix b/pkgs/by-name/se/see/package.nix
similarity index 100%
rename from pkgs/tools/misc/see/default.nix
rename to pkgs/by-name/se/see/package.nix
diff --git a/pkgs/tools/text/seehecht/default.nix b/pkgs/by-name/se/seehecht/package.nix
similarity index 100%
rename from pkgs/tools/text/seehecht/default.nix
rename to pkgs/by-name/se/seehecht/package.nix
diff --git a/pkgs/development/tools/misc/segger-ozone/default.nix b/pkgs/by-name/se/segger-ozone/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/segger-ozone/default.nix
rename to pkgs/by-name/se/segger-ozone/package.nix
diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/by-name/se/selendroid/package.nix
similarity index 100%
rename from pkgs/development/tools/selenium/selendroid/default.nix
rename to pkgs/by-name/se/selendroid/package.nix
diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/by-name/se/selene/package.nix
similarity index 100%
rename from pkgs/development/tools/selene/default.nix
rename to pkgs/by-name/se/selene/package.nix
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/by-name/se/selenium-server-standalone/package.nix
similarity index 100%
rename from pkgs/development/tools/selenium/server/default.nix
rename to pkgs/by-name/se/selenium-server-standalone/package.nix
diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/by-name/se/selfoss/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/selfoss/default.nix
rename to pkgs/by-name/se/selfoss/package.nix
diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/by-name/se/selinux-python/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/selinux-python/default.nix
rename to pkgs/by-name/se/selinux-python/package.nix
diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/by-name/se/selinux-sandbox/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/selinux-sandbox/default.nix
rename to pkgs/by-name/se/selinux-sandbox/package.nix
diff --git a/pkgs/development/tools/sem/default.nix b/pkgs/by-name/se/sem/package.nix
similarity index 100%
rename from pkgs/development/tools/sem/default.nix
rename to pkgs/by-name/se/sem/package.nix
diff --git a/pkgs/development/tools/semantic-release/default.nix b/pkgs/by-name/se/semantic-release/package.nix
similarity index 100%
rename from pkgs/development/tools/semantic-release/default.nix
rename to pkgs/by-name/se/semantic-release/package.nix
diff --git a/pkgs/tools/misc/semiphemeral/default.nix b/pkgs/by-name/se/semiphemeral/package.nix
similarity index 100%
rename from pkgs/tools/misc/semiphemeral/default.nix
rename to pkgs/by-name/se/semiphemeral/package.nix
diff --git a/pkgs/os-specific/linux/semodule-utils/default.nix b/pkgs/by-name/se/semodule-utils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/semodule-utils/default.nix
rename to pkgs/by-name/se/semodule-utils/package.nix
diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/by-name/se/semver-tool/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/semver-tool/default.nix
rename to pkgs/by-name/se/semver-tool/package.nix
diff --git a/pkgs/applications/misc/semver/default.nix b/pkgs/by-name/se/semver/package.nix
similarity index 100%
rename from pkgs/applications/misc/semver/default.nix
rename to pkgs/by-name/se/semver/package.nix
diff --git a/pkgs/applications/networking/irc/senpai/bump-go-version.patch b/pkgs/by-name/se/senpai/bump-go-version.patch
similarity index 100%
rename from pkgs/applications/networking/irc/senpai/bump-go-version.patch
rename to pkgs/by-name/se/senpai/bump-go-version.patch
diff --git a/pkgs/applications/networking/irc/senpai/default.nix b/pkgs/by-name/se/senpai/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/senpai/default.nix
rename to pkgs/by-name/se/senpai/package.nix
diff --git a/pkgs/os-specific/darwin/sensible-side-buttons/default.nix b/pkgs/by-name/se/sensible-side-buttons/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/sensible-side-buttons/default.nix
rename to pkgs/by-name/se/sensible-side-buttons/package.nix
diff --git a/pkgs/tools/misc/sensible-utils/default.nix b/pkgs/by-name/se/sensible-utils/package.nix
similarity index 100%
rename from pkgs/tools/misc/sensible-utils/default.nix
rename to pkgs/by-name/se/sensible-utils/package.nix
diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/by-name/se/sent/package.nix
similarity index 100%
rename from pkgs/applications/misc/sent/default.nix
rename to pkgs/by-name/se/sent/package.nix
diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/by-name/se/sentencepiece/package.nix
similarity index 100%
rename from pkgs/development/libraries/sentencepiece/default.nix
rename to pkgs/by-name/se/sentencepiece/package.nix
diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/by-name/se/sentry-native/package.nix
similarity index 100%
rename from pkgs/development/libraries/sentry-native/default.nix
rename to pkgs/by-name/se/sentry-native/package.nix
diff --git a/pkgs/applications/misc/senv/default.nix b/pkgs/by-name/se/senv/package.nix
similarity index 100%
rename from pkgs/applications/misc/senv/default.nix
rename to pkgs/by-name/se/senv/package.nix
diff --git a/pkgs/applications/audio/seq24/mutex_no_nameclash.patch b/pkgs/by-name/se/seq24/mutex_no_nameclash.patch
similarity index 100%
rename from pkgs/applications/audio/seq24/mutex_no_nameclash.patch
rename to pkgs/by-name/se/seq24/mutex_no_nameclash.patch
diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/by-name/se/seq24/package.nix
similarity index 100%
rename from pkgs/applications/audio/seq24/default.nix
rename to pkgs/by-name/se/seq24/package.nix
diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/by-name/se/seqkit/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/seqkit/default.nix
rename to pkgs/by-name/se/seqkit/package.nix
diff --git a/pkgs/applications/science/biology/seqtk/default.nix b/pkgs/by-name/se/seqtk/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/seqtk/default.nix
rename to pkgs/by-name/se/seqtk/package.nix
diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/by-name/se/sequeler/package.nix
similarity index 100%
rename from pkgs/applications/misc/sequeler/default.nix
rename to pkgs/by-name/se/sequeler/package.nix
diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/by-name/se/sequelpro/package.nix
similarity index 100%
rename from pkgs/applications/misc/sequelpro/default.nix
rename to pkgs/by-name/se/sequelpro/package.nix
diff --git a/pkgs/tools/security/sequoia-chameleon-gnupg/default.nix b/pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
similarity index 100%
rename from pkgs/tools/security/sequoia-chameleon-gnupg/default.nix
rename to pkgs/by-name/se/sequoia-chameleon-gnupg/package.nix
diff --git a/pkgs/tools/security/sequoia-sqop/default.nix b/pkgs/by-name/se/sequoia-sqop/package.nix
similarity index 100%
rename from pkgs/tools/security/sequoia-sqop/default.nix
rename to pkgs/by-name/se/sequoia-sqop/package.nix
diff --git a/pkgs/tools/security/sequoia-sqv/Cargo.lock.patch b/pkgs/by-name/se/sequoia-sqv/Cargo.lock.patch
similarity index 100%
rename from pkgs/tools/security/sequoia-sqv/Cargo.lock.patch
rename to pkgs/by-name/se/sequoia-sqv/Cargo.lock.patch
diff --git a/pkgs/tools/security/sequoia-sqv/default.nix b/pkgs/by-name/se/sequoia-sqv/package.nix
similarity index 100%
rename from pkgs/tools/security/sequoia-sqv/default.nix
rename to pkgs/by-name/se/sequoia-sqv/package.nix
diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/by-name/se/ser2net/package.nix
similarity index 100%
rename from pkgs/servers/ser2net/default.nix
rename to pkgs/by-name/se/ser2net/package.nix
diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/by-name/se/serd/package.nix
similarity index 100%
rename from pkgs/development/libraries/serd/default.nix
rename to pkgs/by-name/se/serd/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/seren/default.nix b/pkgs/by-name/se/seren/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/seren/default.nix
rename to pkgs/by-name/se/seren/package.nix
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/by-name/se/serf/package.nix
similarity index 100%
rename from pkgs/development/libraries/serf/default.nix
rename to pkgs/by-name/se/serf/package.nix
diff --git a/pkgs/development/libraries/serf/scons.patch b/pkgs/by-name/se/serf/scons.patch
similarity index 100%
rename from pkgs/development/libraries/serf/scons.patch
rename to pkgs/by-name/se/serf/scons.patch
diff --git a/pkgs/servers/serf/default.nix b/pkgs/by-name/se/serfdom/package.nix
similarity index 100%
rename from pkgs/servers/serf/default.nix
rename to pkgs/by-name/se/serfdom/package.nix
diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/by-name/se/serialdv/package.nix
similarity index 100%
rename from pkgs/development/libraries/serialdv/default.nix
rename to pkgs/by-name/se/serialdv/package.nix
diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/by-name/se/serpent/package.nix
similarity index 100%
rename from pkgs/development/compilers/serpent/default.nix
rename to pkgs/by-name/se/serpent/package.nix
diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/by-name/se/service-wrapper/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/service-wrapper/default.nix
rename to pkgs/by-name/se/service-wrapper/package.nix
diff --git a/pkgs/os-specific/linux/service-wrapper/service-wrapper.sh b/pkgs/by-name/se/service-wrapper/service-wrapper.sh
similarity index 100%
rename from pkgs/os-specific/linux/service-wrapper/service-wrapper.sh
rename to pkgs/by-name/se/service-wrapper/service-wrapper.sh
diff --git a/pkgs/servers/serviio/default.nix b/pkgs/by-name/se/serviio/package.nix
similarity index 100%
rename from pkgs/servers/serviio/default.nix
rename to pkgs/by-name/se/serviio/package.nix
diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/by-name/se/seshat/package.nix
similarity index 100%
rename from pkgs/data/fonts/seshat/default.nix
rename to pkgs/by-name/se/seshat/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/by-name/se/session-desktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/session-desktop/default.nix
rename to pkgs/by-name/se/session-desktop/package.nix
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/by-name/se/setbfree/package.nix
similarity index 100%
rename from pkgs/applications/audio/setbfree/default.nix
rename to pkgs/by-name/se/setbfree/package.nix
diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/by-name/se/setools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/setools/default.nix
rename to pkgs/by-name/se/setools/package.nix
diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/by-name/se/setroot/package.nix
similarity index 100%
rename from pkgs/tools/X11/setroot/default.nix
rename to pkgs/by-name/se/setroot/package.nix
diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/by-name/se/setserial/package.nix
similarity index 100%
rename from pkgs/tools/system/setserial/default.nix
rename to pkgs/by-name/se/setserial/package.nix
diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/by-name/se/seturgent/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/seturgent/default.nix
rename to pkgs/by-name/se/seturgent/package.nix
diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/by-name/se/sewer/package.nix
similarity index 100%
rename from pkgs/tools/admin/sewer/default.nix
rename to pkgs/by-name/se/sewer/package.nix
diff --git a/pkgs/development/libraries/sexpp/default.nix b/pkgs/by-name/se/sexpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/sexpp/default.nix
rename to pkgs/by-name/se/sexpp/package.nix
diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/by-name/se/seyren/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/seyren/default.nix
rename to pkgs/by-name/se/seyren/package.nix
diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/by-name/sf/sfeed/package.nix
similarity index 100%
rename from pkgs/tools/misc/sfeed/default.nix
rename to pkgs/by-name/sf/sfeed/package.nix
diff --git a/pkgs/applications/audio/sfizz/gcc13.patch b/pkgs/by-name/sf/sfizz/gcc13.patch
similarity index 100%
rename from pkgs/applications/audio/sfizz/gcc13.patch
rename to pkgs/by-name/sf/sfizz/gcc13.patch
diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/by-name/sf/sfizz/package.nix
similarity index 100%
rename from pkgs/applications/audio/sfizz/default.nix
rename to pkgs/by-name/sf/sfizz/package.nix
diff --git a/pkgs/applications/file-managers/sfm/default.nix b/pkgs/by-name/sf/sfm/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/sfm/default.nix
rename to pkgs/by-name/sf/sfm/package.nix
diff --git a/pkgs/games/sfrotz/default.nix b/pkgs/by-name/sf/sfrotz/package.nix
similarity index 100%
rename from pkgs/games/sfrotz/default.nix
rename to pkgs/by-name/sf/sfrotz/package.nix
diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/by-name/sf/sfsexp/package.nix
similarity index 100%
rename from pkgs/development/libraries/sfsexp/default.nix
rename to pkgs/by-name/sf/sfsexp/package.nix
diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/by-name/sf/sftpgo/package.nix
similarity index 100%
rename from pkgs/servers/sftpgo/default.nix
rename to pkgs/by-name/sf/sftpgo/package.nix
diff --git a/pkgs/tools/filesystems/sftpman/default.nix b/pkgs/by-name/sf/sftpman/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/sftpman/default.nix
rename to pkgs/by-name/sf/sftpman/package.nix
diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/by-name/sf/sfxr/package.nix
similarity index 100%
rename from pkgs/applications/audio/sfxr/default.nix
rename to pkgs/by-name/sf/sfxr/package.nix
diff --git a/pkgs/tools/misc/sfz/default.nix b/pkgs/by-name/sf/sfz/package.nix
similarity index 100%
rename from pkgs/tools/misc/sfz/default.nix
rename to pkgs/by-name/sf/sfz/package.nix
diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/by-name/sg/sg3_utils/package.nix
similarity index 100%
rename from pkgs/tools/system/sg3_utils/default.nix
rename to pkgs/by-name/sg/sg3_utils/package.nix
diff --git a/pkgs/development/libraries/sgp4/default.nix b/pkgs/by-name/sg/sgp4/package.nix
similarity index 100%
rename from pkgs/development/libraries/sgp4/default.nix
rename to pkgs/by-name/sg/sgp4/package.nix
diff --git a/pkgs/tools/text/sgrep/default.nix b/pkgs/by-name/sg/sgrep/package.nix
similarity index 100%
rename from pkgs/tools/text/sgrep/default.nix
rename to pkgs/by-name/sg/sgrep/package.nix
diff --git a/pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sgx/azure-dcap-client/default.nix
rename to pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
diff --git a/pkgs/os-specific/linux/sgx/azure-dcap-client/test-suite.nix b/pkgs/by-name/sg/sgx-azure-dcap-client/test-suite.nix
similarity index 100%
rename from pkgs/os-specific/linux/sgx/azure-dcap-client/test-suite.nix
rename to pkgs/by-name/sg/sgx-azure-dcap-client/test-suite.nix
diff --git a/pkgs/os-specific/linux/sgx/azure-dcap-client/tests-missing-includes.patch b/pkgs/by-name/sg/sgx-azure-dcap-client/tests-missing-includes.patch
similarity index 100%
rename from pkgs/os-specific/linux/sgx/azure-dcap-client/tests-missing-includes.patch
rename to pkgs/by-name/sg/sgx-azure-dcap-client/tests-missing-includes.patch
diff --git a/pkgs/os-specific/linux/sgx/ssl/default.nix b/pkgs/by-name/sg/sgx-ssl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sgx/ssl/default.nix
rename to pkgs/by-name/sg/sgx-ssl/package.nix
diff --git a/pkgs/os-specific/linux/sgx/ssl/tests.nix b/pkgs/by-name/sg/sgx-ssl/tests.nix
similarity index 100%
rename from pkgs/os-specific/linux/sgx/ssl/tests.nix
rename to pkgs/by-name/sg/sgx-ssl/tests.nix
diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/pkgs/by-name/sh/sha1collisiondetection/package.nix
similarity index 100%
rename from pkgs/tools/security/sha1collisiondetection/default.nix
rename to pkgs/by-name/sh/sha1collisiondetection/package.nix
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/by-name/sh/shaarli/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/shaarli/default.nix
rename to pkgs/by-name/sh/shaarli/package.nix
diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/by-name/sh/shabnam-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/shabnam-fonts/default.nix
rename to pkgs/by-name/sh/shabnam-fonts/package.nix
diff --git a/pkgs/development/tools/shadered/install_path_fix.patch b/pkgs/by-name/sh/shadered/install_path_fix.patch
similarity index 100%
rename from pkgs/development/tools/shadered/install_path_fix.patch
rename to pkgs/by-name/sh/shadered/install_path_fix.patch
diff --git a/pkgs/development/tools/shadered/default.nix b/pkgs/by-name/sh/shadered/package.nix
similarity index 100%
rename from pkgs/development/tools/shadered/default.nix
rename to pkgs/by-name/sh/shadered/package.nix
diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/by-name/sh/shades-of-gray-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/shades-of-gray/default.nix
rename to pkgs/by-name/sh/shades-of-gray-theme/package.nix
diff --git a/pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch b/pkgs/by-name/sh/shadow/fix-install-with-tcb.patch
similarity index 100%
rename from pkgs/os-specific/linux/shadow/fix-install-with-tcb.patch
rename to pkgs/by-name/sh/shadow/fix-install-with-tcb.patch
diff --git a/pkgs/os-specific/linux/shadow/keep-path.patch b/pkgs/by-name/sh/shadow/keep-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/shadow/keep-path.patch
rename to pkgs/by-name/sh/shadow/keep-path.patch
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/by-name/sh/shadow/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/shadow/default.nix
rename to pkgs/by-name/sh/shadow/package.nix
diff --git a/pkgs/os-specific/linux/shadow/respect-xml-catalog-files-var.patch b/pkgs/by-name/sh/shadow/respect-xml-catalog-files-var.patch
similarity index 100%
rename from pkgs/os-specific/linux/shadow/respect-xml-catalog-files-var.patch
rename to pkgs/by-name/sh/shadow/respect-xml-catalog-files-var.patch
diff --git a/pkgs/os-specific/linux/shadow/runtime-shell.patch b/pkgs/by-name/sh/shadow/runtime-shell.patch
similarity index 100%
rename from pkgs/os-specific/linux/shadow/runtime-shell.patch
rename to pkgs/by-name/sh/shadow/runtime-shell.patch
diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/by-name/sh/shadowfox/package.nix
similarity index 100%
rename from pkgs/tools/networking/shadowfox/default.nix
rename to pkgs/by-name/sh/shadowfox/package.nix
diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/by-name/sh/shadowsocks-libev/package.nix
similarity index 100%
rename from pkgs/tools/networking/shadowsocks-libev/default.nix
rename to pkgs/by-name/sh/shadowsocks-libev/package.nix
diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix
similarity index 100%
rename from pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix
rename to pkgs/by-name/sh/shadowsocks-v2ray-plugin/package.nix
diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/by-name/sh/shairport-sync/package.nix
similarity index 100%
rename from pkgs/servers/shairport-sync/default.nix
rename to pkgs/by-name/sh/shairport-sync/package.nix
diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/by-name/sh/shallot/package.nix
similarity index 100%
rename from pkgs/tools/misc/shallot/default.nix
rename to pkgs/by-name/sh/shallot/package.nix
diff --git a/pkgs/tools/audio/shaq/default.nix b/pkgs/by-name/sh/shaq/package.nix
similarity index 100%
rename from pkgs/tools/audio/shaq/default.nix
rename to pkgs/by-name/sh/shaq/package.nix
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/by-name/sh/shared-mime-info/package.nix
similarity index 100%
rename from pkgs/data/misc/shared-mime-info/default.nix
rename to pkgs/by-name/sh/shared-mime-info/package.nix
diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/by-name/sh/shared_desktop_ontologies/package.nix
similarity index 100%
rename from pkgs/data/misc/shared-desktop-ontologies/default.nix
rename to pkgs/by-name/sh/shared_desktop_ontologies/package.nix
diff --git a/pkgs/servers/sharing/default.nix b/pkgs/by-name/sh/sharing/package.nix
similarity index 100%
rename from pkgs/servers/sharing/default.nix
rename to pkgs/by-name/sh/sharing/package.nix
diff --git a/pkgs/development/libraries/sharness/default.nix b/pkgs/by-name/sh/sharness/package.nix
similarity index 100%
rename from pkgs/development/libraries/sharness/default.nix
rename to pkgs/by-name/sh/sharness/package.nix
diff --git a/pkgs/applications/science/logic/sharpsat-td/default.nix b/pkgs/by-name/sh/sharpsat-td/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/sharpsat-td/default.nix
rename to pkgs/by-name/sh/sharpsat-td/package.nix
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/by-name/sh/sharutils/package.nix
similarity index 100%
rename from pkgs/tools/archivers/sharutils/default.nix
rename to pkgs/by-name/sh/sharutils/package.nix
diff --git a/pkgs/applications/misc/shavee/default.nix b/pkgs/by-name/sh/shavee/package.nix
similarity index 100%
rename from pkgs/applications/misc/shavee/default.nix
rename to pkgs/by-name/sh/shavee/package.nix
diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/by-name/sh/shc/package.nix
similarity index 100%
rename from pkgs/tools/security/shc/default.nix
rename to pkgs/by-name/sh/shc/package.nix
diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/by-name/sh/shell-genie/package.nix
similarity index 100%
rename from pkgs/applications/misc/shell-genie/default.nix
rename to pkgs/by-name/sh/shell-genie/package.nix
diff --git a/pkgs/tools/misc/shell-hist/default.nix b/pkgs/by-name/sh/shell-hist/package.nix
similarity index 100%
rename from pkgs/tools/misc/shell-hist/default.nix
rename to pkgs/by-name/sh/shell-hist/package.nix
diff --git a/pkgs/servers/misc/shell2http/default.nix b/pkgs/by-name/sh/shell2http/package.nix
similarity index 100%
rename from pkgs/servers/misc/shell2http/default.nix
rename to pkgs/by-name/sh/shell2http/package.nix
diff --git a/pkgs/tools/security/shellclear/default.nix b/pkgs/by-name/sh/shellclear/package.nix
similarity index 100%
rename from pkgs/tools/security/shellclear/default.nix
rename to pkgs/by-name/sh/shellclear/package.nix
diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/by-name/sh/shelldap/package.nix
similarity index 100%
rename from pkgs/tools/misc/shelldap/default.nix
rename to pkgs/by-name/sh/shelldap/package.nix
diff --git a/pkgs/development/tools/shellharden/default.nix b/pkgs/by-name/sh/shellharden/package.nix
similarity index 100%
rename from pkgs/development/tools/shellharden/default.nix
rename to pkgs/by-name/sh/shellharden/package.nix
diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/by-name/sh/shellhub-agent/package.nix
similarity index 100%
rename from pkgs/applications/networking/shellhub-agent/default.nix
rename to pkgs/by-name/sh/shellhub-agent/package.nix
diff --git a/pkgs/tools/security/shellnoob/default.nix b/pkgs/by-name/sh/shellnoob/package.nix
similarity index 100%
rename from pkgs/tools/security/shellnoob/default.nix
rename to pkgs/by-name/sh/shellnoob/package.nix
diff --git a/pkgs/tools/misc/shellspec/default.nix b/pkgs/by-name/sh/shellspec/package.nix
similarity index 100%
rename from pkgs/tools/misc/shellspec/default.nix
rename to pkgs/by-name/sh/shellspec/package.nix
diff --git a/pkgs/tools/security/shellz/default.nix b/pkgs/by-name/sh/shellz/package.nix
similarity index 100%
rename from pkgs/tools/security/shellz/default.nix
rename to pkgs/by-name/sh/shellz/package.nix
diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/by-name/sh/shen-sbcl/package.nix
similarity index 100%
rename from pkgs/development/interpreters/shen-sbcl/default.nix
rename to pkgs/by-name/sh/shen-sbcl/package.nix
diff --git a/pkgs/development/interpreters/shen-sources/default.nix b/pkgs/by-name/sh/shen-sources/package.nix
similarity index 100%
rename from pkgs/development/interpreters/shen-sources/default.nix
rename to pkgs/by-name/sh/shen-sources/package.nix
diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/by-name/sh/sherpa/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/sherpa/default.nix
rename to pkgs/by-name/sh/sherpa/package.nix
diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/by-name/sh/shfmt/package.nix
similarity index 100%
rename from pkgs/tools/text/shfmt/default.nix
rename to pkgs/by-name/sh/shfmt/package.nix
diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/by-name/sh/shhmsg/package.nix
similarity index 100%
rename from pkgs/development/libraries/shhmsg/default.nix
rename to pkgs/by-name/sh/shhmsg/package.nix
diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/by-name/sh/shhopt/package.nix
similarity index 100%
rename from pkgs/development/libraries/shhopt/default.nix
rename to pkgs/by-name/sh/shhopt/package.nix
diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/by-name/sh/shibboleth-sp/package.nix
similarity index 100%
rename from pkgs/development/libraries/shibboleth-sp/default.nix
rename to pkgs/by-name/sh/shibboleth-sp/package.nix
diff --git a/pkgs/tools/wayland/shikane/default.nix b/pkgs/by-name/sh/shikane/package.nix
similarity index 100%
rename from pkgs/tools/wayland/shikane/default.nix
rename to pkgs/by-name/sh/shikane/package.nix
diff --git a/pkgs/tools/misc/shim/default.nix b/pkgs/by-name/sh/shim-unsigned/package.nix
similarity index 100%
rename from pkgs/tools/misc/shim/default.nix
rename to pkgs/by-name/sh/shim-unsigned/package.nix
diff --git a/pkgs/development/libraries/shine/default.nix b/pkgs/by-name/sh/shine/package.nix
similarity index 100%
rename from pkgs/development/libraries/shine/default.nix
rename to pkgs/by-name/sh/shine/package.nix
diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/by-name/sh/shiori/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/shiori/default.nix
rename to pkgs/by-name/sh/shiori/package.nix
diff --git a/pkgs/applications/misc/shipments/default.nix b/pkgs/by-name/sh/shipments/package.nix
similarity index 100%
rename from pkgs/applications/misc/shipments/default.nix
rename to pkgs/by-name/sh/shipments/package.nix
diff --git a/pkgs/games/shipwright/darwin-fixes.patch b/pkgs/by-name/sh/shipwright/darwin-fixes.patch
similarity index 100%
rename from pkgs/games/shipwright/darwin-fixes.patch
rename to pkgs/by-name/sh/shipwright/darwin-fixes.patch
diff --git a/pkgs/games/shipwright/default.nix b/pkgs/by-name/sh/shipwright/package.nix
similarity index 100%
rename from pkgs/games/shipwright/default.nix
rename to pkgs/by-name/sh/shipwright/package.nix
diff --git a/pkgs/tools/security/shisho/default.nix b/pkgs/by-name/sh/shisho/package.nix
similarity index 100%
rename from pkgs/tools/security/shisho/default.nix
rename to pkgs/by-name/sh/shisho/package.nix
diff --git a/pkgs/development/tools/database/shmig/default.nix b/pkgs/by-name/sh/shmig/package.nix
similarity index 100%
rename from pkgs/development/tools/database/shmig/default.nix
rename to pkgs/by-name/sh/shmig/package.nix
diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/by-name/sh/shncpd/package.nix
similarity index 100%
rename from pkgs/tools/networking/shncpd/default.nix
rename to pkgs/by-name/sh/shncpd/package.nix
diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/by-name/sh/shntool/package.nix
similarity index 100%
rename from pkgs/applications/audio/shntool/default.nix
rename to pkgs/by-name/sh/shntool/package.nix
diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/by-name/sh/shocco/package.nix
similarity index 100%
rename from pkgs/tools/text/shocco/default.nix
rename to pkgs/by-name/sh/shocco/package.nix
diff --git a/pkgs/applications/window-managers/shod/default.nix b/pkgs/by-name/sh/shod/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/shod/default.nix
rename to pkgs/by-name/sh/shod/package.nix
diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/by-name/sh/shopify-themekit/package.nix
similarity index 100%
rename from pkgs/development/web/shopify-themekit/default.nix
rename to pkgs/by-name/sh/shopify-themekit/package.nix
diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/by-name/sh/shorewall/package.nix
similarity index 100%
rename from pkgs/tools/networking/shorewall/default.nix
rename to pkgs/by-name/sh/shorewall/package.nix
diff --git a/pkgs/os-specific/darwin/shortcat/default.nix b/pkgs/by-name/sh/shortcat/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/shortcat/default.nix
rename to pkgs/by-name/sh/shortcat/package.nix
diff --git a/pkgs/tools/graphics/shot-scraper/default.nix b/pkgs/by-name/sh/shot-scraper/package.nix
similarity index 100%
rename from pkgs/tools/graphics/shot-scraper/default.nix
rename to pkgs/by-name/sh/shot-scraper/package.nix
diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/by-name/sh/shotgun/package.nix
similarity index 100%
rename from pkgs/tools/graphics/shotgun/default.nix
rename to pkgs/by-name/sh/shotgun/package.nix
diff --git a/pkgs/tools/wayland/shotman/default.nix b/pkgs/by-name/sh/shotman/package.nix
similarity index 100%
rename from pkgs/tools/wayland/shotman/default.nix
rename to pkgs/by-name/sh/shotman/package.nix
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/by-name/sh/shotwell/package.nix
similarity index 100%
rename from pkgs/applications/graphics/shotwell/default.nix
rename to pkgs/by-name/sh/shotwell/package.nix
diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/by-name/sh/shrikhand/package.nix
similarity index 100%
rename from pkgs/data/fonts/shrikhand/default.nix
rename to pkgs/by-name/sh/shrikhand/package.nix
diff --git a/pkgs/games/shticker-book-unwritten/default.nix b/pkgs/by-name/sh/shticker-book-unwritten/package.nix
similarity index 100%
rename from pkgs/games/shticker-book-unwritten/default.nix
rename to pkgs/by-name/sh/shticker-book-unwritten/package.nix
diff --git a/pkgs/games/shticker-book-unwritten/unwrapped.nix b/pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix
similarity index 100%
rename from pkgs/games/shticker-book-unwritten/unwrapped.nix
rename to pkgs/by-name/sh/shticker-book-unwritten/unwrapped.nix
diff --git a/pkgs/applications/science/physics/shtns/default.nix b/pkgs/by-name/sh/shtns/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/shtns/default.nix
rename to pkgs/by-name/sh/shtns/package.nix
diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/by-name/sh/shunit2/package.nix
similarity index 100%
rename from pkgs/tools/misc/shunit2/default.nix
rename to pkgs/by-name/sh/shunit2/package.nix
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/by-name/sh/shutter/package.nix
similarity index 100%
rename from pkgs/applications/graphics/shutter/default.nix
rename to pkgs/by-name/sh/shutter/package.nix
diff --git a/pkgs/tools/graphics/sic-image-cli/default.nix b/pkgs/by-name/si/sic-image-cli/package.nix
similarity index 100%
rename from pkgs/tools/graphics/sic-image-cli/default.nix
rename to pkgs/by-name/si/sic-image-cli/package.nix
diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/by-name/si/sic/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/sic/default.nix
rename to pkgs/by-name/si/sic/package.nix
diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/by-name/si/sidequest/package.nix
similarity index 100%
rename from pkgs/applications/misc/sidequest/default.nix
rename to pkgs/by-name/si/sidequest/package.nix
diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/by-name/si/sidplayfp/package.nix
similarity index 100%
rename from pkgs/applications/audio/sidplayfp/default.nix
rename to pkgs/by-name/si/sidplayfp/package.nix
diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/by-name/si/siege/package.nix
similarity index 100%
rename from pkgs/tools/networking/siege/default.nix
rename to pkgs/by-name/si/siege/package.nix
diff --git a/pkgs/games/sienna/default.nix b/pkgs/by-name/si/sienna/package.nix
similarity index 100%
rename from pkgs/games/sienna/default.nix
rename to pkgs/by-name/si/sienna/package.nix
diff --git a/pkgs/data/themes/sierra/default.nix b/pkgs/by-name/si/sierra-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/sierra/default.nix
rename to pkgs/by-name/si/sierra-gtk-theme/package.nix
diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/by-name/si/sieve-connect/package.nix
similarity index 100%
rename from pkgs/applications/networking/sieve-connect/default.nix
rename to pkgs/by-name/si/sieve-connect/package.nix
diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/by-name/si/sift/package.nix
similarity index 100%
rename from pkgs/tools/text/sift/default.nix
rename to pkgs/by-name/si/sift/package.nix
diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/by-name/si/sigal/package.nix
similarity index 100%
rename from pkgs/applications/misc/sigal/default.nix
rename to pkgs/by-name/si/sigal/package.nix
diff --git a/pkgs/applications/misc/siglo/default.nix b/pkgs/by-name/si/siglo/package.nix
similarity index 100%
rename from pkgs/applications/misc/siglo/default.nix
rename to pkgs/by-name/si/siglo/package.nix
diff --git a/pkgs/applications/misc/siglo/siglo-no-user-install.patch b/pkgs/by-name/si/siglo/siglo-no-user-install.patch
similarity index 100%
rename from pkgs/applications/misc/siglo/siglo-no-user-install.patch
rename to pkgs/by-name/si/siglo/siglo-no-user-install.patch
diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/by-name/si/sigma-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/sigma-cli/default.nix
rename to pkgs/by-name/si/sigma-cli/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/by-name/si/signal-cli/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/signal-cli/default.nix
rename to pkgs/by-name/si/signal-cli/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/signald/deps.json b/pkgs/by-name/si/signald/deps.json
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/signald/deps.json
rename to pkgs/by-name/si/signald/deps.json
diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/by-name/si/signald/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/signald/default.nix
rename to pkgs/by-name/si/signald/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/signaldctl/default.nix b/pkgs/by-name/si/signaldctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/signaldctl/default.nix
rename to pkgs/by-name/si/signaldctl/package.nix
diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/by-name/si/signify/package.nix
similarity index 100%
rename from pkgs/tools/security/signify/default.nix
rename to pkgs/by-name/si/signify/package.nix
diff --git a/pkgs/tools/security/signing-party/gpgwrap_makefile.patch b/pkgs/by-name/si/signing-party/gpgwrap_makefile.patch
similarity index 100%
rename from pkgs/tools/security/signing-party/gpgwrap_makefile.patch
rename to pkgs/by-name/si/signing-party/gpgwrap_makefile.patch
diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/by-name/si/signing-party/package.nix
similarity index 100%
rename from pkgs/tools/security/signing-party/default.nix
rename to pkgs/by-name/si/signing-party/package.nix
diff --git a/pkgs/data/fonts/signwriting/default.nix b/pkgs/by-name/si/signwriting/package.nix
similarity index 100%
rename from pkgs/data/fonts/signwriting/default.nix
rename to pkgs/by-name/si/signwriting/package.nix
diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/by-name/si/sigrok-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/sigrok-cli/default.nix
rename to pkgs/by-name/si/sigrok-cli/package.nix
diff --git a/pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix b/pkgs/by-name/si/sigrok-firmware-fx2lafw/package.nix
similarity index 100%
rename from pkgs/development/tools/sigrok-firmware-fx2lafw/default.nix
rename to pkgs/by-name/si/sigrok-firmware-fx2lafw/package.nix
diff --git a/pkgs/development/libraries/sigslot/default.nix b/pkgs/by-name/si/sigslot/package.nix
similarity index 100%
rename from pkgs/development/libraries/sigslot/default.nix
rename to pkgs/by-name/si/sigslot/package.nix
diff --git a/pkgs/tools/backup/sigtop/default.nix b/pkgs/by-name/si/sigtop/package.nix
similarity index 100%
rename from pkgs/tools/backup/sigtop/default.nix
rename to pkgs/by-name/si/sigtop/package.nix
diff --git a/pkgs/applications/radio/sigutils/default.nix b/pkgs/by-name/si/sigutils/package.nix
similarity index 100%
rename from pkgs/applications/radio/sigutils/default.nix
rename to pkgs/by-name/si/sigutils/package.nix
diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/by-name/si/siji/package.nix
similarity index 100%
rename from pkgs/data/fonts/siji/default.nix
rename to pkgs/by-name/si/siji/package.nix
diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/by-name/si/sil-abyssinica/package.nix
similarity index 100%
rename from pkgs/data/fonts/sil-abyssinica/default.nix
rename to pkgs/by-name/si/sil-abyssinica/package.nix
diff --git a/pkgs/data/fonts/sil-padauk/default.nix b/pkgs/by-name/si/sil-padauk/package.nix
similarity index 100%
rename from pkgs/data/fonts/sil-padauk/default.nix
rename to pkgs/by-name/si/sil-padauk/package.nix
diff --git a/pkgs/games/sil-q/default.nix b/pkgs/by-name/si/sil-q/package.nix
similarity index 100%
rename from pkgs/games/sil-q/default.nix
rename to pkgs/by-name/si/sil-q/package.nix
diff --git a/pkgs/games/sil/default.nix b/pkgs/by-name/si/sil/package.nix
similarity index 100%
rename from pkgs/games/sil/default.nix
rename to pkgs/by-name/si/sil/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/by-name/si/silc_client/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/silc-client/default.nix
rename to pkgs/by-name/si/silc_client/package.nix
diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/by-name/si/silc_server/package.nix
similarity index 100%
rename from pkgs/servers/silc-server/default.nix
rename to pkgs/by-name/si/silc_server/package.nix
diff --git a/pkgs/tools/security/silenthound/default.nix b/pkgs/by-name/si/silenthound/package.nix
similarity index 100%
rename from pkgs/tools/security/silenthound/default.nix
rename to pkgs/by-name/si/silenthound/package.nix
diff --git a/pkgs/development/compilers/silice/default.nix b/pkgs/by-name/si/silice/package.nix
similarity index 100%
rename from pkgs/development/compilers/silice/default.nix
rename to pkgs/by-name/si/silice/package.nix
diff --git a/pkgs/tools/text/silver-searcher/bash-completion.patch b/pkgs/by-name/si/silver-searcher/bash-completion.patch
similarity index 100%
rename from pkgs/tools/text/silver-searcher/bash-completion.patch
rename to pkgs/by-name/si/silver-searcher/bash-completion.patch
diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/by-name/si/silver-searcher/package.nix
similarity index 100%
rename from pkgs/tools/text/silver-searcher/default.nix
rename to pkgs/by-name/si/silver-searcher/package.nix
diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/by-name/si/simdjson/package.nix
similarity index 100%
rename from pkgs/development/libraries/simdjson/default.nix
rename to pkgs/by-name/si/simdjson/package.nix
diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/by-name/si/simg2img/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/simg2img/default.nix
rename to pkgs/by-name/si/simg2img/package.nix
diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/by-name/si/simgear/package.nix
similarity index 100%
rename from pkgs/development/libraries/simgear/default.nix
rename to pkgs/by-name/si/simgear/package.nix
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/by-name/si/simgrid/package.nix
similarity index 100%
rename from pkgs/applications/science/misc/simgrid/default.nix
rename to pkgs/by-name/si/simgrid/package.nix
diff --git a/pkgs/data/icons/simp1e-cursors/default.nix b/pkgs/by-name/si/simp1e-cursors/package.nix
similarity index 100%
rename from pkgs/data/icons/simp1e-cursors/default.nix
rename to pkgs/by-name/si/simp1e-cursors/package.nix
diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/by-name/si/simp_le/package.nix
similarity index 100%
rename from pkgs/tools/admin/simp_le/default.nix
rename to pkgs/by-name/si/simp_le/package.nix
diff --git a/pkgs/tools/networking/simple-dlna-browser/default.nix b/pkgs/by-name/si/simple-dlna-browser/package.nix
similarity index 100%
rename from pkgs/tools/networking/simple-dlna-browser/default.nix
rename to pkgs/by-name/si/simple-dlna-browser/package.nix
diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/by-name/si/simple-http-server/package.nix
similarity index 100%
rename from pkgs/servers/simple-http-server/default.nix
rename to pkgs/by-name/si/simple-http-server/package.nix
diff --git a/pkgs/tools/filesystems/simple-mtpfs/default.nix b/pkgs/by-name/si/simple-mtpfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/simple-mtpfs/default.nix
rename to pkgs/by-name/si/simple-mtpfs/package.nix
diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/by-name/si/simpleTpmPk11/package.nix
similarity index 100%
rename from pkgs/tools/security/simple-tpm-pk11/default.nix
rename to pkgs/by-name/si/simpleTpmPk11/package.nix
diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/by-name/si/simplehttp2server/package.nix
similarity index 100%
rename from pkgs/servers/simplehttp2server/default.nix
rename to pkgs/by-name/si/simplehttp2server/package.nix
diff --git a/pkgs/applications/emulators/simplenes/default.nix b/pkgs/by-name/si/simplenes/package.nix
similarity index 100%
rename from pkgs/applications/emulators/simplenes/default.nix
rename to pkgs/by-name/si/simplenes/package.nix
diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/by-name/si/simpleproxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/simpleproxy/default.nix
rename to pkgs/by-name/si/simpleproxy/package.nix
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/by-name/si/simutrans/package.nix
similarity index 100%
rename from pkgs/games/simutrans/default.nix
rename to pkgs/by-name/si/simutrans/package.nix
diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/by-name/si/sing-box/package.nix
similarity index 100%
rename from pkgs/tools/networking/sing-box/default.nix
rename to pkgs/by-name/si/sing-box/package.nix
diff --git a/pkgs/data/misc/sing-geoip/main.go b/pkgs/by-name/si/sing-geoip/main.go
similarity index 100%
rename from pkgs/data/misc/sing-geoip/main.go
rename to pkgs/by-name/si/sing-geoip/main.go
diff --git a/pkgs/data/misc/sing-geoip/default.nix b/pkgs/by-name/si/sing-geoip/package.nix
similarity index 100%
rename from pkgs/data/misc/sing-geoip/default.nix
rename to pkgs/by-name/si/sing-geoip/package.nix
diff --git a/pkgs/data/misc/sing-geosite/main.go b/pkgs/by-name/si/sing-geosite/main.go
similarity index 100%
rename from pkgs/data/misc/sing-geosite/main.go
rename to pkgs/by-name/si/sing-geosite/main.go
diff --git a/pkgs/data/misc/sing-geosite/default.nix b/pkgs/by-name/si/sing-geosite/package.nix
similarity index 100%
rename from pkgs/data/misc/sing-geosite/default.nix
rename to pkgs/by-name/si/sing-geosite/package.nix
diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/by-name/si/singular/package.nix
similarity index 100%
rename from pkgs/applications/science/math/singular/default.nix
rename to pkgs/by-name/si/singular/package.nix
diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/by-name/si/sipcalc/package.nix
similarity index 100%
rename from pkgs/tools/networking/sipcalc/default.nix
rename to pkgs/by-name/si/sipcalc/package.nix
diff --git a/pkgs/tools/networking/sipexer/default.nix b/pkgs/by-name/si/sipexer/package.nix
similarity index 100%
rename from pkgs/tools/networking/sipexer/default.nix
rename to pkgs/by-name/si/sipexer/package.nix
diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/by-name/si/sipp/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/sipp/default.nix
rename to pkgs/by-name/si/sipp/package.nix
diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/pkgs/by-name/si/siproxd/cheaders.patch
similarity index 100%
rename from pkgs/applications/networking/siproxd/cheaders.patch
rename to pkgs/by-name/si/siproxd/cheaders.patch
diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/by-name/si/siproxd/package.nix
similarity index 100%
rename from pkgs/applications/networking/siproxd/default.nix
rename to pkgs/by-name/si/siproxd/package.nix
diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/by-name/si/sipsak/package.nix
similarity index 100%
rename from pkgs/tools/networking/sipsak/default.nix
rename to pkgs/by-name/si/sipsak/package.nix
diff --git a/pkgs/tools/security/sipvicious/default.nix b/pkgs/by-name/si/sipvicious/package.nix
similarity index 100%
rename from pkgs/tools/security/sipvicious/default.nix
rename to pkgs/by-name/si/sipvicious/package.nix
diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/by-name/si/sipwitch/package.nix
similarity index 100%
rename from pkgs/servers/sip/sipwitch/default.nix
rename to pkgs/by-name/si/sipwitch/package.nix
diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/by-name/si/siril/package.nix
similarity index 100%
rename from pkgs/applications/science/astronomy/siril/default.nix
rename to pkgs/by-name/si/siril/package.nix
diff --git a/pkgs/tools/wayland/sirula/Cargo.lock b/pkgs/by-name/si/sirula/Cargo.lock
similarity index 100%
rename from pkgs/tools/wayland/sirula/Cargo.lock
rename to pkgs/by-name/si/sirula/Cargo.lock
diff --git a/pkgs/tools/wayland/sirula/default.nix b/pkgs/by-name/si/sirula/package.nix
similarity index 100%
rename from pkgs/tools/wayland/sirula/default.nix
rename to pkgs/by-name/si/sirula/package.nix
diff --git a/pkgs/tools/networking/sish/default.nix b/pkgs/by-name/si/sish/package.nix
similarity index 100%
rename from pkgs/tools/networking/sish/default.nix
rename to pkgs/by-name/si/sish/package.nix
diff --git a/pkgs/data/fonts/sitelen-seli-kiwen/default.nix b/pkgs/by-name/si/sitelen-seli-kiwen/package.nix
similarity index 100%
rename from pkgs/data/fonts/sitelen-seli-kiwen/default.nix
rename to pkgs/by-name/si/sitelen-seli-kiwen/package.nix
diff --git a/pkgs/tools/networking/sitespeed-io/default.nix b/pkgs/by-name/si/sitespeed-io/package.nix
similarity index 100%
rename from pkgs/tools/networking/sitespeed-io/default.nix
rename to pkgs/by-name/si/sitespeed-io/package.nix
diff --git a/pkgs/tools/misc/sixpair/hcitool.patch b/pkgs/by-name/si/sixpair/hcitool.patch
similarity index 100%
rename from pkgs/tools/misc/sixpair/hcitool.patch
rename to pkgs/by-name/si/sixpair/hcitool.patch
diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/by-name/si/sixpair/package.nix
similarity index 100%
rename from pkgs/tools/misc/sixpair/default.nix
rename to pkgs/by-name/si/sixpair/package.nix
diff --git a/pkgs/development/compilers/sjasmplus/default.nix b/pkgs/by-name/sj/sjasmplus/package.nix
similarity index 100%
rename from pkgs/development/compilers/sjasmplus/default.nix
rename to pkgs/by-name/sj/sjasmplus/package.nix
diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/by-name/sk/skaffold/package.nix
similarity index 100%
rename from pkgs/development/tools/skaffold/default.nix
rename to pkgs/by-name/sk/skaffold/package.nix
diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/by-name/sk/skate/package.nix
similarity index 100%
rename from pkgs/applications/misc/skate/default.nix
rename to pkgs/by-name/sk/skate/package.nix
diff --git a/pkgs/data/themes/skeu/default.nix b/pkgs/by-name/sk/skeu/package.nix
similarity index 100%
rename from pkgs/data/themes/skeu/default.nix
rename to pkgs/by-name/sk/skeu/package.nix
diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/by-name/sk/skim/package.nix
similarity index 100%
rename from pkgs/tools/misc/skim/default.nix
rename to pkgs/by-name/sk/skim/package.nix
diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/by-name/sk/skippy-xd/package.nix
similarity index 100%
rename from pkgs/tools/X11/skippy-xd/default.nix
rename to pkgs/by-name/sk/skippy-xd/package.nix
diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/by-name/sk/skjold/package.nix
similarity index 100%
rename from pkgs/development/tools/skjold/default.nix
rename to pkgs/by-name/sk/skjold/package.nix
diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/by-name/sk/skktools/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/skk/skktools/default.nix
rename to pkgs/by-name/sk/skktools/package.nix
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/by-name/sk/skopeo/package.nix
similarity index 100%
rename from pkgs/development/tools/skopeo/default.nix
rename to pkgs/by-name/sk/skopeo/package.nix
diff --git a/pkgs/servers/skydns/default.nix b/pkgs/by-name/sk/skydns/package.nix
similarity index 100%
rename from pkgs/servers/skydns/default.nix
rename to pkgs/by-name/sk/skydns/package.nix
diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/by-name/sk/skytemple/package.nix
similarity index 100%
rename from pkgs/applications/misc/skytemple/default.nix
rename to pkgs/by-name/sk/skytemple/package.nix
diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/by-name/sl/sl/package.nix
similarity index 100%
rename from pkgs/tools/misc/sl/default.nix
rename to pkgs/by-name/sl/sl/package.nix
diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/by-name/sl/slack-cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/slack-cli/default.nix
rename to pkgs/by-name/sl/slack-cli/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/by-name/sl/slack-term/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/slack-term/default.nix
rename to pkgs/by-name/sl/slack-term/package.nix
diff --git a/pkgs/development/tools/database/sleek/Cargo.lock b/pkgs/by-name/sl/sleek/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/database/sleek/Cargo.lock
rename to pkgs/by-name/sl/sleek/Cargo.lock
diff --git a/pkgs/development/tools/database/sleek/default.nix b/pkgs/by-name/sl/sleek/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sleek/default.nix
rename to pkgs/by-name/sl/sleek/package.nix
diff --git a/pkgs/tools/networking/sleep-on-lan/default.nix b/pkgs/by-name/sl/sleep-on-lan/package.nix
similarity index 100%
rename from pkgs/tools/networking/sleep-on-lan/default.nix
rename to pkgs/by-name/sl/sleep-on-lan/package.nix
diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/by-name/sl/sleuthkit/package.nix
similarity index 100%
rename from pkgs/tools/system/sleuthkit/default.nix
rename to pkgs/by-name/sl/sleuthkit/package.nix
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/by-name/sl/slic3r/package.nix
similarity index 100%
rename from pkgs/applications/misc/slic3r/default.nix
rename to pkgs/by-name/sl/slic3r/package.nix
diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/by-name/sl/slides/package.nix
similarity index 100%
rename from pkgs/applications/misc/slides/default.nix
rename to pkgs/by-name/sl/slides/package.nix
diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/by-name/sl/slimerjs/package.nix
similarity index 100%
rename from pkgs/development/tools/slimerjs/default.nix
rename to pkgs/by-name/sl/slimerjs/package.nix
diff --git a/pkgs/tools/misc/slingshot/default.nix b/pkgs/by-name/sl/slingshot/package.nix
similarity index 100%
rename from pkgs/tools/misc/slingshot/default.nix
rename to pkgs/by-name/sl/slingshot/package.nix
diff --git a/pkgs/applications/misc/slippy/default.nix b/pkgs/by-name/sl/slippy/package.nix
similarity index 100%
rename from pkgs/applications/misc/slippy/default.nix
rename to pkgs/by-name/sl/slippy/package.nix
diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/by-name/sl/slirp4netns/package.nix
similarity index 100%
rename from pkgs/tools/networking/slirp4netns/default.nix
rename to pkgs/by-name/sl/slirp4netns/package.nix
diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/by-name/sl/sloccount/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/sloccount/default.nix
rename to pkgs/by-name/sl/sloccount/package.nix
diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/by-name/sl/slop/package.nix
similarity index 100%
rename from pkgs/tools/misc/slop/default.nix
rename to pkgs/by-name/sl/slop/package.nix
diff --git a/pkgs/tools/misc/sloth/default.nix b/pkgs/by-name/sl/sloth/package.nix
similarity index 100%
rename from pkgs/tools/misc/sloth/default.nix
rename to pkgs/by-name/sl/sloth/package.nix
diff --git a/pkgs/tools/security/slowhttptest/default.nix b/pkgs/by-name/sl/slowhttptest/package.nix
similarity index 100%
rename from pkgs/tools/security/slowhttptest/default.nix
rename to pkgs/by-name/sl/slowhttptest/package.nix
diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/by-name/sl/slrn/package.nix
similarity index 100%
rename from pkgs/applications/networking/newsreaders/slrn/default.nix
rename to pkgs/by-name/sl/slrn/package.nix
diff --git a/pkgs/tools/security/slsa-verifier/default.nix b/pkgs/by-name/sl/slsa-verifier/package.nix
similarity index 100%
rename from pkgs/tools/security/slsa-verifier/default.nix
rename to pkgs/by-name/sl/slsa-verifier/package.nix
diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/by-name/sl/slsnif/package.nix
similarity index 100%
rename from pkgs/tools/misc/slsnif/default.nix
rename to pkgs/by-name/sl/slsnif/package.nix
diff --git a/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch b/pkgs/by-name/sl/slurm-spank-stunnel/hostlist.patch
similarity index 100%
rename from pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch
rename to pkgs/by-name/sl/slurm-spank-stunnel/hostlist.patch
diff --git a/pkgs/servers/computing/slurm-spank-stunnel/default.nix b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
similarity index 100%
rename from pkgs/servers/computing/slurm-spank-stunnel/default.nix
rename to pkgs/by-name/sl/slurm-spank-stunnel/package.nix
diff --git a/pkgs/servers/computing/slurm-spank-x11/hostlist.patch b/pkgs/by-name/sl/slurm-spank-x11/hostlist.patch
similarity index 100%
rename from pkgs/servers/computing/slurm-spank-x11/hostlist.patch
rename to pkgs/by-name/sl/slurm-spank-x11/hostlist.patch
diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/by-name/sl/slurm-spank-x11/package.nix
similarity index 100%
rename from pkgs/servers/computing/slurm-spank-x11/default.nix
rename to pkgs/by-name/sl/slurm-spank-x11/package.nix
diff --git a/pkgs/servers/computing/slurm/common-env-echo.patch b/pkgs/by-name/sl/slurm/common-env-echo.patch
similarity index 100%
rename from pkgs/servers/computing/slurm/common-env-echo.patch
rename to pkgs/by-name/sl/slurm/common-env-echo.patch
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/by-name/sl/slurm/package.nix
similarity index 100%
rename from pkgs/servers/computing/slurm/default.nix
rename to pkgs/by-name/sl/slurm/package.nix
diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/by-name/sm/smack/package.nix
similarity index 100%
rename from pkgs/development/libraries/java/smack/default.nix
rename to pkgs/by-name/sm/smack/package.nix
diff --git a/pkgs/tools/X11/smart-wallpaper/default.nix b/pkgs/by-name/sm/smart-wallpaper/package.nix
similarity index 100%
rename from pkgs/tools/X11/smart-wallpaper/default.nix
rename to pkgs/by-name/sm/smart-wallpaper/package.nix
diff --git a/pkgs/tools/graphics/smartcrop/default.nix b/pkgs/by-name/sm/smartcrop/package.nix
similarity index 100%
rename from pkgs/tools/graphics/smartcrop/default.nix
rename to pkgs/by-name/sm/smartcrop/package.nix
diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/by-name/sm/smartdns/package.nix
similarity index 100%
rename from pkgs/tools/networking/smartdns/default.nix
rename to pkgs/by-name/sm/smartdns/package.nix
diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/by-name/sm/smarty3-i18n/package.nix
similarity index 100%
rename from pkgs/development/libraries/smarty3-i18n/default.nix
rename to pkgs/by-name/sm/smarty3-i18n/package.nix
diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/by-name/sm/smarty3/package.nix
similarity index 100%
rename from pkgs/development/libraries/smarty3/default.nix
rename to pkgs/by-name/sm/smarty3/package.nix
diff --git a/pkgs/tools/security/smbmap/default.nix b/pkgs/by-name/sm/smbmap/package.nix
similarity index 100%
rename from pkgs/tools/security/smbmap/default.nix
rename to pkgs/by-name/sm/smbmap/package.nix
diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/by-name/sm/smbnetfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/smbnetfs/default.nix
rename to pkgs/by-name/sm/smbnetfs/package.nix
diff --git a/pkgs/tools/security/smbscan/default.nix b/pkgs/by-name/sm/smbscan/package.nix
similarity index 100%
rename from pkgs/tools/security/smbscan/default.nix
rename to pkgs/by-name/sm/smbscan/package.nix
diff --git a/pkgs/data/fonts/smc-chilanka/default.nix b/pkgs/by-name/sm/smc-chilanka/package.nix
similarity index 100%
rename from pkgs/data/fonts/smc-chilanka/default.nix
rename to pkgs/by-name/sm/smc-chilanka/package.nix
diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/by-name/sm/smc/package.nix
similarity index 100%
rename from pkgs/tools/misc/smc/default.nix
rename to pkgs/by-name/sm/smc/package.nix
diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/by-name/sm/smcroute/package.nix
similarity index 100%
rename from pkgs/servers/smcroute/default.nix
rename to pkgs/by-name/sm/smcroute/package.nix
diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/by-name/sm/smem/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/smem/default.nix
rename to pkgs/by-name/sm/smem/package.nix
diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/by-name/sm/smemstat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/smemstat/default.nix
rename to pkgs/by-name/sm/smemstat/package.nix
diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/by-name/sm/smenu/package.nix
similarity index 100%
rename from pkgs/tools/misc/smenu/default.nix
rename to pkgs/by-name/sm/smenu/package.nix
diff --git a/pkgs/data/fonts/smiley-sans/default.nix b/pkgs/by-name/sm/smiley-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/smiley-sans/default.nix
rename to pkgs/by-name/sm/smiley-sans/package.nix
diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/by-name/sm/smimesign/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/smimesign/default.nix
rename to pkgs/by-name/sm/smimesign/package.nix
diff --git a/pkgs/development/tools/smlfmt/default.nix b/pkgs/by-name/sm/smlfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/smlfmt/default.nix
rename to pkgs/by-name/sm/smlfmt/package.nix
diff --git a/pkgs/tools/package-management/smlpkg/default.nix b/pkgs/by-name/sm/smlpkg/package.nix
similarity index 100%
rename from pkgs/tools/package-management/smlpkg/default.nix
rename to pkgs/by-name/sm/smlpkg/package.nix
diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/by-name/sm/smokeping/package.nix
similarity index 100%
rename from pkgs/tools/networking/smokeping/default.nix
rename to pkgs/by-name/sm/smokeping/package.nix
diff --git a/pkgs/development/libraries/smooth/default.nix b/pkgs/by-name/sm/smooth/package.nix
similarity index 100%
rename from pkgs/development/libraries/smooth/default.nix
rename to pkgs/by-name/sm/smooth/package.nix
diff --git a/pkgs/development/libraries/smpeg/format.patch b/pkgs/by-name/sm/smpeg/format.patch
similarity index 100%
rename from pkgs/development/libraries/smpeg/format.patch
rename to pkgs/by-name/sm/smpeg/format.patch
diff --git a/pkgs/development/libraries/smpeg/gcc6.patch b/pkgs/by-name/sm/smpeg/gcc6.patch
similarity index 100%
rename from pkgs/development/libraries/smpeg/gcc6.patch
rename to pkgs/by-name/sm/smpeg/gcc6.patch
diff --git a/pkgs/development/libraries/smpeg/gtk.patch b/pkgs/by-name/sm/smpeg/gtk.patch
similarity index 100%
rename from pkgs/development/libraries/smpeg/gtk.patch
rename to pkgs/by-name/sm/smpeg/gtk.patch
diff --git a/pkgs/development/libraries/smpeg/libx11.patch b/pkgs/by-name/sm/smpeg/libx11.patch
similarity index 100%
rename from pkgs/development/libraries/smpeg/libx11.patch
rename to pkgs/by-name/sm/smpeg/libx11.patch
diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/by-name/sm/smpeg/package.nix
similarity index 100%
rename from pkgs/development/libraries/smpeg/default.nix
rename to pkgs/by-name/sm/smpeg/package.nix
diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/by-name/sm/smpeg2/package.nix
similarity index 100%
rename from pkgs/development/libraries/smpeg2/default.nix
rename to pkgs/by-name/sm/smpeg2/package.nix
diff --git a/pkgs/servers/mail/smtprelay/default.nix b/pkgs/by-name/sm/smtprelay/package.nix
similarity index 100%
rename from pkgs/servers/mail/smtprelay/default.nix
rename to pkgs/by-name/sm/smtprelay/package.nix
diff --git a/pkgs/tools/text/smu/default.nix b/pkgs/by-name/sm/smu/package.nix
similarity index 100%
rename from pkgs/tools/text/smu/default.nix
rename to pkgs/by-name/sm/smu/package.nix
diff --git a/pkgs/tools/misc/smug/default.nix b/pkgs/by-name/sm/smug/package.nix
similarity index 100%
rename from pkgs/tools/misc/smug/default.nix
rename to pkgs/by-name/sm/smug/package.nix
diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/by-name/sn/snabb/package.nix
similarity index 100%
rename from pkgs/tools/networking/snabb/default.nix
rename to pkgs/by-name/sn/snabb/package.nix
diff --git a/pkgs/games/snake4/default.nix b/pkgs/by-name/sn/snake4/package.nix
similarity index 100%
rename from pkgs/games/snake4/default.nix
rename to pkgs/by-name/sn/snake4/package.nix
diff --git a/pkgs/tools/security/snallygaster/default.nix b/pkgs/by-name/sn/snallygaster/package.nix
similarity index 100%
rename from pkgs/tools/security/snallygaster/default.nix
rename to pkgs/by-name/sn/snallygaster/package.nix
diff --git a/pkgs/development/libraries/snap7/default.nix b/pkgs/by-name/sn/snap7/package.nix
similarity index 100%
rename from pkgs/development/libraries/snap7/default.nix
rename to pkgs/by-name/sn/snap7/package.nix
diff --git a/pkgs/tools/graphics/snapdragon-profiler/default.nix b/pkgs/by-name/sn/snapdragon-profiler/package.nix
similarity index 100%
rename from pkgs/tools/graphics/snapdragon-profiler/default.nix
rename to pkgs/by-name/sn/snapdragon-profiler/package.nix
diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/by-name/sn/snapmaker-luban/package.nix
similarity index 100%
rename from pkgs/applications/misc/snapmaker-luban/default.nix
rename to pkgs/by-name/sn/snapmaker-luban/package.nix
diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/by-name/sn/snapper-gui/package.nix
similarity index 100%
rename from pkgs/applications/misc/snapper-gui/default.nix
rename to pkgs/by-name/sn/snapper-gui/package.nix
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/by-name/sn/snapper/package.nix
similarity index 100%
rename from pkgs/tools/misc/snapper/default.nix
rename to pkgs/by-name/sn/snapper/package.nix
diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/by-name/sn/snappy/package.nix
similarity index 100%
rename from pkgs/development/libraries/snappy/default.nix
rename to pkgs/by-name/sn/snappy/package.nix
diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/by-name/sn/snappymail/package.nix
similarity index 100%
rename from pkgs/servers/snappymail/default.nix
rename to pkgs/by-name/sn/snappymail/package.nix
diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/by-name/sn/snapraid/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/snapraid/default.nix
rename to pkgs/by-name/sn/snapraid/package.nix
diff --git a/pkgs/applications/graphics/snapshot/default.nix b/pkgs/by-name/sn/snapshot/package.nix
similarity index 100%
rename from pkgs/applications/graphics/snapshot/default.nix
rename to pkgs/by-name/sn/snapshot/package.nix
diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/by-name/sn/snazy/package.nix
similarity index 100%
rename from pkgs/development/tools/snazy/default.nix
rename to pkgs/by-name/sn/snazy/package.nix
diff --git a/pkgs/misc/sndio/default.nix b/pkgs/by-name/sn/sndio/package.nix
similarity index 100%
rename from pkgs/misc/sndio/default.nix
rename to pkgs/by-name/sn/sndio/package.nix
diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/by-name/sn/sndpeek/package.nix
similarity index 100%
rename from pkgs/applications/audio/sndpeek/default.nix
rename to pkgs/by-name/sn/sndpeek/package.nix
diff --git a/pkgs/applications/audio/sndpeek/pthread.patch b/pkgs/by-name/sn/sndpeek/pthread.patch
similarity index 100%
rename from pkgs/applications/audio/sndpeek/pthread.patch
rename to pkgs/by-name/sn/sndpeek/pthread.patch
diff --git a/pkgs/tools/networking/snet/default.nix b/pkgs/by-name/sn/snet/package.nix
similarity index 100%
rename from pkgs/tools/networking/snet/default.nix
rename to pkgs/by-name/sn/snet/package.nix
diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/by-name/sn/sngrep/package.nix
similarity index 100%
rename from pkgs/applications/networking/sniffers/sngrep/default.nix
rename to pkgs/by-name/sn/sngrep/package.nix
diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/by-name/sn/sniffnet/package.nix
similarity index 100%
rename from pkgs/applications/networking/sniffnet/default.nix
rename to pkgs/by-name/sn/sniffnet/package.nix
diff --git a/pkgs/data/fonts/sniglet/default.nix b/pkgs/by-name/sn/sniglet/package.nix
similarity index 100%
rename from pkgs/data/fonts/sniglet/default.nix
rename to pkgs/by-name/sn/sniglet/package.nix
diff --git a/pkgs/games/snipes/default.nix b/pkgs/by-name/sn/snipes/package.nix
similarity index 100%
rename from pkgs/games/snipes/default.nix
rename to pkgs/by-name/sn/snipes/package.nix
diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/by-name/sn/snippetpixie/package.nix
similarity index 100%
rename from pkgs/tools/text/snippetpixie/default.nix
rename to pkgs/by-name/sn/snippetpixie/package.nix
diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/by-name/sn/sniproxy/package.nix
similarity index 100%
rename from pkgs/applications/networking/sniproxy/default.nix
rename to pkgs/by-name/sn/sniproxy/package.nix
diff --git a/pkgs/games/snis/default.nix b/pkgs/by-name/sn/snis/package.nix
similarity index 100%
rename from pkgs/games/snis/default.nix
rename to pkgs/by-name/sn/snis/package.nix
diff --git a/pkgs/applications/misc/snixembed/default.nix b/pkgs/by-name/sn/snixembed/package.nix
similarity index 100%
rename from pkgs/applications/misc/snixembed/default.nix
rename to pkgs/by-name/sn/snixembed/package.nix
diff --git a/pkgs/tools/networking/snmpcheck/default.nix b/pkgs/by-name/sn/snmpcheck/package.nix
similarity index 100%
rename from pkgs/tools/networking/snmpcheck/default.nix
rename to pkgs/by-name/sn/snmpcheck/package.nix
diff --git a/pkgs/development/interpreters/snobol4/fix-paths.patch b/pkgs/by-name/sn/snobol4/fix-paths.patch
similarity index 100%
rename from pkgs/development/interpreters/snobol4/fix-paths.patch
rename to pkgs/by-name/sn/snobol4/fix-paths.patch
diff --git a/pkgs/development/interpreters/snobol4/default.nix b/pkgs/by-name/sn/snobol4/package.nix
similarity index 100%
rename from pkgs/development/interpreters/snobol4/default.nix
rename to pkgs/by-name/sn/snobol4/package.nix
diff --git a/pkgs/tools/system/snooze/default.nix b/pkgs/by-name/sn/snooze/package.nix
similarity index 100%
rename from pkgs/tools/system/snooze/default.nix
rename to pkgs/by-name/sn/snooze/package.nix
diff --git a/pkgs/tools/misc/snore/default.nix b/pkgs/by-name/sn/snore/package.nix
similarity index 100%
rename from pkgs/tools/misc/snore/default.nix
rename to pkgs/by-name/sn/snore/package.nix
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/by-name/sn/snort/package.nix
similarity index 100%
rename from pkgs/applications/networking/ids/snort/default.nix
rename to pkgs/by-name/sn/snort/package.nix
diff --git a/pkgs/tools/security/snow/default.nix b/pkgs/by-name/sn/snow/package.nix
similarity index 100%
rename from pkgs/tools/security/snow/default.nix
rename to pkgs/by-name/sn/snow/package.nix
diff --git a/pkgs/data/themes/snowblind/default.nix b/pkgs/by-name/sn/snowblind/package.nix
similarity index 100%
rename from pkgs/data/themes/snowblind/default.nix
rename to pkgs/by-name/sn/snowblind/package.nix
diff --git a/pkgs/tools/security/snowcat/default.nix b/pkgs/by-name/sn/snowcat/package.nix
similarity index 100%
rename from pkgs/tools/security/snowcat/default.nix
rename to pkgs/by-name/sn/snowcat/package.nix
diff --git a/pkgs/tools/security/snowcrash/default.nix b/pkgs/by-name/sn/snowcrash/package.nix
similarity index 100%
rename from pkgs/tools/security/snowcrash/default.nix
rename to pkgs/by-name/sn/snowcrash/package.nix
diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/by-name/sn/snowflake/package.nix
similarity index 100%
rename from pkgs/tools/networking/snowflake/default.nix
rename to pkgs/by-name/sn/snowflake/package.nix
diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/by-name/sn/snowsql/package.nix
similarity index 100%
rename from pkgs/applications/misc/snowsql/default.nix
rename to pkgs/by-name/sn/snowsql/package.nix
diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/by-name/sn/snpeff/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/snpeff/default.nix
rename to pkgs/by-name/sn/snpeff/package.nix
diff --git a/pkgs/tools/archivers/snzip/default.nix b/pkgs/by-name/sn/snzip/package.nix
similarity index 100%
rename from pkgs/tools/archivers/snzip/default.nix
rename to pkgs/by-name/sn/snzip/package.nix
diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/by-name/so/soapyremote/package.nix
similarity index 100%
rename from pkgs/applications/radio/soapyremote/default.nix
rename to pkgs/by-name/so/soapyremote/package.nix
diff --git a/pkgs/applications/radio/soapysdrplay/default.nix b/pkgs/by-name/so/soapysdrplay/package.nix
similarity index 100%
rename from pkgs/applications/radio/soapysdrplay/default.nix
rename to pkgs/by-name/so/soapysdrplay/package.nix
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/by-name/so/socat/package.nix
similarity index 100%
rename from pkgs/tools/networking/socat/default.nix
rename to pkgs/by-name/so/socat/package.nix
diff --git a/pkgs/tools/security/social-engineer-toolkit/default.nix b/pkgs/by-name/so/social-engineer-toolkit/package.nix
similarity index 100%
rename from pkgs/tools/security/social-engineer-toolkit/default.nix
rename to pkgs/by-name/so/social-engineer-toolkit/package.nix
diff --git a/pkgs/tools/networking/sockdump/default.nix b/pkgs/by-name/so/sockdump/package.nix
similarity index 100%
rename from pkgs/tools/networking/sockdump/default.nix
rename to pkgs/by-name/so/sockdump/package.nix
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/by-name/so/socket_wrapper/package.nix
similarity index 100%
rename from pkgs/development/libraries/socket_wrapper/default.nix
rename to pkgs/by-name/so/socket_wrapper/package.nix
diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/by-name/so/socklog/package.nix
similarity index 100%
rename from pkgs/tools/system/socklog/default.nix
rename to pkgs/by-name/so/socklog/package.nix
diff --git a/pkgs/tools/networking/sockperf/default.nix b/pkgs/by-name/so/sockperf/package.nix
similarity index 100%
rename from pkgs/tools/networking/sockperf/default.nix
rename to pkgs/by-name/so/sockperf/package.nix
diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/by-name/so/sof-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/sof-firmware/default.nix
rename to pkgs/by-name/so/sof-firmware/package.nix
diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/by-name/so/soft-serve/package.nix
similarity index 100%
rename from pkgs/servers/soft-serve/default.nix
rename to pkgs/by-name/so/soft-serve/package.nix
diff --git a/pkgs/tools/networking/softnet/default.nix b/pkgs/by-name/so/softnet/package.nix
similarity index 100%
rename from pkgs/tools/networking/softnet/default.nix
rename to pkgs/by-name/so/softnet/package.nix
diff --git a/pkgs/servers/web-apps/sogo/enable-activesync.patch b/pkgs/by-name/so/sogo/enable-activesync.patch
similarity index 100%
rename from pkgs/servers/web-apps/sogo/enable-activesync.patch
rename to pkgs/by-name/so/sogo/enable-activesync.patch
diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/by-name/so/sogo/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/sogo/default.nix
rename to pkgs/by-name/so/sogo/package.nix
diff --git a/pkgs/development/libraries/sokol/default.nix b/pkgs/by-name/so/sokol/package.nix
similarity index 100%
rename from pkgs/development/libraries/sokol/default.nix
rename to pkgs/by-name/so/sokol/package.nix
diff --git a/pkgs/development/libraries/sol2/default.nix b/pkgs/by-name/so/sol2/package.nix
similarity index 100%
rename from pkgs/development/libraries/sol2/default.nix
rename to pkgs/by-name/so/sol2/package.nix
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/by-name/so/solaar/package.nix
similarity index 100%
rename from pkgs/applications/misc/solaar/default.nix
rename to pkgs/by-name/so/solaar/package.nix
diff --git a/pkgs/data/themes/solarc/default.nix b/pkgs/by-name/so/solarc-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/solarc/default.nix
rename to pkgs/by-name/so/solarc-gtk-theme/package.nix
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/by-name/so/solc/package.nix
similarity index 100%
rename from pkgs/development/compilers/solc/default.nix
rename to pkgs/by-name/so/solc/package.nix
diff --git a/pkgs/games/solicurses/default.nix b/pkgs/by-name/so/solicurses/package.nix
similarity index 100%
rename from pkgs/games/solicurses/default.nix
rename to pkgs/by-name/so/solicurses/package.nix
diff --git a/pkgs/development/interpreters/sollya/default.nix b/pkgs/by-name/so/sollya/package.nix
similarity index 100%
rename from pkgs/development/interpreters/sollya/default.nix
rename to pkgs/by-name/so/sollya/package.nix
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/by-name/so/solvespace/package.nix
similarity index 100%
rename from pkgs/applications/graphics/solvespace/default.nix
rename to pkgs/by-name/so/solvespace/package.nix
diff --git a/pkgs/tools/misc/somafm-cli/default.nix b/pkgs/by-name/so/somafm-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/somafm-cli/default.nix
rename to pkgs/by-name/so/somafm-cli/package.nix
diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/by-name/so/somatic-sniper/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/somatic-sniper/default.nix
rename to pkgs/by-name/so/somatic-sniper/package.nix
diff --git a/pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch b/pkgs/by-name/so/somatic-sniper/somatic-sniper.patch
similarity index 100%
rename from pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch
rename to pkgs/by-name/so/somatic-sniper/somatic-sniper.patch
diff --git a/pkgs/applications/misc/somebar/default.nix b/pkgs/by-name/so/somebar/package.nix
similarity index 100%
rename from pkgs/applications/misc/somebar/default.nix
rename to pkgs/by-name/so/somebar/package.nix
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/by-name/so/sonata/package.nix
similarity index 100%
rename from pkgs/applications/audio/sonata/default.nix
rename to pkgs/by-name/so/sonata/package.nix
diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/by-name/so/songrec/package.nix
similarity index 100%
rename from pkgs/applications/audio/songrec/default.nix
rename to pkgs/by-name/so/songrec/package.nix
diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/by-name/so/sonic/package.nix
similarity index 100%
rename from pkgs/development/libraries/sonic/default.nix
rename to pkgs/by-name/so/sonic/package.nix
diff --git a/pkgs/development/libraries/sonivox/default.nix b/pkgs/by-name/so/sonivox/package.nix
similarity index 100%
rename from pkgs/development/libraries/sonivox/default.nix
rename to pkgs/by-name/so/sonivox/package.nix
diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/by-name/so/sonixd/package.nix
similarity index 100%
rename from pkgs/applications/audio/sonixd/default.nix
rename to pkgs/by-name/so/sonixd/package.nix
diff --git a/pkgs/applications/audio/sonobus/default.nix b/pkgs/by-name/so/sonobus/package.nix
similarity index 100%
rename from pkgs/applications/audio/sonobus/default.nix
rename to pkgs/by-name/so/sonobus/package.nix
diff --git a/pkgs/tools/misc/sonota/default.nix b/pkgs/by-name/so/sonota/package.nix
similarity index 100%
rename from pkgs/tools/misc/sonota/default.nix
rename to pkgs/by-name/so/sonota/package.nix
diff --git a/pkgs/tools/misc/sonota/set_resource_path.patch b/pkgs/by-name/so/sonota/set_resource_path.patch
similarity index 100%
rename from pkgs/tools/misc/sonota/set_resource_path.patch
rename to pkgs/by-name/so/sonota/set_resource_path.patch
diff --git a/pkgs/applications/audio/sony-headphones-client/default.nix b/pkgs/by-name/so/sony-headphones-client/package.nix
similarity index 100%
rename from pkgs/applications/audio/sony-headphones-client/default.nix
rename to pkgs/by-name/so/sony-headphones-client/package.nix
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/by-name/so/sooperlooper/package.nix
similarity index 100%
rename from pkgs/applications/audio/sooperlooper/default.nix
rename to pkgs/by-name/so/sooperlooper/package.nix
diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/by-name/so/sope/package.nix
similarity index 100%
rename from pkgs/development/libraries/sope/default.nix
rename to pkgs/by-name/so/sope/package.nix
diff --git a/pkgs/tools/security/sops/bash_autocomplete b/pkgs/by-name/so/sops/bash_autocomplete
similarity index 100%
rename from pkgs/tools/security/sops/bash_autocomplete
rename to pkgs/by-name/so/sops/bash_autocomplete
diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/by-name/so/sops/package.nix
similarity index 100%
rename from pkgs/tools/security/sops/default.nix
rename to pkgs/by-name/so/sops/package.nix
diff --git a/pkgs/tools/security/sops/zsh_autocomplete b/pkgs/by-name/so/sops/zsh_autocomplete
similarity index 100%
rename from pkgs/tools/security/sops/zsh_autocomplete
rename to pkgs/by-name/so/sops/zsh_autocomplete
diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/by-name/so/sorcer/package.nix
similarity index 100%
rename from pkgs/applications/audio/sorcer/default.nix
rename to pkgs/by-name/so/sorcer/package.nix
diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/by-name/so/sord/package.nix
similarity index 100%
rename from pkgs/development/libraries/sord/default.nix
rename to pkgs/by-name/so/sord/package.nix
diff --git a/pkgs/tools/text/sorted-grep/default.nix b/pkgs/by-name/so/sorted-grep/package.nix
similarity index 100%
rename from pkgs/tools/text/sorted-grep/default.nix
rename to pkgs/by-name/so/sorted-grep/package.nix
diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/by-name/so/sortmerna/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/sortmerna/default.nix
rename to pkgs/by-name/so/sortmerna/package.nix
diff --git a/pkgs/data/fonts/sorts-mill-goudy/default.nix b/pkgs/by-name/so/sorts-mill-goudy/package.nix
similarity index 100%
rename from pkgs/data/fonts/sorts-mill-goudy/default.nix
rename to pkgs/by-name/so/sorts-mill-goudy/package.nix
diff --git a/pkgs/development/compilers/souffle/includes.patch b/pkgs/by-name/so/souffle/includes.patch
similarity index 100%
rename from pkgs/development/compilers/souffle/includes.patch
rename to pkgs/by-name/so/souffle/includes.patch
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/by-name/so/souffle/package.nix
similarity index 100%
rename from pkgs/development/compilers/souffle/default.nix
rename to pkgs/by-name/so/souffle/package.nix
diff --git a/pkgs/development/compilers/souffle/tests.nix b/pkgs/by-name/so/souffle/tests.nix
similarity index 100%
rename from pkgs/development/compilers/souffle/tests.nix
rename to pkgs/by-name/so/souffle/tests.nix
diff --git a/pkgs/development/compilers/souffle/threads.patch b/pkgs/by-name/so/souffle/threads.patch
similarity index 100%
rename from pkgs/development/compilers/souffle/threads.patch
rename to pkgs/by-name/so/souffle/threads.patch
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/by-name/so/sound-juicer/package.nix
similarity index 100%
rename from pkgs/applications/audio/sound-juicer/default.nix
rename to pkgs/by-name/so/sound-juicer/package.nix
diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/by-name/so/sound-theme-freedesktop/package.nix
similarity index 100%
rename from pkgs/data/misc/sound-theme-freedesktop/default.nix
rename to pkgs/by-name/so/sound-theme-freedesktop/package.nix
diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/by-name/so/soundconverter/package.nix
similarity index 100%
rename from pkgs/applications/audio/soundconverter/default.nix
rename to pkgs/by-name/so/soundconverter/package.nix
diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/by-name/so/soundfont-fluid/package.nix
similarity index 100%
rename from pkgs/data/soundfonts/fluid/default.nix
rename to pkgs/by-name/so/soundfont-fluid/package.nix
diff --git a/pkgs/data/soundfonts/generaluser/default.nix b/pkgs/by-name/so/soundfont-generaluser/package.nix
similarity index 100%
rename from pkgs/data/soundfonts/generaluser/default.nix
rename to pkgs/by-name/so/soundfont-generaluser/package.nix
diff --git a/pkgs/data/soundfonts/ydp-grand/default.nix b/pkgs/by-name/so/soundfont-ydp-grand/package.nix
similarity index 100%
rename from pkgs/data/soundfonts/ydp-grand/default.nix
rename to pkgs/by-name/so/soundfont-ydp-grand/package.nix
diff --git a/pkgs/applications/radio/soundmodem/matFix.patch b/pkgs/by-name/so/soundmodem/matFix.patch
similarity index 100%
rename from pkgs/applications/radio/soundmodem/matFix.patch
rename to pkgs/by-name/so/soundmodem/matFix.patch
diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/by-name/so/soundmodem/package.nix
similarity index 100%
rename from pkgs/applications/radio/soundmodem/default.nix
rename to pkgs/by-name/so/soundmodem/package.nix
diff --git a/pkgs/applications/audio/soundsource/default.nix b/pkgs/by-name/so/soundsource/package.nix
similarity index 100%
rename from pkgs/applications/audio/soundsource/default.nix
rename to pkgs/by-name/so/soundsource/package.nix
diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/by-name/so/soundtouch/package.nix
similarity index 100%
rename from pkgs/development/libraries/soundtouch/default.nix
rename to pkgs/by-name/so/soundtouch/package.nix
diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/by-name/so/soundtracker/package.nix
similarity index 100%
rename from pkgs/applications/audio/soundtracker/default.nix
rename to pkgs/by-name/so/soundtracker/package.nix
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/by-name/so/source-code-pro/package.nix
similarity index 100%
rename from pkgs/data/fonts/source-code-pro/default.nix
rename to pkgs/by-name/so/source-code-pro/package.nix
diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/by-name/so/source-han-code-jp/package.nix
similarity index 100%
rename from pkgs/data/fonts/source-han-code-jp/default.nix
rename to pkgs/by-name/so/source-han-code-jp/package.nix
diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/by-name/so/source-sans-pro/package.nix
similarity index 100%
rename from pkgs/data/fonts/source-sans-pro/default.nix
rename to pkgs/by-name/so/source-sans-pro/package.nix
diff --git a/pkgs/data/fonts/source-sans/default.nix b/pkgs/by-name/so/source-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/source-sans/default.nix
rename to pkgs/by-name/so/source-sans/package.nix
diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/by-name/so/source-serif-pro/package.nix
similarity index 100%
rename from pkgs/data/fonts/source-serif-pro/default.nix
rename to pkgs/by-name/so/source-serif-pro/package.nix
diff --git a/pkgs/data/fonts/source-serif/default.nix b/pkgs/by-name/so/source-serif/package.nix
similarity index 100%
rename from pkgs/data/fonts/source-serif/default.nix
rename to pkgs/by-name/so/source-serif/package.nix
diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/by-name/so/sourceHighlight/package.nix
similarity index 100%
rename from pkgs/tools/text/source-highlight/default.nix
rename to pkgs/by-name/so/sourceHighlight/package.nix
diff --git a/pkgs/applications/misc/audio/soxr/arm64-check.patch b/pkgs/by-name/so/soxr/arm64-check.patch
similarity index 100%
rename from pkgs/applications/misc/audio/soxr/arm64-check.patch
rename to pkgs/by-name/so/soxr/arm64-check.patch
diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/by-name/so/soxr/package.nix
similarity index 100%
rename from pkgs/applications/misc/audio/soxr/default.nix
rename to pkgs/by-name/so/soxr/package.nix
diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/by-name/so/soxt/package.nix
similarity index 100%
rename from pkgs/development/libraries/soxt/default.nix
rename to pkgs/by-name/so/soxt/package.nix
diff --git a/pkgs/servers/sozu/default.nix b/pkgs/by-name/so/sozu/package.nix
similarity index 100%
rename from pkgs/servers/sozu/default.nix
rename to pkgs/by-name/so/sozu/package.nix
diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/by-name/sp/space-orbit/package.nix
similarity index 100%
rename from pkgs/games/space-orbit/default.nix
rename to pkgs/by-name/sp/space-orbit/package.nix
diff --git a/pkgs/applications/file-managers/spacefm/glibc-fix.patch b/pkgs/by-name/sp/spaceFM/glibc-fix.patch
similarity index 100%
rename from pkgs/applications/file-managers/spacefm/glibc-fix.patch
rename to pkgs/by-name/sp/spaceFM/glibc-fix.patch
diff --git a/pkgs/applications/file-managers/spacefm/default.nix b/pkgs/by-name/sp/spaceFM/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/spacefm/default.nix
rename to pkgs/by-name/sp/spaceFM/package.nix
diff --git a/pkgs/applications/file-managers/spacefm/x11-only.patch b/pkgs/by-name/sp/spaceFM/x11-only.patch
similarity index 100%
rename from pkgs/applications/file-managers/spacefm/x11-only.patch
rename to pkgs/by-name/sp/spaceFM/x11-only.patch
diff --git a/pkgs/applications/misc/spacenav-cube-example/default.nix b/pkgs/by-name/sp/spacenav-cube-example/package.nix
similarity index 100%
rename from pkgs/applications/misc/spacenav-cube-example/default.nix
rename to pkgs/by-name/sp/spacenav-cube-example/package.nix
diff --git a/pkgs/tools/misc/spacer/default.nix b/pkgs/by-name/sp/spacer/package.nix
similarity index 100%
rename from pkgs/tools/misc/spacer/default.nix
rename to pkgs/by-name/sp/spacer/package.nix
diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix
similarity index 100%
rename from pkgs/shells/zsh/spaceship-prompt/default.nix
rename to pkgs/by-name/sp/spaceship-prompt/package.nix
diff --git a/pkgs/applications/editors/spacevim/helptags.patch b/pkgs/by-name/sp/spacevim/helptags.patch
similarity index 100%
rename from pkgs/applications/editors/spacevim/helptags.patch
rename to pkgs/by-name/sp/spacevim/helptags.patch
diff --git a/pkgs/applications/editors/spacevim/init.nix b/pkgs/by-name/sp/spacevim/init.nix
similarity index 100%
rename from pkgs/applications/editors/spacevim/init.nix
rename to pkgs/by-name/sp/spacevim/init.nix
diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/by-name/sp/spacevim/package.nix
similarity index 100%
rename from pkgs/applications/editors/spacevim/default.nix
rename to pkgs/by-name/sp/spacevim/package.nix
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/by-name/sp/spamassassin/package.nix
similarity index 100%
rename from pkgs/servers/mail/spamassassin/default.nix
rename to pkgs/by-name/sp/spamassassin/package.nix
diff --git a/pkgs/servers/mail/spamassassin/sa_compile-use-perl5lib.patch b/pkgs/by-name/sp/spamassassin/sa_compile-use-perl5lib.patch
similarity index 100%
rename from pkgs/servers/mail/spamassassin/sa_compile-use-perl5lib.patch
rename to pkgs/by-name/sp/spamassassin/sa_compile-use-perl5lib.patch
diff --git a/pkgs/servers/mail/spamassassin/satest-no-clean-path.patch b/pkgs/by-name/sp/spamassassin/satest-no-clean-path.patch
similarity index 100%
rename from pkgs/servers/mail/spamassassin/satest-no-clean-path.patch
rename to pkgs/by-name/sp/spamassassin/satest-no-clean-path.patch
diff --git a/pkgs/development/libraries/span-lite/default.nix b/pkgs/by-name/sp/span-lite/package.nix
similarity index 100%
rename from pkgs/development/libraries/span-lite/default.nix
rename to pkgs/by-name/sp/span-lite/package.nix
diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/by-name/sp/sparkleshare/package.nix
similarity index 100%
rename from pkgs/applications/version-management/sparkleshare/default.nix
rename to pkgs/by-name/sp/sparkleshare/package.nix
diff --git a/pkgs/development/libraries/sparrow3d/default.nix b/pkgs/by-name/sp/sparrow3d/package.nix
similarity index 100%
rename from pkgs/development/libraries/sparrow3d/default.nix
rename to pkgs/by-name/sp/sparrow3d/package.nix
diff --git a/pkgs/development/libraries/sparrow3d/sparrow3d.pc.in b/pkgs/by-name/sp/sparrow3d/sparrow3d.pc.in
similarity index 100%
rename from pkgs/development/libraries/sparrow3d/sparrow3d.pc.in
rename to pkgs/by-name/sp/sparrow3d/sparrow3d.pc.in
diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/by-name/sp/sparsehash/package.nix
similarity index 100%
rename from pkgs/development/libraries/sparsehash/default.nix
rename to pkgs/by-name/sp/sparsehash/package.nix
diff --git a/pkgs/development/compilers/spasm-ng/default.nix b/pkgs/by-name/sp/spasm-ng/package.nix
similarity index 100%
rename from pkgs/development/compilers/spasm-ng/default.nix
rename to pkgs/by-name/sp/spasm-ng/package.nix
diff --git a/pkgs/applications/gis/spatialite-tools/default.nix b/pkgs/by-name/sp/spatialite_tools/package.nix
similarity index 100%
rename from pkgs/applications/gis/spatialite-tools/default.nix
rename to pkgs/by-name/sp/spatialite_tools/package.nix
diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/by-name/sp/spawn_fcgi/package.nix
similarity index 100%
rename from pkgs/servers/http/spawn-fcgi/default.nix
rename to pkgs/by-name/sp/spawn_fcgi/package.nix
diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/by-name/sp/spdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/spdk/default.nix
rename to pkgs/by-name/sp/spdk/package.nix
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/by-name/sp/spdlog/package.nix
similarity index 100%
rename from pkgs/development/libraries/spdlog/default.nix
rename to pkgs/by-name/sp/spdlog/package.nix
diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/by-name/sp/spdx-license-list-data/package.nix
similarity index 100%
rename from pkgs/data/misc/spdx-license-list-data/default.nix
rename to pkgs/by-name/sp/spdx-license-list-data/package.nix
diff --git a/pkgs/development/tools/rust/specr-transpile/default.nix b/pkgs/by-name/sp/specr-transpile/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/specr-transpile/default.nix
rename to pkgs/by-name/sp/specr-transpile/package.nix
diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/by-name/sp/spectmorph/package.nix
similarity index 100%
rename from pkgs/applications/audio/spectmorph/default.nix
rename to pkgs/by-name/sp/spectmorph/package.nix
diff --git a/pkgs/development/libraries/spectra/default.nix b/pkgs/by-name/sp/spectra/package.nix
similarity index 100%
rename from pkgs/development/libraries/spectra/default.nix
rename to pkgs/by-name/sp/spectra/package.nix
diff --git a/pkgs/tools/security/spectre-cli/default.nix b/pkgs/by-name/sp/spectre-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/spectre-cli/default.nix
rename to pkgs/by-name/sp/spectre-cli/package.nix
diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix
similarity index 100%
rename from pkgs/tools/security/spectre-meltdown-checker/default.nix
rename to pkgs/by-name/sp/spectre-meltdown-checker/package.nix
diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/by-name/sp/spectrojack/package.nix
similarity index 100%
rename from pkgs/applications/audio/spectrojack/default.nix
rename to pkgs/by-name/sp/spectrojack/package.nix
diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/by-name/sp/spectrwm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/spectrwm/default.nix
rename to pkgs/by-name/sp/spectrwm/package.nix
diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/by-name/sp/speech-denoiser/package.nix
similarity index 100%
rename from pkgs/applications/audio/speech-denoiser/default.nix
rename to pkgs/by-name/sp/speech-denoiser/package.nix
diff --git a/pkgs/development/libraries/speechd/fix-mbrola-paths.patch b/pkgs/by-name/sp/speechd/fix-mbrola-paths.patch
similarity index 100%
rename from pkgs/development/libraries/speechd/fix-mbrola-paths.patch
rename to pkgs/by-name/sp/speechd/fix-mbrola-paths.patch
diff --git a/pkgs/development/libraries/speechd/fix-paths.patch b/pkgs/by-name/sp/speechd/fix-paths.patch
similarity index 100%
rename from pkgs/development/libraries/speechd/fix-paths.patch
rename to pkgs/by-name/sp/speechd/fix-paths.patch
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/by-name/sp/speechd/package.nix
similarity index 100%
rename from pkgs/development/libraries/speechd/default.nix
rename to pkgs/by-name/sp/speechd/package.nix
diff --git a/pkgs/applications/misc/speedread/default.nix b/pkgs/by-name/sp/speedread/package.nix
similarity index 100%
rename from pkgs/applications/misc/speedread/default.nix
rename to pkgs/by-name/sp/speedread/package.nix
diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/by-name/sp/speedtest-go/package.nix
similarity index 100%
rename from pkgs/tools/networking/speedtest-go/default.nix
rename to pkgs/by-name/sp/speedtest-go/package.nix
diff --git a/pkgs/tools/networking/speedtest-rs/default.nix b/pkgs/by-name/sp/speedtest-rs/package.nix
similarity index 100%
rename from pkgs/tools/networking/speedtest-rs/default.nix
rename to pkgs/by-name/sp/speedtest-rs/package.nix
diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/by-name/sp/sphinxsearch/package.nix
similarity index 100%
rename from pkgs/servers/search/sphinxsearch/default.nix
rename to pkgs/by-name/sp/sphinxsearch/package.nix
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/by-name/sp/spice-gtk/package.nix
similarity index 100%
rename from pkgs/development/libraries/spice-gtk/default.nix
rename to pkgs/by-name/sp/spice-gtk/package.nix
diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/by-name/sp/spice-protocol/package.nix
similarity index 100%
rename from pkgs/development/libraries/spice-protocol/default.nix
rename to pkgs/by-name/sp/spice-protocol/package.nix
diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/by-name/sp/spice-up/package.nix
similarity index 100%
rename from pkgs/applications/office/spice-up/default.nix
rename to pkgs/by-name/sp/spice-up/package.nix
diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/by-name/sp/spice-vdagent/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/spice-vdagent/default.nix
rename to pkgs/by-name/sp/spice-vdagent/package.nix
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/by-name/sp/spice/package.nix
similarity index 100%
rename from pkgs/development/libraries/spice/default.nix
rename to pkgs/by-name/sp/spice/package.nix
diff --git a/pkgs/development/libraries/spice/remove-rt-on-darwin.patch b/pkgs/by-name/sp/spice/remove-rt-on-darwin.patch
similarity index 100%
rename from pkgs/development/libraries/spice/remove-rt-on-darwin.patch
rename to pkgs/by-name/sp/spice/remove-rt-on-darwin.patch
diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/by-name/sp/spicy-parser-generator/package.nix
similarity index 100%
rename from pkgs/development/tools/parsing/spicy/default.nix
rename to pkgs/by-name/sp/spicy-parser-generator/package.nix
diff --git a/pkgs/development/tools/spicy/default.nix b/pkgs/by-name/sp/spicy/package.nix
similarity index 100%
rename from pkgs/development/tools/spicy/default.nix
rename to pkgs/by-name/sp/spicy/package.nix
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/by-name/sp/spideroak/package.nix
similarity index 100%
rename from pkgs/applications/networking/spideroak/default.nix
rename to pkgs/by-name/sp/spideroak/package.nix
diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/by-name/sp/spike/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/spike/default.nix
rename to pkgs/by-name/sp/spike/package.nix
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/by-name/sp/spin/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/spin/default.nix
rename to pkgs/by-name/sp/spin/package.nix
diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/by-name/sp/spiped/package.nix
similarity index 100%
rename from pkgs/tools/networking/spiped/default.nix
rename to pkgs/by-name/sp/spiped/package.nix
diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/by-name/sp/spire/package.nix
similarity index 100%
rename from pkgs/tools/security/spire/default.nix
rename to pkgs/by-name/sp/spire/package.nix
diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/by-name/sp/spirv-cross/package.nix
similarity index 100%
rename from pkgs/tools/graphics/spirv-cross/default.nix
rename to pkgs/by-name/sp/spirv-cross/package.nix
diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/by-name/sp/spirv-headers/package.nix
similarity index 100%
rename from pkgs/development/libraries/spirv-headers/default.nix
rename to pkgs/by-name/sp/spirv-headers/package.nix
diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix
similarity index 100%
rename from pkgs/development/compilers/spirv-llvm-translator/default.nix
rename to pkgs/by-name/sp/spirv-llvm-translator/package.nix
diff --git a/pkgs/development/tools/spirv-tools/no-shared-libs.patch b/pkgs/by-name/sp/spirv-tools/no-shared-libs.patch
similarity index 100%
rename from pkgs/development/tools/spirv-tools/no-shared-libs.patch
rename to pkgs/by-name/sp/spirv-tools/no-shared-libs.patch
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/by-name/sp/spirv-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/spirv-tools/default.nix
rename to pkgs/by-name/sp/spirv-tools/package.nix
diff --git a/pkgs/applications/radio/splat/default.nix b/pkgs/by-name/sp/splat/package.nix
similarity index 100%
rename from pkgs/applications/radio/splat/default.nix
rename to pkgs/by-name/sp/splat/package.nix
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/by-name/sp/spleen/package.nix
similarity index 100%
rename from pkgs/data/fonts/spleen/default.nix
rename to pkgs/by-name/sp/spleen/package.nix
diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/by-name/sp/splix/package.nix
similarity index 100%
rename from pkgs/misc/cups/drivers/splix/default.nix
rename to pkgs/by-name/sp/splix/package.nix
diff --git a/pkgs/applications/misc/spnavcfg/configure-cfgfile-path.patch b/pkgs/by-name/sp/spnavcfg/configure-cfgfile-path.patch
similarity index 100%
rename from pkgs/applications/misc/spnavcfg/configure-cfgfile-path.patch
rename to pkgs/by-name/sp/spnavcfg/configure-cfgfile-path.patch
diff --git a/pkgs/applications/misc/spnavcfg/configure-pidfile-path.patch b/pkgs/by-name/sp/spnavcfg/configure-pidfile-path.patch
similarity index 100%
rename from pkgs/applications/misc/spnavcfg/configure-pidfile-path.patch
rename to pkgs/by-name/sp/spnavcfg/configure-pidfile-path.patch
diff --git a/pkgs/applications/misc/spnavcfg/default.nix b/pkgs/by-name/sp/spnavcfg/package.nix
similarity index 100%
rename from pkgs/applications/misc/spnavcfg/default.nix
rename to pkgs/by-name/sp/spnavcfg/package.nix
diff --git a/pkgs/development/libraries/science/math/spooles/allocate.patch b/pkgs/by-name/sp/spooles/allocate.patch
similarity index 100%
rename from pkgs/development/libraries/science/math/spooles/allocate.patch
rename to pkgs/by-name/sp/spooles/allocate.patch
diff --git a/pkgs/development/libraries/science/math/spooles/default.nix b/pkgs/by-name/sp/spooles/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/spooles/default.nix
rename to pkgs/by-name/sp/spooles/package.nix
diff --git a/pkgs/development/libraries/science/math/spooles/spooles.patch b/pkgs/by-name/sp/spooles/spooles.patch
similarity index 100%
rename from pkgs/development/libraries/science/math/spooles/spooles.patch
rename to pkgs/by-name/sp/spooles/spooles.patch
diff --git a/pkgs/development/libraries/science/math/spooles/transform.patch b/pkgs/by-name/sp/spooles/transform.patch
similarity index 100%
rename from pkgs/development/libraries/science/math/spooles/transform.patch
rename to pkgs/by-name/sp/spooles/transform.patch
diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/by-name/sp/spotdl/package.nix
similarity index 100%
rename from pkgs/tools/audio/spotdl/default.nix
rename to pkgs/by-name/sp/spotdl/package.nix
diff --git a/pkgs/applications/audio/spotify-cli-linux/default.nix b/pkgs/by-name/sp/spotify-cli-linux/package.nix
similarity index 100%
rename from pkgs/applications/audio/spotify-cli-linux/default.nix
rename to pkgs/by-name/sp/spotify-cli-linux/package.nix
diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/by-name/sp/spotify-player/package.nix
similarity index 100%
rename from pkgs/applications/audio/spotify-player/default.nix
rename to pkgs/by-name/sp/spotify-player/package.nix
diff --git a/pkgs/applications/misc/spotify-tray/default.nix b/pkgs/by-name/sp/spotify-tray/package.nix
similarity index 100%
rename from pkgs/applications/misc/spotify-tray/default.nix
rename to pkgs/by-name/sp/spotify-tray/package.nix
diff --git a/pkgs/applications/audio/spotify/darwin.nix b/pkgs/by-name/sp/spotify/darwin.nix
similarity index 100%
rename from pkgs/applications/audio/spotify/darwin.nix
rename to pkgs/by-name/sp/spotify/darwin.nix
diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/by-name/sp/spotify/linux.nix
similarity index 100%
rename from pkgs/applications/audio/spotify/linux.nix
rename to pkgs/by-name/sp/spotify/linux.nix
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/by-name/sp/spotify/package.nix
similarity index 100%
rename from pkgs/applications/audio/spotify/default.nix
rename to pkgs/by-name/sp/spotify/package.nix
diff --git a/pkgs/applications/audio/spotify/update.sh b/pkgs/by-name/sp/spotify/update.sh
similarity index 100%
rename from pkgs/applications/audio/spotify/update.sh
rename to pkgs/by-name/sp/spotify/update.sh
diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/by-name/sp/spring-boot-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/spring-boot-cli/default.nix
rename to pkgs/by-name/sp/spring-boot-cli/package.nix
diff --git a/pkgs/development/tools/misc/spruce/default.nix b/pkgs/by-name/sp/spruce/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/spruce/default.nix
rename to pkgs/by-name/sp/spruce/package.nix
diff --git a/pkgs/development/libraries/sptk/default.nix b/pkgs/by-name/sp/sptk/package.nix
similarity index 100%
rename from pkgs/development/libraries/sptk/default.nix
rename to pkgs/by-name/sp/sptk/package.nix
diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/by-name/sp/sptlrx/package.nix
similarity index 100%
rename from pkgs/applications/audio/sptlrx/default.nix
rename to pkgs/by-name/sp/sptlrx/package.nix
diff --git a/pkgs/tools/security/spyre/default.nix b/pkgs/by-name/sp/spyre/package.nix
similarity index 100%
rename from pkgs/tools/security/spyre/default.nix
rename to pkgs/by-name/sp/spyre/package.nix
diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/by-name/sq/sq/package.nix
similarity index 100%
rename from pkgs/development/tools/sq/default.nix
rename to pkgs/by-name/sq/sq/package.nix
diff --git a/pkgs/development/tools/database/sqlboiler-crdb/default.nix b/pkgs/by-name/sq/sqlboiler-crdb/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sqlboiler-crdb/default.nix
rename to pkgs/by-name/sq/sqlboiler-crdb/package.nix
diff --git a/pkgs/development/tools/sqlboiler/default.nix b/pkgs/by-name/sq/sqlboiler/package.nix
similarity index 100%
rename from pkgs/development/tools/sqlboiler/default.nix
rename to pkgs/by-name/sq/sqlboiler/package.nix
diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/by-name/sq/sqlcheck/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sqlcheck/default.nix
rename to pkgs/by-name/sq/sqlcheck/package.nix
diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/by-name/sq/sqlcipher/package.nix
similarity index 100%
rename from pkgs/development/libraries/sqlcipher/default.nix
rename to pkgs/by-name/sq/sqlcipher/package.nix
diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/by-name/sq/sqlcl/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sqlcl/default.nix
rename to pkgs/by-name/sq/sqlcl/package.nix
diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/by-name/sq/sqlcmd/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sqlcmd/default.nix
rename to pkgs/by-name/sq/sqlcmd/package.nix
diff --git a/pkgs/servers/sql/sqld/Cargo.lock b/pkgs/by-name/sq/sqld/Cargo.lock
similarity index 100%
rename from pkgs/servers/sql/sqld/Cargo.lock
rename to pkgs/by-name/sq/sqld/Cargo.lock
diff --git a/pkgs/servers/sql/sqld/default.nix b/pkgs/by-name/sq/sqld/package.nix
similarity index 100%
rename from pkgs/servers/sql/sqld/default.nix
rename to pkgs/by-name/sq/sqld/package.nix
diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/by-name/sq/sqldef/package.nix
similarity index 100%
rename from pkgs/development/tools/sqldef/default.nix
rename to pkgs/by-name/sq/sqldef/package.nix
diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/by-name/sq/sqlfluff/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sqlfluff/default.nix
rename to pkgs/by-name/sq/sqlfluff/package.nix
diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/by-name/sq/sqlite-jdbc/package.nix
similarity index 100%
rename from pkgs/servers/sql/sqlite/jdbc/default.nix
rename to pkgs/by-name/sq/sqlite-jdbc/package.nix
diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/by-name/sq/sqlite-web/package.nix
similarity index 100%
rename from pkgs/development/tools/database/sqlite-web/default.nix
rename to pkgs/by-name/sq/sqlite-web/package.nix
diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
similarity index 100%
rename from pkgs/tools/misc/sqlite3-to-mysql/default.nix
rename to pkgs/by-name/sq/sqlite3-to-mysql/package.nix
diff --git a/pkgs/development/libraries/sqlitecpp/default.nix b/pkgs/by-name/sq/sqlitecpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/sqlitecpp/default.nix
rename to pkgs/by-name/sq/sqlitecpp/package.nix
diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/by-name/sq/sqlpage/package.nix
similarity index 100%
rename from pkgs/servers/sqlpage/default.nix
rename to pkgs/by-name/sq/sqlpage/package.nix
diff --git a/pkgs/applications/misc/sqls/default.nix b/pkgs/by-name/sq/sqls/package.nix
similarity index 100%
rename from pkgs/applications/misc/sqls/default.nix
rename to pkgs/by-name/sq/sqls/package.nix
diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/by-name/sq/sqsh/package.nix
similarity index 100%
rename from pkgs/development/tools/sqsh/default.nix
rename to pkgs/by-name/sq/sqsh/package.nix
diff --git a/pkgs/tools/filesystems/squashfs/4k-align.patch b/pkgs/by-name/sq/squashfsTools/4k-align.patch
similarity index 100%
rename from pkgs/tools/filesystems/squashfs/4k-align.patch
rename to pkgs/by-name/sq/squashfsTools/4k-align.patch
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/by-name/sq/squashfsTools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/squashfs/default.nix
rename to pkgs/by-name/sq/squashfsTools/package.nix
diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/by-name/sq/squashfuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/squashfuse/default.nix
rename to pkgs/by-name/sq/squashfuse/package.nix
diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/by-name/sq/squawk/package.nix
similarity index 100%
rename from pkgs/development/tools/squawk/default.nix
rename to pkgs/by-name/sq/squawk/package.nix
diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/by-name/sq/squeekboard/package.nix
similarity index 100%
rename from pkgs/applications/accessibility/squeekboard/default.nix
rename to pkgs/by-name/sq/squeekboard/package.nix
diff --git a/pkgs/servers/squid/default.nix b/pkgs/by-name/sq/squid/package.nix
similarity index 100%
rename from pkgs/servers/squid/default.nix
rename to pkgs/by-name/sq/squid/package.nix
diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/by-name/sr/srain/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/srain/default.nix
rename to pkgs/by-name/sr/srain/package.nix
diff --git a/pkgs/tools/X11/srandrd/default.nix b/pkgs/by-name/sr/srandrd/package.nix
similarity index 100%
rename from pkgs/tools/X11/srandrd/default.nix
rename to pkgs/by-name/sr/srandrd/package.nix
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/by-name/sr/sratom/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/sratom/default.nix
rename to pkgs/by-name/sr/sratom/package.nix
diff --git a/pkgs/development/tools/misc/src-cli/default.nix b/pkgs/by-name/sr/src-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/src-cli/default.nix
rename to pkgs/by-name/sr/src-cli/package.nix
diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/by-name/sr/srecord/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/srecord/default.nix
rename to pkgs/by-name/sr/srecord/package.nix
diff --git a/pkgs/development/libraries/sregex/default.nix b/pkgs/by-name/sr/sregex/package.nix
similarity index 100%
rename from pkgs/development/libraries/sregex/default.nix
rename to pkgs/by-name/sr/sregex/package.nix
diff --git a/pkgs/tools/networking/srelay/arm.patch b/pkgs/by-name/sr/srelay/arm.patch
similarity index 100%
rename from pkgs/tools/networking/srelay/arm.patch
rename to pkgs/by-name/sr/srelay/arm.patch
diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/by-name/sr/srelay/package.nix
similarity index 100%
rename from pkgs/tools/networking/srelay/default.nix
rename to pkgs/by-name/sr/srelay/package.nix
diff --git a/pkgs/tools/misc/srisum/default.nix b/pkgs/by-name/sr/srisum/package.nix
similarity index 100%
rename from pkgs/tools/misc/srisum/default.nix
rename to pkgs/by-name/sr/srisum/package.nix
diff --git a/pkgs/tools/security/srm/fix-output-in-verbose-mode.patch b/pkgs/by-name/sr/srm/fix-output-in-verbose-mode.patch
similarity index 100%
rename from pkgs/tools/security/srm/fix-output-in-verbose-mode.patch
rename to pkgs/by-name/sr/srm/fix-output-in-verbose-mode.patch
diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/by-name/sr/srm/package.nix
similarity index 100%
rename from pkgs/tools/security/srm/default.nix
rename to pkgs/by-name/sr/srm/package.nix
diff --git a/pkgs/applications/radio/srsran/default.nix b/pkgs/by-name/sr/srsran/package.nix
similarity index 100%
rename from pkgs/applications/radio/srsran/default.nix
rename to pkgs/by-name/sr/srsran/package.nix
diff --git a/pkgs/applications/video/srt-live-server/add-ctime-include.patch b/pkgs/by-name/sr/srt-live-server/add-ctime-include.patch
similarity index 100%
rename from pkgs/applications/video/srt-live-server/add-ctime-include.patch
rename to pkgs/by-name/sr/srt-live-server/add-ctime-include.patch
diff --git a/pkgs/applications/video/srt-live-server/fix-insecure-printfs.patch b/pkgs/by-name/sr/srt-live-server/fix-insecure-printfs.patch
similarity index 100%
rename from pkgs/applications/video/srt-live-server/fix-insecure-printfs.patch
rename to pkgs/by-name/sr/srt-live-server/fix-insecure-printfs.patch
diff --git a/pkgs/applications/video/srt-live-server/default.nix b/pkgs/by-name/sr/srt-live-server/package.nix
similarity index 100%
rename from pkgs/applications/video/srt-live-server/default.nix
rename to pkgs/by-name/sr/srt-live-server/package.nix
diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch b/pkgs/by-name/sr/srt-to-vtt-cl/fix-validation.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/srt-to-vtt-cl/fix-validation.patch
rename to pkgs/by-name/sr/srt-to-vtt-cl/fix-validation.patch
diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/pkgs/by-name/sr/srt-to-vtt-cl/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix
rename to pkgs/by-name/sr/srt-to-vtt-cl/package.nix
diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch b/pkgs/by-name/sr/srt-to-vtt-cl/simplify-macOS-builds.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch
rename to pkgs/by-name/sr/srt-to-vtt-cl/simplify-macOS-builds.patch
diff --git a/pkgs/development/libraries/srt/no-msvc-compat-headers.patch b/pkgs/by-name/sr/srt/no-msvc-compat-headers.patch
similarity index 100%
rename from pkgs/development/libraries/srt/no-msvc-compat-headers.patch
rename to pkgs/by-name/sr/srt/no-msvc-compat-headers.patch
diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/by-name/sr/srt/package.nix
similarity index 100%
rename from pkgs/development/libraries/srt/default.nix
rename to pkgs/by-name/sr/srt/package.nix
diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/by-name/sr/srtp/package.nix
similarity index 100%
rename from pkgs/development/libraries/srtp/default.nix
rename to pkgs/by-name/sr/srtp/package.nix
diff --git a/pkgs/applications/video/srtrelay/default.nix b/pkgs/by-name/sr/srtrelay/package.nix
similarity index 100%
rename from pkgs/applications/video/srtrelay/default.nix
rename to pkgs/by-name/sr/srtrelay/package.nix
diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/by-name/ss/ssb-patchwork/package.nix
similarity index 100%
rename from pkgs/applications/networking/ssb-patchwork/default.nix
rename to pkgs/by-name/ss/ssb-patchwork/package.nix
diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/by-name/ss/ssdeep/package.nix
similarity index 100%
rename from pkgs/tools/security/ssdeep/default.nix
rename to pkgs/by-name/ss/ssdeep/package.nix
diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/by-name/ss/sselp/package.nix
similarity index 100%
rename from pkgs/tools/X11/sselp/default.nix
rename to pkgs/by-name/ss/sselp/package.nix
diff --git a/pkgs/tools/networking/ssh-agents/default.nix b/pkgs/by-name/ss/ssh-agents/package.nix
similarity index 100%
rename from pkgs/tools/networking/ssh-agents/default.nix
rename to pkgs/by-name/ss/ssh-agents/package.nix
diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/by-name/ss/ssh-audit/package.nix
similarity index 100%
rename from pkgs/tools/security/ssh-audit/default.nix
rename to pkgs/by-name/ss/ssh-audit/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/pkgs/by-name/ss/ssh-chat/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
rename to pkgs/by-name/ss/ssh-chat/package.nix
diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/by-name/ss/ssh-ident/package.nix
similarity index 100%
rename from pkgs/tools/networking/ssh-ident/default.nix
rename to pkgs/by-name/ss/ssh-ident/package.nix
diff --git a/pkgs/tools/networking/ssh-key-confirmer/default.nix b/pkgs/by-name/ss/ssh-key-confirmer/package.nix
similarity index 100%
rename from pkgs/tools/networking/ssh-key-confirmer/default.nix
rename to pkgs/by-name/ss/ssh-key-confirmer/package.nix
diff --git a/pkgs/tools/security/ssh-mitm/default.nix b/pkgs/by-name/ss/ssh-mitm/package.nix
similarity index 100%
rename from pkgs/tools/security/ssh-mitm/default.nix
rename to pkgs/by-name/ss/ssh-mitm/package.nix
diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/by-name/ss/ssh-to-age/package.nix
similarity index 100%
rename from pkgs/tools/security/ssh-to-age/default.nix
rename to pkgs/by-name/ss/ssh-to-age/package.nix
diff --git a/pkgs/tools/security/ssh-to-pgp/default.nix b/pkgs/by-name/ss/ssh-to-pgp/package.nix
similarity index 100%
rename from pkgs/tools/security/ssh-to-pgp/default.nix
rename to pkgs/by-name/ss/ssh-to-pgp/package.nix
diff --git a/pkgs/applications/misc/ssh-tools/default.nix b/pkgs/by-name/ss/ssh-tools/package.nix
similarity index 100%
rename from pkgs/applications/misc/ssh-tools/default.nix
rename to pkgs/by-name/ss/ssh-tools/package.nix
diff --git a/pkgs/tools/security/sshchecker/default.nix b/pkgs/by-name/ss/sshchecker/package.nix
similarity index 100%
rename from pkgs/tools/security/sshchecker/default.nix
rename to pkgs/by-name/ss/sshchecker/package.nix
diff --git a/pkgs/tools/networking/sshed/default.nix b/pkgs/by-name/ss/sshed/package.nix
similarity index 100%
rename from pkgs/tools/networking/sshed/default.nix
rename to pkgs/by-name/ss/sshed/package.nix
diff --git a/pkgs/tools/filesystems/sshfs-fuse/common.nix b/pkgs/by-name/ss/sshfs-fuse/common.nix
similarity index 100%
rename from pkgs/tools/filesystems/sshfs-fuse/common.nix
rename to pkgs/by-name/ss/sshfs-fuse/common.nix
diff --git a/pkgs/tools/filesystems/sshfs-fuse/fix-fuse-darwin-h.patch b/pkgs/by-name/ss/sshfs-fuse/fix-fuse-darwin-h.patch
similarity index 100%
rename from pkgs/tools/filesystems/sshfs-fuse/fix-fuse-darwin-h.patch
rename to pkgs/by-name/ss/sshfs-fuse/fix-fuse-darwin-h.patch
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/by-name/ss/sshfs-fuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/sshfs-fuse/default.nix
rename to pkgs/by-name/ss/sshfs-fuse/package.nix
diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/by-name/ss/sshguard/package.nix
similarity index 100%
rename from pkgs/tools/security/sshguard/default.nix
rename to pkgs/by-name/ss/sshguard/package.nix
diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/by-name/ss/sshlatex/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/sshlatex/default.nix
rename to pkgs/by-name/ss/sshlatex/package.nix
diff --git a/pkgs/tools/security/sshocker/default.nix b/pkgs/by-name/ss/sshocker/package.nix
similarity index 100%
rename from pkgs/tools/security/sshocker/default.nix
rename to pkgs/by-name/ss/sshocker/package.nix
diff --git a/pkgs/tools/networking/sshoogr/default.nix b/pkgs/by-name/ss/sshoogr/package.nix
similarity index 100%
rename from pkgs/tools/networking/sshoogr/default.nix
rename to pkgs/by-name/ss/sshoogr/package.nix
diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/by-name/ss/sshpass/package.nix
similarity index 100%
rename from pkgs/tools/networking/sshpass/default.nix
rename to pkgs/by-name/ss/sshpass/package.nix
diff --git a/pkgs/tools/networking/sshping/default.nix b/pkgs/by-name/ss/sshping/package.nix
similarity index 100%
rename from pkgs/tools/networking/sshping/default.nix
rename to pkgs/by-name/ss/sshping/package.nix
diff --git a/pkgs/servers/sshportal/default.nix b/pkgs/by-name/ss/sshportal/package.nix
similarity index 100%
rename from pkgs/servers/sshportal/default.nix
rename to pkgs/by-name/ss/sshportal/package.nix
diff --git a/pkgs/development/tools/sshs/default.nix b/pkgs/by-name/ss/sshs/package.nix
similarity index 100%
rename from pkgs/development/tools/sshs/default.nix
rename to pkgs/by-name/ss/sshs/package.nix
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/by-name/ss/sshuttle/package.nix
similarity index 100%
rename from pkgs/tools/security/sshuttle/default.nix
rename to pkgs/by-name/ss/sshuttle/package.nix
diff --git a/pkgs/tools/security/sshuttle/sudo.patch b/pkgs/by-name/ss/sshuttle/sudo.patch
similarity index 100%
rename from pkgs/tools/security/sshuttle/sudo.patch
rename to pkgs/by-name/ss/sshuttle/sudo.patch
diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/by-name/ss/ssl-cert-check/package.nix
similarity index 100%
rename from pkgs/tools/admin/ssl-cert-check/default.nix
rename to pkgs/by-name/ss/ssl-cert-check/package.nix
diff --git a/pkgs/tools/networking/ssl-proxy/default.nix b/pkgs/by-name/ss/ssl-proxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/ssl-proxy/default.nix
rename to pkgs/by-name/ss/ssl-proxy/package.nix
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/by-name/ss/ssldump/package.nix
similarity index 100%
rename from pkgs/tools/networking/ssldump/default.nix
rename to pkgs/by-name/ss/ssldump/package.nix
diff --git a/pkgs/servers/sslh/default.nix b/pkgs/by-name/ss/sslh/package.nix
similarity index 100%
rename from pkgs/servers/sslh/default.nix
rename to pkgs/by-name/ss/sslh/package.nix
diff --git a/pkgs/development/tools/sslmate-agent/default.nix b/pkgs/by-name/ss/sslmate-agent/package.nix
similarity index 100%
rename from pkgs/development/tools/sslmate-agent/default.nix
rename to pkgs/by-name/ss/sslmate-agent/package.nix
diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/by-name/ss/sslmate/package.nix
similarity index 100%
rename from pkgs/development/tools/sslmate/default.nix
rename to pkgs/by-name/ss/sslmate/package.nix
diff --git a/pkgs/tools/networking/sslsplit/default.nix b/pkgs/by-name/ss/sslsplit/package.nix
similarity index 100%
rename from pkgs/tools/networking/sslsplit/default.nix
rename to pkgs/by-name/ss/sslsplit/package.nix
diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/by-name/ss/ssmsh/package.nix
similarity index 100%
rename from pkgs/tools/admin/ssmsh/default.nix
rename to pkgs/by-name/ss/ssmsh/package.nix
diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/by-name/ss/ssocr/package.nix
similarity index 100%
rename from pkgs/applications/misc/ssocr/default.nix
rename to pkgs/by-name/ss/ssocr/package.nix
diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/by-name/ss/ssrc/package.nix
similarity index 100%
rename from pkgs/applications/audio/ssrc/default.nix
rename to pkgs/by-name/ss/ssrc/package.nix
diff --git a/pkgs/tools/security/sss-cli/fix-cargo-lock.patch b/pkgs/by-name/ss/sss-cli/fix-cargo-lock.patch
similarity index 100%
rename from pkgs/tools/security/sss-cli/fix-cargo-lock.patch
rename to pkgs/by-name/ss/sss-cli/fix-cargo-lock.patch
diff --git a/pkgs/tools/security/sss-cli/default.nix b/pkgs/by-name/ss/sss-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/sss-cli/default.nix
rename to pkgs/by-name/ss/sss-cli/package.nix
diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/by-name/ss/ssss/package.nix
similarity index 100%
rename from pkgs/tools/security/ssss/default.nix
rename to pkgs/by-name/ss/ssss/package.nix
diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/by-name/ss/sstp/package.nix
similarity index 100%
rename from pkgs/tools/networking/sstp/default.nix
rename to pkgs/by-name/ss/sstp/package.nix
diff --git a/pkgs/applications/misc/ssw/default.nix b/pkgs/by-name/ss/ssw/package.nix
similarity index 100%
rename from pkgs/applications/misc/ssw/default.nix
rename to pkgs/by-name/ss/ssw/package.nix
diff --git a/pkgs/tools/misc/sta/default.nix b/pkgs/by-name/st/sta/package.nix
similarity index 100%
rename from pkgs/tools/misc/sta/default.nix
rename to pkgs/by-name/st/sta/package.nix
diff --git a/pkgs/misc/stabber/default.nix b/pkgs/by-name/st/stabber/package.nix
similarity index 100%
rename from pkgs/misc/stabber/default.nix
rename to pkgs/by-name/st/stabber/package.nix
diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/by-name/st/stacks/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/stacks/default.nix
rename to pkgs/by-name/st/stacks/package.nix
diff --git a/pkgs/tools/security/stacs/default.nix b/pkgs/by-name/st/stacs/package.nix
similarity index 100%
rename from pkgs/tools/security/stacs/default.nix
rename to pkgs/by-name/st/stacs/package.nix
diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/by-name/st/stagit/package.nix
similarity index 100%
rename from pkgs/development/tools/stagit/default.nix
rename to pkgs/by-name/st/stagit/package.nix
diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/by-name/st/stalin/package.nix
similarity index 100%
rename from pkgs/development/compilers/stalin/default.nix
rename to pkgs/by-name/st/stalin/package.nix
diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/by-name/st/stalonetray/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/stalonetray/default.nix
rename to pkgs/by-name/st/stalonetray/package.nix
diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/by-name/st/star-history/package.nix
similarity index 100%
rename from pkgs/tools/misc/star-history/default.nix
rename to pkgs/by-name/st/star-history/package.nix
diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/by-name/st/star/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/star/default.nix
rename to pkgs/by-name/st/star/package.nix
diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/by-name/st/starboard/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/starboard/default.nix
rename to pkgs/by-name/st/starboard/package.nix
diff --git a/pkgs/servers/misc/starcharts/default.nix b/pkgs/by-name/st/starcharts/package.nix
similarity index 100%
rename from pkgs/servers/misc/starcharts/default.nix
rename to pkgs/by-name/st/starcharts/package.nix
diff --git a/pkgs/games/stardust/default.nix b/pkgs/by-name/st/stardust/package.nix
similarity index 100%
rename from pkgs/games/stardust/default.nix
rename to pkgs/by-name/st/stardust/package.nix
diff --git a/pkgs/tools/misc/starfetch/default.nix b/pkgs/by-name/st/starfetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/starfetch/default.nix
rename to pkgs/by-name/st/starfetch/package.nix
diff --git a/pkgs/development/libraries/stargate-libcds/Makefile.patch b/pkgs/by-name/st/stargate-libcds/Makefile.patch
similarity index 100%
rename from pkgs/development/libraries/stargate-libcds/Makefile.patch
rename to pkgs/by-name/st/stargate-libcds/Makefile.patch
diff --git a/pkgs/development/libraries/stargate-libcds/default.nix b/pkgs/by-name/st/stargate-libcds/package.nix
similarity index 100%
rename from pkgs/development/libraries/stargate-libcds/default.nix
rename to pkgs/by-name/st/stargate-libcds/package.nix
diff --git a/pkgs/development/interpreters/starlark-rust/default.nix b/pkgs/by-name/st/starlark-rust/package.nix
similarity index 100%
rename from pkgs/development/interpreters/starlark-rust/default.nix
rename to pkgs/by-name/st/starlark-rust/package.nix
diff --git a/pkgs/tools/misc/starry/default.nix b/pkgs/by-name/st/starry/package.nix
similarity index 100%
rename from pkgs/tools/misc/starry/default.nix
rename to pkgs/by-name/st/starry/package.nix
diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/by-name/st/static-web-server/package.nix
similarity index 100%
rename from pkgs/servers/static-web-server/default.nix
rename to pkgs/by-name/st/static-web-server/package.nix
diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/by-name/st/statifier/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/statifier/default.nix
rename to pkgs/by-name/st/statifier/package.nix
diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/by-name/st/statik/package.nix
similarity index 100%
rename from pkgs/development/tools/statik/default.nix
rename to pkgs/by-name/st/statik/package.nix
diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/by-name/st/station/package.nix
similarity index 100%
rename from pkgs/applications/networking/station/default.nix
rename to pkgs/by-name/st/station/package.nix
diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/by-name/st/statix/package.nix
similarity index 100%
rename from pkgs/tools/nix/statix/default.nix
rename to pkgs/by-name/st/statix/package.nix
diff --git a/pkgs/tools/misc/statserial/default.nix b/pkgs/by-name/st/statserial/package.nix
similarity index 100%
rename from pkgs/tools/misc/statserial/default.nix
rename to pkgs/by-name/st/statserial/package.nix
diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/by-name/st/stb/package.nix
similarity index 100%
rename from pkgs/development/libraries/stb/default.nix
rename to pkgs/by-name/st/stb/package.nix
diff --git a/pkgs/tools/misc/stderred/default.nix b/pkgs/by-name/st/stderred/package.nix
similarity index 100%
rename from pkgs/tools/misc/stderred/default.nix
rename to pkgs/by-name/st/stderred/package.nix
diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/by-name/st/stdman/package.nix
similarity index 100%
rename from pkgs/data/documentation/stdman/default.nix
rename to pkgs/by-name/st/stdman/package.nix
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/by-name/st/stdmanpages/package.nix
similarity index 100%
rename from pkgs/data/documentation/std-man-pages/default.nix
rename to pkgs/by-name/st/stdmanpages/package.nix
diff --git a/pkgs/tools/games/steam-acf/default.nix b/pkgs/by-name/st/steam-acf/package.nix
similarity index 100%
rename from pkgs/tools/games/steam-acf/default.nix
rename to pkgs/by-name/st/steam-acf/package.nix
diff --git a/pkgs/tools/games/steam-rom-manager/default.nix b/pkgs/by-name/st/steam-rom-manager/package.nix
similarity index 100%
rename from pkgs/tools/games/steam-rom-manager/default.nix
rename to pkgs/by-name/st/steam-rom-manager/package.nix
diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/by-name/st/steam-tui/package.nix
similarity index 100%
rename from pkgs/games/steam-tui/default.nix
rename to pkgs/by-name/st/steam-tui/package.nix
diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/by-name/st/steamcontroller/package.nix
similarity index 100%
rename from pkgs/misc/drivers/steamcontroller/default.nix
rename to pkgs/by-name/st/steamcontroller/package.nix
diff --git a/pkgs/development/tools/steamos-devkit/default.nix b/pkgs/by-name/st/steamos-devkit/package.nix
similarity index 100%
rename from pkgs/development/tools/steamos-devkit/default.nix
rename to pkgs/by-name/st/steamos-devkit/package.nix
diff --git a/pkgs/tools/games/steamtinkerlaunch/default.nix b/pkgs/by-name/st/steamtinkerlaunch/package.nix
similarity index 100%
rename from pkgs/tools/games/steamtinkerlaunch/default.nix
rename to pkgs/by-name/st/steamtinkerlaunch/package.nix
diff --git a/pkgs/tools/security/stegseek/default.nix b/pkgs/by-name/st/stegseek/package.nix
similarity index 100%
rename from pkgs/tools/security/stegseek/default.nix
rename to pkgs/by-name/st/stegseek/package.nix
diff --git a/pkgs/tools/graphics/stegsolve/default.nix b/pkgs/by-name/st/stegsolve/package.nix
similarity index 100%
rename from pkgs/tools/graphics/stegsolve/default.nix
rename to pkgs/by-name/st/stegsolve/package.nix
diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/by-name/st/stellar-core/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/stellar-core/default.nix
rename to pkgs/by-name/st/stellar-core/package.nix
diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/by-name/st/stenc/package.nix
similarity index 100%
rename from pkgs/tools/backup/stenc/default.nix
rename to pkgs/by-name/st/stenc/package.nix
diff --git a/pkgs/tools/security/step-kms-plugin/default.nix b/pkgs/by-name/st/step-kms-plugin/package.nix
similarity index 100%
rename from pkgs/tools/security/step-kms-plugin/default.nix
rename to pkgs/by-name/st/step-kms-plugin/package.nix
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/by-name/st/stepmania/package.nix
similarity index 100%
rename from pkgs/games/stepmania/default.nix
rename to pkgs/by-name/st/stepmania/package.nix
diff --git a/pkgs/applications/misc/stepreduce/default.nix b/pkgs/by-name/st/stepreduce/package.nix
similarity index 100%
rename from pkgs/applications/misc/stepreduce/default.nix
rename to pkgs/by-name/st/stepreduce/package.nix
diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/by-name/st/stfl/package.nix
similarity index 100%
rename from pkgs/development/libraries/stfl/default.nix
rename to pkgs/by-name/st/stfl/package.nix
diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/by-name/st/stgit/package.nix
similarity index 100%
rename from pkgs/applications/version-management/stgit/default.nix
rename to pkgs/by-name/st/stgit/package.nix
diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/by-name/st/sticky/package.nix
similarity index 100%
rename from pkgs/applications/misc/sticky/default.nix
rename to pkgs/by-name/st/sticky/package.nix
diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/by-name/st/stig/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/stig/default.nix
rename to pkgs/by-name/st/stig/package.nix
diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/by-name/st/stilo-themes/package.nix
similarity index 100%
rename from pkgs/data/themes/stilo/default.nix
rename to pkgs/by-name/st/stilo-themes/package.nix
diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/by-name/st/stix-otf/package.nix
similarity index 100%
rename from pkgs/data/fonts/stix-otf/default.nix
rename to pkgs/by-name/st/stix-otf/package.nix
diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/by-name/st/stix-two/package.nix
similarity index 100%
rename from pkgs/data/fonts/stix-two/default.nix
rename to pkgs/by-name/st/stix-two/package.nix
diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/by-name/st/stm32cubemx/package.nix
similarity index 100%
rename from pkgs/development/embedded/stm32/stm32cubemx/default.nix
rename to pkgs/by-name/st/stm32cubemx/package.nix
diff --git a/pkgs/development/embedded/stm32/stm32flash/default.nix b/pkgs/by-name/st/stm32flash/package.nix
similarity index 100%
rename from pkgs/development/embedded/stm32/stm32flash/default.nix
rename to pkgs/by-name/st/stm32flash/package.nix
diff --git a/pkgs/development/embedded/stm8/stm8flash/default.nix b/pkgs/by-name/st/stm8flash/package.nix
similarity index 100%
rename from pkgs/development/embedded/stm8/stm8flash/default.nix
rename to pkgs/by-name/st/stm8flash/package.nix
diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/by-name/st/stochas/package.nix
similarity index 100%
rename from pkgs/applications/audio/stochas/default.nix
rename to pkgs/by-name/st/stochas/package.nix
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/by-name/st/stockfish/package.nix
similarity index 100%
rename from pkgs/games/stockfish/default.nix
rename to pkgs/by-name/st/stockfish/package.nix
diff --git a/pkgs/games/stone-kingdoms/default.nix b/pkgs/by-name/st/stone-kingdoms/package.nix
similarity index 100%
rename from pkgs/games/stone-kingdoms/default.nix
rename to pkgs/by-name/st/stone-kingdoms/package.nix
diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/by-name/st/stone-phaser/package.nix
similarity index 100%
rename from pkgs/applications/audio/stone-phaser/default.nix
rename to pkgs/by-name/st/stone-phaser/package.nix
diff --git a/pkgs/servers/stone/default.nix b/pkgs/by-name/st/stone/package.nix
similarity index 100%
rename from pkgs/servers/stone/default.nix
rename to pkgs/by-name/st/stone/package.nix
diff --git a/pkgs/tools/backup/store-backup/CVE-2020-7040.patch b/pkgs/by-name/st/storeBackup/CVE-2020-7040.patch
similarity index 100%
rename from pkgs/tools/backup/store-backup/CVE-2020-7040.patch
rename to pkgs/by-name/st/storeBackup/CVE-2020-7040.patch
diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/by-name/st/storeBackup/package.nix
similarity index 100%
rename from pkgs/tools/backup/store-backup/default.nix
rename to pkgs/by-name/st/storeBackup/package.nix
diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/by-name/st/storj-uplink/package.nix
similarity index 100%
rename from pkgs/applications/networking/sync/storj-uplink/default.nix
rename to pkgs/by-name/st/storj-uplink/package.nix
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/by-name/st/storm/package.nix
similarity index 100%
rename from pkgs/servers/computing/storm/default.nix
rename to pkgs/by-name/st/storm/package.nix
diff --git a/pkgs/applications/networking/p2p/storrent/default.nix b/pkgs/by-name/st/storrent/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/storrent/default.nix
rename to pkgs/by-name/st/storrent/package.nix
diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/by-name/st/stow/package.nix
similarity index 100%
rename from pkgs/tools/misc/stow/default.nix
rename to pkgs/by-name/st/stow/package.nix
diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/by-name/st/stp/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/stp/default.nix
rename to pkgs/by-name/st/stp/package.nix
diff --git a/pkgs/applications/science/logic/stp/stdint.patch b/pkgs/by-name/st/stp/stdint.patch
similarity index 100%
rename from pkgs/applications/science/logic/stp/stdint.patch
rename to pkgs/by-name/st/stp/stdint.patch
diff --git a/pkgs/development/tools/misc/strace-analyzer/default.nix b/pkgs/by-name/st/strace-analyzer/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/strace-analyzer/default.nix
rename to pkgs/by-name/st/strace-analyzer/package.nix
diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/by-name/st/strace/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/strace/default.nix
rename to pkgs/by-name/st/strace/package.nix
diff --git a/pkgs/tools/filesystems/stratis-cli/default.nix b/pkgs/by-name/st/stratis-cli/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/stratis-cli/default.nix
rename to pkgs/by-name/st/stratis-cli/package.nix
diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/by-name/st/stratisd/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/stratisd/default.nix
rename to pkgs/by-name/st/stratisd/package.nix
diff --git a/pkgs/applications/virtualization/stratovirt/default.nix b/pkgs/by-name/st/stratovirt/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/stratovirt/default.nix
rename to pkgs/by-name/st/stratovirt/package.nix
diff --git a/pkgs/applications/video/streamlink/ffmpeg-path.patch b/pkgs/by-name/st/streamlink/ffmpeg-path.patch
similarity index 100%
rename from pkgs/applications/video/streamlink/ffmpeg-path.patch
rename to pkgs/by-name/st/streamlink/ffmpeg-path.patch
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/by-name/st/streamlink/package.nix
similarity index 100%
rename from pkgs/applications/video/streamlink/default.nix
rename to pkgs/by-name/st/streamlink/package.nix
diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/by-name/st/streamripper/package.nix
similarity index 100%
rename from pkgs/applications/audio/streamripper/default.nix
rename to pkgs/by-name/st/streamripper/package.nix
diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/by-name/st/strelka/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/strelka/default.nix
rename to pkgs/by-name/st/strelka/package.nix
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/by-name/st/stress-ng/package.nix
similarity index 100%
rename from pkgs/tools/system/stress-ng/default.nix
rename to pkgs/by-name/st/stress-ng/package.nix
diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/by-name/st/stress/package.nix
similarity index 100%
rename from pkgs/tools/system/stress/default.nix
rename to pkgs/by-name/st/stress/package.nix
diff --git a/pkgs/tools/system/stressapptest/default.nix b/pkgs/by-name/st/stressapptest/package.nix
similarity index 100%
rename from pkgs/tools/system/stressapptest/default.nix
rename to pkgs/by-name/st/stressapptest/package.nix
diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/by-name/st/stretchly/package.nix
similarity index 100%
rename from pkgs/applications/misc/stretchly/default.nix
rename to pkgs/by-name/st/stretchly/package.nix
diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/by-name/st/stricat/package.nix
similarity index 100%
rename from pkgs/tools/security/stricat/default.nix
rename to pkgs/by-name/st/stricat/package.nix
diff --git a/pkgs/applications/audio/string-machine/default.nix b/pkgs/by-name/st/string-machine/package.nix
similarity index 100%
rename from pkgs/applications/audio/string-machine/default.nix
rename to pkgs/by-name/st/string-machine/package.nix
diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/by-name/st/stripe-cli/package.nix
similarity index 100%
rename from pkgs/tools/admin/stripe-cli/default.nix
rename to pkgs/by-name/st/stripe-cli/package.nix
diff --git a/pkgs/tools/networking/strongswan/ext_auth-path.patch b/pkgs/by-name/st/strongswan/ext_auth-path.patch
similarity index 100%
rename from pkgs/tools/networking/strongswan/ext_auth-path.patch
rename to pkgs/by-name/st/strongswan/ext_auth-path.patch
diff --git a/pkgs/tools/networking/strongswan/firewall_defaults.patch b/pkgs/by-name/st/strongswan/firewall_defaults.patch
similarity index 100%
rename from pkgs/tools/networking/strongswan/firewall_defaults.patch
rename to pkgs/by-name/st/strongswan/firewall_defaults.patch
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/by-name/st/strongswan/package.nix
similarity index 100%
rename from pkgs/tools/networking/strongswan/default.nix
rename to pkgs/by-name/st/strongswan/package.nix
diff --git a/pkgs/tools/networking/strongswan/updown-path.patch b/pkgs/by-name/st/strongswan/updown-path.patch
similarity index 100%
rename from pkgs/tools/networking/strongswan/updown-path.patch
rename to pkgs/by-name/st/strongswan/updown-path.patch
diff --git a/pkgs/tools/audio/stt/default.nix b/pkgs/by-name/st/stt/package.nix
similarity index 100%
rename from pkgs/tools/audio/stt/default.nix
rename to pkgs/by-name/st/stt/package.nix
diff --git a/pkgs/tools/filesystems/stuffbin/default.nix b/pkgs/by-name/st/stuffbin/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/stuffbin/default.nix
rename to pkgs/by-name/st/stuffbin/package.nix
diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/by-name/st/stumpish/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/stumpish/default.nix
rename to pkgs/by-name/st/stumpish/package.nix
diff --git a/pkgs/applications/window-managers/stumpish/paths.patch b/pkgs/by-name/st/stumpish/paths.patch
similarity index 100%
rename from pkgs/applications/window-managers/stumpish/paths.patch
rename to pkgs/by-name/st/stumpish/paths.patch
diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/by-name/st/stun/package.nix
similarity index 100%
rename from pkgs/tools/networking/stun/default.nix
rename to pkgs/by-name/st/stun/package.nix
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/by-name/st/stunnel/package.nix
similarity index 100%
rename from pkgs/tools/networking/stunnel/default.nix
rename to pkgs/by-name/st/stunnel/package.nix
diff --git a/pkgs/tools/networking/stuntman/default.nix b/pkgs/by-name/st/stuntman/package.nix
similarity index 100%
rename from pkgs/tools/networking/stuntman/default.nix
rename to pkgs/by-name/st/stuntman/package.nix
diff --git a/pkgs/applications/misc/stw/default.nix b/pkgs/by-name/st/stw/package.nix
similarity index 100%
rename from pkgs/applications/misc/stw/default.nix
rename to pkgs/by-name/st/stw/package.nix
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/by-name/st/stxxl/package.nix
similarity index 100%
rename from pkgs/development/libraries/stxxl/default.nix
rename to pkgs/by-name/st/stxxl/package.nix
diff --git a/pkgs/applications/misc/stylish/default.nix b/pkgs/by-name/st/stylish/package.nix
similarity index 100%
rename from pkgs/applications/misc/stylish/default.nix
rename to pkgs/by-name/st/stylish/package.nix
diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/by-name/st/stylua/package.nix
similarity index 100%
rename from pkgs/development/tools/stylua/default.nix
rename to pkgs/by-name/st/stylua/package.nix
diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/by-name/st/styx/package.nix
similarity index 100%
rename from pkgs/applications/misc/styx/default.nix
rename to pkgs/by-name/st/styx/package.nix
diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/by-name/su/sub-batch/package.nix
similarity index 100%
rename from pkgs/applications/video/sub-batch/default.nix
rename to pkgs/by-name/su/sub-batch/package.nix
diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/by-name/su/subberthehut/package.nix
similarity index 100%
rename from pkgs/tools/misc/subberthehut/default.nix
rename to pkgs/by-name/su/subberthehut/package.nix
diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/by-name/su/subdl/package.nix
similarity index 100%
rename from pkgs/applications/video/subdl/default.nix
rename to pkgs/by-name/su/subdl/package.nix
diff --git a/pkgs/tools/text/subedit/default.nix b/pkgs/by-name/su/subedit/package.nix
similarity index 100%
rename from pkgs/tools/text/subedit/default.nix
rename to pkgs/by-name/su/subedit/package.nix
diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/by-name/su/subfinder/package.nix
similarity index 100%
rename from pkgs/tools/networking/subfinder/default.nix
rename to pkgs/by-name/su/subfinder/package.nix
diff --git a/pkgs/applications/version-management/subgit/default.nix b/pkgs/by-name/su/subgit/package.nix
similarity index 100%
rename from pkgs/applications/version-management/subgit/default.nix
rename to pkgs/by-name/su/subgit/package.nix
diff --git a/pkgs/tools/security/subjs/default.nix b/pkgs/by-name/su/subjs/package.nix
similarity index 100%
rename from pkgs/tools/security/subjs/default.nix
rename to pkgs/by-name/su/subjs/package.nix
diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/by-name/su/sublime/package.nix
similarity index 100%
rename from pkgs/applications/editors/sublime/2/default.nix
rename to pkgs/by-name/su/sublime/package.nix
diff --git a/pkgs/tools/networking/subnetcalc/default.nix b/pkgs/by-name/su/subnetcalc/package.nix
similarity index 100%
rename from pkgs/tools/networking/subnetcalc/default.nix
rename to pkgs/by-name/su/subnetcalc/package.nix
diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/by-name/su/subread/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/subread/default.nix
rename to pkgs/by-name/su/subread/package.nix
diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/by-name/su/subsonic/package.nix
similarity index 100%
rename from pkgs/servers/misc/subsonic/default.nix
rename to pkgs/by-name/su/subsonic/package.nix
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/by-name/su/subtitleeditor/package.nix
similarity index 100%
rename from pkgs/applications/video/subtitleeditor/default.nix
rename to pkgs/by-name/su/subtitleeditor/package.nix
diff --git a/pkgs/applications/audio/subtitlr/default.nix b/pkgs/by-name/su/subtitlr/package.nix
similarity index 100%
rename from pkgs/applications/audio/subtitlr/default.nix
rename to pkgs/by-name/su/subtitlr/package.nix
diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/by-name/su/subunit/package.nix
similarity index 100%
rename from pkgs/development/libraries/subunit/default.nix
rename to pkgs/by-name/su/subunit/package.nix
diff --git a/pkgs/development/tools/subxt/default.nix b/pkgs/by-name/su/subxt/package.nix
similarity index 100%
rename from pkgs/development/tools/subxt/default.nix
rename to pkgs/by-name/su/subxt/package.nix
diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/by-name/su/sudo-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/sudo/default.nix
rename to pkgs/by-name/su/sudo-font/package.nix
diff --git a/pkgs/tools/security/sudo-rs/default.nix b/pkgs/by-name/su/sudo-rs/package.nix
similarity index 100%
rename from pkgs/tools/security/sudo-rs/default.nix
rename to pkgs/by-name/su/sudo-rs/package.nix
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/by-name/su/sudo/package.nix
similarity index 100%
rename from pkgs/tools/security/sudo/default.nix
rename to pkgs/by-name/su/sudo/package.nix
diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/by-name/su/suidChroot/package.nix
similarity index 100%
rename from pkgs/tools/system/suid-chroot/default.nix
rename to pkgs/by-name/su/suidChroot/package.nix
diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/by-name/su/suitesparse-graphblas/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
rename to pkgs/by-name/su/suitesparse-graphblas/package.nix
diff --git a/pkgs/development/tools/summon/default.nix b/pkgs/by-name/su/summon/package.nix
similarity index 100%
rename from pkgs/development/tools/summon/default.nix
rename to pkgs/by-name/su/summon/package.nix
diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/by-name/su/sumo/package.nix
similarity index 100%
rename from pkgs/applications/science/networking/sumo/default.nix
rename to pkgs/by-name/su/sumo/package.nix
diff --git a/pkgs/applications/blockchains/sumokoin/default.nix b/pkgs/by-name/su/sumokoin/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/sumokoin/default.nix
rename to pkgs/by-name/su/sumokoin/package.nix
diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/by-name/su/sundtek/package.nix
similarity index 100%
rename from pkgs/misc/drivers/sundtek/default.nix
rename to pkgs/by-name/su/sundtek/package.nix
diff --git a/pkgs/applications/misc/sunwait/default.nix b/pkgs/by-name/su/sunwait/package.nix
similarity index 100%
rename from pkgs/applications/misc/sunwait/default.nix
rename to pkgs/by-name/su/sunwait/package.nix
diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/by-name/su/sunxi-tools/package.nix
similarity index 100%
rename from pkgs/development/tools/sunxi-tools/default.nix
rename to pkgs/by-name/su/sunxi-tools/package.nix
diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/by-name/su/supabase-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/supabase-cli/default.nix
rename to pkgs/by-name/su/supabase-cli/package.nix
diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/by-name/su/super-productivity/package.nix
similarity index 100%
rename from pkgs/applications/office/super-productivity/default.nix
rename to pkgs/by-name/su/super-productivity/package.nix
diff --git a/pkgs/data/icons/super-tiny-icons/default.nix b/pkgs/by-name/su/super-tiny-icons/package.nix
similarity index 100%
rename from pkgs/data/icons/super-tiny-icons/default.nix
rename to pkgs/by-name/su/super-tiny-icons/package.nix
diff --git a/pkgs/games/supertux/default.nix b/pkgs/by-name/su/superTux/package.nix
similarity index 100%
rename from pkgs/games/supertux/default.nix
rename to pkgs/by-name/su/superTux/package.nix
diff --git a/pkgs/tools/system/supercronic/default.nix b/pkgs/by-name/su/supercronic/package.nix
similarity index 100%
rename from pkgs/tools/system/supercronic/default.nix
rename to pkgs/by-name/su/supercronic/package.nix
diff --git a/pkgs/misc/superd/default.nix b/pkgs/by-name/su/superd/package.nix
similarity index 100%
rename from pkgs/misc/superd/default.nix
rename to pkgs/by-name/su/superd/package.nix
diff --git a/pkgs/applications/system/supergfxctl/default.nix b/pkgs/by-name/su/supergfxctl/package.nix
similarity index 100%
rename from pkgs/applications/system/supergfxctl/default.nix
rename to pkgs/by-name/su/supergfxctl/package.nix
diff --git a/pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch b/pkgs/by-name/su/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch
similarity index 100%
rename from pkgs/development/libraries/science/math/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch
rename to pkgs/by-name/su/superlu/add-superlu-lib-as-dependency-for-the-unit-tests.patch
diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/by-name/su/superlu/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/superlu/default.nix
rename to pkgs/by-name/su/superlu/package.nix
diff --git a/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch b/pkgs/by-name/su/supertag/cargo-lock-update-lexical-core.patch
similarity index 100%
rename from pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch
rename to pkgs/by-name/su/supertag/cargo-lock-update-lexical-core.patch
diff --git a/pkgs/tools/filesystems/supertag/default.nix b/pkgs/by-name/su/supertag/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/supertag/default.nix
rename to pkgs/by-name/su/supertag/package.nix
diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/by-name/su/supervise/package.nix
similarity index 100%
rename from pkgs/tools/system/supervise/default.nix
rename to pkgs/by-name/su/supervise/package.nix
diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/by-name/su/surelog/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/surelog/default.nix
rename to pkgs/by-name/su/surelog/package.nix
diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/by-name/su/surf-display/package.nix
similarity index 100%
rename from pkgs/desktops/surf-display/default.nix
rename to pkgs/by-name/su/surf-display/package.nix
diff --git a/pkgs/desktops/surf-display/pdf-makefile.patch b/pkgs/by-name/su/surf-display/pdf-makefile.patch
similarity index 100%
rename from pkgs/desktops/surf-display/pdf-makefile.patch
rename to pkgs/by-name/su/surf-display/pdf-makefile.patch
diff --git a/pkgs/applications/misc/surface-control/Cargo.lock b/pkgs/by-name/su/surface-control/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/surface-control/Cargo.lock
rename to pkgs/by-name/su/surface-control/Cargo.lock
diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/by-name/su/surface-control/package.nix
similarity index 100%
rename from pkgs/applications/misc/surface-control/default.nix
rename to pkgs/by-name/su/surface-control/package.nix
diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/by-name/su/surfraw/package.nix
similarity index 100%
rename from pkgs/tools/networking/surfraw/default.nix
rename to pkgs/by-name/su/surfraw/package.nix
diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/by-name/su/surge-XT/package.nix
similarity index 100%
rename from pkgs/applications/audio/surge-XT/default.nix
rename to pkgs/by-name/su/surge-XT/package.nix
diff --git a/pkgs/development/tools/surge-cli/default.nix b/pkgs/by-name/su/surge-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/surge-cli/default.nix
rename to pkgs/by-name/su/surge-cli/package.nix
diff --git a/pkgs/applications/radio/suscan/default.nix b/pkgs/by-name/su/suscan/package.nix
similarity index 100%
rename from pkgs/applications/radio/suscan/default.nix
rename to pkgs/by-name/su/suscan/package.nix
diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/by-name/su/sutils/package.nix
similarity index 100%
rename from pkgs/tools/misc/sutils/default.nix
rename to pkgs/by-name/su/sutils/package.nix
diff --git a/pkgs/applications/science/electronics/sv-lang/default.nix b/pkgs/by-name/sv/sv-lang/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/sv-lang/default.nix
rename to pkgs/by-name/sv/sv-lang/package.nix
diff --git a/pkgs/applications/science/biology/svaba/default.nix b/pkgs/by-name/sv/svaba/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/svaba/default.nix
rename to pkgs/by-name/sv/svaba/package.nix
diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/by-name/sv/svd2rust/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/svd2rust/default.nix
rename to pkgs/by-name/sv/svd2rust/package.nix
diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/by-name/sv/svg2pdf/package.nix
similarity index 100%
rename from pkgs/tools/graphics/svg2pdf/default.nix
rename to pkgs/by-name/sv/svg2pdf/package.nix
diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/by-name/sv/svgbob/package.nix
similarity index 100%
rename from pkgs/tools/graphics/svgbob/default.nix
rename to pkgs/by-name/sv/svgbob/package.nix
diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/by-name/sv/svgcleaner/package.nix
similarity index 100%
rename from pkgs/tools/graphics/svgcleaner/default.nix
rename to pkgs/by-name/sv/svgcleaner/package.nix
diff --git a/pkgs/applications/accessibility/svkbd/default.nix b/pkgs/by-name/sv/svkbd/package.nix
similarity index 100%
rename from pkgs/applications/accessibility/svkbd/default.nix
rename to pkgs/by-name/sv/svkbd/package.nix
diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/by-name/sv/svlint/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/svlint/default.nix
rename to pkgs/by-name/sv/svlint/package.nix
diff --git a/pkgs/development/tools/language-servers/svls/default.nix b/pkgs/by-name/sv/svls/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/svls/default.nix
rename to pkgs/by-name/sv/svls/package.nix
diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/by-name/sv/svnfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/svnfs/default.nix
rename to pkgs/by-name/sv/svnfs/package.nix
diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/by-name/sv/svox/package.nix
similarity index 100%
rename from pkgs/applications/audio/svox/default.nix
rename to pkgs/by-name/sv/svox/package.nix
diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/by-name/sv/svrcore/package.nix
similarity index 100%
rename from pkgs/development/libraries/svrcore/default.nix
rename to pkgs/by-name/sv/svrcore/package.nix
diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/by-name/sv/svt-av1/package.nix
similarity index 100%
rename from pkgs/tools/video/svt-av1/default.nix
rename to pkgs/by-name/sv/svt-av1/package.nix
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/by-name/sv/svtplay-dl/package.nix
similarity index 100%
rename from pkgs/tools/misc/svtplay-dl/default.nix
rename to pkgs/by-name/sv/svtplay-dl/package.nix
diff --git a/pkgs/tools/misc/svu/default.nix b/pkgs/by-name/sv/svu/package.nix
similarity index 100%
rename from pkgs/tools/misc/svu/default.nix
rename to pkgs/by-name/sv/svu/package.nix
diff --git a/pkgs/tools/networking/swagger-cli/default.nix b/pkgs/by-name/sw/swagger-cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/swagger-cli/default.nix
rename to pkgs/by-name/sw/swagger-cli/package.nix
diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/by-name/sw/swagger-codegen/package.nix
similarity index 100%
rename from pkgs/tools/networking/swagger-codegen/default.nix
rename to pkgs/by-name/sw/swagger-codegen/package.nix
diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/by-name/sw/swagger-codegen3/package.nix
similarity index 100%
rename from pkgs/tools/networking/swagger-codegen3/default.nix
rename to pkgs/by-name/sw/swagger-codegen3/package.nix
diff --git a/pkgs/tools/security/swaggerhole/default.nix b/pkgs/by-name/sw/swaggerhole/package.nix
similarity index 100%
rename from pkgs/tools/security/swaggerhole/default.nix
rename to pkgs/by-name/sw/swaggerhole/package.nix
diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/by-name/sw/swaglyrics/package.nix
similarity index 100%
rename from pkgs/tools/misc/swaglyrics/default.nix
rename to pkgs/by-name/sw/swaglyrics/package.nix
diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/by-name/sw/swaks/package.nix
similarity index 100%
rename from pkgs/tools/networking/swaks/default.nix
rename to pkgs/by-name/sw/swaks/package.nix
diff --git a/pkgs/tools/admin/swapspace/default.nix b/pkgs/by-name/sw/swapspace/package.nix
similarity index 100%
rename from pkgs/tools/admin/swapspace/default.nix
rename to pkgs/by-name/sw/swapspace/package.nix
diff --git a/pkgs/os-specific/linux/swapview/default.nix b/pkgs/by-name/sw/swapview/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/swapview/default.nix
rename to pkgs/by-name/sw/swapview/package.nix
diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/by-name/sw/swarm/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/swarm/default.nix
rename to pkgs/by-name/sw/swarm/package.nix
diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/by-name/sw/sway-launcher-desktop/package.nix
similarity index 100%
rename from pkgs/applications/misc/sway-launcher-desktop/default.nix
rename to pkgs/by-name/sw/sway-launcher-desktop/package.nix
diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/by-name/sw/swaynag-battery/package.nix
similarity index 100%
rename from pkgs/applications/misc/swaynag-battery/default.nix
rename to pkgs/by-name/sw/swaynag-battery/package.nix
diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix
similarity index 100%
rename from pkgs/applications/misc/swaynotificationcenter/default.nix
rename to pkgs/by-name/sw/swaynotificationcenter/package.nix
diff --git a/pkgs/tools/wayland/swayr/icon-paths.patch b/pkgs/by-name/sw/swayr/icon-paths.patch
similarity index 100%
rename from pkgs/tools/wayland/swayr/icon-paths.patch
rename to pkgs/by-name/sw/swayr/icon-paths.patch
diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/by-name/sw/swayr/package.nix
similarity index 100%
rename from pkgs/tools/wayland/swayr/default.nix
rename to pkgs/by-name/sw/swayr/package.nix
diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/by-name/sw/swayrbar/package.nix
similarity index 100%
rename from pkgs/tools/wayland/swayrbar/default.nix
rename to pkgs/by-name/sw/swayrbar/package.nix
diff --git a/pkgs/applications/misc/swaysettings/default.nix b/pkgs/by-name/sw/swaysettings/package.nix
similarity index 100%
rename from pkgs/applications/misc/swaysettings/default.nix
rename to pkgs/by-name/sw/swaysettings/package.nix
diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/by-name/sw/swaysome/package.nix
similarity index 100%
rename from pkgs/tools/wayland/swaysome/default.nix
rename to pkgs/by-name/sw/swaysome/package.nix
diff --git a/pkgs/development/tools/swc/default.nix b/pkgs/by-name/sw/swc/package.nix
similarity index 100%
rename from pkgs/development/tools/swc/default.nix
rename to pkgs/by-name/sw/swc/package.nix
diff --git a/pkgs/data/themes/sweet-nova/default.nix b/pkgs/by-name/sw/sweet-nova/package.nix
similarity index 100%
rename from pkgs/data/themes/sweet-nova/default.nix
rename to pkgs/by-name/sw/sweet-nova/package.nix
diff --git a/pkgs/servers/swego/default.nix b/pkgs/by-name/sw/swego/package.nix
similarity index 100%
rename from pkgs/servers/swego/default.nix
rename to pkgs/by-name/sw/swego/package.nix
diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/by-name/sw/swfmill/package.nix
similarity index 100%
rename from pkgs/tools/video/swfmill/default.nix
rename to pkgs/by-name/sw/swfmill/package.nix
diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/by-name/sw/swh_lv2/package.nix
similarity index 100%
rename from pkgs/applications/audio/swh-lv2/default.nix
rename to pkgs/by-name/sw/swh_lv2/package.nix
diff --git a/pkgs/os-specific/darwin/swiftbar/default.nix b/pkgs/by-name/sw/swiftbar/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/swiftbar/default.nix
rename to pkgs/by-name/sw/swiftbar/package.nix
diff --git a/pkgs/os-specific/darwin/swiftdefaultapps/default.nix b/pkgs/by-name/sw/swiftdefaultapps/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/swiftdefaultapps/default.nix
rename to pkgs/by-name/sw/swiftdefaultapps/package.nix
diff --git a/pkgs/development/libraries/swiften/build-fix.patch b/pkgs/by-name/sw/swiften/build-fix.patch
similarity index 100%
rename from pkgs/development/libraries/swiften/build-fix.patch
rename to pkgs/by-name/sw/swiften/build-fix.patch
diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/by-name/sw/swiften/package.nix
similarity index 100%
rename from pkgs/development/libraries/swiften/default.nix
rename to pkgs/by-name/sw/swiften/package.nix
diff --git a/pkgs/development/libraries/swiften/scons.patch b/pkgs/by-name/sw/swiften/scons.patch
similarity index 100%
rename from pkgs/development/libraries/swiften/scons.patch
rename to pkgs/by-name/sw/swiften/scons.patch
diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/by-name/sw/swiftformat/package.nix
similarity index 100%
rename from pkgs/development/tools/swiftformat/default.nix
rename to pkgs/by-name/sw/swiftformat/package.nix
diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/by-name/sw/swiftshader/package.nix
similarity index 100%
rename from pkgs/development/libraries/swiftshader/default.nix
rename to pkgs/by-name/sw/swiftshader/package.nix
diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/by-name/sw/swingsane/package.nix
similarity index 100%
rename from pkgs/applications/graphics/swingsane/default.nix
rename to pkgs/by-name/sw/swingsane/package.nix
diff --git a/pkgs/os-specific/linux/switcheroo-control/default.nix b/pkgs/by-name/sw/switcheroo-control/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/switcheroo-control/default.nix
rename to pkgs/by-name/sw/switcheroo-control/package.nix
diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/by-name/sw/swtpm/package.nix
similarity index 100%
rename from pkgs/tools/security/swtpm/default.nix
rename to pkgs/by-name/sw/swtpm/package.nix
diff --git a/pkgs/tools/security/sx-go/default.nix b/pkgs/by-name/sx/sx-go/package.nix
similarity index 100%
rename from pkgs/tools/security/sx-go/default.nix
rename to pkgs/by-name/sx/sx-go/package.nix
diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/by-name/sy/sycl-info/package.nix
similarity index 100%
rename from pkgs/development/libraries/sycl-info/default.nix
rename to pkgs/by-name/sy/sycl-info/package.nix
diff --git a/pkgs/os-specific/linux/sydbox/default.nix b/pkgs/by-name/sy/sydbox/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sydbox/default.nix
rename to pkgs/by-name/sy/sydbox/package.nix
diff --git a/pkgs/applications/graphics/symbolic-preview/default.nix b/pkgs/by-name/sy/symbolic-preview/package.nix
similarity index 100%
rename from pkgs/applications/graphics/symbolic-preview/default.nix
rename to pkgs/by-name/sy/symbolic-preview/package.nix
diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/by-name/sy/symengine/package.nix
similarity index 100%
rename from pkgs/development/libraries/symengine/default.nix
rename to pkgs/by-name/sy/symengine/package.nix
diff --git a/pkgs/applications/science/logic/symfpu/default.nix b/pkgs/by-name/sy/symfpu/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/symfpu/default.nix
rename to pkgs/by-name/sy/symfpu/package.nix
diff --git a/pkgs/tools/system/symlinks/default.nix b/pkgs/by-name/sy/symlinks/package.nix
similarity index 100%
rename from pkgs/tools/system/symlinks/default.nix
rename to pkgs/by-name/sy/symlinks/package.nix
diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/by-name/sy/symmetrica/package.nix
similarity index 100%
rename from pkgs/applications/science/math/symmetrica/default.nix
rename to pkgs/by-name/sy/symmetrica/package.nix
diff --git a/pkgs/servers/mail/sympa/make-docs.patch b/pkgs/by-name/sy/sympa/make-docs.patch
similarity index 100%
rename from pkgs/servers/mail/sympa/make-docs.patch
rename to pkgs/by-name/sy/sympa/make-docs.patch
diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/by-name/sy/sympa/package.nix
similarity index 100%
rename from pkgs/servers/mail/sympa/default.nix
rename to pkgs/by-name/sy/sympa/package.nix
diff --git a/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch b/pkgs/by-name/sy/sympow/clean-extra-logfile-output-from-pari.patch
similarity index 100%
rename from pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch
rename to pkgs/by-name/sy/sympow/clean-extra-logfile-output-from-pari.patch
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/by-name/sy/sympow/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/sympow/default.nix
rename to pkgs/by-name/sy/sympow/package.nix
diff --git a/pkgs/applications/audio/synaesthesia/default.nix b/pkgs/by-name/sy/synaesthesia/package.nix
similarity index 100%
rename from pkgs/applications/audio/synaesthesia/default.nix
rename to pkgs/by-name/sy/synaesthesia/package.nix
diff --git a/pkgs/tools/admin/synapse-admin/package.json b/pkgs/by-name/sy/synapse-admin/package.json
similarity index 100%
rename from pkgs/tools/admin/synapse-admin/package.json
rename to pkgs/by-name/sy/synapse-admin/package.json
diff --git a/pkgs/tools/admin/synapse-admin/default.nix b/pkgs/by-name/sy/synapse-admin/package.nix
similarity index 100%
rename from pkgs/tools/admin/synapse-admin/default.nix
rename to pkgs/by-name/sy/synapse-admin/package.nix
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/by-name/sy/synapse/package.nix
similarity index 100%
rename from pkgs/applications/misc/synapse/default.nix
rename to pkgs/by-name/sy/synapse/package.nix
diff --git a/pkgs/applications/terminal-emulators/syncterm/0001-use-sched-yield-53264f2b.patch b/pkgs/by-name/sy/syncterm/0001-use-sched-yield-53264f2b.patch
similarity index 100%
rename from pkgs/applications/terminal-emulators/syncterm/0001-use-sched-yield-53264f2b.patch
rename to pkgs/by-name/sy/syncterm/0001-use-sched-yield-53264f2b.patch
diff --git a/pkgs/applications/terminal-emulators/syncterm/default.nix b/pkgs/by-name/sy/syncterm/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/syncterm/default.nix
rename to pkgs/by-name/sy/syncterm/package.nix
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/by-name/sy/synfigstudio/package.nix
similarity index 100%
rename from pkgs/applications/graphics/synfigstudio/default.nix
rename to pkgs/by-name/sy/synfigstudio/package.nix
diff --git a/pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix b/pkgs/by-name/sy/synology-cloud-sync-decryption-tool/package.nix
similarity index 100%
rename from pkgs/applications/networking/synology-cloud-sync-decryption-tool/default.nix
rename to pkgs/by-name/sy/synology-cloud-sync-decryption-tool/package.nix
diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/by-name/sy/synology-drive-client/package.nix
similarity index 100%
rename from pkgs/applications/networking/synology-drive-client/default.nix
rename to pkgs/by-name/sy/synology-drive-client/package.nix
diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/by-name/sy/syntex/package.nix
similarity index 100%
rename from pkgs/tools/graphics/syntex/default.nix
rename to pkgs/by-name/sy/syntex/package.nix
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/by-name/sy/sysbench/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/sysbench/default.nix
rename to pkgs/by-name/sy/sysbench/package.nix
diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/by-name/sy/syscall_limiter/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/syscall_limiter/default.nix
rename to pkgs/by-name/sy/syscall_limiter/package.nix
diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/by-name/sy/sysfsutils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sysfsutils/default.nix
rename to pkgs/by-name/sy/sysfsutils/package.nix
diff --git a/pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch b/pkgs/by-name/sy/sysklogd/fix-includes-for-musl.patch
similarity index 100%
rename from pkgs/os-specific/linux/sysklogd/fix-includes-for-musl.patch
rename to pkgs/by-name/sy/sysklogd/fix-includes-for-musl.patch
diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/by-name/sy/sysklogd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sysklogd/default.nix
rename to pkgs/by-name/sy/sysklogd/package.nix
diff --git a/pkgs/os-specific/linux/sysklogd/systemd.patch b/pkgs/by-name/sy/sysklogd/systemd.patch
similarity index 100%
rename from pkgs/os-specific/linux/sysklogd/systemd.patch
rename to pkgs/by-name/sy/sysklogd/systemd.patch
diff --git a/pkgs/os-specific/linux/sysklogd/union-wait.patch b/pkgs/by-name/sy/sysklogd/union-wait.patch
similarity index 100%
rename from pkgs/os-specific/linux/sysklogd/union-wait.patch
rename to pkgs/by-name/sy/sysklogd/union-wait.patch
diff --git a/pkgs/os-specific/linux/syslinux/define-wchar_t.patch b/pkgs/by-name/sy/syslinux/define-wchar_t.patch
similarity index 100%
rename from pkgs/os-specific/linux/syslinux/define-wchar_t.patch
rename to pkgs/by-name/sy/syslinux/define-wchar_t.patch
diff --git a/pkgs/os-specific/linux/syslinux/gcc10.patch b/pkgs/by-name/sy/syslinux/gcc10.patch
similarity index 100%
rename from pkgs/os-specific/linux/syslinux/gcc10.patch
rename to pkgs/by-name/sy/syslinux/gcc10.patch
diff --git a/pkgs/os-specific/linux/syslinux/import-efisetjmp.patch b/pkgs/by-name/sy/syslinux/import-efisetjmp.patch
similarity index 100%
rename from pkgs/os-specific/linux/syslinux/import-efisetjmp.patch
rename to pkgs/by-name/sy/syslinux/import-efisetjmp.patch
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/by-name/sy/syslinux/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/syslinux/default.nix
rename to pkgs/by-name/sy/syslinux/package.nix
diff --git a/pkgs/os-specific/linux/sysstat/install.patch b/pkgs/by-name/sy/sysstat/install.patch
similarity index 100%
rename from pkgs/os-specific/linux/sysstat/install.patch
rename to pkgs/by-name/sy/sysstat/install.patch
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/by-name/sy/sysstat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sysstat/default.nix
rename to pkgs/by-name/sy/sysstat/package.nix
diff --git a/pkgs/games/system-syzygy/Cargo.lock b/pkgs/by-name/sy/system-syzygy/Cargo.lock
similarity index 100%
rename from pkgs/games/system-syzygy/Cargo.lock
rename to pkgs/by-name/sy/system-syzygy/Cargo.lock
diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/by-name/sy/system-syzygy/package.nix
similarity index 100%
rename from pkgs/games/system-syzygy/default.nix
rename to pkgs/by-name/sy/system-syzygy/package.nix
diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/Cargo.lock b/pkgs/by-name/sy/system76-firmware/Cargo.lock
similarity index 100%
rename from pkgs/os-specific/linux/firmware/system76-firmware/Cargo.lock
rename to pkgs/by-name/sy/system76-firmware/Cargo.lock
diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/by-name/sy/system76-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/system76-firmware/default.nix
rename to pkgs/by-name/sy/system76-firmware/package.nix
diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/by-name/sy/system76-keyboard-configurator/package.nix
similarity index 100%
rename from pkgs/applications/misc/system76-keyboard-configurator/default.nix
rename to pkgs/by-name/sy/system76-keyboard-configurator/package.nix
diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/by-name/sy/systembus-notify/package.nix
similarity index 100%
rename from pkgs/applications/misc/systembus-notify/default.nix
rename to pkgs/by-name/sy/systembus-notify/package.nix
diff --git a/pkgs/applications/science/electronics/systemc/default.nix b/pkgs/by-name/sy/systemc/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/systemc/default.nix
rename to pkgs/by-name/sy/systemc/package.nix
diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/by-name/sy/systemd-journal2gelf/package.nix
similarity index 100%
rename from pkgs/tools/system/systemd-journal2gelf/default.nix
rename to pkgs/by-name/sy/systemd-journal2gelf/package.nix
diff --git a/pkgs/os-specific/linux/systemd-wait/default.nix b/pkgs/by-name/sy/systemd-wait/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/systemd-wait/default.nix
rename to pkgs/by-name/sy/systemd-wait/package.nix
diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/by-name/sy/systemfd/package.nix
similarity index 100%
rename from pkgs/development/tools/systemfd/default.nix
rename to pkgs/by-name/sy/systemfd/package.nix
diff --git a/pkgs/tools/system/systeroid/default.nix b/pkgs/by-name/sy/systeroid/package.nix
similarity index 100%
rename from pkgs/tools/system/systeroid/default.nix
rename to pkgs/by-name/sy/systeroid/package.nix
diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/by-name/sy/systrayhelper/package.nix
similarity index 100%
rename from pkgs/tools/misc/systrayhelper/default.nix
rename to pkgs/by-name/sy/systrayhelper/package.nix
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/by-name/sy/sysvinit/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/sysvinit/default.nix
rename to pkgs/by-name/sy/sysvinit/package.nix
diff --git a/pkgs/tools/misc/sysz/default.nix b/pkgs/by-name/sy/sysz/package.nix
similarity index 100%
rename from pkgs/tools/misc/sysz/default.nix
rename to pkgs/by-name/sy/sysz/package.nix
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/by-name/sz/szip/package.nix
similarity index 100%
rename from pkgs/development/libraries/szip/default.nix
rename to pkgs/by-name/sz/szip/package.nix
diff --git a/pkgs/tools/misc/szyszka/default.nix b/pkgs/by-name/sz/szyszka/package.nix
similarity index 100%
rename from pkgs/tools/misc/szyszka/default.nix
rename to pkgs/by-name/sz/szyszka/package.nix
diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/by-name/t1/t1lib/package.nix
similarity index 100%
rename from pkgs/development/libraries/t1lib/default.nix
rename to pkgs/by-name/t1/t1lib/package.nix
diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/by-name/t1/t1utils/package.nix
similarity index 100%
rename from pkgs/tools/misc/t1utils/default.nix
rename to pkgs/by-name/t1/t1utils/package.nix
diff --git a/pkgs/games/t4kcommon/default.nix b/pkgs/by-name/t4/t4kcommon/package.nix
similarity index 100%
rename from pkgs/games/t4kcommon/default.nix
rename to pkgs/by-name/t4/t4kcommon/package.nix
diff --git a/pkgs/development/libraries/ta-lib/default.nix b/pkgs/by-name/ta/ta-lib/package.nix
similarity index 100%
rename from pkgs/development/libraries/ta-lib/default.nix
rename to pkgs/by-name/ta/ta-lib/package.nix
diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/by-name/ta/tab/package.nix
similarity index 100%
rename from pkgs/tools/text/tab/default.nix
rename to pkgs/by-name/ta/tab/package.nix
diff --git a/pkgs/applications/misc/tableplus/default.nix b/pkgs/by-name/ta/tableplus/package.nix
similarity index 100%
rename from pkgs/applications/misc/tableplus/default.nix
rename to pkgs/by-name/ta/tableplus/package.nix
diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/by-name/ta/tabula-java/package.nix
similarity index 100%
rename from pkgs/applications/misc/tabula-java/default.nix
rename to pkgs/by-name/ta/tabula-java/package.nix
diff --git a/pkgs/servers/tacacsplus/default.nix b/pkgs/by-name/ta/tacacsplus/package.nix
similarity index 100%
rename from pkgs/servers/tacacsplus/default.nix
rename to pkgs/by-name/ta/tacacsplus/package.nix
diff --git a/pkgs/development/libraries/taco/default.nix b/pkgs/by-name/ta/taco/package.nix
similarity index 100%
rename from pkgs/development/libraries/taco/default.nix
rename to pkgs/by-name/ta/taco/package.nix
diff --git a/pkgs/development/libraries/taco/taco.patch b/pkgs/by-name/ta/taco/taco.patch
similarity index 100%
rename from pkgs/development/libraries/taco/taco.patch
rename to pkgs/by-name/ta/taco/taco.patch
diff --git a/pkgs/applications/audio/tagger/deps.nix b/pkgs/by-name/ta/tagger/deps.nix
similarity index 100%
rename from pkgs/applications/audio/tagger/deps.nix
rename to pkgs/by-name/ta/tagger/deps.nix
diff --git a/pkgs/applications/audio/tagger/default.nix b/pkgs/by-name/ta/tagger/package.nix
similarity index 100%
rename from pkgs/applications/audio/tagger/default.nix
rename to pkgs/by-name/ta/tagger/package.nix
diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/by-name/ta/taglib-sharp/package.nix
similarity index 100%
rename from pkgs/development/libraries/taglib-sharp/default.nix
rename to pkgs/by-name/ta/taglib-sharp/package.nix
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/by-name/ta/taglib/package.nix
similarity index 100%
rename from pkgs/development/libraries/taglib/default.nix
rename to pkgs/by-name/ta/taglib/package.nix
diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/by-name/ta/taglib_extras/package.nix
similarity index 100%
rename from pkgs/development/libraries/taglib-extras/default.nix
rename to pkgs/by-name/ta/taglib_extras/package.nix
diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/by-name/ta/tagparser/package.nix
similarity index 100%
rename from pkgs/development/libraries/tagparser/default.nix
rename to pkgs/by-name/ta/tagparser/package.nix
diff --git a/pkgs/tools/misc/tagref/default.nix b/pkgs/by-name/ta/tagref/package.nix
similarity index 100%
rename from pkgs/tools/misc/tagref/default.nix
rename to pkgs/by-name/ta/tagref/package.nix
diff --git a/pkgs/applications/misc/tagtime/default.nix b/pkgs/by-name/ta/tagtime/package.nix
similarity index 100%
rename from pkgs/applications/misc/tagtime/default.nix
rename to pkgs/by-name/ta/tagtime/package.nix
diff --git a/pkgs/applications/audio/tagutil/default.nix b/pkgs/by-name/ta/tagutil/package.nix
similarity index 100%
rename from pkgs/applications/audio/tagutil/default.nix
rename to pkgs/by-name/ta/tagutil/package.nix
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix
similarity index 100%
rename from pkgs/tools/networking/p2p/tahoe-lafs/default.nix
rename to pkgs/by-name/ta/tahoe-lafs/package.nix
diff --git a/pkgs/tools/misc/tailer/default.nix b/pkgs/by-name/ta/tailer/package.nix
similarity index 100%
rename from pkgs/tools/misc/tailer/default.nix
rename to pkgs/by-name/ta/tailer/package.nix
diff --git a/pkgs/os-specific/linux/tailor-gui/default.nix b/pkgs/by-name/ta/tailor-gui/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tailor-gui/default.nix
rename to pkgs/by-name/ta/tailor-gui/package.nix
diff --git a/pkgs/applications/misc/tailscale-systray/default.nix b/pkgs/by-name/ta/tailscale-systray/package.nix
similarity index 100%
rename from pkgs/applications/misc/tailscale-systray/default.nix
rename to pkgs/by-name/ta/tailscale-systray/package.nix
diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/by-name/ta/taizen/package.nix
similarity index 100%
rename from pkgs/applications/misc/taizen/default.nix
rename to pkgs/by-name/ta/taizen/package.nix
diff --git a/pkgs/data/fonts/takao/default.nix b/pkgs/by-name/ta/takao/package.nix
similarity index 100%
rename from pkgs/data/fonts/takao/default.nix
rename to pkgs/by-name/ta/takao/package.nix
diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/by-name/ta/taktuk/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/taktuk/default.nix
rename to pkgs/by-name/ta/taktuk/package.nix
diff --git a/pkgs/applications/audio/talentedhack/default.nix b/pkgs/by-name/ta/talentedhack/package.nix
similarity index 100%
rename from pkgs/applications/audio/talentedhack/default.nix
rename to pkgs/by-name/ta/talentedhack/package.nix
diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/by-name/ta/talkfilters/package.nix
similarity index 100%
rename from pkgs/misc/talkfilters/default.nix
rename to pkgs/by-name/ta/talkfilters/package.nix
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/by-name/ta/talloc/package.nix
similarity index 100%
rename from pkgs/development/libraries/talloc/default.nix
rename to pkgs/by-name/ta/talloc/package.nix
diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/by-name/ta/talosctl/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/talosctl/default.nix
rename to pkgs/by-name/ta/talosctl/package.nix
diff --git a/pkgs/applications/emulators/tamatool/default.nix b/pkgs/by-name/ta/tamatool/package.nix
similarity index 100%
rename from pkgs/applications/emulators/tamatool/default.nix
rename to pkgs/by-name/ta/tamatool/package.nix
diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/by-name/ta/tambura/package.nix
similarity index 100%
rename from pkgs/applications/audio/tambura/default.nix
rename to pkgs/by-name/ta/tambura/package.nix
diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/by-name/ta/tamsyn/package.nix
similarity index 100%
rename from pkgs/data/fonts/tamsyn/default.nix
rename to pkgs/by-name/ta/tamsyn/package.nix
diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/by-name/ta/tamzen/package.nix
similarity index 100%
rename from pkgs/data/fonts/tamzen/default.nix
rename to pkgs/by-name/ta/tamzen/package.nix
diff --git a/pkgs/applications/misc/tango/default.nix b/pkgs/by-name/ta/tango/package.nix
similarity index 100%
rename from pkgs/applications/misc/tango/default.nix
rename to pkgs/by-name/ta/tango/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/by-name/ta/tangram/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/tangram/default.nix
rename to pkgs/by-name/ta/tangram/package.nix
diff --git a/pkgs/applications/video/tanidvr/default.nix b/pkgs/by-name/ta/tanidvr/package.nix
similarity index 100%
rename from pkgs/applications/video/tanidvr/default.nix
rename to pkgs/by-name/ta/tanidvr/package.nix
diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/by-name/ta/tanka/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tanka/default.nix
rename to pkgs/by-name/ta/tanka/package.nix
diff --git a/pkgs/tools/misc/taoup/cachefile.patch b/pkgs/by-name/ta/taoup/cachefile.patch
similarity index 100%
rename from pkgs/tools/misc/taoup/cachefile.patch
rename to pkgs/by-name/ta/taoup/cachefile.patch
diff --git a/pkgs/tools/misc/taoup/help.patch b/pkgs/by-name/ta/taoup/help.patch
similarity index 100%
rename from pkgs/tools/misc/taoup/help.patch
rename to pkgs/by-name/ta/taoup/help.patch
diff --git a/pkgs/tools/misc/taoup/default.nix b/pkgs/by-name/ta/taoup/package.nix
similarity index 100%
rename from pkgs/tools/misc/taoup/default.nix
rename to pkgs/by-name/ta/taoup/package.nix
diff --git a/pkgs/tools/misc/taoup/tput.patch b/pkgs/by-name/ta/taoup/tput.patch
similarity index 100%
rename from pkgs/tools/misc/taoup/tput.patch
rename to pkgs/by-name/ta/taoup/tput.patch
diff --git a/pkgs/development/tools/taplo/default.nix b/pkgs/by-name/ta/taplo/package.nix
similarity index 100%
rename from pkgs/development/tools/taplo/default.nix
rename to pkgs/by-name/ta/taplo/package.nix
diff --git a/pkgs/applications/blockchains/taproot-assets/default.nix b/pkgs/by-name/ta/taproot-assets/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/taproot-assets/default.nix
rename to pkgs/by-name/ta/taproot-assets/package.nix
diff --git a/pkgs/development/tools/tapview/dont_check_echo.patch b/pkgs/by-name/ta/tapview/dont_check_echo.patch
similarity index 100%
rename from pkgs/development/tools/tapview/dont_check_echo.patch
rename to pkgs/by-name/ta/tapview/dont_check_echo.patch
diff --git a/pkgs/development/tools/tapview/default.nix b/pkgs/by-name/ta/tapview/package.nix
similarity index 100%
rename from pkgs/development/tools/tapview/default.nix
rename to pkgs/by-name/ta/tapview/package.nix
diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/by-name/ta/tar2ext4/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/tar2ext4/default.nix
rename to pkgs/by-name/ta/tar2ext4/package.nix
diff --git a/pkgs/servers/tarantool/default.nix b/pkgs/by-name/ta/tarantool/package.nix
similarity index 100%
rename from pkgs/servers/tarantool/default.nix
rename to pkgs/by-name/ta/tarantool/package.nix
diff --git a/pkgs/os-specific/linux/target-isns/install_prefix_path.patch b/pkgs/by-name/ta/target-isns/install_prefix_path.patch
similarity index 100%
rename from pkgs/os-specific/linux/target-isns/install_prefix_path.patch
rename to pkgs/by-name/ta/target-isns/install_prefix_path.patch
diff --git a/pkgs/os-specific/linux/target-isns/default.nix b/pkgs/by-name/ta/target-isns/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/target-isns/default.nix
rename to pkgs/by-name/ta/target-isns/package.nix
diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/by-name/ta/targetcli/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/targetcli/default.nix
rename to pkgs/by-name/ta/targetcli/package.nix
diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/by-name/ta/tarsnap/package.nix
similarity index 100%
rename from pkgs/tools/backup/tarsnap/default.nix
rename to pkgs/by-name/ta/tarsnap/package.nix
diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/by-name/ta/tarsnapper/package.nix
similarity index 100%
rename from pkgs/tools/backup/tarsnapper/default.nix
rename to pkgs/by-name/ta/tarsnapper/package.nix
diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/by-name/ta/tarssh/package.nix
similarity index 100%
rename from pkgs/servers/tarssh/default.nix
rename to pkgs/by-name/ta/tarssh/package.nix
diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/by-name/ta/tart/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/tart/default.nix
rename to pkgs/by-name/ta/tart/package.nix
diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/by-name/ta/tasknc/package.nix
similarity index 100%
rename from pkgs/applications/misc/tasknc/default.nix
rename to pkgs/by-name/ta/tasknc/package.nix
diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/by-name/ta/taskopen/package.nix
similarity index 100%
rename from pkgs/applications/misc/taskopen/default.nix
rename to pkgs/by-name/ta/taskopen/package.nix
diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/by-name/ta/taskserver/package.nix
similarity index 100%
rename from pkgs/servers/misc/taskserver/default.nix
rename to pkgs/by-name/ta/taskserver/package.nix
diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/by-name/ta/tasksh/package.nix
similarity index 100%
rename from pkgs/applications/misc/tasksh/default.nix
rename to pkgs/by-name/ta/tasksh/package.nix
diff --git a/pkgs/tools/system/taskspooler/default.nix b/pkgs/by-name/ta/taskspooler/package.nix
similarity index 100%
rename from pkgs/tools/system/taskspooler/default.nix
rename to pkgs/by-name/ta/taskspooler/package.nix
diff --git a/pkgs/applications/misc/tasktimer/default.nix b/pkgs/by-name/ta/tasktimer/package.nix
similarity index 100%
rename from pkgs/applications/misc/tasktimer/default.nix
rename to pkgs/by-name/ta/tasktimer/package.nix
diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix
similarity index 100%
rename from pkgs/applications/misc/taskwarrior-tui/default.nix
rename to pkgs/by-name/ta/taskwarrior-tui/package.nix
diff --git a/pkgs/data/icons/tau-hydrogen/default.nix b/pkgs/by-name/ta/tau-hydrogen/package.nix
similarity index 100%
rename from pkgs/data/icons/tau-hydrogen/default.nix
rename to pkgs/by-name/ta/tau-hydrogen/package.nix
diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/by-name/ta/tauon/package.nix
similarity index 100%
rename from pkgs/applications/audio/tauon/default.nix
rename to pkgs/by-name/ta/tauon/package.nix
diff --git a/pkgs/tools/networking/tayga/default.nix b/pkgs/by-name/ta/tayga/package.nix
similarity index 100%
rename from pkgs/tools/networking/tayga/default.nix
rename to pkgs/by-name/ta/tayga/package.nix
diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/by-name/tb/tbls/package.nix
similarity index 100%
rename from pkgs/tools/misc/tbls/default.nix
rename to pkgs/by-name/tb/tbls/package.nix
diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/by-name/tb/tboot/package.nix
similarity index 100%
rename from pkgs/tools/security/tboot/default.nix
rename to pkgs/by-name/tb/tboot/package.nix
diff --git a/pkgs/development/libraries/tbox/libtbox.pc.in b/pkgs/by-name/tb/tbox/libtbox.pc.in
similarity index 100%
rename from pkgs/development/libraries/tbox/libtbox.pc.in
rename to pkgs/by-name/tb/tbox/libtbox.pc.in
diff --git a/pkgs/development/libraries/tbox/default.nix b/pkgs/by-name/tb/tbox/package.nix
similarity index 100%
rename from pkgs/development/libraries/tbox/default.nix
rename to pkgs/by-name/tb/tbox/package.nix
diff --git a/pkgs/tools/misc/tcat/default.nix b/pkgs/by-name/tc/tcat/package.nix
similarity index 100%
rename from pkgs/tools/misc/tcat/default.nix
rename to pkgs/by-name/tc/tcat/package.nix
diff --git a/pkgs/tools/security/tcb/fix-makefiles.patch b/pkgs/by-name/tc/tcb/fix-makefiles.patch
similarity index 100%
rename from pkgs/tools/security/tcb/fix-makefiles.patch
rename to pkgs/by-name/tc/tcb/fix-makefiles.patch
diff --git a/pkgs/tools/security/tcb/default.nix b/pkgs/by-name/tc/tcb/package.nix
similarity index 100%
rename from pkgs/tools/security/tcb/default.nix
rename to pkgs/by-name/tc/tcb/package.nix
diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/by-name/tc/tcl2048/package.nix
similarity index 100%
rename from pkgs/games/tcl2048/default.nix
rename to pkgs/by-name/tc/tcl2048/package.nix
diff --git a/pkgs/tools/networking/tcp-cutter/default.nix b/pkgs/by-name/tc/tcp-cutter/package.nix
similarity index 100%
rename from pkgs/tools/networking/tcp-cutter/default.nix
rename to pkgs/by-name/tc/tcp-cutter/package.nix
diff --git a/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch b/pkgs/by-name/tc/tcp_wrappers/cdecls.patch
similarity index 100%
rename from pkgs/os-specific/linux/tcp-wrappers/cdecls.patch
rename to pkgs/by-name/tc/tcp_wrappers/cdecls.patch
diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/by-name/tc/tcp_wrappers/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tcp-wrappers/default.nix
rename to pkgs/by-name/tc/tcp_wrappers/package.nix
diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/by-name/tc/tcpcrypt/package.nix
similarity index 100%
rename from pkgs/tools/security/tcpcrypt/default.nix
rename to pkgs/by-name/tc/tcpcrypt/package.nix
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/by-name/tc/tcpdump/package.nix
similarity index 100%
rename from pkgs/tools/networking/tcpdump/default.nix
rename to pkgs/by-name/tc/tcpdump/package.nix
diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/by-name/tc/tcpflow/package.nix
similarity index 100%
rename from pkgs/tools/networking/tcpflow/default.nix
rename to pkgs/by-name/tc/tcpflow/package.nix
diff --git a/pkgs/applications/networking/tcping-go/default.nix b/pkgs/by-name/tc/tcping-go/package.nix
similarity index 100%
rename from pkgs/applications/networking/tcping-go/default.nix
rename to pkgs/by-name/tc/tcping-go/package.nix
diff --git a/pkgs/applications/networking/tcpkali/default.nix b/pkgs/by-name/tc/tcpkali/package.nix
similarity index 100%
rename from pkgs/applications/networking/tcpkali/default.nix
rename to pkgs/by-name/tc/tcpkali/package.nix
diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/by-name/tc/tcptraceroute/package.nix
similarity index 100%
rename from pkgs/tools/networking/tcptraceroute/default.nix
rename to pkgs/by-name/tc/tcptraceroute/package.nix
diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/by-name/tc/tcptrack/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/tcptrack/default.nix
rename to pkgs/by-name/tc/tcptrack/package.nix
diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/by-name/td/tdb/package.nix
similarity index 100%
rename from pkgs/development/libraries/tdb/default.nix
rename to pkgs/by-name/td/tdb/package.nix
diff --git a/pkgs/tools/misc/tdfgo/default.nix b/pkgs/by-name/td/tdfgo/package.nix
similarity index 100%
rename from pkgs/tools/misc/tdfgo/default.nix
rename to pkgs/by-name/td/tdfgo/package.nix
diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/by-name/td/tdlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/tdlib/default.nix
rename to pkgs/by-name/td/tdlib/package.nix
diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/by-name/td/tdns-cli/package.nix
similarity index 100%
rename from pkgs/tools/networking/tdns-cli/default.nix
rename to pkgs/by-name/td/tdns-cli/package.nix
diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/by-name/td/tdrop/package.nix
similarity index 100%
rename from pkgs/applications/misc/tdrop/default.nix
rename to pkgs/by-name/td/tdrop/package.nix
diff --git a/pkgs/tools/misc/tea/default.nix b/pkgs/by-name/te/tea/package.nix
similarity index 100%
rename from pkgs/tools/misc/tea/default.nix
rename to pkgs/by-name/te/tea/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/by-name/te/teams/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/teams/default.nix
rename to pkgs/by-name/te/teams/package.nix
diff --git a/pkgs/tools/networking/teavpn2/nix.patch b/pkgs/by-name/te/teavpn2/nix.patch
similarity index 100%
rename from pkgs/tools/networking/teavpn2/nix.patch
rename to pkgs/by-name/te/teavpn2/nix.patch
diff --git a/pkgs/tools/networking/teavpn2/default.nix b/pkgs/by-name/te/teavpn2/package.nix
similarity index 100%
rename from pkgs/tools/networking/teavpn2/default.nix
rename to pkgs/by-name/te/teavpn2/package.nix
diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/by-name/te/tebreak/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/tebreak/default.nix
rename to pkgs/by-name/te/tebreak/package.nix
diff --git a/pkgs/games/tecnoballz/default.nix b/pkgs/by-name/te/tecnoballz/package.nix
similarity index 100%
rename from pkgs/games/tecnoballz/default.nix
rename to pkgs/by-name/te/tecnoballz/package.nix
diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/by-name/te/ted/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/ted/default.nix
rename to pkgs/by-name/te/ted/package.nix
diff --git a/pkgs/applications/editors/teehee/default.nix b/pkgs/by-name/te/teehee/package.nix
similarity index 100%
rename from pkgs/applications/editors/teehee/default.nix
rename to pkgs/by-name/te/teehee/package.nix
diff --git a/pkgs/development/embedded/teensy-cmake-macros/hook.nix b/pkgs/by-name/te/teensy-cmake-macros/hook.nix
similarity index 100%
rename from pkgs/development/embedded/teensy-cmake-macros/hook.nix
rename to pkgs/by-name/te/teensy-cmake-macros/hook.nix
diff --git a/pkgs/development/embedded/teensy-cmake-macros/default.nix b/pkgs/by-name/te/teensy-cmake-macros/package.nix
similarity index 100%
rename from pkgs/development/embedded/teensy-cmake-macros/default.nix
rename to pkgs/by-name/te/teensy-cmake-macros/package.nix
diff --git a/pkgs/development/embedded/teensy-cmake-macros/setup-hook.sh b/pkgs/by-name/te/teensy-cmake-macros/setup-hook.sh
similarity index 100%
rename from pkgs/development/embedded/teensy-cmake-macros/setup-hook.sh
rename to pkgs/by-name/te/teensy-cmake-macros/setup-hook.sh
diff --git a/pkgs/development/embedded/teensy-loader-cli/default.nix b/pkgs/by-name/te/teensy-loader-cli/package.nix
similarity index 100%
rename from pkgs/development/embedded/teensy-loader-cli/default.nix
rename to pkgs/by-name/te/teensy-loader-cli/package.nix
diff --git a/pkgs/os-specific/linux/teensy-udev-rules/default.nix b/pkgs/by-name/te/teensy-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/teensy-udev-rules/default.nix
rename to pkgs/by-name/te/teensy-udev-rules/package.nix
diff --git a/pkgs/os-specific/linux/teensy-udev-rules/teensy.rules b/pkgs/by-name/te/teensy-udev-rules/teensy.rules
similarity index 100%
rename from pkgs/os-specific/linux/teensy-udev-rules/teensy.rules
rename to pkgs/by-name/te/teensy-udev-rules/teensy.rules
diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/by-name/te/teetertorture/package.nix
similarity index 100%
rename from pkgs/games/teetertorture/default.nix
rename to pkgs/by-name/te/teetertorture/package.nix
diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/by-name/te/tegaki-zinnia-japanese/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix
rename to pkgs/by-name/te/tegaki-zinnia-japanese/package.nix
diff --git a/pkgs/tools/text/teip/default.nix b/pkgs/by-name/te/teip/package.nix
similarity index 100%
rename from pkgs/tools/text/teip/default.nix
rename to pkgs/by-name/te/teip/package.nix
diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/by-name/te/tektoncd-cli/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tektoncd-cli/default.nix
rename to pkgs/by-name/te/tektoncd-cli/package.nix
diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/by-name/te/tela-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/tela-icon-theme/default.nix
rename to pkgs/by-name/te/tela-icon-theme/package.nix
diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/by-name/te/telepathy-farstream/package.nix
similarity index 100%
rename from pkgs/development/libraries/telepathy/farstream/default.nix
rename to pkgs/by-name/te/telepathy-farstream/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/by-name/te/telepathy-gabble/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
rename to pkgs/by-name/te/telepathy-gabble/package.nix
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/by-name/te/telepathy-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/telepathy/glib/default.nix
rename to pkgs/by-name/te/telepathy-glib/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/by-name/te/telepathy-haze/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
rename to pkgs/by-name/te/telepathy-haze/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/by-name/te/telepathy-idle/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
rename to pkgs/by-name/te/telepathy-idle/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/by-name/te/telepathy-logger/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
rename to pkgs/by-name/te/telepathy-logger/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/by-name/te/telepathy-mission-control/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
rename to pkgs/by-name/te/telepathy-mission-control/package.nix
diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/by-name/te/telepresence2/package.nix
similarity index 100%
rename from pkgs/tools/networking/telepresence2/default.nix
rename to pkgs/by-name/te/telepresence2/package.nix
diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/by-name/te/teler/package.nix
similarity index 100%
rename from pkgs/tools/security/teler/default.nix
rename to pkgs/by-name/te/teler/package.nix
diff --git a/pkgs/tools/security/tell-me-your-secrets/default.nix b/pkgs/by-name/te/tell-me-your-secrets/package.nix
similarity index 100%
rename from pkgs/tools/security/tell-me-your-secrets/default.nix
rename to pkgs/by-name/te/tell-me-your-secrets/package.nix
diff --git a/pkgs/development/tools/teller/default.nix b/pkgs/by-name/te/teller/package.nix
similarity index 100%
rename from pkgs/development/tools/teller/default.nix
rename to pkgs/by-name/te/teller/package.nix
diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/by-name/te/template-glib/package.nix
similarity index 100%
rename from pkgs/development/libraries/template-glib/default.nix
rename to pkgs/by-name/te/template-glib/package.nix
diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/by-name/te/tempo/package.nix
similarity index 100%
rename from pkgs/servers/tracing/tempo/default.nix
rename to pkgs/by-name/te/tempo/package.nix
diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/by-name/te/tempora_lgc/package.nix
similarity index 100%
rename from pkgs/data/fonts/tempora-lgc/default.nix
rename to pkgs/by-name/te/tempora_lgc/package.nix
diff --git a/pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch b/pkgs/by-name/te/temporal-cli/darwin-sandbox-fix.patch
similarity index 100%
rename from pkgs/applications/networking/cluster/temporal-cli/darwin-sandbox-fix.patch
rename to pkgs/by-name/te/temporal-cli/darwin-sandbox-fix.patch
diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/by-name/te/temporal-cli/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/temporal-cli/default.nix
rename to pkgs/by-name/te/temporal-cli/package.nix
diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/by-name/te/temporal/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/temporal/default.nix
rename to pkgs/by-name/te/temporal/package.nix
diff --git a/pkgs/applications/networking/cluster/temporalite/default.nix b/pkgs/by-name/te/temporalite/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/temporalite/default.nix
rename to pkgs/by-name/te/temporalite/package.nix
diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/by-name/te/tenacity/package.nix
similarity index 100%
rename from pkgs/applications/audio/tenacity/default.nix
rename to pkgs/by-name/te/tenacity/package.nix
diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/by-name/te/tendermint/package.nix
similarity index 100%
rename from pkgs/tools/networking/tendermint/default.nix
rename to pkgs/by-name/te/tendermint/package.nix
diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/by-name/te/tenderness/package.nix
similarity index 100%
rename from pkgs/data/fonts/tenderness/default.nix
rename to pkgs/by-name/te/tenderness/package.nix
diff --git a/pkgs/games/tennix/default.nix b/pkgs/by-name/te/tennix/package.nix
similarity index 100%
rename from pkgs/games/tennix/default.nix
rename to pkgs/by-name/te/tennix/package.nix
diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/by-name/te/tensorflow-lite/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/tensorflow-lite/default.nix
rename to pkgs/by-name/te/tensorflow-lite/package.nix
diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/by-name/te/tensorman/package.nix
similarity index 100%
rename from pkgs/tools/misc/tensorman/default.nix
rename to pkgs/by-name/te/tensorman/package.nix
diff --git a/pkgs/tools/misc/tere/default.nix b/pkgs/by-name/te/tere/package.nix
similarity index 100%
rename from pkgs/tools/misc/tere/default.nix
rename to pkgs/by-name/te/tere/package.nix
diff --git a/pkgs/tools/text/termbook/Cargo.lock b/pkgs/by-name/te/termbook/Cargo.lock
similarity index 100%
rename from pkgs/tools/text/termbook/Cargo.lock
rename to pkgs/by-name/te/termbook/Cargo.lock
diff --git a/pkgs/tools/text/termbook/default.nix b/pkgs/by-name/te/termbook/package.nix
similarity index 100%
rename from pkgs/tools/text/termbook/default.nix
rename to pkgs/by-name/te/termbook/package.nix
diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/by-name/te/termbox/package.nix
similarity index 100%
rename from pkgs/development/libraries/termbox/default.nix
rename to pkgs/by-name/te/termbox/package.nix
diff --git a/pkgs/development/libraries/termcolor/default.nix b/pkgs/by-name/te/termcolor/package.nix
similarity index 100%
rename from pkgs/development/libraries/termcolor/default.nix
rename to pkgs/by-name/te/termcolor/package.nix
diff --git a/pkgs/development/tools/database/termdbms/default.nix b/pkgs/by-name/te/termdbms/package.nix
similarity index 100%
rename from pkgs/development/tools/database/termdbms/default.nix
rename to pkgs/by-name/te/termdbms/package.nix
diff --git a/pkgs/development/tools/database/termdbms/viewer.patch b/pkgs/by-name/te/termdbms/viewer.patch
similarity index 100%
rename from pkgs/development/tools/database/termdbms/viewer.patch
rename to pkgs/by-name/te/termdbms/viewer.patch
diff --git a/pkgs/tools/graphics/termimage/default.nix b/pkgs/by-name/te/termimage/package.nix
similarity index 100%
rename from pkgs/tools/graphics/termimage/default.nix
rename to pkgs/by-name/te/termimage/package.nix
diff --git a/pkgs/applications/misc/terminal-colors/default.nix b/pkgs/by-name/te/terminal-colors/package.nix
similarity index 100%
rename from pkgs/applications/misc/terminal-colors/default.nix
rename to pkgs/by-name/te/terminal-colors/package.nix
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/by-name/te/terminal-notifier/package.nix
similarity index 100%
rename from pkgs/applications/misc/terminal-notifier/default.nix
rename to pkgs/by-name/te/terminal-notifier/package.nix
diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/by-name/te/terminal-parrot/package.nix
similarity index 100%
rename from pkgs/applications/misc/terminal-parrot/default.nix
rename to pkgs/by-name/te/terminal-parrot/package.nix
diff --git a/pkgs/applications/misc/terminal-stocks/default.nix b/pkgs/by-name/te/terminal-stocks/package.nix
similarity index 100%
rename from pkgs/applications/misc/terminal-stocks/default.nix
rename to pkgs/by-name/te/terminal-stocks/package.nix
diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/by-name/te/terminator/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/terminator/default.nix
rename to pkgs/by-name/te/terminator/package.nix
diff --git a/pkgs/data/fonts/terminus-font/SOURCE_DATE_EPOCH-for-otb.patch b/pkgs/by-name/te/terminus_font/SOURCE_DATE_EPOCH-for-otb.patch
similarity index 100%
rename from pkgs/data/fonts/terminus-font/SOURCE_DATE_EPOCH-for-otb.patch
rename to pkgs/by-name/te/terminus_font/SOURCE_DATE_EPOCH-for-otb.patch
diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/by-name/te/terminus_font/package.nix
similarity index 100%
rename from pkgs/data/fonts/terminus-font/default.nix
rename to pkgs/by-name/te/terminus_font/package.nix
diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/by-name/te/terminus_font_ttf/package.nix
similarity index 100%
rename from pkgs/data/fonts/terminus-font-ttf/default.nix
rename to pkgs/by-name/te/terminus_font_ttf/package.nix
diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/by-name/te/termius/package.nix
similarity index 100%
rename from pkgs/applications/networking/termius/default.nix
rename to pkgs/by-name/te/termius/package.nix
diff --git a/pkgs/applications/terminal-emulators/termonad/default.nix b/pkgs/by-name/te/termonad/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/termonad/default.nix
rename to pkgs/by-name/te/termonad/package.nix
diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/by-name/te/termplay/package.nix
similarity index 100%
rename from pkgs/tools/misc/termplay/default.nix
rename to pkgs/by-name/te/termplay/package.nix
diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/by-name/te/termshark/package.nix
similarity index 100%
rename from pkgs/tools/networking/termshark/default.nix
rename to pkgs/by-name/te/termshark/package.nix
diff --git a/pkgs/data/fonts/termsyn/default.nix b/pkgs/by-name/te/termsyn/package.nix
similarity index 100%
rename from pkgs/data/fonts/termsyn/default.nix
rename to pkgs/by-name/te/termsyn/package.nix
diff --git a/pkgs/applications/emulators/termtekst/default.nix b/pkgs/by-name/te/termtekst/package.nix
similarity index 100%
rename from pkgs/applications/emulators/termtekst/default.nix
rename to pkgs/by-name/te/termtekst/package.nix
diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/by-name/te/termtosvg/package.nix
similarity index 100%
rename from pkgs/tools/misc/termtosvg/default.nix
rename to pkgs/by-name/te/termtosvg/package.nix
diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/by-name/te/terra-station/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/terra-station/default.nix
rename to pkgs/by-name/te/terra-station/package.nix
diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/by-name/te/terracognita/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/terracognita/default.nix
rename to pkgs/by-name/te/terracognita/package.nix
diff --git a/pkgs/applications/networking/cluster/terraform-backend-git/default.nix b/pkgs/by-name/te/terraform-backend-git/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform-backend-git/default.nix
rename to pkgs/by-name/te/terraform-backend-git/package.nix
diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/by-name/te/terraform-inventory/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terraform-inventory/default.nix
rename to pkgs/by-name/te/terraform-inventory/package.nix
diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/by-name/te/terraform-ls/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/terraform-ls/default.nix
rename to pkgs/by-name/te/terraform-ls/package.nix
diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/by-name/te/terraform-lsp/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/terraform-lsp/default.nix
rename to pkgs/by-name/te/terraform-lsp/package.nix
diff --git a/pkgs/development/tools/misc/terraformer/default.nix b/pkgs/by-name/te/terraformer/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/terraformer/default.nix
rename to pkgs/by-name/te/terraformer/package.nix
diff --git a/pkgs/development/tools/misc/terramate/default.nix b/pkgs/by-name/te/terramate/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/terramate/default.nix
rename to pkgs/by-name/te/terramate/package.nix
diff --git a/pkgs/applications/networking/cluster/terranix/default.nix b/pkgs/by-name/te/terranix/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/terranix/default.nix
rename to pkgs/by-name/te/terranix/package.nix
diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/by-name/te/terraria-server/package.nix
similarity index 100%
rename from pkgs/games/terraria-server/default.nix
rename to pkgs/by-name/te/terraria-server/package.nix
diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/by-name/te/terrascan/package.nix
similarity index 100%
rename from pkgs/tools/security/terrascan/default.nix
rename to pkgs/by-name/te/terrascan/package.nix
diff --git a/pkgs/development/tools/misc/terser/default.nix b/pkgs/by-name/te/terser/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/terser/default.nix
rename to pkgs/by-name/te/terser/package.nix
diff --git a/pkgs/games/tes3cmd/default.nix b/pkgs/by-name/te/tes3cmd/package.nix
similarity index 100%
rename from pkgs/games/tes3cmd/default.nix
rename to pkgs/by-name/te/tes3cmd/package.nix
diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/by-name/te/teseq/package.nix
similarity index 100%
rename from pkgs/applications/misc/teseq/default.nix
rename to pkgs/by-name/te/teseq/package.nix
diff --git a/pkgs/tools/text/tesh/default.nix b/pkgs/by-name/te/tesh/package.nix
similarity index 100%
rename from pkgs/tools/text/tesh/default.nix
rename to pkgs/by-name/te/tesh/package.nix
diff --git a/pkgs/tools/security/tessen/default.nix b/pkgs/by-name/te/tessen/package.nix
similarity index 100%
rename from pkgs/tools/security/tessen/default.nix
rename to pkgs/by-name/te/tessen/package.nix
diff --git a/pkgs/applications/blockchains/tessera/default.nix b/pkgs/by-name/te/tessera/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/tessera/default.nix
rename to pkgs/by-name/te/tessera/package.nix
diff --git a/pkgs/development/libraries/test-drive/default.nix b/pkgs/by-name/te/test-drive/package.nix
similarity index 100%
rename from pkgs/development/libraries/test-drive/default.nix
rename to pkgs/by-name/te/test-drive/package.nix
diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/by-name/te/testssl/package.nix
similarity index 100%
rename from pkgs/applications/networking/testssl/default.nix
rename to pkgs/by-name/te/testssl/package.nix
diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/by-name/te/tet/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/tet/default.nix
rename to pkgs/by-name/te/tet/package.nix
diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/by-name/te/tetraproc/package.nix
similarity index 100%
rename from pkgs/applications/audio/tetraproc/default.nix
rename to pkgs/by-name/te/tetraproc/package.nix
diff --git a/pkgs/applications/networking/tetrd/default.nix b/pkgs/by-name/te/tetrd/package.nix
similarity index 100%
rename from pkgs/applications/networking/tetrd/default.nix
rename to pkgs/by-name/te/tetrd/package.nix
diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/by-name/te/tev/package.nix
similarity index 100%
rename from pkgs/applications/graphics/tev/default.nix
rename to pkgs/by-name/te/tev/package.nix
diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/by-name/te/tevent/package.nix
similarity index 100%
rename from pkgs/development/libraries/tevent/default.nix
rename to pkgs/by-name/te/tevent/package.nix
diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/by-name/te/tewi-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/tewi/default.nix
rename to pkgs/by-name/te/tewi-font/package.nix
diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/by-name/te/tewisay/package.nix
similarity index 100%
rename from pkgs/tools/misc/tewisay/default.nix
rename to pkgs/by-name/te/tewisay/package.nix
diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/by-name/te/texi2html/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/texi2html/default.nix
rename to pkgs/by-name/te/texi2html/package.nix
diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/by-name/te/texi2mdoc/package.nix
similarity index 100%
rename from pkgs/tools/misc/texi2mdoc/default.nix
rename to pkgs/by-name/te/texi2mdoc/package.nix
diff --git a/pkgs/development/libraries/text-engine/default.nix b/pkgs/by-name/te/text-engine/package.nix
similarity index 100%
rename from pkgs/development/libraries/text-engine/default.nix
rename to pkgs/by-name/te/text-engine/package.nix
diff --git a/pkgs/tools/graphics/textplots/default.nix b/pkgs/by-name/te/textplots/package.nix
similarity index 100%
rename from pkgs/tools/graphics/textplots/default.nix
rename to pkgs/by-name/te/textplots/package.nix
diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/by-name/te/textql/package.nix
similarity index 100%
rename from pkgs/development/tools/textql/default.nix
rename to pkgs/by-name/te/textql/package.nix
diff --git a/pkgs/applications/graphics/textual-paint/default.nix b/pkgs/by-name/te/textual-paint/package.nix
similarity index 100%
rename from pkgs/applications/graphics/textual-paint/default.nix
rename to pkgs/by-name/te/textual-paint/package.nix
diff --git a/pkgs/tools/graphics/texture-synthesis/Cargo.lock b/pkgs/by-name/te/texture-synthesis/Cargo.lock
similarity index 100%
rename from pkgs/tools/graphics/texture-synthesis/Cargo.lock
rename to pkgs/by-name/te/texture-synthesis/Cargo.lock
diff --git a/pkgs/tools/graphics/texture-synthesis/default.nix b/pkgs/by-name/te/texture-synthesis/package.nix
similarity index 100%
rename from pkgs/tools/graphics/texture-synthesis/default.nix
rename to pkgs/by-name/te/texture-synthesis/package.nix
diff --git a/pkgs/development/libraries/tezos-rust-libs/default.nix b/pkgs/by-name/te/tezos-rust-libs/package.nix
similarity index 100%
rename from pkgs/development/libraries/tezos-rust-libs/default.nix
rename to pkgs/by-name/te/tezos-rust-libs/package.nix
diff --git a/pkgs/applications/networking/cluster/tf-summarize/default.nix b/pkgs/by-name/tf/tf-summarize/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tf-summarize/default.nix
rename to pkgs/by-name/tf/tf-summarize/package.nix
diff --git a/pkgs/development/tools/tf2pulumi/default.nix b/pkgs/by-name/tf/tf2pulumi/package.nix
similarity index 100%
rename from pkgs/development/tools/tf2pulumi/default.nix
rename to pkgs/by-name/tf/tf2pulumi/package.nix
diff --git a/pkgs/applications/networking/cluster/tfautomv/default.nix b/pkgs/by-name/tf/tfautomv/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tfautomv/default.nix
rename to pkgs/by-name/tf/tfautomv/package.nix
diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/by-name/tf/tfk8s/package.nix
similarity index 100%
rename from pkgs/tools/misc/tfk8s/default.nix
rename to pkgs/by-name/tf/tfk8s/package.nix
diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/default.nix b/pkgs/by-name/tf/tfk8s/tests/sample1/default.nix
similarity index 100%
rename from pkgs/tools/misc/tfk8s/tests/sample1/default.nix
rename to pkgs/by-name/tf/tfk8s/tests/sample1/default.nix
diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/input.yaml b/pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml
similarity index 100%
rename from pkgs/tools/misc/tfk8s/tests/sample1/input.yaml
rename to pkgs/by-name/tf/tfk8s/tests/sample1/input.yaml
diff --git a/pkgs/tools/misc/tfk8s/tests/sample1/output.tf b/pkgs/by-name/tf/tfk8s/tests/sample1/output.tf
similarity index 100%
rename from pkgs/tools/misc/tfk8s/tests/sample1/output.tf
rename to pkgs/by-name/tf/tfk8s/tests/sample1/output.tf
diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/by-name/tf/tfsec/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/tfsec/default.nix
rename to pkgs/by-name/tf/tfsec/package.nix
diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/by-name/tf/tfswitch/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tfswitch/default.nix
rename to pkgs/by-name/tf/tfswitch/package.nix
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/by-name/tf/tftp-hpa/package.nix
similarity index 100%
rename from pkgs/tools/networking/tftp-hpa/default.nix
rename to pkgs/by-name/tf/tftp-hpa/package.nix
diff --git a/pkgs/applications/networking/cluster/tfupdate/default.nix b/pkgs/by-name/tf/tfupdate/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tfupdate/default.nix
rename to pkgs/by-name/tf/tfupdate/package.nix
diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/by-name/tg/tgswitch/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tgswitch/default.nix
rename to pkgs/by-name/tg/tgswitch/package.nix
diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/by-name/tg/tgt/package.nix
similarity index 100%
rename from pkgs/tools/networking/tgt/default.nix
rename to pkgs/by-name/tg/tgt/package.nix
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/by-name/th/thc-hydra/package.nix
similarity index 100%
rename from pkgs/tools/security/thc-hydra/default.nix
rename to pkgs/by-name/th/thc-hydra/package.nix
diff --git a/pkgs/tools/security/thc-ipv6/default.nix b/pkgs/by-name/th/thc-ipv6/package.nix
similarity index 100%
rename from pkgs/tools/security/thc-ipv6/default.nix
rename to pkgs/by-name/th/thc-ipv6/package.nix
diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/by-name/th/the-foundation/package.nix
similarity index 100%
rename from pkgs/development/libraries/the-foundation/default.nix
rename to pkgs/by-name/th/the-foundation/package.nix
diff --git a/pkgs/data/fonts/the-neue-black/default.nix b/pkgs/by-name/th/the-neue-black/package.nix
similarity index 100%
rename from pkgs/data/fonts/the-neue-black/default.nix
rename to pkgs/by-name/th/the-neue-black/package.nix
diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/by-name/th/the-way/package.nix
similarity index 100%
rename from pkgs/development/tools/the-way/default.nix
rename to pkgs/by-name/th/the-way/package.nix
diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/by-name/th/theano/package.nix
similarity index 100%
rename from pkgs/data/fonts/theano/default.nix
rename to pkgs/by-name/th/theano/package.nix
diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/by-name/th/thedesk/package.nix
similarity index 100%
rename from pkgs/applications/misc/thedesk/default.nix
rename to pkgs/by-name/th/thedesk/package.nix
diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/by-name/th/theft/package.nix
similarity index 100%
rename from pkgs/development/libraries/theft/default.nix
rename to pkgs/by-name/th/theft/package.nix
diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/by-name/th/theharvester/package.nix
similarity index 100%
rename from pkgs/tools/security/theharvester/default.nix
rename to pkgs/by-name/th/theharvester/package.nix
diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/by-name/th/thelounge/package.nix
similarity index 100%
rename from pkgs/applications/networking/irc/thelounge/default.nix
rename to pkgs/by-name/th/thelounge/package.nix
diff --git a/pkgs/applications/networking/irc/thelounge/packages-path.patch b/pkgs/by-name/th/thelounge/packages-path.patch
similarity index 100%
rename from pkgs/applications/networking/irc/thelounge/packages-path.patch
rename to pkgs/by-name/th/thelounge/packages-path.patch
diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/by-name/th/theme-jade1/package.nix
similarity index 100%
rename from pkgs/data/themes/jade1/default.nix
rename to pkgs/by-name/th/theme-jade1/package.nix
diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/by-name/th/theme-obsidian2/package.nix
similarity index 100%
rename from pkgs/data/themes/obsidian2/default.nix
rename to pkgs/by-name/th/theme-obsidian2/package.nix
diff --git a/pkgs/tools/misc/theme-sh/default.nix b/pkgs/by-name/th/theme-sh/package.nix
similarity index 100%
rename from pkgs/tools/misc/theme-sh/default.nix
rename to pkgs/by-name/th/theme-sh/package.nix
diff --git a/pkgs/data/themes/vertex/default.nix b/pkgs/by-name/th/theme-vertex/package.nix
similarity index 100%
rename from pkgs/data/themes/vertex/default.nix
rename to pkgs/by-name/th/theme-vertex/package.nix
diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/by-name/th/themechanger/package.nix
similarity index 100%
rename from pkgs/applications/misc/themechanger/default.nix
rename to pkgs/by-name/th/themechanger/package.nix
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/by-name/th/thepeg/package.nix
similarity index 100%
rename from pkgs/development/libraries/physics/thepeg/default.nix
rename to pkgs/by-name/th/thepeg/package.nix
diff --git a/pkgs/applications/misc/therion/default.nix b/pkgs/by-name/th/therion/package.nix
similarity index 100%
rename from pkgs/applications/misc/therion/default.nix
rename to pkgs/by-name/th/therion/package.nix
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/by-name/th/thermald/package.nix
similarity index 100%
rename from pkgs/tools/system/thermald/default.nix
rename to pkgs/by-name/th/thermald/package.nix
diff --git a/pkgs/applications/version-management/thicket/default.nix b/pkgs/by-name/th/thicket/package.nix
similarity index 100%
rename from pkgs/applications/version-management/thicket/default.nix
rename to pkgs/by-name/th/thicket/package.nix
diff --git a/pkgs/applications/editors/thiefmd/default.nix b/pkgs/by-name/th/thiefmd/package.nix
similarity index 100%
rename from pkgs/applications/editors/thiefmd/default.nix
rename to pkgs/by-name/th/thiefmd/package.nix
diff --git a/pkgs/tools/misc/thin-provisioning-tools/Cargo.lock b/pkgs/by-name/th/thin-provisioning-tools/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/thin-provisioning-tools/Cargo.lock
rename to pkgs/by-name/th/thin-provisioning-tools/Cargo.lock
diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/by-name/th/thin-provisioning-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/thin-provisioning-tools/default.nix
rename to pkgs/by-name/th/thin-provisioning-tools/package.nix
diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/by-name/th/thinkfan/package.nix
similarity index 100%
rename from pkgs/tools/system/thinkfan/default.nix
rename to pkgs/by-name/th/thinkfan/package.nix
diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/by-name/th/thinkingRock/package.nix
similarity index 100%
rename from pkgs/applications/misc/thinking-rock/default.nix
rename to pkgs/by-name/th/thinkingRock/package.nix
diff --git a/pkgs/applications/misc/thokr/default.nix b/pkgs/by-name/th/thokr/package.nix
similarity index 100%
rename from pkgs/applications/misc/thokr/default.nix
rename to pkgs/by-name/th/thokr/package.nix
diff --git a/pkgs/tools/security/threatest/default.nix b/pkgs/by-name/th/threatest/package.nix
similarity index 100%
rename from pkgs/tools/security/threatest/default.nix
rename to pkgs/by-name/th/threatest/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/by-name/th/threema-desktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/threema-desktop/default.nix
rename to pkgs/by-name/th/threema-desktop/package.nix
diff --git a/pkgs/development/libraries/thrift/disable-failing-test.patch b/pkgs/by-name/th/thrift/disable-failing-test.patch
similarity index 100%
rename from pkgs/development/libraries/thrift/disable-failing-test.patch
rename to pkgs/by-name/th/thrift/disable-failing-test.patch
diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/by-name/th/thrift/package.nix
similarity index 100%
rename from pkgs/development/libraries/thrift/default.nix
rename to pkgs/by-name/th/thrift/package.nix
diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/by-name/th/throttled/package.nix
similarity index 100%
rename from pkgs/tools/system/throttled/default.nix
rename to pkgs/by-name/th/throttled/package.nix
diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/by-name/th/thttpd/package.nix
similarity index 100%
rename from pkgs/servers/http/thttpd/default.nix
rename to pkgs/by-name/th/thttpd/package.nix
diff --git a/pkgs/tools/misc/thumbs/fix.patch b/pkgs/by-name/th/thumbs/fix.patch
similarity index 100%
rename from pkgs/tools/misc/thumbs/fix.patch
rename to pkgs/by-name/th/thumbs/fix.patch
diff --git a/pkgs/tools/misc/thumbs/default.nix b/pkgs/by-name/th/thumbs/package.nix
similarity index 100%
rename from pkgs/tools/misc/thumbs/default.nix
rename to pkgs/by-name/th/thumbs/package.nix
diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/by-name/th/thunderbolt/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/thunderbolt/default.nix
rename to pkgs/by-name/th/thunderbolt/package.nix
diff --git a/pkgs/data/fonts/tibetan-machine/default.nix b/pkgs/by-name/ti/tibetan-machine/package.nix
similarity index 100%
rename from pkgs/data/fonts/tibetan-machine/default.nix
rename to pkgs/by-name/ti/tibetan-machine/package.nix
diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/by-name/ti/ticker/package.nix
similarity index 100%
rename from pkgs/applications/misc/ticker/default.nix
rename to pkgs/by-name/ti/ticker/package.nix
diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/by-name/ti/tickrs/package.nix
similarity index 100%
rename from pkgs/applications/misc/tickrs/default.nix
rename to pkgs/by-name/ti/tickrs/package.nix
diff --git a/pkgs/applications/office/ticktick/default.nix b/pkgs/by-name/ti/ticktick/package.nix
similarity index 100%
rename from pkgs/applications/office/ticktick/default.nix
rename to pkgs/by-name/ti/ticktick/package.nix
diff --git a/pkgs/development/libraries/ticpp/default.nix b/pkgs/by-name/ti/ticpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/ticpp/default.nix
rename to pkgs/by-name/ti/ticpp/package.nix
diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/by-name/ti/tidal-hifi/package.nix
similarity index 100%
rename from pkgs/applications/audio/tidal-hifi/default.nix
rename to pkgs/by-name/ti/tidal-hifi/package.nix
diff --git a/pkgs/servers/tidb/default.nix b/pkgs/by-name/ti/tidb/package.nix
similarity index 100%
rename from pkgs/servers/tidb/default.nix
rename to pkgs/by-name/ti/tidb/package.nix
diff --git a/pkgs/tools/text/tidy-viewer/default.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
similarity index 100%
rename from pkgs/tools/text/tidy-viewer/default.nix
rename to pkgs/by-name/ti/tidy-viewer/package.nix
diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/by-name/ti/tidyp/package.nix
similarity index 100%
rename from pkgs/development/libraries/tidyp/default.nix
rename to pkgs/by-name/ti/tidyp/package.nix
diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/by-name/ti/tie/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/tie/default.nix
rename to pkgs/by-name/ti/tie/package.nix
diff --git a/pkgs/applications/version-management/tig/default.nix b/pkgs/by-name/ti/tig/package.nix
similarity index 100%
rename from pkgs/applications/version-management/tig/default.nix
rename to pkgs/by-name/ti/tig/package.nix
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/by-name/ti/tigervnc/package.nix
similarity index 100%
rename from pkgs/tools/admin/tigervnc/default.nix
rename to pkgs/by-name/ti/tigervnc/package.nix
diff --git a/pkgs/applications/editors/tijolo/default.nix b/pkgs/by-name/ti/tijolo/package.nix
similarity index 100%
rename from pkgs/applications/editors/tijolo/default.nix
rename to pkgs/by-name/ti/tijolo/package.nix
diff --git a/pkgs/applications/editors/tijolo/shards.nix b/pkgs/by-name/ti/tijolo/shards.nix
similarity index 100%
rename from pkgs/applications/editors/tijolo/shards.nix
rename to pkgs/by-name/ti/tijolo/shards.nix
diff --git a/pkgs/development/libraries/tiledb/FindMagic_EP.cmake.patch b/pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch
similarity index 100%
rename from pkgs/development/libraries/tiledb/FindMagic_EP.cmake.patch
rename to pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch
diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/by-name/ti/tiledb/package.nix
similarity index 100%
rename from pkgs/development/libraries/tiledb/default.nix
rename to pkgs/by-name/ti/tiledb/package.nix
diff --git a/pkgs/applications/emulators/tilem/default.nix b/pkgs/by-name/ti/tilem/package.nix
similarity index 100%
rename from pkgs/applications/emulators/tilem/default.nix
rename to pkgs/by-name/ti/tilem/package.nix
diff --git a/pkgs/applications/networking/cluster/tilt/assets.nix b/pkgs/by-name/ti/tilt/assets.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tilt/assets.nix
rename to pkgs/by-name/ti/tilt/assets.nix
diff --git a/pkgs/applications/networking/cluster/tilt/binary.nix b/pkgs/by-name/ti/tilt/binary.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tilt/binary.nix
rename to pkgs/by-name/ti/tilt/binary.nix
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/by-name/ti/tilt/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/tilt/default.nix
rename to pkgs/by-name/ti/tilt/package.nix
diff --git a/pkgs/tools/misc/time-decode/default.nix b/pkgs/by-name/ti/time-decode/package.nix
similarity index 100%
rename from pkgs/tools/misc/time-decode/default.nix
rename to pkgs/by-name/ti/time-decode/package.nix
diff --git a/pkgs/development/tools/time-ghc-modules/default.nix b/pkgs/by-name/ti/time-ghc-modules/package.nix
similarity index 100%
rename from pkgs/development/tools/time-ghc-modules/default.nix
rename to pkgs/by-name/ti/time-ghc-modules/package.nix
diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/by-name/ti/time/package.nix
similarity index 100%
rename from pkgs/tools/misc/time/default.nix
rename to pkgs/by-name/ti/time/package.nix
diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/by-name/ti/timelapse-deflicker/package.nix
similarity index 100%
rename from pkgs/applications/graphics/timelapse-deflicker/default.nix
rename to pkgs/by-name/ti/timelapse-deflicker/package.nix
diff --git a/pkgs/applications/video/timelens/default.nix b/pkgs/by-name/ti/timelens/package.nix
similarity index 100%
rename from pkgs/applications/video/timelens/default.nix
rename to pkgs/by-name/ti/timelens/package.nix
diff --git a/pkgs/tools/misc/timelimit/default.nix b/pkgs/by-name/ti/timelimit/package.nix
similarity index 100%
rename from pkgs/tools/misc/timelimit/default.nix
rename to pkgs/by-name/ti/timelimit/package.nix
diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/by-name/ti/timeline/package.nix
similarity index 100%
rename from pkgs/applications/office/timeline/default.nix
rename to pkgs/by-name/ti/timeline/package.nix
diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/by-name/ti/timemachine/package.nix
similarity index 100%
rename from pkgs/applications/audio/timemachine/default.nix
rename to pkgs/by-name/ti/timemachine/package.nix
diff --git a/pkgs/tools/misc/timer/default.nix b/pkgs/by-name/ti/timer/package.nix
similarity index 100%
rename from pkgs/tools/misc/timer/default.nix
rename to pkgs/by-name/ti/timer/package.nix
diff --git a/pkgs/data/fonts/times-newer-roman/default.nix b/pkgs/by-name/ti/times-newer-roman/package.nix
similarity index 100%
rename from pkgs/data/fonts/times-newer-roman/default.nix
rename to pkgs/by-name/ti/times-newer-roman/package.nix
diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/by-name/ti/timescaledb-parallel-copy/package.nix
similarity index 100%
rename from pkgs/development/tools/database/timescaledb-parallel-copy/default.nix
rename to pkgs/by-name/ti/timescaledb-parallel-copy/package.nix
diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/by-name/ti/timescaledb-tune/package.nix
similarity index 100%
rename from pkgs/development/tools/database/timescaledb-tune/default.nix
rename to pkgs/by-name/ti/timescaledb-tune/package.nix
diff --git a/pkgs/servers/timetagger/default.nix b/pkgs/by-name/ti/timetagger/package.nix
similarity index 100%
rename from pkgs/servers/timetagger/default.nix
rename to pkgs/by-name/ti/timetagger/package.nix
diff --git a/pkgs/tools/misc/timetagger_cli/default.nix b/pkgs/by-name/ti/timetagger_cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/timetagger_cli/default.nix
rename to pkgs/by-name/ti/timetagger_cli/package.nix
diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/by-name/ti/timeular/package.nix
similarity index 100%
rename from pkgs/applications/office/timeular/default.nix
rename to pkgs/by-name/ti/timeular/package.nix
diff --git a/pkgs/applications/misc/timew-sync-server/default.nix b/pkgs/by-name/ti/timew-sync-server/package.nix
similarity index 100%
rename from pkgs/applications/misc/timew-sync-server/default.nix
rename to pkgs/by-name/ti/timew-sync-server/package.nix
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/by-name/ti/timewarrior/package.nix
similarity index 100%
rename from pkgs/applications/misc/timewarrior/default.nix
rename to pkgs/by-name/ti/timewarrior/package.nix
diff --git a/pkgs/development/libraries/timezonemap/default.nix b/pkgs/by-name/ti/timezonemap/package.nix
similarity index 100%
rename from pkgs/development/libraries/timezonemap/default.nix
rename to pkgs/by-name/ti/timezonemap/package.nix
diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/by-name/ti/timg/package.nix
similarity index 100%
rename from pkgs/tools/graphics/timg/default.nix
rename to pkgs/by-name/ti/timg/package.nix
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/by-name/ti/tini/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/tini/default.nix
rename to pkgs/by-name/ti/tini/package.nix
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/by-name/ti/tint2/package.nix
similarity index 100%
rename from pkgs/applications/misc/tint2/default.nix
rename to pkgs/by-name/ti/tint2/package.nix
diff --git a/pkgs/games/tintin/default.nix b/pkgs/by-name/ti/tintin/package.nix
similarity index 100%
rename from pkgs/games/tintin/default.nix
rename to pkgs/by-name/ti/tintin/package.nix
diff --git a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/pkgs/by-name/ti/tiny-cuda-nn/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix
rename to pkgs/by-name/ti/tiny-cuda-nn/package.nix
diff --git a/pkgs/development/libraries/tinycbor/default.nix b/pkgs/by-name/ti/tinycbor/package.nix
similarity index 100%
rename from pkgs/development/libraries/tinycbor/default.nix
rename to pkgs/by-name/ti/tinycbor/package.nix
diff --git a/pkgs/development/libraries/tinycdb/default.nix b/pkgs/by-name/ti/tinycdb/package.nix
similarity index 100%
rename from pkgs/development/libraries/tinycdb/default.nix
rename to pkgs/by-name/ti/tinycdb/package.nix
diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/by-name/ti/tinyfecvpn/package.nix
similarity index 100%
rename from pkgs/tools/networking/tinyfecvpn/default.nix
rename to pkgs/by-name/ti/tinyfecvpn/package.nix
diff --git a/pkgs/games/tinyfugue/001-darwin-fixes.patch b/pkgs/by-name/ti/tinyfugue/001-darwin-fixes.patch
similarity index 100%
rename from pkgs/games/tinyfugue/001-darwin-fixes.patch
rename to pkgs/by-name/ti/tinyfugue/001-darwin-fixes.patch
diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/by-name/ti/tinyfugue/package.nix
similarity index 100%
rename from pkgs/games/tinyfugue/default.nix
rename to pkgs/by-name/ti/tinyfugue/package.nix
diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/by-name/ti/tinyobjloader/package.nix
similarity index 100%
rename from pkgs/development/libraries/tinyobjloader/default.nix
rename to pkgs/by-name/ti/tinyobjloader/package.nix
diff --git a/pkgs/development/embedded/fpga/tinyprog/default.nix b/pkgs/by-name/ti/tinyprog/package.nix
similarity index 100%
rename from pkgs/development/embedded/fpga/tinyprog/default.nix
rename to pkgs/by-name/ti/tinyprog/package.nix
diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/by-name/ti/tinyproxy/package.nix
similarity index 100%
rename from pkgs/tools/networking/tinyproxy/default.nix
rename to pkgs/by-name/ti/tinyproxy/package.nix
diff --git a/pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch b/pkgs/by-name/ti/tinyscheme/01-remove-macOS-main.patch
similarity index 100%
rename from pkgs/development/interpreters/tinyscheme/01-remove-macOS-main.patch
rename to pkgs/by-name/ti/tinyscheme/01-remove-macOS-main.patch
diff --git a/pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch b/pkgs/by-name/ti/tinyscheme/02-use-toolchain-env-vars.patch
similarity index 100%
rename from pkgs/development/interpreters/tinyscheme/02-use-toolchain-env-vars.patch
rename to pkgs/by-name/ti/tinyscheme/02-use-toolchain-env-vars.patch
diff --git a/pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch b/pkgs/by-name/ti/tinyscheme/03-macOS-SOsuf.patch
similarity index 100%
rename from pkgs/development/interpreters/tinyscheme/03-macOS-SOsuf.patch
rename to pkgs/by-name/ti/tinyscheme/03-macOS-SOsuf.patch
diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/by-name/ti/tinyscheme/package.nix
similarity index 100%
rename from pkgs/development/interpreters/tinyscheme/default.nix
rename to pkgs/by-name/ti/tinyscheme/package.nix
diff --git a/pkgs/tools/networking/tinyssh/default.nix b/pkgs/by-name/ti/tinyssh/package.nix
similarity index 100%
rename from pkgs/tools/networking/tinyssh/default.nix
rename to pkgs/by-name/ti/tinyssh/package.nix
diff --git a/pkgs/tools/networking/tinystatus/default.nix b/pkgs/by-name/ti/tinystatus/package.nix
similarity index 100%
rename from pkgs/tools/networking/tinystatus/default.nix
rename to pkgs/by-name/ti/tinystatus/package.nix
diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/by-name/ti/tipa/package.nix
similarity index 100%
rename from pkgs/data/fonts/tipa/default.nix
rename to pkgs/by-name/ti/tipa/package.nix
diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/by-name/ti/tiptop/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tiptop/default.nix
rename to pkgs/by-name/ti/tiptop/package.nix
diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/by-name/ti/tiramisu/package.nix
similarity index 100%
rename from pkgs/applications/misc/tiramisu/default.nix
rename to pkgs/by-name/ti/tiramisu/package.nix
diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/by-name/ti/tiscamera/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tiscamera/default.nix
rename to pkgs/by-name/ti/tiscamera/package.nix
diff --git a/pkgs/games/titanion/default.nix b/pkgs/by-name/ti/titanion/package.nix
similarity index 100%
rename from pkgs/games/titanion/default.nix
rename to pkgs/by-name/ti/titanion/package.nix
diff --git a/pkgs/development/mobile/titanium-alloy/default.nix b/pkgs/by-name/ti/titanium-alloy/package.nix
similarity index 100%
rename from pkgs/development/mobile/titanium-alloy/default.nix
rename to pkgs/by-name/ti/titanium-alloy/package.nix
diff --git a/pkgs/development/mobile/titanium/default.nix b/pkgs/by-name/ti/titanium/package.nix
similarity index 100%
rename from pkgs/development/mobile/titanium/default.nix
rename to pkgs/by-name/ti/titanium/package.nix
diff --git a/pkgs/applications/misc/tiv/default.nix b/pkgs/by-name/ti/tiv/package.nix
similarity index 100%
rename from pkgs/applications/misc/tiv/default.nix
rename to pkgs/by-name/ti/tiv/package.nix
diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/by-name/ti/tivodecode/package.nix
similarity index 100%
rename from pkgs/applications/video/tivodecode/default.nix
rename to pkgs/by-name/ti/tivodecode/package.nix
diff --git a/pkgs/tools/misc/tkman/default.nix b/pkgs/by-name/tk/tkman/package.nix
similarity index 100%
rename from pkgs/tools/misc/tkman/default.nix
rename to pkgs/by-name/tk/tkman/package.nix
diff --git a/pkgs/applications/version-management/tkrev/default.nix b/pkgs/by-name/tk/tkrev/package.nix
similarity index 100%
rename from pkgs/applications/version-management/tkrev/default.nix
rename to pkgs/by-name/tk/tkrev/package.nix
diff --git a/pkgs/development/libraries/tkrzw/default.nix b/pkgs/by-name/tk/tkrzw/package.nix
similarity index 100%
rename from pkgs/development/libraries/tkrzw/default.nix
rename to pkgs/by-name/tk/tkrzw/package.nix
diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/by-name/tl/tl-expected/package.nix
similarity index 100%
rename from pkgs/development/libraries/tl-expected/default.nix
rename to pkgs/by-name/tl/tl-expected/package.nix
diff --git a/pkgs/applications/version-management/arch/configure-tmpdir.patch b/pkgs/by-name/tl/tla/configure-tmpdir.patch
similarity index 100%
rename from pkgs/applications/version-management/arch/configure-tmpdir.patch
rename to pkgs/by-name/tl/tla/configure-tmpdir.patch
diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/by-name/tl/tla/package.nix
similarity index 100%
rename from pkgs/applications/version-management/arch/default.nix
rename to pkgs/by-name/tl/tla/package.nix
diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/by-name/tl/tldr/package.nix
similarity index 100%
rename from pkgs/tools/misc/tldr/default.nix
rename to pkgs/by-name/tl/tldr/package.nix
diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/by-name/tl/tlf/package.nix
similarity index 100%
rename from pkgs/applications/radio/tlf/default.nix
rename to pkgs/by-name/tl/tlf/package.nix
diff --git a/pkgs/tools/admin/tlsclient/default.nix b/pkgs/by-name/tl/tlsclient/package.nix
similarity index 100%
rename from pkgs/tools/admin/tlsclient/default.nix
rename to pkgs/by-name/tl/tlsclient/package.nix
diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/by-name/tl/tlsx/package.nix
similarity index 100%
rename from pkgs/tools/security/tlsx/default.nix
rename to pkgs/by-name/tl/tlsx/package.nix
diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/by-name/tl/tlwg/package.nix
similarity index 100%
rename from pkgs/data/fonts/tlwg/default.nix
rename to pkgs/by-name/tl/tlwg/package.nix
diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/by-name/tm/tm/package.nix
similarity index 100%
rename from pkgs/tools/system/tm/default.nix
rename to pkgs/by-name/tm/tm/package.nix
diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/by-name/tm/tmate-ssh-server/package.nix
similarity index 100%
rename from pkgs/servers/tmate-ssh-server/default.nix
rename to pkgs/by-name/tm/tmate-ssh-server/package.nix
diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/by-name/tm/tmate/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmate/default.nix
rename to pkgs/by-name/tm/tmate/package.nix
diff --git a/pkgs/applications/misc/tmatrix/default.nix b/pkgs/by-name/tm/tmatrix/package.nix
similarity index 100%
rename from pkgs/applications/misc/tmatrix/default.nix
rename to pkgs/by-name/tm/tmatrix/package.nix
diff --git a/pkgs/tools/text/tml/default.nix b/pkgs/by-name/tm/tml/package.nix
similarity index 100%
rename from pkgs/tools/text/tml/default.nix
rename to pkgs/by-name/tm/tml/package.nix
diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/by-name/tm/tmpmail/package.nix
similarity index 100%
rename from pkgs/applications/networking/tmpmail/default.nix
rename to pkgs/by-name/tm/tmpmail/package.nix
diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/by-name/tm/tmpwatch/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmpwatch/default.nix
rename to pkgs/by-name/tm/tmpwatch/package.nix
diff --git a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/pkgs/by-name/tm/tmux-mem-cpu-load/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmux-mem-cpu-load/default.nix
rename to pkgs/by-name/tm/tmux-mem-cpu-load/package.nix
diff --git a/pkgs/tools/misc/tmux-xpanes/default.nix b/pkgs/by-name/tm/tmux-xpanes/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmux-xpanes/default.nix
rename to pkgs/by-name/tm/tmux-xpanes/package.nix
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/by-name/tm/tmux/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmux/default.nix
rename to pkgs/by-name/tm/tmux/package.nix
diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/by-name/tm/tmuxinator/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmuxinator/default.nix
rename to pkgs/by-name/tm/tmuxinator/package.nix
diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/by-name/tm/tmuxp/package.nix
similarity index 100%
rename from pkgs/tools/misc/tmuxp/default.nix
rename to pkgs/by-name/tm/tmuxp/package.nix
diff --git a/pkgs/tools/networking/tnat64/default.nix b/pkgs/by-name/tn/tnat64/package.nix
similarity index 100%
rename from pkgs/tools/networking/tnat64/default.nix
rename to pkgs/by-name/tn/tnat64/package.nix
diff --git a/pkgs/applications/radio/tncattach/default.nix b/pkgs/by-name/tn/tncattach/package.nix
similarity index 100%
rename from pkgs/applications/radio/tncattach/default.nix
rename to pkgs/by-name/tn/tncattach/package.nix
diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/by-name/tn/tnef/package.nix
similarity index 100%
rename from pkgs/applications/misc/tnef/default.nix
rename to pkgs/by-name/tn/tnef/package.nix
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/by-name/tn/tnt/package.nix
similarity index 100%
rename from pkgs/development/libraries/tnt/default.nix
rename to pkgs/by-name/tn/tnt/package.nix
diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/by-name/tn/tntdb/package.nix
similarity index 100%
rename from pkgs/development/libraries/tntdb/default.nix
rename to pkgs/by-name/tn/tntdb/package.nix
diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/by-name/tn/tntnet/package.nix
similarity index 100%
rename from pkgs/development/libraries/tntnet/default.nix
rename to pkgs/by-name/tn/tntnet/package.nix
diff --git a/pkgs/tools/text/to-html/default.nix b/pkgs/by-name/to/to-html/package.nix
similarity index 100%
rename from pkgs/tools/text/to-html/default.nix
rename to pkgs/by-name/to/to-html/package.nix
diff --git a/pkgs/development/tools/toast/default.nix b/pkgs/by-name/to/toast/package.nix
similarity index 100%
rename from pkgs/development/tools/toast/default.nix
rename to pkgs/by-name/to/toast/package.nix
diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/by-name/to/tockloader/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/tockloader/default.nix
rename to pkgs/by-name/to/tockloader/package.nix
diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/by-name/to/todiff/package.nix
similarity index 100%
rename from pkgs/applications/misc/todiff/default.nix
rename to pkgs/by-name/to/todiff/package.nix
diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/by-name/to/todo-txt-cli/package.nix
similarity index 100%
rename from pkgs/applications/office/todo.txt-cli/default.nix
rename to pkgs/by-name/to/todo-txt-cli/package.nix
diff --git a/pkgs/tools/misc/todo/default.nix b/pkgs/by-name/to/todo/package.nix
similarity index 100%
rename from pkgs/tools/misc/todo/default.nix
rename to pkgs/by-name/to/todo/package.nix
diff --git a/pkgs/applications/office/todofi.sh/default.nix b/pkgs/by-name/to/todofi-sh/package.nix
similarity index 100%
rename from pkgs/applications/office/todofi.sh/default.nix
rename to pkgs/by-name/to/todofi-sh/package.nix
diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/by-name/to/todoist-electron/package.nix
similarity index 100%
rename from pkgs/applications/misc/todoist-electron/default.nix
rename to pkgs/by-name/to/todoist-electron/package.nix
diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/by-name/to/todoist/package.nix
similarity index 100%
rename from pkgs/applications/misc/todoist/default.nix
rename to pkgs/by-name/to/todoist/package.nix
diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/by-name/to/todoman/package.nix
similarity index 100%
rename from pkgs/applications/office/todoman/default.nix
rename to pkgs/by-name/to/todoman/package.nix
diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/by-name/to/tofi/package.nix
similarity index 100%
rename from pkgs/applications/misc/tofi/default.nix
rename to pkgs/by-name/to/tofi/package.nix
diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/by-name/to/toilet/package.nix
similarity index 100%
rename from pkgs/tools/misc/toilet/default.nix
rename to pkgs/by-name/to/toilet/package.nix
diff --git a/pkgs/applications/misc/toipe/default.nix b/pkgs/by-name/to/toipe/package.nix
similarity index 100%
rename from pkgs/applications/misc/toipe/default.nix
rename to pkgs/by-name/to/toipe/package.nix
diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/by-name/to/tokio-console/package.nix
similarity index 100%
rename from pkgs/development/tools/tokio-console/default.nix
rename to pkgs/by-name/to/tokio-console/package.nix
diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/by-name/to/tokyocabinet/package.nix
similarity index 100%
rename from pkgs/development/libraries/tokyo-cabinet/default.nix
rename to pkgs/by-name/to/tokyocabinet/package.nix
diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/by-name/to/tokyotyrant/package.nix
similarity index 100%
rename from pkgs/development/libraries/tokyo-tyrant/default.nix
rename to pkgs/by-name/to/tokyotyrant/package.nix
diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/by-name/to/tomcat_mysql_jdbc/package.nix
similarity index 100%
rename from pkgs/servers/http/tomcat/jdbc/mysql/default.nix
rename to pkgs/by-name/to/tomcat_mysql_jdbc/package.nix
diff --git a/pkgs/games/tome2/default.nix b/pkgs/by-name/to/tome2/package.nix
similarity index 100%
rename from pkgs/games/tome2/default.nix
rename to pkgs/by-name/to/tome2/package.nix
diff --git a/pkgs/games/tome4/default.nix b/pkgs/by-name/to/tome4/package.nix
similarity index 100%
rename from pkgs/games/tome4/default.nix
rename to pkgs/by-name/to/tome4/package.nix
diff --git a/pkgs/development/libraries/toml-f/default.nix b/pkgs/by-name/to/toml-f/package.nix
similarity index 100%
rename from pkgs/development/libraries/toml-f/default.nix
rename to pkgs/by-name/to/toml-f/package.nix
diff --git a/pkgs/development/tools/toml2json/default.nix b/pkgs/by-name/to/toml2json/package.nix
similarity index 100%
rename from pkgs/development/tools/toml2json/default.nix
rename to pkgs/by-name/to/toml2json/package.nix
diff --git a/pkgs/development/tools/toml2nix/Cargo.lock b/pkgs/by-name/to/toml2nix/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/toml2nix/Cargo.lock
rename to pkgs/by-name/to/toml2nix/Cargo.lock
diff --git a/pkgs/development/tools/toml2nix/default.nix b/pkgs/by-name/to/toml2nix/package.nix
similarity index 100%
rename from pkgs/development/tools/toml2nix/default.nix
rename to pkgs/by-name/to/toml2nix/package.nix
diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/by-name/to/ton/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/ton/default.nix
rename to pkgs/by-name/to/ton/package.nix
diff --git a/pkgs/applications/audio/tone/nuget-deps.nix b/pkgs/by-name/to/tone/nuget-deps.nix
similarity index 100%
rename from pkgs/applications/audio/tone/nuget-deps.nix
rename to pkgs/by-name/to/tone/nuget-deps.nix
diff --git a/pkgs/applications/audio/tone/default.nix b/pkgs/by-name/to/tone/package.nix
similarity index 100%
rename from pkgs/applications/audio/tone/default.nix
rename to pkgs/by-name/to/tone/package.nix
diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/by-name/to/tonelib-gfx/package.nix
similarity index 100%
rename from pkgs/applications/audio/tonelib-gfx/default.nix
rename to pkgs/by-name/to/tonelib-gfx/package.nix
diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/by-name/to/tonelib-jam/package.nix
similarity index 100%
rename from pkgs/applications/audio/tonelib-jam/default.nix
rename to pkgs/by-name/to/tonelib-jam/package.nix
diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/by-name/to/tonelib-metal/package.nix
similarity index 100%
rename from pkgs/applications/audio/tonelib-metal/default.nix
rename to pkgs/by-name/to/tonelib-metal/package.nix
diff --git a/pkgs/applications/audio/tonelib-noisereducer/default.nix b/pkgs/by-name/to/tonelib-noisereducer/package.nix
similarity index 100%
rename from pkgs/applications/audio/tonelib-noisereducer/default.nix
rename to pkgs/by-name/to/tonelib-noisereducer/package.nix
diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/by-name/to/tonelib-zoom/package.nix
similarity index 100%
rename from pkgs/applications/audio/tonelib-zoom/default.nix
rename to pkgs/by-name/to/tonelib-zoom/package.nix
diff --git a/pkgs/applications/virtualization/toolbox/glibc.patch b/pkgs/by-name/to/toolbox/glibc.patch
similarity index 100%
rename from pkgs/applications/virtualization/toolbox/glibc.patch
rename to pkgs/by-name/to/toolbox/glibc.patch
diff --git a/pkgs/applications/virtualization/toolbox/default.nix b/pkgs/by-name/to/toolbox/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/toolbox/default.nix
rename to pkgs/by-name/to/toolbox/package.nix
diff --git a/pkgs/applications/version-management/topgit/default.nix b/pkgs/by-name/to/top-git/package.nix
similarity index 100%
rename from pkgs/applications/version-management/topgit/default.nix
rename to pkgs/by-name/to/top-git/package.nix
diff --git a/pkgs/tools/text/topfew-rs/default.nix b/pkgs/by-name/to/topfew-rs/package.nix
similarity index 100%
rename from pkgs/tools/text/topfew-rs/default.nix
rename to pkgs/by-name/to/topfew-rs/package.nix
diff --git a/pkgs/tools/text/topfew/default.nix b/pkgs/by-name/to/topfew/package.nix
similarity index 100%
rename from pkgs/tools/text/topfew/default.nix
rename to pkgs/by-name/to/topfew/package.nix
diff --git a/pkgs/development/tools/misc/topiary/Cargo.lock b/pkgs/by-name/to/topiary/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/misc/topiary/Cargo.lock
rename to pkgs/by-name/to/topiary/Cargo.lock
diff --git a/pkgs/development/tools/misc/topiary/default.nix b/pkgs/by-name/to/topiary/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/topiary/default.nix
rename to pkgs/by-name/to/topiary/package.nix
diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/by-name/to/topicctl/package.nix
similarity index 100%
rename from pkgs/tools/misc/topicctl/default.nix
rename to pkgs/by-name/to/topicctl/package.nix
diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/by-name/to/topydo/package.nix
similarity index 100%
rename from pkgs/applications/misc/topydo/default.nix
rename to pkgs/by-name/to/topydo/package.nix
diff --git a/pkgs/games/torcs/default.nix b/pkgs/by-name/to/torcs/package.nix
similarity index 100%
rename from pkgs/games/torcs/default.nix
rename to pkgs/by-name/to/torcs/package.nix
diff --git a/pkgs/applications/blockchains/torq/default.nix b/pkgs/by-name/to/torq/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/torq/default.nix
rename to pkgs/by-name/to/torq/package.nix
diff --git a/pkgs/tools/archivers/torrent7z/default.nix b/pkgs/by-name/to/torrent7z/package.nix
similarity index 100%
rename from pkgs/tools/archivers/torrent7z/default.nix
rename to pkgs/by-name/to/torrent7z/package.nix
diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/by-name/to/torrential/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/torrential/default.nix
rename to pkgs/by-name/to/torrential/package.nix
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/by-name/to/tortoisehg/package.nix
similarity index 100%
rename from pkgs/applications/version-management/tortoisehg/default.nix
rename to pkgs/by-name/to/tortoisehg/package.nix
diff --git a/pkgs/games/torus-trooper/default.nix b/pkgs/by-name/to/torus-trooper/package.nix
similarity index 100%
rename from pkgs/games/torus-trooper/default.nix
rename to pkgs/by-name/to/torus-trooper/package.nix
diff --git a/pkgs/tools/networking/toss/default.nix b/pkgs/by-name/to/toss/package.nix
similarity index 100%
rename from pkgs/tools/networking/toss/default.nix
rename to pkgs/by-name/to/toss/package.nix
diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/by-name/to/totem-pl-parser/package.nix
similarity index 100%
rename from pkgs/development/libraries/totem-pl-parser/default.nix
rename to pkgs/by-name/to/totem-pl-parser/package.nix
diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/by-name/to/touchegg/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/touchegg/default.nix
rename to pkgs/by-name/to/touchegg/package.nix
diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/by-name/to/tox-node/package.nix
similarity index 100%
rename from pkgs/tools/networking/tox-node/default.nix
rename to pkgs/by-name/to/tox-node/package.nix
diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/by-name/to/toxiproxy/package.nix
similarity index 100%
rename from pkgs/development/tools/toxiproxy/default.nix
rename to pkgs/by-name/to/toxiproxy/package.nix
diff --git a/pkgs/tools/networking/toxvpn/bootstrap.json b/pkgs/by-name/to/toxvpn/bootstrap.json
similarity index 100%
rename from pkgs/tools/networking/toxvpn/bootstrap.json
rename to pkgs/by-name/to/toxvpn/bootstrap.json
diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/by-name/to/toxvpn/package.nix
similarity index 100%
rename from pkgs/tools/networking/toxvpn/default.nix
rename to pkgs/by-name/to/toxvpn/package.nix
diff --git a/pkgs/tools/system/tp-auto-kbbl/default.nix b/pkgs/by-name/tp/tp-auto-kbbl/package.nix
similarity index 100%
rename from pkgs/tools/system/tp-auto-kbbl/default.nix
rename to pkgs/by-name/tp/tp-auto-kbbl/package.nix
diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/by-name/tp/tpacpi-bat/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tpacpi-bat/default.nix
rename to pkgs/by-name/tp/tpacpi-bat/package.nix
diff --git a/pkgs/tools/security/tpm-luks/openssl-1.1.patch b/pkgs/by-name/tp/tpm-luks/openssl-1.1.patch
similarity index 100%
rename from pkgs/tools/security/tpm-luks/openssl-1.1.patch
rename to pkgs/by-name/tp/tpm-luks/openssl-1.1.patch
diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/by-name/tp/tpm-luks/package.nix
similarity index 100%
rename from pkgs/tools/security/tpm-luks/default.nix
rename to pkgs/by-name/tp/tpm-luks/package.nix
diff --git a/pkgs/tools/security/tpm-luks/signed-ptr.patch b/pkgs/by-name/tp/tpm-luks/signed-ptr.patch
similarity index 100%
rename from pkgs/tools/security/tpm-luks/signed-ptr.patch
rename to pkgs/by-name/tp/tpm-luks/signed-ptr.patch
diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/by-name/tp/tpm-quote-tools/package.nix
similarity index 100%
rename from pkgs/tools/security/tpm-quote-tools/default.nix
rename to pkgs/by-name/tp/tpm-quote-tools/package.nix
diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/by-name/tp/tpm-tools/package.nix
similarity index 100%
rename from pkgs/tools/security/tpm-tools/default.nix
rename to pkgs/by-name/tp/tpm-tools/package.nix
diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/by-name/tp/tpm2-abrmd/package.nix
similarity index 100%
rename from pkgs/tools/security/tpm2-abrmd/default.nix
rename to pkgs/by-name/tp/tpm2-abrmd/package.nix
diff --git a/pkgs/misc/tpm2-pkcs11/graceful-fapi-fail.patch b/pkgs/by-name/tp/tpm2-pkcs11/graceful-fapi-fail.patch
similarity index 100%
rename from pkgs/misc/tpm2-pkcs11/graceful-fapi-fail.patch
rename to pkgs/by-name/tp/tpm2-pkcs11/graceful-fapi-fail.patch
diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
similarity index 100%
rename from pkgs/misc/tpm2-pkcs11/default.nix
rename to pkgs/by-name/tp/tpm2-pkcs11/package.nix
diff --git a/pkgs/misc/tpm2-pkcs11/version.patch b/pkgs/by-name/tp/tpm2-pkcs11/version.patch
similarity index 100%
rename from pkgs/misc/tpm2-pkcs11/version.patch
rename to pkgs/by-name/tp/tpm2-pkcs11/version.patch
diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/by-name/tp/tpm2-tools/package.nix
similarity index 100%
rename from pkgs/tools/security/tpm2-tools/default.nix
rename to pkgs/by-name/tp/tpm2-tools/package.nix
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/by-name/tp/tptp/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/tptp/default.nix
rename to pkgs/by-name/tp/tptp/package.nix
diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/by-name/tq/tqsl/package.nix
similarity index 100%
rename from pkgs/applications/radio/tqsl/default.nix
rename to pkgs/by-name/tq/tqsl/package.nix
diff --git a/pkgs/games/tr-patcher/default.nix b/pkgs/by-name/tr/tr-patcher/package.nix
similarity index 100%
rename from pkgs/games/tr-patcher/default.nix
rename to pkgs/by-name/tr/tr-patcher/package.nix
diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/by-name/tr/tracebox/package.nix
similarity index 100%
rename from pkgs/tools/networking/tracebox/default.nix
rename to pkgs/by-name/tr/tracebox/package.nix
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch b/pkgs/by-name/tr/tracefilegen/gcc7.patch
similarity index 100%
rename from pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch
rename to pkgs/by-name/tr/tracefilegen/gcc7.patch
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/by-name/tr/tracefilegen/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix
rename to pkgs/by-name/tr/tracefilegen/package.nix
diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/by-name/tr/tracefilesim/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix
rename to pkgs/by-name/tr/tracefilesim/package.nix
diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/by-name/tr/traceroute/package.nix
similarity index 100%
rename from pkgs/tools/networking/traceroute/default.nix
rename to pkgs/by-name/tr/traceroute/package.nix
diff --git a/pkgs/games/trackballs/default.nix b/pkgs/by-name/tr/trackballs/package.nix
similarity index 100%
rename from pkgs/games/trackballs/default.nix
rename to pkgs/by-name/tr/trackballs/package.nix
diff --git a/pkgs/development/tools/tradcpp/aarch64.patch b/pkgs/by-name/tr/tradcpp/aarch64.patch
similarity index 100%
rename from pkgs/development/tools/tradcpp/aarch64.patch
rename to pkgs/by-name/tr/tradcpp/aarch64.patch
diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/by-name/tr/tradcpp/package.nix
similarity index 100%
rename from pkgs/development/tools/tradcpp/default.nix
rename to pkgs/by-name/tr/tradcpp/package.nix
diff --git a/pkgs/development/tools/tradcpp/tradcpp-configure.patch b/pkgs/by-name/tr/tradcpp/tradcpp-configure.patch
similarity index 100%
rename from pkgs/development/tools/tradcpp/tradcpp-configure.patch
rename to pkgs/by-name/tr/tradcpp/tradcpp-configure.patch
diff --git a/pkgs/tools/misc/traefik-certs-dumper/default.nix b/pkgs/by-name/tr/traefik-certs-dumper/package.nix
similarity index 100%
rename from pkgs/tools/misc/traefik-certs-dumper/default.nix
rename to pkgs/by-name/tr/traefik-certs-dumper/package.nix
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/by-name/tr/traefik/package.nix
similarity index 100%
rename from pkgs/servers/traefik/default.nix
rename to pkgs/by-name/tr/traefik/package.nix
diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/by-name/tr/trafficserver/package.nix
similarity index 100%
rename from pkgs/servers/http/trafficserver/default.nix
rename to pkgs/by-name/tr/trafficserver/package.nix
diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/by-name/tr/traitor/package.nix
similarity index 100%
rename from pkgs/tools/security/traitor/default.nix
rename to pkgs/by-name/tr/traitor/package.nix
diff --git a/pkgs/tools/networking/tran/default.nix b/pkgs/by-name/tr/tran/package.nix
similarity index 100%
rename from pkgs/tools/networking/tran/default.nix
rename to pkgs/by-name/tr/tran/package.nix
diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/by-name/tr/transcode/package.nix
similarity index 100%
rename from pkgs/applications/audio/transcode/default.nix
rename to pkgs/by-name/tr/transcode/package.nix
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/by-name/tr/transcribe/package.nix
similarity index 100%
rename from pkgs/applications/audio/transcribe/default.nix
rename to pkgs/by-name/tr/transcribe/package.nix
diff --git a/pkgs/applications/version-management/transcrypt/default.nix b/pkgs/by-name/tr/transcrypt/package.nix
similarity index 100%
rename from pkgs/applications/version-management/transcrypt/default.nix
rename to pkgs/by-name/tr/transcrypt/package.nix
diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/by-name/tr/transgui/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/transgui/default.nix
rename to pkgs/by-name/tr/transgui/package.nix
diff --git a/pkgs/applications/misc/transifex-cli/default.nix b/pkgs/by-name/tr/transifex-cli/package.nix
similarity index 100%
rename from pkgs/applications/misc/transifex-cli/default.nix
rename to pkgs/by-name/tr/transifex-cli/package.nix
diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/by-name/tr/translate-shell/package.nix
similarity index 100%
rename from pkgs/applications/misc/translate-shell/default.nix
rename to pkgs/by-name/tr/translate-shell/package.nix
diff --git a/pkgs/applications/misc/translatelocally/default.nix b/pkgs/by-name/tr/translatelocally/package.nix
similarity index 100%
rename from pkgs/applications/misc/translatelocally/default.nix
rename to pkgs/by-name/tr/translatelocally/package.nix
diff --git a/pkgs/applications/misc/translatelocally/version_without_git.patch b/pkgs/by-name/tr/translatelocally/version_without_git.patch
similarity index 100%
rename from pkgs/applications/misc/translatelocally/version_without_git.patch
rename to pkgs/by-name/tr/translatelocally/version_without_git.patch
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/by-name/tr/transmission-remote-gtk/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
rename to pkgs/by-name/tr/transmission-remote-gtk/package.nix
diff --git a/pkgs/tools/networking/transmission-rss/default.nix b/pkgs/by-name/tr/transmission-rss/package.nix
similarity index 100%
rename from pkgs/tools/networking/transmission-rss/default.nix
rename to pkgs/by-name/tr/transmission-rss/package.nix
diff --git a/pkgs/tools/networking/transmission-rss/update-cargo-lock-version.patch b/pkgs/by-name/tr/transmission-rss/update-cargo-lock-version.patch
similarity index 100%
rename from pkgs/tools/networking/transmission-rss/update-cargo-lock-version.patch
rename to pkgs/by-name/tr/transmission-rss/update-cargo-lock-version.patch
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/by-name/tr/trash-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/trash-cli/default.nix
rename to pkgs/by-name/tr/trash-cli/package.nix
diff --git a/pkgs/tools/misc/trashy/default.nix b/pkgs/by-name/tr/trashy/package.nix
similarity index 100%
rename from pkgs/tools/misc/trashy/default.nix
rename to pkgs/by-name/tr/trashy/package.nix
diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/by-name/tr/trayer/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/trayer/default.nix
rename to pkgs/by-name/tr/trayer/package.nix
diff --git a/pkgs/tools/misc/trdl-client/default.nix b/pkgs/by-name/tr/trdl-client/package.nix
similarity index 100%
rename from pkgs/tools/misc/trdl-client/default.nix
rename to pkgs/by-name/tr/trdl-client/package.nix
diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/by-name/tr/tre-command/package.nix
similarity index 100%
rename from pkgs/tools/system/tre-command/default.nix
rename to pkgs/by-name/tr/tre-command/package.nix
diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/by-name/tr/tre/package.nix
similarity index 100%
rename from pkgs/development/libraries/tre/default.nix
rename to pkgs/by-name/tr/tre/package.nix
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/by-name/tr/tree/package.nix
similarity index 100%
rename from pkgs/tools/system/tree/default.nix
rename to pkgs/by-name/tr/tree/package.nix
diff --git a/pkgs/applications/science/biology/treemix/default.nix b/pkgs/by-name/tr/treemix/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/treemix/default.nix
rename to pkgs/by-name/tr/treemix/package.nix
diff --git a/pkgs/development/embedded/fpga/trellis/default.nix b/pkgs/by-name/tr/trellis/package.nix
similarity index 100%
rename from pkgs/development/embedded/fpga/trellis/default.nix
rename to pkgs/by-name/tr/trellis/package.nix
diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/by-name/tr/tremc/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/tremc/default.nix
rename to pkgs/by-name/tr/tremc/package.nix
diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/by-name/tr/tremor/package.nix
similarity index 100%
rename from pkgs/development/libraries/tremor/default.nix
rename to pkgs/by-name/tr/tremor/package.nix
diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/by-name/tr/trezor-suite/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/trezor-suite/default.nix
rename to pkgs/by-name/tr/trezor-suite/package.nix
diff --git a/pkgs/os-specific/linux/trezor-udev-rules/default.nix b/pkgs/by-name/tr/trezor-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/trezor-udev-rules/default.nix
rename to pkgs/by-name/tr/trezor-udev-rules/package.nix
diff --git a/pkgs/applications/science/biology/trf/default.nix b/pkgs/by-name/tr/trf/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/trf/default.nix
rename to pkgs/by-name/tr/trf/package.nix
diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/by-name/tr/trickle/package.nix
similarity index 100%
rename from pkgs/tools/networking/trickle/default.nix
rename to pkgs/by-name/tr/trickle/package.nix
diff --git a/pkgs/games/trigger/default.nix b/pkgs/by-name/tr/trigger/package.nix
similarity index 100%
rename from pkgs/games/trigger/default.nix
rename to pkgs/by-name/tr/trigger/package.nix
diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/by-name/tr/triggerhappy/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/triggerhappy/default.nix
rename to pkgs/by-name/tr/triggerhappy/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/trillian-im/default.nix b/pkgs/by-name/tr/trillian-im/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/trillian-im/default.nix
rename to pkgs/by-name/tr/trillian-im/package.nix
diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/by-name/tr/trillian/package.nix
similarity index 100%
rename from pkgs/tools/misc/trillian/default.nix
rename to pkgs/by-name/tr/trillian/package.nix
diff --git a/pkgs/applications/science/biology/trimal/default.nix b/pkgs/by-name/tr/trimal/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/trimal/default.nix
rename to pkgs/by-name/tr/trimal/package.nix
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/by-name/tr/trinity/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/trinity/default.nix
rename to pkgs/by-name/tr/trinity/package.nix
diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/by-name/tr/trino-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/database/trino-cli/default.nix
rename to pkgs/by-name/tr/trino-cli/package.nix
diff --git a/pkgs/tools/networking/trippy/default.nix b/pkgs/by-name/tr/trippy/package.nix
similarity index 100%
rename from pkgs/tools/networking/trippy/default.nix
rename to pkgs/by-name/tr/trippy/package.nix
diff --git a/pkgs/tools/admin/triton/default.nix b/pkgs/by-name/tr/triton/package.nix
similarity index 100%
rename from pkgs/tools/admin/triton/default.nix
rename to pkgs/by-name/tr/triton/package.nix
diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/by-name/tr/trivy/package.nix
similarity index 100%
rename from pkgs/tools/admin/trivy/default.nix
rename to pkgs/by-name/tr/trivy/package.nix
diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/by-name/tr/trompeloeil/package.nix
similarity index 100%
rename from pkgs/development/libraries/trompeloeil/default.nix
rename to pkgs/by-name/tr/trompeloeil/package.nix
diff --git a/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch b/pkgs/by-name/tr/trousers/allow-non-tss-config-file-owner.patch
similarity index 100%
rename from pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch
rename to pkgs/by-name/tr/trousers/allow-non-tss-config-file-owner.patch
diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/by-name/tr/trousers/package.nix
similarity index 100%
rename from pkgs/tools/security/trousers/default.nix
rename to pkgs/by-name/tr/trousers/package.nix
diff --git a/pkgs/tools/security/truecrack/default.nix b/pkgs/by-name/tr/truecrack/package.nix
similarity index 100%
rename from pkgs/tools/security/truecrack/default.nix
rename to pkgs/by-name/tr/truecrack/package.nix
diff --git a/pkgs/tools/security/trueseeing/default.nix b/pkgs/by-name/tr/trueseeing/package.nix
similarity index 100%
rename from pkgs/tools/security/trueseeing/default.nix
rename to pkgs/by-name/tr/trueseeing/package.nix
diff --git a/pkgs/tools/networking/trurl/default.nix b/pkgs/by-name/tr/trurl/package.nix
similarity index 100%
rename from pkgs/tools/networking/trurl/default.nix
rename to pkgs/by-name/tr/trurl/package.nix
diff --git a/pkgs/tools/security/trustymail/default.nix b/pkgs/by-name/tr/trustymail/package.nix
similarity index 100%
rename from pkgs/tools/security/trustymail/default.nix
rename to pkgs/by-name/tr/trustymail/package.nix
diff --git a/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch b/pkgs/by-name/tr/trx/add_bctoolbox_ldlib.patch
similarity index 100%
rename from pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch
rename to pkgs/by-name/tr/trx/add_bctoolbox_ldlib.patch
diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/by-name/tr/trx/package.nix
similarity index 100%
rename from pkgs/tools/audio/trx/default.nix
rename to pkgs/by-name/tr/trx/package.nix
diff --git a/pkgs/tools/admin/try/default.nix b/pkgs/by-name/tr/try/package.nix
similarity index 100%
rename from pkgs/tools/admin/try/default.nix
rename to pkgs/by-name/tr/try/package.nix
diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/by-name/tr/tryton/package.nix
similarity index 100%
rename from pkgs/applications/office/tryton/default.nix
rename to pkgs/by-name/tr/tryton/package.nix
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/by-name/ts/ts/package.nix
similarity index 100%
rename from pkgs/tools/system/ts/default.nix
rename to pkgs/by-name/ts/ts/package.nix
diff --git a/pkgs/tools/video/tsduck/default.nix b/pkgs/by-name/ts/tsduck/package.nix
similarity index 100%
rename from pkgs/tools/video/tsduck/default.nix
rename to pkgs/by-name/ts/tsduck/package.nix
diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/by-name/ts/tsocks/package.nix
similarity index 100%
rename from pkgs/development/libraries/tsocks/default.nix
rename to pkgs/by-name/ts/tsocks/package.nix
diff --git a/pkgs/development/libraries/tsocks/poll.patch b/pkgs/by-name/ts/tsocks/poll.patch
similarity index 100%
rename from pkgs/development/libraries/tsocks/poll.patch
rename to pkgs/by-name/ts/tsocks/poll.patch
diff --git a/pkgs/applications/misc/tsukae/default.nix b/pkgs/by-name/ts/tsukae/package.nix
similarity index 100%
rename from pkgs/applications/misc/tsukae/default.nix
rename to pkgs/by-name/ts/tsukae/package.nix
diff --git a/pkgs/applications/networking/tsung/default.nix b/pkgs/by-name/ts/tsung/package.nix
similarity index 100%
rename from pkgs/applications/networking/tsung/default.nix
rename to pkgs/by-name/ts/tsung/package.nix
diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix
similarity index 100%
rename from pkgs/servers/tt-rss/plugin-auth-ldap/default.nix
rename to pkgs/by-name/tt/tt-rss-plugin-auth-ldap/package.nix
diff --git a/pkgs/servers/tt-rss/plugin-feediron/default.nix b/pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix
similarity index 100%
rename from pkgs/servers/tt-rss/plugin-feediron/default.nix
rename to pkgs/by-name/tt/tt-rss-plugin-feediron/package.nix
diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix
similarity index 100%
rename from pkgs/servers/tt-rss/plugin-ff-instagram/default.nix
rename to pkgs/by-name/tt/tt-rss-plugin-ff-instagram/package.nix
diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/by-name/tt/tt-rss-theme-feedly/package.nix
similarity index 100%
rename from pkgs/servers/tt-rss/theme-feedly/default.nix
rename to pkgs/by-name/tt/tt-rss-theme-feedly/package.nix
diff --git a/pkgs/data/fonts/tt2020/default.nix b/pkgs/by-name/tt/tt2020/package.nix
similarity index 100%
rename from pkgs/data/fonts/tt2020/default.nix
rename to pkgs/by-name/tt/tt2020/package.nix
diff --git a/pkgs/development/tools/misc/ttags/default.nix b/pkgs/by-name/tt/ttags/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/ttags/default.nix
rename to pkgs/by-name/tt/ttags/package.nix
diff --git a/pkgs/tools/misc/ttchat/default.nix b/pkgs/by-name/tt/ttchat/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttchat/default.nix
rename to pkgs/by-name/tt/ttchat/package.nix
diff --git a/pkgs/applications/misc/ttdl/default.nix b/pkgs/by-name/tt/ttdl/package.nix
similarity index 100%
rename from pkgs/applications/misc/ttdl/default.nix
rename to pkgs/by-name/tt/ttdl/package.nix
diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/by-name/tt/ttf-envy-code-r/package.nix
similarity index 100%
rename from pkgs/data/fonts/ttf-envy-code-r/default.nix
rename to pkgs/by-name/tt/ttf-envy-code-r/package.nix
diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/by-name/tt/ttf-tw-moe/package.nix
similarity index 100%
rename from pkgs/data/fonts/ttf-tw-moe/default.nix
rename to pkgs/by-name/tt/ttf-tw-moe/package.nix
diff --git a/pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch b/pkgs/by-name/tt/ttf2pt1/gentoo-makefile.patch
similarity index 100%
rename from pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch
rename to pkgs/by-name/tt/ttf2pt1/gentoo-makefile.patch
diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/by-name/tt/ttf2pt1/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttf2pt1/default.nix
rename to pkgs/by-name/tt/ttf2pt1/package.nix
diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/by-name/tt/ttf_bitstream_vera/package.nix
similarity index 100%
rename from pkgs/data/fonts/ttf-bitstream-vera/default.nix
rename to pkgs/by-name/tt/ttf_bitstream_vera/package.nix
diff --git a/pkgs/development/tools/ttfb/default.nix b/pkgs/by-name/tt/ttfb/package.nix
similarity index 100%
rename from pkgs/development/tools/ttfb/default.nix
rename to pkgs/by-name/tt/ttfb/package.nix
diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/by-name/tt/tthsum/package.nix
similarity index 100%
rename from pkgs/applications/misc/tthsum/default.nix
rename to pkgs/by-name/tt/tthsum/package.nix
diff --git a/pkgs/tools/misc/ttmkfdir/cstring.patch b/pkgs/by-name/tt/ttmkfdir/cstring.patch
similarity index 100%
rename from pkgs/tools/misc/ttmkfdir/cstring.patch
rename to pkgs/by-name/tt/ttmkfdir/cstring.patch
diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/by-name/tt/ttmkfdir/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttmkfdir/default.nix
rename to pkgs/by-name/tt/ttmkfdir/package.nix
diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/by-name/tt/tts/package.nix
similarity index 100%
rename from pkgs/tools/audio/tts/default.nix
rename to pkgs/by-name/tt/tts/package.nix
diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/by-name/tt/ttwatch/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttwatch/default.nix
rename to pkgs/by-name/tt/ttwatch/package.nix
diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/by-name/tt/tty-clock/package.nix
similarity index 100%
rename from pkgs/tools/misc/tty-clock/default.nix
rename to pkgs/by-name/tt/tty-clock/package.nix
diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/by-name/tt/tty-share/package.nix
similarity index 100%
rename from pkgs/applications/misc/tty-share/default.nix
rename to pkgs/by-name/tt/tty-share/package.nix
diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/by-name/tt/ttyd/package.nix
similarity index 100%
rename from pkgs/servers/ttyd/default.nix
rename to pkgs/by-name/tt/ttyd/package.nix
diff --git a/pkgs/tools/misc/ttygif/default.nix b/pkgs/by-name/tt/ttygif/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttygif/default.nix
rename to pkgs/by-name/tt/ttygif/package.nix
diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/by-name/tt/ttylog/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttylog/default.nix
rename to pkgs/by-name/tt/ttylog/package.nix
diff --git a/pkgs/applications/misc/ttyper/default.nix b/pkgs/by-name/tt/ttyper/package.nix
similarity index 100%
rename from pkgs/applications/misc/ttyper/default.nix
rename to pkgs/by-name/tt/ttyper/package.nix
diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/by-name/tt/ttyplot/package.nix
similarity index 100%
rename from pkgs/tools/misc/ttyplot/default.nix
rename to pkgs/by-name/tt/ttyplot/package.nix
diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/by-name/tu/tuba/package.nix
similarity index 100%
rename from pkgs/applications/misc/tuba/default.nix
rename to pkgs/by-name/tu/tuba/package.nix
diff --git a/pkgs/tools/text/tuc/default.nix b/pkgs/by-name/tu/tuc/package.nix
similarity index 100%
rename from pkgs/tools/text/tuc/default.nix
rename to pkgs/by-name/tu/tuc/package.nix
diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/by-name/tu/tuckr/package.nix
similarity index 100%
rename from pkgs/applications/misc/tuckr/default.nix
rename to pkgs/by-name/tu/tuckr/package.nix
diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/by-name/tu/tudu/package.nix
similarity index 100%
rename from pkgs/applications/office/tudu/default.nix
rename to pkgs/by-name/tu/tudu/package.nix
diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/by-name/tu/tuhi/package.nix
similarity index 100%
rename from pkgs/applications/misc/tuhi/default.nix
rename to pkgs/by-name/tu/tuhi/package.nix
diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/by-name/tu/tui-journal/package.nix
similarity index 100%
rename from pkgs/applications/misc/tui-journal/default.nix
rename to pkgs/by-name/tu/tui-journal/package.nix
diff --git a/pkgs/tools/networking/tuic/Cargo.lock b/pkgs/by-name/tu/tuic/Cargo.lock
similarity index 100%
rename from pkgs/tools/networking/tuic/Cargo.lock
rename to pkgs/by-name/tu/tuic/Cargo.lock
diff --git a/pkgs/tools/networking/tuic/default.nix b/pkgs/by-name/tu/tuic/package.nix
similarity index 100%
rename from pkgs/tools/networking/tuic/default.nix
rename to pkgs/by-name/tu/tuic/package.nix
diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/by-name/tu/tuir/package.nix
similarity index 100%
rename from pkgs/applications/misc/tuir/default.nix
rename to pkgs/by-name/tu/tuir/package.nix
diff --git a/pkgs/games/tumiki-fighters/default.nix b/pkgs/by-name/tu/tumiki-fighters/package.nix
similarity index 100%
rename from pkgs/games/tumiki-fighters/default.nix
rename to pkgs/by-name/tu/tumiki-fighters/package.nix
diff --git a/pkgs/tools/networking/tun2socks/default.nix b/pkgs/by-name/tu/tun2socks/package.nix
similarity index 100%
rename from pkgs/tools/networking/tun2socks/default.nix
rename to pkgs/by-name/tu/tun2socks/package.nix
diff --git a/pkgs/os-specific/linux/tuna/default.nix b/pkgs/by-name/tu/tuna/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tuna/default.nix
rename to pkgs/by-name/tu/tuna/package.nix
diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/by-name/tu/tunctl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tunctl/default.nix
rename to pkgs/by-name/tu/tunctl/package.nix
diff --git a/pkgs/applications/audio/tuner/default.nix b/pkgs/by-name/tu/tuner/package.nix
similarity index 100%
rename from pkgs/applications/audio/tuner/default.nix
rename to pkgs/by-name/tu/tuner/package.nix
diff --git a/pkgs/applications/gis/tunnelx/default.nix b/pkgs/by-name/tu/tunnelx/package.nix
similarity index 100%
rename from pkgs/applications/gis/tunnelx/default.nix
rename to pkgs/by-name/tu/tunnelx/package.nix
diff --git a/pkgs/tools/networking/tuntox/default.nix b/pkgs/by-name/tu/tuntox/package.nix
similarity index 100%
rename from pkgs/tools/networking/tuntox/default.nix
rename to pkgs/by-name/tu/tuntox/package.nix
diff --git a/pkgs/tools/networking/tunwg/default.nix b/pkgs/by-name/tu/tunwg/package.nix
similarity index 100%
rename from pkgs/tools/networking/tunwg/default.nix
rename to pkgs/by-name/tu/tunwg/package.nix
diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/by-name/tu/tuptime/package.nix
similarity index 100%
rename from pkgs/tools/system/tuptime/default.nix
rename to pkgs/by-name/tu/tuptime/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/by-name/tu/turses/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/turses/default.nix
rename to pkgs/by-name/tu/turses/package.nix
diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/by-name/tu/turso-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/turso-cli/default.nix
rename to pkgs/by-name/tu/turso-cli/package.nix
diff --git a/pkgs/development/tools/build-managers/turtle-build/default.nix b/pkgs/by-name/tu/turtle-build/package.nix
similarity index 100%
rename from pkgs/development/tools/build-managers/turtle-build/default.nix
rename to pkgs/by-name/tu/turtle-build/package.nix
diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/by-name/tu/tusk/package.nix
similarity index 100%
rename from pkgs/applications/office/tusk/default.nix
rename to pkgs/by-name/tu/tusk/package.nix
diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/by-name/tu/tut/package.nix
similarity index 100%
rename from pkgs/applications/misc/tut/default.nix
rename to pkgs/by-name/tu/tut/package.nix
diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
rename to pkgs/by-name/tu/tutanota-desktop/package.nix
diff --git a/pkgs/os-specific/linux/tuxedo-rs/default.nix b/pkgs/by-name/tu/tuxedo-rs/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tuxedo-rs/default.nix
rename to pkgs/by-name/tu/tuxedo-rs/package.nix
diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/by-name/tu/tuxpaint/package.nix
similarity index 100%
rename from pkgs/games/tuxpaint/default.nix
rename to pkgs/by-name/tu/tuxpaint/package.nix
diff --git a/pkgs/games/tuxpaint/tuxpaint-completion.diff b/pkgs/by-name/tu/tuxpaint/tuxpaint-completion.diff
similarity index 100%
rename from pkgs/games/tuxpaint/tuxpaint-completion.diff
rename to pkgs/by-name/tu/tuxpaint/tuxpaint-completion.diff
diff --git a/pkgs/games/tuxtype/default.nix b/pkgs/by-name/tu/tuxtype/package.nix
similarity index 100%
rename from pkgs/games/tuxtype/default.nix
rename to pkgs/by-name/tu/tuxtype/package.nix
diff --git a/pkgs/tools/text/tv/default.nix b/pkgs/by-name/tv/tv/package.nix
similarity index 100%
rename from pkgs/tools/text/tv/default.nix
rename to pkgs/by-name/tv/tv/package.nix
diff --git a/pkgs/applications/misc/tvbrowser/default.nix b/pkgs/by-name/tv/tvbrowser/package.nix
similarity index 100%
rename from pkgs/applications/misc/tvbrowser/default.nix
rename to pkgs/by-name/tv/tvbrowser/package.nix
diff --git a/pkgs/applications/misc/tvbrowser/test.nix b/pkgs/by-name/tv/tvbrowser/test.nix
similarity index 100%
rename from pkgs/applications/misc/tvbrowser/test.nix
rename to pkgs/by-name/tv/tvbrowser/test.nix
diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/by-name/tv/tvm/package.nix
similarity index 100%
rename from pkgs/development/compilers/tvm/default.nix
rename to pkgs/by-name/tv/tvm/package.nix
diff --git a/pkgs/tools/misc/tvnamer/default.nix b/pkgs/by-name/tv/tvnamer/package.nix
similarity index 100%
rename from pkgs/tools/misc/tvnamer/default.nix
rename to pkgs/by-name/tv/tvnamer/package.nix
diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/by-name/tw/twa/package.nix
similarity index 100%
rename from pkgs/tools/networking/twa/default.nix
rename to pkgs/by-name/tw/twa/package.nix
diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/by-name/tw/tweak/package.nix
similarity index 100%
rename from pkgs/applications/editors/tweak/default.nix
rename to pkgs/by-name/tw/tweak/package.nix
diff --git a/pkgs/development/libraries/tweeny/default.nix b/pkgs/by-name/tw/tweeny/package.nix
similarity index 100%
rename from pkgs/development/libraries/tweeny/default.nix
rename to pkgs/by-name/tw/tweeny/package.nix
diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/by-name/tw/twelf/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/twelf/default.nix
rename to pkgs/by-name/tw/twelf/package.nix
diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/twemoji-color-font/default.nix
rename to pkgs/by-name/tw/twemoji-color-font/package.nix
diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/by-name/tw/twilio-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/twilio-cli/default.nix
rename to pkgs/by-name/tw/twilio-cli/package.nix
diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/by-name/tw/twingate/package.nix
similarity index 100%
rename from pkgs/applications/networking/twingate/default.nix
rename to pkgs/by-name/tw/twingate/package.nix
diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/by-name/tw/twitter-color-emoji/package.nix
similarity index 100%
rename from pkgs/data/fonts/twitter-color-emoji/default.nix
rename to pkgs/by-name/tw/twitter-color-emoji/package.nix
diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/by-name/tw/twitterBootstrap/package.nix
similarity index 100%
rename from pkgs/development/web/twitter-bootstrap/default.nix
rename to pkgs/by-name/tw/twitterBootstrap/package.nix
diff --git a/pkgs/tools/misc/twspace-crawler/default.nix b/pkgs/by-name/tw/twspace-crawler/package.nix
similarity index 100%
rename from pkgs/tools/misc/twspace-crawler/default.nix
rename to pkgs/by-name/tw/twspace-crawler/package.nix
diff --git a/pkgs/tools/misc/twspace-dl/default.nix b/pkgs/by-name/tw/twspace-dl/package.nix
similarity index 100%
rename from pkgs/tools/misc/twspace-dl/default.nix
rename to pkgs/by-name/tw/twspace-dl/package.nix
diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/by-name/tx/txt2man/package.nix
similarity index 100%
rename from pkgs/tools/misc/txt2man/default.nix
rename to pkgs/by-name/tx/txt2man/package.nix
diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/by-name/tx/txt2tags/package.nix
similarity index 100%
rename from pkgs/tools/text/txt2tags/default.nix
rename to pkgs/by-name/tx/txt2tags/package.nix
diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/by-name/tx/txtw/package.nix
similarity index 100%
rename from pkgs/tools/misc/txtw/default.nix
rename to pkgs/by-name/tx/txtw/package.nix
diff --git a/pkgs/tools/misc/tydra/default.nix b/pkgs/by-name/ty/tydra/package.nix
similarity index 100%
rename from pkgs/tools/misc/tydra/default.nix
rename to pkgs/by-name/ty/tydra/package.nix
diff --git a/pkgs/applications/terminal-emulators/tym/default.nix b/pkgs/by-name/ty/tym/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/tym/default.nix
rename to pkgs/by-name/ty/tym/package.nix
diff --git a/pkgs/applications/misc/typer/default.nix b/pkgs/by-name/ty/typer/package.nix
similarity index 100%
rename from pkgs/applications/misc/typer/default.nix
rename to pkgs/by-name/ty/typer/package.nix
diff --git a/pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch b/pkgs/by-name/ty/typescript/disable-dprint-dstBundler.patch
similarity index 100%
rename from pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch
rename to pkgs/by-name/ty/typescript/disable-dprint-dstBundler.patch
diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/by-name/ty/typescript/package.nix
similarity index 100%
rename from pkgs/development/compilers/typescript/default.nix
rename to pkgs/by-name/ty/typescript/package.nix
diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/by-name/ty/typeshare/package.nix
similarity index 100%
rename from pkgs/development/tools/rust/typeshare/default.nix
rename to pkgs/by-name/ty/typeshare/package.nix
diff --git a/pkgs/games/typespeed/default.nix b/pkgs/by-name/ty/typespeed/package.nix
similarity index 100%
rename from pkgs/games/typespeed/default.nix
rename to pkgs/by-name/ty/typespeed/package.nix
diff --git a/pkgs/games/typespeed/typespeed-config-in-home.patch b/pkgs/by-name/ty/typespeed/typespeed-config-in-home.patch
similarity index 100%
rename from pkgs/games/typespeed/typespeed-config-in-home.patch
rename to pkgs/by-name/ty/typespeed/typespeed-config-in-home.patch
diff --git a/pkgs/development/tools/misc/typical/default.nix b/pkgs/by-name/ty/typical/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/typical/default.nix
rename to pkgs/by-name/ty/typical/package.nix
diff --git a/pkgs/applications/misc/typioca/default.nix b/pkgs/by-name/ty/typioca/package.nix
similarity index 100%
rename from pkgs/applications/misc/typioca/default.nix
rename to pkgs/by-name/ty/typioca/package.nix
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/by-name/ty/typora/package.nix
similarity index 100%
rename from pkgs/applications/editors/typora/default.nix
rename to pkgs/by-name/ty/typora/package.nix
diff --git a/pkgs/development/tools/misc/tyson/default.nix b/pkgs/by-name/ty/tyson/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/tyson/default.nix
rename to pkgs/by-name/ty/tyson/package.nix
diff --git a/pkgs/tools/misc/tz/default.nix b/pkgs/by-name/tz/tz/package.nix
similarity index 100%
rename from pkgs/tools/misc/tz/default.nix
rename to pkgs/by-name/tz/tz/package.nix
diff --git a/pkgs/data/misc/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch b/pkgs/by-name/tz/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch
similarity index 100%
rename from pkgs/data/misc/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch
rename to pkgs/by-name/tz/tzdata/0001-Add-exe-extension-for-MS-Windows-binaries.patch
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/by-name/tz/tzdata/package.nix
similarity index 100%
rename from pkgs/data/misc/tzdata/default.nix
rename to pkgs/by-name/tz/tzdata/package.nix
diff --git a/pkgs/data/misc/tzdata/tzdata-setup-hook.sh b/pkgs/by-name/tz/tzdata/tzdata-setup-hook.sh
similarity index 100%
rename from pkgs/data/misc/tzdata/tzdata-setup-hook.sh
rename to pkgs/by-name/tz/tzdata/tzdata-setup-hook.sh
diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/by-name/tz/tzupdate/package.nix
similarity index 100%
rename from pkgs/applications/misc/tzupdate/default.nix
rename to pkgs/by-name/tz/tzupdate/package.nix
diff --git a/pkgs/data/fonts/u001/default.nix b/pkgs/by-name/u0/u001-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/u001/default.nix
rename to pkgs/by-name/u0/u001-font/package.nix
diff --git a/pkgs/tools/text/u2ps/default.nix b/pkgs/by-name/u2/u2ps/package.nix
similarity index 100%
rename from pkgs/tools/text/u2ps/default.nix
rename to pkgs/by-name/u2/u2ps/package.nix
diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/by-name/u3/u3-tool/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/u3-tool/default.nix
rename to pkgs/by-name/u3/u3-tool/package.nix
diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/by-name/u9/u9fs/package.nix
similarity index 100%
rename from pkgs/servers/u9fs/default.nix
rename to pkgs/by-name/u9/u9fs/package.nix
diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/by-name/ua/ua/package.nix
similarity index 100%
rename from pkgs/tools/networking/ua/default.nix
rename to pkgs/by-name/ua/ua/package.nix
diff --git a/pkgs/tools/admin/uacme/default.nix b/pkgs/by-name/ua/uacme/package.nix
similarity index 100%
rename from pkgs/tools/admin/uacme/default.nix
rename to pkgs/by-name/ua/uacme/package.nix
diff --git a/pkgs/applications/audio/uade/default.nix b/pkgs/by-name/ua/uade/package.nix
similarity index 100%
rename from pkgs/applications/audio/uade/default.nix
rename to pkgs/by-name/ua/uade/package.nix
diff --git a/pkgs/applications/emulators/uae/default.nix b/pkgs/by-name/ua/uae/package.nix
similarity index 100%
rename from pkgs/applications/emulators/uae/default.nix
rename to pkgs/by-name/ua/uae/package.nix
diff --git a/pkgs/tools/misc/uair/default.nix b/pkgs/by-name/ua/uair/package.nix
similarity index 100%
rename from pkgs/tools/misc/uair/default.nix
rename to pkgs/by-name/ua/uair/package.nix
diff --git a/pkgs/applications/science/machine-learning/uarmsolver/default.nix b/pkgs/by-name/ua/uarmsolver/package.nix
similarity index 100%
rename from pkgs/applications/science/machine-learning/uarmsolver/default.nix
rename to pkgs/by-name/ua/uarmsolver/package.nix
diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/by-name/ua/uasm/package.nix
similarity index 100%
rename from pkgs/development/compilers/uasm/default.nix
rename to pkgs/by-name/ua/uasm/package.nix
diff --git a/pkgs/applications/radio/ubertooth/default.nix b/pkgs/by-name/ub/ubertooth/package.nix
similarity index 100%
rename from pkgs/applications/radio/ubertooth/default.nix
rename to pkgs/by-name/ub/ubertooth/package.nix
diff --git a/pkgs/tools/filesystems/ubi_reader/default.nix b/pkgs/by-name/ub/ubi_reader/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/ubi_reader/default.nix
rename to pkgs/by-name/ub/ubi_reader/package.nix
diff --git a/pkgs/data/themes/ubuntu-themes/default.nix b/pkgs/by-name/ub/ubuntu-themes/package.nix
similarity index 100%
rename from pkgs/data/themes/ubuntu-themes/default.nix
rename to pkgs/by-name/ub/ubuntu-themes/package.nix
diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/by-name/ub/ubus/package.nix
similarity index 100%
rename from pkgs/development/libraries/ubus/default.nix
rename to pkgs/by-name/ub/ubus/package.nix
diff --git a/pkgs/servers/ucarp/default.nix b/pkgs/by-name/uc/ucarp/package.nix
similarity index 100%
rename from pkgs/servers/ucarp/default.nix
rename to pkgs/by-name/uc/ucarp/package.nix
diff --git a/pkgs/development/libraries/ucc/default.nix b/pkgs/by-name/uc/ucc/package.nix
similarity index 100%
rename from pkgs/development/libraries/ucc/default.nix
rename to pkgs/by-name/uc/ucc/package.nix
diff --git a/pkgs/games/uchess/default.nix b/pkgs/by-name/uc/uchess/package.nix
similarity index 100%
rename from pkgs/games/uchess/default.nix
rename to pkgs/by-name/uc/uchess/package.nix
diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/by-name/uc/uci/package.nix
similarity index 100%
rename from pkgs/development/libraries/uci/default.nix
rename to pkgs/by-name/uc/uci/package.nix
diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/by-name/uc/ucl/package.nix
similarity index 100%
rename from pkgs/development/libraries/ucl/default.nix
rename to pkgs/by-name/uc/ucl/package.nix
diff --git a/pkgs/development/libraries/uclient/default.nix b/pkgs/by-name/uc/uclient/package.nix
similarity index 100%
rename from pkgs/development/libraries/uclient/default.nix
rename to pkgs/by-name/uc/uclient/package.nix
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/by-name/uc/ucommon/package.nix
similarity index 100%
rename from pkgs/development/libraries/ucommon/default.nix
rename to pkgs/by-name/uc/ucommon/package.nix
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/by-name/uc/ucs-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/ucs-fonts/default.nix
rename to pkgs/by-name/uc/ucs-fonts/package.nix
diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/by-name/uc/ucspi-tcp/package.nix
similarity index 100%
rename from pkgs/tools/networking/ucspi-tcp/default.nix
rename to pkgs/by-name/uc/ucspi-tcp/package.nix
diff --git a/pkgs/tools/networking/ucspi-tcp/remove-setuid.patch b/pkgs/by-name/uc/ucspi-tcp/remove-setuid.patch
similarity index 100%
rename from pkgs/tools/networking/ucspi-tcp/remove-setuid.patch
rename to pkgs/by-name/uc/ucspi-tcp/remove-setuid.patch
diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/by-name/uc/ucx/package.nix
similarity index 100%
rename from pkgs/development/libraries/ucx/default.nix
rename to pkgs/by-name/uc/ucx/package.nix
diff --git a/pkgs/tools/security/uddup/default.nix b/pkgs/by-name/ud/uddup/package.nix
similarity index 100%
rename from pkgs/tools/security/uddup/default.nix
rename to pkgs/by-name/ud/uddup/package.nix
diff --git a/pkgs/tools/filesystems/udftools/default.nix b/pkgs/by-name/ud/udftools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/udftools/default.nix
rename to pkgs/by-name/ud/udftools/package.nix
diff --git a/pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch b/pkgs/by-name/ud/udict/0001-update-version-in-lock-file.patch
similarity index 100%
rename from pkgs/applications/misc/udict/0001-update-version-in-lock-file.patch
rename to pkgs/by-name/ud/udict/0001-update-version-in-lock-file.patch
diff --git a/pkgs/applications/misc/udict/default.nix b/pkgs/by-name/ud/udict/package.nix
similarity index 100%
rename from pkgs/applications/misc/udict/default.nix
rename to pkgs/by-name/ud/udict/package.nix
diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/by-name/ud/udig/package.nix
similarity index 100%
rename from pkgs/applications/gis/udig/default.nix
rename to pkgs/by-name/ud/udig/package.nix
diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/by-name/ud/udis86/package.nix
similarity index 100%
rename from pkgs/development/tools/udis86/default.nix
rename to pkgs/by-name/ud/udis86/package.nix
diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/by-name/ud/udns/package.nix
similarity index 100%
rename from pkgs/development/libraries/udns/default.nix
rename to pkgs/by-name/ud/udns/package.nix
diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/by-name/ud/udocker/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/udocker/default.nix
rename to pkgs/by-name/ud/udocker/package.nix
diff --git a/pkgs/tools/networking/udp2raw/default.nix b/pkgs/by-name/ud/udp2raw/package.nix
similarity index 100%
rename from pkgs/tools/networking/udp2raw/default.nix
rename to pkgs/by-name/ud/udp2raw/package.nix
diff --git a/pkgs/tools/networking/udpreplay/default.nix b/pkgs/by-name/ud/udpreplay/package.nix
similarity index 100%
rename from pkgs/tools/networking/udpreplay/default.nix
rename to pkgs/by-name/ud/udpreplay/package.nix
diff --git a/pkgs/servers/udpt/default.nix b/pkgs/by-name/ud/udpt/package.nix
similarity index 100%
rename from pkgs/servers/udpt/default.nix
rename to pkgs/by-name/ud/udpt/package.nix
diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/by-name/ud/udptunnel/package.nix
similarity index 100%
rename from pkgs/tools/networking/udptunnel/default.nix
rename to pkgs/by-name/ud/udptunnel/package.nix
diff --git a/pkgs/tools/security/udpx/default.nix b/pkgs/by-name/ud/udpx/package.nix
similarity index 100%
rename from pkgs/tools/security/udpx/default.nix
rename to pkgs/by-name/ud/udpx/package.nix
diff --git a/pkgs/tools/virtualization/uefi-run/default.nix b/pkgs/by-name/ue/uefi-run/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/uefi-run/default.nix
rename to pkgs/by-name/ue/uefi-run/package.nix
diff --git a/pkgs/tools/system/ufiformat/default.nix b/pkgs/by-name/uf/ufiformat/package.nix
similarity index 100%
rename from pkgs/tools/system/ufiformat/default.nix
rename to pkgs/by-name/uf/ufiformat/package.nix
diff --git a/pkgs/games/ufoai/default.nix b/pkgs/by-name/uf/ufoai/package.nix
similarity index 100%
rename from pkgs/games/ufoai/default.nix
rename to pkgs/by-name/uf/ufoai/package.nix
diff --git a/pkgs/servers/uftp/default.nix b/pkgs/by-name/uf/uftp/package.nix
similarity index 100%
rename from pkgs/servers/uftp/default.nix
rename to pkgs/by-name/uf/uftp/package.nix
diff --git a/pkgs/servers/ftp/uftpd/default.nix b/pkgs/by-name/uf/uftpd/package.nix
similarity index 100%
rename from pkgs/servers/ftp/uftpd/default.nix
rename to pkgs/by-name/uf/uftpd/package.nix
diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/by-name/uf/uftrace/package.nix
similarity index 100%
rename from pkgs/development/tools/uftrace/default.nix
rename to pkgs/by-name/uf/uftrace/package.nix
diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/by-name/ug/uget-integrator/package.nix
similarity index 100%
rename from pkgs/tools/networking/uget-integrator/default.nix
rename to pkgs/by-name/ug/uget-integrator/package.nix
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/by-name/ug/uget/package.nix
similarity index 100%
rename from pkgs/tools/networking/uget/default.nix
rename to pkgs/by-name/ug/uget/package.nix
diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/by-name/ug/ugrep/package.nix
similarity index 100%
rename from pkgs/tools/text/ugrep/default.nix
rename to pkgs/by-name/ug/ugrep/package.nix
diff --git a/pkgs/tools/misc/ugs/default.nix b/pkgs/by-name/ug/ugs/package.nix
similarity index 100%
rename from pkgs/tools/misc/ugs/default.nix
rename to pkgs/by-name/ug/ugs/package.nix
diff --git a/pkgs/tools/misc/ugtrain/default.nix b/pkgs/by-name/ug/ugtrain/package.nix
similarity index 100%
rename from pkgs/tools/misc/ugtrain/default.nix
rename to pkgs/by-name/ug/ugtrain/package.nix
diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/by-name/uh/uhdm/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/uhdm/default.nix
rename to pkgs/by-name/uh/uhdm/package.nix
diff --git a/pkgs/games/uhexen2/default.nix b/pkgs/by-name/uh/uhexen2/package.nix
similarity index 100%
rename from pkgs/games/uhexen2/default.nix
rename to pkgs/by-name/uh/uhexen2/package.nix
diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/by-name/uh/uhk-agent/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/uhk-agent/default.nix
rename to pkgs/by-name/uh/uhk-agent/package.nix
diff --git a/pkgs/os-specific/linux/uhk-udev-rules/default.nix b/pkgs/by-name/uh/uhk-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/uhk-udev-rules/default.nix
rename to pkgs/by-name/uh/uhk-udev-rules/package.nix
diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/by-name/uh/uhttpmock/package.nix
similarity index 100%
rename from pkgs/development/libraries/uhttpmock/default.nix
rename to pkgs/by-name/uh/uhttpmock/package.nix
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/by-name/uh/uhub/package.nix
similarity index 100%
rename from pkgs/servers/uhub/default.nix
rename to pkgs/by-name/uh/uhub/package.nix
diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/by-name/uh/uhubctl/package.nix
similarity index 100%
rename from pkgs/tools/misc/uhubctl/default.nix
rename to pkgs/by-name/uh/uhubctl/package.nix
diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/by-name/ui/uid_wrapper/package.nix
similarity index 100%
rename from pkgs/development/libraries/uid_wrapper/default.nix
rename to pkgs/by-name/ui/uid_wrapper/package.nix
diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/by-name/ui/uif2iso/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/uif2iso/default.nix
rename to pkgs/by-name/ui/uif2iso/package.nix
diff --git a/pkgs/development/embedded/uisp/default.nix b/pkgs/by-name/ui/uisp/package.nix
similarity index 100%
rename from pkgs/development/embedded/uisp/default.nix
rename to pkgs/by-name/ui/uisp/package.nix
diff --git a/pkgs/applications/editors/uivonim/default.nix b/pkgs/by-name/ui/uivonim/package.nix
similarity index 100%
rename from pkgs/applications/editors/uivonim/default.nix
rename to pkgs/by-name/ui/uivonim/package.nix
diff --git a/pkgs/tools/games/ukmm/Cargo.lock b/pkgs/by-name/uk/ukmm/Cargo.lock
similarity index 100%
rename from pkgs/tools/games/ukmm/Cargo.lock
rename to pkgs/by-name/uk/ukmm/Cargo.lock
diff --git a/pkgs/tools/games/ukmm/default.nix b/pkgs/by-name/uk/ukmm/package.nix
similarity index 100%
rename from pkgs/tools/games/ukmm/default.nix
rename to pkgs/by-name/uk/ukmm/package.nix
diff --git a/pkgs/applications/misc/ulauncher/fix-extensions.patch b/pkgs/by-name/ul/ulauncher/fix-extensions.patch
similarity index 100%
rename from pkgs/applications/misc/ulauncher/fix-extensions.patch
rename to pkgs/by-name/ul/ulauncher/fix-extensions.patch
diff --git a/pkgs/applications/misc/ulauncher/fix-path.patch b/pkgs/by-name/ul/ulauncher/fix-path.patch
similarity index 100%
rename from pkgs/applications/misc/ulauncher/fix-path.patch
rename to pkgs/by-name/ul/ulauncher/fix-path.patch
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/by-name/ul/ulauncher/package.nix
similarity index 100%
rename from pkgs/applications/misc/ulauncher/default.nix
rename to pkgs/by-name/ul/ulauncher/package.nix
diff --git a/pkgs/tools/misc/ulid/default.nix b/pkgs/by-name/ul/ulid/package.nix
similarity index 100%
rename from pkgs/tools/misc/ulid/default.nix
rename to pkgs/by-name/ul/ulid/package.nix
diff --git a/pkgs/os-specific/linux/ulogd/default.nix b/pkgs/by-name/ul/ulogd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ulogd/default.nix
rename to pkgs/by-name/ul/ulogd/package.nix
diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/by-name/ul/ultimate-oldschool-pc-font-pack/package.nix
similarity index 100%
rename from pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
rename to pkgs/by-name/ul/ultimate-oldschool-pc-font-pack/package.nix
diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/by-name/ul/ultimatestunts/package.nix
similarity index 100%
rename from pkgs/games/ultimatestunts/default.nix
rename to pkgs/by-name/ul/ultimatestunts/package.nix
diff --git a/pkgs/os-specific/linux/ultrablue-server/default.nix b/pkgs/by-name/ul/ultrablue-server/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/ultrablue-server/default.nix
rename to pkgs/by-name/ul/ultrablue-server/package.nix
diff --git a/pkgs/applications/misc/ultralist/default.nix b/pkgs/by-name/ul/ultralist/package.nix
similarity index 100%
rename from pkgs/applications/misc/ultralist/default.nix
rename to pkgs/by-name/ul/ultralist/package.nix
diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/by-name/ul/ultrastardx/package.nix
similarity index 100%
rename from pkgs/games/ultrastardx/default.nix
rename to pkgs/by-name/ul/ultrastardx/package.nix
diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/by-name/um/umlet/package.nix
similarity index 100%
rename from pkgs/tools/misc/umlet/default.nix
rename to pkgs/by-name/um/umlet/package.nix
diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/by-name/um/umoci/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/umoci/default.nix
rename to pkgs/by-name/um/umoci/package.nix
diff --git a/pkgs/development/libraries/umockdev/hardcode-paths.patch b/pkgs/by-name/um/umockdev/hardcode-paths.patch
similarity index 100%
rename from pkgs/development/libraries/umockdev/hardcode-paths.patch
rename to pkgs/by-name/um/umockdev/hardcode-paths.patch
diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/by-name/um/umockdev/package.nix
similarity index 100%
rename from pkgs/development/libraries/umockdev/default.nix
rename to pkgs/by-name/um/umockdev/package.nix
diff --git a/pkgs/development/libraries/umockdev/substitute-udevadm.patch b/pkgs/by-name/um/umockdev/substitute-udevadm.patch
similarity index 100%
rename from pkgs/development/libraries/umockdev/substitute-udevadm.patch
rename to pkgs/by-name/um/umockdev/substitute-udevadm.patch
diff --git a/pkgs/games/umoria/default.nix b/pkgs/by-name/um/umoria/package.nix
similarity index 100%
rename from pkgs/games/umoria/default.nix
rename to pkgs/by-name/um/umoria/package.nix
diff --git a/pkgs/development/misc/umr/default.nix b/pkgs/by-name/um/umr/package.nix
similarity index 100%
rename from pkgs/development/misc/umr/default.nix
rename to pkgs/by-name/um/umr/package.nix
diff --git a/pkgs/servers/ums/default.nix b/pkgs/by-name/um/ums/package.nix
similarity index 100%
rename from pkgs/servers/ums/default.nix
rename to pkgs/by-name/um/ums/package.nix
diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/by-name/um/umurmur/package.nix
similarity index 100%
rename from pkgs/applications/networking/umurmur/default.nix
rename to pkgs/by-name/um/umurmur/package.nix
diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/by-name/un/unclutter-xfixes/package.nix
similarity index 100%
rename from pkgs/tools/misc/unclutter-xfixes/default.nix
rename to pkgs/by-name/un/unclutter-xfixes/package.nix
diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/by-name/un/unclutter/package.nix
similarity index 100%
rename from pkgs/tools/misc/unclutter/default.nix
rename to pkgs/by-name/un/unclutter/package.nix
diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/by-name/un/unconvert/package.nix
similarity index 100%
rename from pkgs/development/tools/unconvert/default.nix
rename to pkgs/by-name/un/unconvert/package.nix
diff --git a/pkgs/tools/security/uncover/default.nix b/pkgs/by-name/un/uncover/package.nix
similarity index 100%
rename from pkgs/tools/security/uncover/default.nix
rename to pkgs/by-name/un/uncover/package.nix
diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/by-name/un/uncrustify/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/uncrustify/default.nix
rename to pkgs/by-name/un/uncrustify/package.nix
diff --git a/pkgs/tools/system/undaemonize/default.nix b/pkgs/by-name/un/undaemonize/package.nix
similarity index 100%
rename from pkgs/tools/system/undaemonize/default.nix
rename to pkgs/by-name/un/undaemonize/package.nix
diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/by-name/un/undefined-medium/package.nix
similarity index 100%
rename from pkgs/data/fonts/undefined-medium/default.nix
rename to pkgs/by-name/un/undefined-medium/package.nix
diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/by-name/un/undervolt/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/undervolt/default.nix
rename to pkgs/by-name/un/undervolt/package.nix
diff --git a/pkgs/shells/bash/undistract-me/default.nix b/pkgs/by-name/un/undistract-me/package.nix
similarity index 100%
rename from pkgs/shells/bash/undistract-me/default.nix
rename to pkgs/by-name/un/undistract-me/package.nix
diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/by-name/un/undmg/package.nix
similarity index 100%
rename from pkgs/tools/archivers/undmg/default.nix
rename to pkgs/by-name/un/undmg/package.nix
diff --git a/pkgs/tools/archivers/undmg/setup-hook.sh b/pkgs/by-name/un/undmg/setup-hook.sh
similarity index 100%
rename from pkgs/tools/archivers/undmg/setup-hook.sh
rename to pkgs/by-name/un/undmg/setup-hook.sh
diff --git a/pkgs/tools/misc/undocker/default.nix b/pkgs/by-name/un/undocker/package.nix
similarity index 100%
rename from pkgs/tools/misc/undocker/default.nix
rename to pkgs/by-name/un/undocker/package.nix
diff --git a/pkgs/tools/audio/unflac/default.nix b/pkgs/by-name/un/unflac/package.nix
similarity index 100%
rename from pkgs/tools/audio/unflac/default.nix
rename to pkgs/by-name/un/unflac/package.nix
diff --git a/pkgs/data/fonts/unfonts-core/default.nix b/pkgs/by-name/un/unfonts-core/package.nix
similarity index 100%
rename from pkgs/data/fonts/unfonts-core/default.nix
rename to pkgs/by-name/un/unfonts-core/package.nix
diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/by-name/un/unfs3/package.nix
similarity index 100%
rename from pkgs/servers/unfs3/default.nix
rename to pkgs/by-name/un/unfs3/package.nix
diff --git a/pkgs/tools/text/unfurl/default.nix b/pkgs/by-name/un/unfurl/package.nix
similarity index 100%
rename from pkgs/tools/text/unfurl/default.nix
rename to pkgs/by-name/un/unfurl/package.nix
diff --git a/pkgs/applications/version-management/ungit/default.nix b/pkgs/by-name/un/ungit/package.nix
similarity index 100%
rename from pkgs/applications/version-management/ungit/default.nix
rename to pkgs/by-name/un/ungit/package.nix
diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/by-name/un/uni-vga/package.nix
similarity index 100%
rename from pkgs/data/fonts/uni-vga/default.nix
rename to pkgs/by-name/un/uni-vga/package.nix
diff --git a/pkgs/applications/misc/uni/default.nix b/pkgs/by-name/un/uni/package.nix
similarity index 100%
rename from pkgs/applications/misc/uni/default.nix
rename to pkgs/by-name/un/uni/package.nix
diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/by-name/un/uni2ascii/package.nix
similarity index 100%
rename from pkgs/tools/text/uni2ascii/default.nix
rename to pkgs/by-name/un/uni2ascii/package.nix
diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/by-name/un/unibilium/package.nix
similarity index 100%
rename from pkgs/development/libraries/unibilium/default.nix
rename to pkgs/by-name/un/unibilium/package.nix
diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/by-name/un/unicap/package.nix
similarity index 100%
rename from pkgs/development/libraries/unicap/default.nix
rename to pkgs/by-name/un/unicap/package.nix
diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/pkgs/by-name/un/unicode-character-database/package.nix
similarity index 100%
rename from pkgs/data/misc/unicode-character-database/default.nix
rename to pkgs/by-name/un/unicode-character-database/package.nix
diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/by-name/un/unicode-emoji/package.nix
similarity index 100%
rename from pkgs/data/misc/unicode-emoji/default.nix
rename to pkgs/by-name/un/unicode-emoji/package.nix
diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/by-name/un/unicode-paracode/package.nix
similarity index 100%
rename from pkgs/tools/misc/unicode/default.nix
rename to pkgs/by-name/un/unicode-paracode/package.nix
diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/by-name/un/unicon-lang/package.nix
similarity index 100%
rename from pkgs/development/interpreters/unicon-lang/default.nix
rename to pkgs/by-name/un/unicon-lang/package.nix
diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/by-name/un/unifdef/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/unifdef/default.nix
rename to pkgs/by-name/un/unifdef/package.nix
diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/by-name/un/unifi-protect-backup/package.nix
similarity index 100%
rename from pkgs/applications/backup/unifi-protect-backup/default.nix
rename to pkgs/by-name/un/unifi-protect-backup/package.nix
diff --git a/pkgs/servers/unifiedpush-common-proxies/default.nix b/pkgs/by-name/un/unifiedpush-common-proxies/package.nix
similarity index 100%
rename from pkgs/servers/unifiedpush-common-proxies/default.nix
rename to pkgs/by-name/un/unifiedpush-common-proxies/package.nix
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/by-name/un/unifont/package.nix
similarity index 100%
rename from pkgs/data/fonts/unifont/default.nix
rename to pkgs/by-name/un/unifont/package.nix
diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/by-name/un/unifont_upper/package.nix
similarity index 100%
rename from pkgs/data/fonts/unifont_upper/default.nix
rename to pkgs/by-name/un/unifont_upper/package.nix
diff --git a/pkgs/applications/graphics/unigine-heaven/default.nix b/pkgs/by-name/un/unigine-heaven/package.nix
similarity index 100%
rename from pkgs/applications/graphics/unigine-heaven/default.nix
rename to pkgs/by-name/un/unigine-heaven/package.nix
diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/by-name/un/unigine-valley/package.nix
similarity index 100%
rename from pkgs/applications/graphics/unigine-valley/default.nix
rename to pkgs/by-name/un/unigine-valley/package.nix
diff --git a/pkgs/data/misc/unihan-database/default.nix b/pkgs/by-name/un/unihan-database/package.nix
similarity index 100%
rename from pkgs/data/misc/unihan-database/default.nix
rename to pkgs/by-name/un/unihan-database/package.nix
diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/by-name/un/unionfs-fuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/unionfs-fuse/default.nix
rename to pkgs/by-name/un/unionfs-fuse/package.nix
diff --git a/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch b/pkgs/by-name/un/unionfs-fuse/prevent-kill-on-shutdown.patch
similarity index 100%
rename from pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch
rename to pkgs/by-name/un/unionfs-fuse/prevent-kill-on-shutdown.patch
diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/by-name/un/unison-ucm/package.nix
similarity index 100%
rename from pkgs/development/compilers/unison/default.nix
rename to pkgs/by-name/un/unison-ucm/package.nix
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/by-name/un/unit/package.nix
similarity index 100%
rename from pkgs/servers/http/unit/default.nix
rename to pkgs/by-name/un/unit/package.nix
diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/by-name/un/unittest-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/unittest-cpp/default.nix
rename to pkgs/by-name/un/unittest-cpp/package.nix
diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/by-name/un/unixODBC/package.nix
similarity index 100%
rename from pkgs/development/libraries/unixODBC/default.nix
rename to pkgs/by-name/un/unixODBC/package.nix
diff --git a/pkgs/development/tools/misc/unixbench/common.patch b/pkgs/by-name/un/unixbench/common.patch
similarity index 100%
rename from pkgs/development/tools/misc/unixbench/common.patch
rename to pkgs/by-name/un/unixbench/common.patch
diff --git a/pkgs/development/tools/misc/unixbench/default.nix b/pkgs/by-name/un/unixbench/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/unixbench/default.nix
rename to pkgs/by-name/un/unixbench/package.nix
diff --git a/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix b/pkgs/by-name/un/unnaturalscrollwheels/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix
rename to pkgs/by-name/un/unnaturalscrollwheels/package.nix
diff --git a/pkgs/games/unnethack/default.nix b/pkgs/by-name/un/unnethack/package.nix
similarity index 100%
rename from pkgs/games/unnethack/default.nix
rename to pkgs/by-name/un/unnethack/package.nix
diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/by-name/un/unoconv/package.nix
similarity index 100%
rename from pkgs/tools/text/unoconv/default.nix
rename to pkgs/by-name/un/unoconv/package.nix
diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/by-name/un/unp/package.nix
similarity index 100%
rename from pkgs/tools/archivers/unp/default.nix
rename to pkgs/by-name/un/unp/package.nix
diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/by-name/un/unpaper/package.nix
similarity index 100%
rename from pkgs/tools/graphics/unpaper/default.nix
rename to pkgs/by-name/un/unpaper/package.nix
diff --git a/pkgs/tools/misc/unparam/default.nix b/pkgs/by-name/un/unparam/package.nix
similarity index 100%
rename from pkgs/tools/misc/unparam/default.nix
rename to pkgs/by-name/un/unparam/package.nix
diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/by-name/un/unpfs/package.nix
similarity index 100%
rename from pkgs/servers/unpfs/default.nix
rename to pkgs/by-name/un/unpfs/package.nix
diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/by-name/un/unpoller/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/unpoller/default.nix
rename to pkgs/by-name/un/unpoller/package.nix
diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/by-name/un/unrtf/package.nix
similarity index 100%
rename from pkgs/tools/text/unrtf/default.nix
rename to pkgs/by-name/un/unrtf/package.nix
diff --git a/pkgs/os-specific/linux/unscd/0001-adjust-socket-paths-for-nixos.patch b/pkgs/by-name/un/unscd/0001-adjust-socket-paths-for-nixos.patch
similarity index 100%
rename from pkgs/os-specific/linux/unscd/0001-adjust-socket-paths-for-nixos.patch
rename to pkgs/by-name/un/unscd/0001-adjust-socket-paths-for-nixos.patch
diff --git a/pkgs/os-specific/linux/unscd/default.nix b/pkgs/by-name/un/unscd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/unscd/default.nix
rename to pkgs/by-name/un/unscd/package.nix
diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/by-name/un/unscii/package.nix
similarity index 100%
rename from pkgs/data/fonts/unscii/default.nix
rename to pkgs/by-name/un/unscii/package.nix
diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/by-name/un/unshield/package.nix
similarity index 100%
rename from pkgs/tools/archivers/unshield/default.nix
rename to pkgs/by-name/un/unshield/package.nix
diff --git a/pkgs/os-specific/linux/unstick/default.nix b/pkgs/by-name/un/unstick/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/unstick/default.nix
rename to pkgs/by-name/un/unstick/package.nix
diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/by-name/un/untex/package.nix
similarity index 100%
rename from pkgs/tools/text/untex/default.nix
rename to pkgs/by-name/un/untex/package.nix
diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/by-name/un/untie/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/untie/default.nix
rename to pkgs/by-name/un/untie/package.nix
diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/by-name/un/untrunc-anthwlock/package.nix
similarity index 100%
rename from pkgs/tools/video/untrunc-anthwlock/default.nix
rename to pkgs/by-name/un/untrunc-anthwlock/package.nix
diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/by-name/un/unused/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/unused/default.nix
rename to pkgs/by-name/un/unused/package.nix
diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/by-name/un/unvanquished/package.nix
similarity index 100%
rename from pkgs/games/unvanquished/default.nix
rename to pkgs/by-name/un/unvanquished/package.nix
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-8139.diff b/pkgs/by-name/un/unzip/CVE-2014-8139.diff
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2014-8139.diff
rename to pkgs/by-name/un/unzip/CVE-2014-8139.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-8140.diff b/pkgs/by-name/un/unzip/CVE-2014-8140.diff
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2014-8140.diff
rename to pkgs/by-name/un/unzip/CVE-2014-8140.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-8141.diff b/pkgs/by-name/un/unzip/CVE-2014-8141.diff
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2014-8141.diff
rename to pkgs/by-name/un/unzip/CVE-2014-8141.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9636.diff b/pkgs/by-name/un/unzip/CVE-2014-9636.diff
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2014-9636.diff
rename to pkgs/by-name/un/unzip/CVE-2014-9636.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2014-9913.patch b/pkgs/by-name/un/unzip/CVE-2014-9913.patch
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2014-9913.patch
rename to pkgs/by-name/un/unzip/CVE-2014-9913.patch
diff --git a/pkgs/tools/archivers/unzip/CVE-2015-7696.diff b/pkgs/by-name/un/unzip/CVE-2015-7696.diff
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2015-7696.diff
rename to pkgs/by-name/un/unzip/CVE-2015-7696.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2015-7697.diff b/pkgs/by-name/un/unzip/CVE-2015-7697.diff
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2015-7697.diff
rename to pkgs/by-name/un/unzip/CVE-2015-7697.diff
diff --git a/pkgs/tools/archivers/unzip/CVE-2016-9844.patch b/pkgs/by-name/un/unzip/CVE-2016-9844.patch
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2016-9844.patch
rename to pkgs/by-name/un/unzip/CVE-2016-9844.patch
diff --git a/pkgs/tools/archivers/unzip/CVE-2018-18384.patch b/pkgs/by-name/un/unzip/CVE-2018-18384.patch
similarity index 100%
rename from pkgs/tools/archivers/unzip/CVE-2018-18384.patch
rename to pkgs/by-name/un/unzip/CVE-2018-18384.patch
diff --git a/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch b/pkgs/by-name/un/unzip/dont-hardcode-cc.patch
similarity index 100%
rename from pkgs/tools/archivers/unzip/dont-hardcode-cc.patch
rename to pkgs/by-name/un/unzip/dont-hardcode-cc.patch
diff --git a/pkgs/tools/archivers/unzip/implicit-declarations-fix.patch b/pkgs/by-name/un/unzip/implicit-declarations-fix.patch
similarity index 100%
rename from pkgs/tools/archivers/unzip/implicit-declarations-fix.patch
rename to pkgs/by-name/un/unzip/implicit-declarations-fix.patch
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/by-name/un/unzip/package.nix
similarity index 100%
rename from pkgs/tools/archivers/unzip/default.nix
rename to pkgs/by-name/un/unzip/package.nix
diff --git a/pkgs/tools/archivers/unzip/setup-hook.sh b/pkgs/by-name/un/unzip/setup-hook.sh
similarity index 100%
rename from pkgs/tools/archivers/unzip/setup-hook.sh
rename to pkgs/by-name/un/unzip/setup-hook.sh
diff --git a/pkgs/tools/compression/unzrip/default.nix b/pkgs/by-name/un/unzrip/package.nix
similarity index 100%
rename from pkgs/tools/compression/unzrip/default.nix
rename to pkgs/by-name/un/unzrip/package.nix
diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/by-name/up/up/package.nix
similarity index 100%
rename from pkgs/tools/misc/up/default.nix
rename to pkgs/by-name/up/up/package.nix
diff --git a/pkgs/development/interpreters/python/update-python-libraries/default.nix b/pkgs/by-name/up/update-python-libraries/package.nix
similarity index 100%
rename from pkgs/development/interpreters/python/update-python-libraries/default.nix
rename to pkgs/by-name/up/update-python-libraries/package.nix
diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/by-name/up/update-python-libraries/update-python-libraries.py
similarity index 100%
rename from pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
rename to pkgs/by-name/up/update-python-libraries/update-python-libraries.py
diff --git a/pkgs/development/libraries/updfparser/default.nix b/pkgs/by-name/up/updfparser/package.nix
similarity index 100%
rename from pkgs/development/libraries/updfparser/default.nix
rename to pkgs/by-name/up/updfparser/package.nix
diff --git a/pkgs/tools/networking/updog/default.nix b/pkgs/by-name/up/updog/package.nix
similarity index 100%
rename from pkgs/tools/networking/updog/default.nix
rename to pkgs/by-name/up/updog/package.nix
diff --git a/pkgs/applications/networking/upnp-router-control/default.nix b/pkgs/by-name/up/upnp-router-control/package.nix
similarity index 100%
rename from pkgs/applications/networking/upnp-router-control/default.nix
rename to pkgs/by-name/up/upnp-router-control/package.nix
diff --git a/pkgs/os-specific/linux/upower/i686-test-remove-battery-check.patch b/pkgs/by-name/up/upower/i686-test-remove-battery-check.patch
similarity index 100%
rename from pkgs/os-specific/linux/upower/i686-test-remove-battery-check.patch
rename to pkgs/by-name/up/upower/i686-test-remove-battery-check.patch
diff --git a/pkgs/os-specific/linux/upower/installed-tests-path.patch b/pkgs/by-name/up/upower/installed-tests-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/upower/installed-tests-path.patch
rename to pkgs/by-name/up/upower/installed-tests-path.patch
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/by-name/up/upower/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/upower/default.nix
rename to pkgs/by-name/up/upower/package.nix
diff --git a/pkgs/tools/filesystems/upspin/default.nix b/pkgs/by-name/up/upspin/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/upspin/default.nix
rename to pkgs/by-name/up/upspin/package.nix
diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/by-name/up/upterm/package.nix
similarity index 100%
rename from pkgs/tools/misc/upterm/default.nix
rename to pkgs/by-name/up/upterm/package.nix
diff --git a/pkgs/servers/monitoring/uptime-kuma/fix-database-permissions.patch b/pkgs/by-name/up/uptime-kuma/fix-database-permissions.patch
similarity index 100%
rename from pkgs/servers/monitoring/uptime-kuma/fix-database-permissions.patch
rename to pkgs/by-name/up/uptime-kuma/fix-database-permissions.patch
diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/by-name/up/uptime-kuma/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/uptime-kuma/default.nix
rename to pkgs/by-name/up/uptime-kuma/package.nix
diff --git a/pkgs/tools/system/uptimed/no-var-spool-install.patch b/pkgs/by-name/up/uptimed/no-var-spool-install.patch
similarity index 100%
rename from pkgs/tools/system/uptimed/no-var-spool-install.patch
rename to pkgs/by-name/up/uptimed/no-var-spool-install.patch
diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/by-name/up/uptimed/package.nix
similarity index 100%
rename from pkgs/tools/system/uptimed/default.nix
rename to pkgs/by-name/up/uptimed/package.nix
diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/by-name/up/upwork/package.nix
similarity index 100%
rename from pkgs/applications/misc/upwork/default.nix
rename to pkgs/by-name/up/upwork/package.nix
diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/by-name/up/upx/package.nix
similarity index 100%
rename from pkgs/tools/compression/upx/default.nix
rename to pkgs/by-name/up/upx/package.nix
diff --git a/pkgs/misc/uq/default.nix b/pkgs/by-name/uq/uq/package.nix
similarity index 100%
rename from pkgs/misc/uq/default.nix
rename to pkgs/by-name/uq/uq/package.nix
diff --git a/pkgs/games/uqm/3dovideo.nix b/pkgs/by-name/uq/uqm/3dovideo.nix
similarity index 100%
rename from pkgs/games/uqm/3dovideo.nix
rename to pkgs/by-name/uq/uqm/3dovideo.nix
diff --git a/pkgs/games/uqm/default.nix b/pkgs/by-name/uq/uqm/package.nix
similarity index 100%
rename from pkgs/games/uqm/default.nix
rename to pkgs/by-name/uq/uqm/package.nix
diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/by-name/uq/uqmi/package.nix
similarity index 100%
rename from pkgs/tools/networking/uqmi/default.nix
rename to pkgs/by-name/uq/uqmi/package.nix
diff --git a/pkgs/applications/backup/urbackup-client/default.nix b/pkgs/by-name/ur/urbackup-client/package.nix
similarity index 100%
rename from pkgs/applications/backup/urbackup-client/default.nix
rename to pkgs/by-name/ur/urbackup-client/package.nix
diff --git a/pkgs/games/urbanterror/Makefile.local b/pkgs/by-name/ur/urbanterror/Makefile.local
similarity index 100%
rename from pkgs/games/urbanterror/Makefile.local
rename to pkgs/by-name/ur/urbanterror/Makefile.local
diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/by-name/ur/urbanterror/package.nix
similarity index 100%
rename from pkgs/games/urbanterror/default.nix
rename to pkgs/by-name/ur/urbanterror/package.nix
diff --git a/pkgs/development/libraries/urdfdom-headers/default.nix b/pkgs/by-name/ur/urdfdom-headers/package.nix
similarity index 100%
rename from pkgs/development/libraries/urdfdom-headers/default.nix
rename to pkgs/by-name/ur/urdfdom-headers/package.nix
diff --git a/pkgs/development/libraries/urdfdom/default.nix b/pkgs/by-name/ur/urdfdom/package.nix
similarity index 100%
rename from pkgs/development/libraries/urdfdom/default.nix
rename to pkgs/by-name/ur/urdfdom/package.nix
diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/by-name/ur/urh/package.nix
similarity index 100%
rename from pkgs/applications/radio/urh/default.nix
rename to pkgs/by-name/ur/urh/package.nix
diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/by-name/ur/uri/package.nix
similarity index 100%
rename from pkgs/development/libraries/uri/default.nix
rename to pkgs/by-name/ur/uri/package.nix
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/by-name/ur/uriparser/package.nix
similarity index 100%
rename from pkgs/development/libraries/uriparser/default.nix
rename to pkgs/by-name/ur/uriparser/package.nix
diff --git a/pkgs/tools/misc/url-parser/default.nix b/pkgs/by-name/ur/url-parser/package.nix
similarity index 100%
rename from pkgs/tools/misc/url-parser/default.nix
rename to pkgs/by-name/ur/url-parser/package.nix
diff --git a/pkgs/tools/misc/urlencode/default.nix b/pkgs/by-name/ur/urlencode/package.nix
similarity index 100%
rename from pkgs/tools/misc/urlencode/default.nix
rename to pkgs/by-name/ur/urlencode/package.nix
diff --git a/pkgs/tools/security/urlhunter/default.nix b/pkgs/by-name/ur/urlhunter/package.nix
similarity index 100%
rename from pkgs/tools/security/urlhunter/default.nix
rename to pkgs/by-name/ur/urlhunter/package.nix
diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/by-name/ur/urlscan/package.nix
similarity index 100%
rename from pkgs/applications/misc/urlscan/default.nix
rename to pkgs/by-name/ur/urlscan/package.nix
diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/by-name/ur/urlwatch/package.nix
similarity index 100%
rename from pkgs/tools/networking/urlwatch/default.nix
rename to pkgs/by-name/ur/urlwatch/package.nix
diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/by-name/ur/urn-timer/package.nix
similarity index 100%
rename from pkgs/tools/misc/urn-timer/default.nix
rename to pkgs/by-name/ur/urn-timer/package.nix
diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/by-name/ur/urn/package.nix
similarity index 100%
rename from pkgs/development/compilers/urn/default.nix
rename to pkgs/by-name/ur/urn/package.nix
diff --git a/pkgs/tools/system/uroboros/default.nix b/pkgs/by-name/ur/uroboros/package.nix
similarity index 100%
rename from pkgs/tools/system/uroboros/default.nix
rename to pkgs/by-name/ur/uroboros/package.nix
diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/by-name/ur/ursadb/package.nix
similarity index 100%
rename from pkgs/servers/ursadb/default.nix
rename to pkgs/by-name/ur/ursadb/package.nix
diff --git a/pkgs/servers/urserver/default.nix b/pkgs/by-name/ur/urserver/package.nix
similarity index 100%
rename from pkgs/servers/urserver/default.nix
rename to pkgs/by-name/ur/urserver/package.nix
diff --git a/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix b/pkgs/by-name/us/usb-blaster-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix
rename to pkgs/by-name/us/usb-blaster-udev-rules/package.nix
diff --git a/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules b/pkgs/by-name/us/usb-blaster-udev-rules/usb-blaster.rules
similarity index 100%
rename from pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules
rename to pkgs/by-name/us/usb-blaster-udev-rules/usb-blaster.rules
diff --git a/pkgs/applications/misc/usb-reset/default.nix b/pkgs/by-name/us/usb-reset/package.nix
similarity index 100%
rename from pkgs/applications/misc/usb-reset/default.nix
rename to pkgs/by-name/us/usb-reset/package.nix
diff --git a/pkgs/os-specific/linux/usbguard-notifier/default.nix b/pkgs/by-name/us/usbguard-notifier/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/usbguard-notifier/default.nix
rename to pkgs/by-name/us/usbguard-notifier/package.nix
diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/by-name/us/usbguard/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/usbguard/default.nix
rename to pkgs/by-name/us/usbguard/package.nix
diff --git a/pkgs/tools/misc/usbimager/default.nix b/pkgs/by-name/us/usbimager/package.nix
similarity index 100%
rename from pkgs/tools/misc/usbimager/default.nix
rename to pkgs/by-name/us/usbimager/package.nix
diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/by-name/us/usbmuxd/package.nix
similarity index 100%
rename from pkgs/tools/misc/usbmuxd/default.nix
rename to pkgs/by-name/us/usbmuxd/package.nix
diff --git a/pkgs/tools/misc/usbmuxd2/default.nix b/pkgs/by-name/us/usbmuxd2/package.nix
similarity index 100%
rename from pkgs/tools/misc/usbmuxd2/default.nix
rename to pkgs/by-name/us/usbmuxd2/package.nix
diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/by-name/us/usbredir/package.nix
similarity index 100%
rename from pkgs/development/libraries/usbredir/default.nix
rename to pkgs/by-name/us/usbredir/package.nix
diff --git a/pkgs/tools/security/usbrip/default.nix b/pkgs/by-name/us/usbrip/package.nix
similarity index 100%
rename from pkgs/tools/security/usbrip/default.nix
rename to pkgs/by-name/us/usbrip/package.nix
diff --git a/pkgs/development/tools/misc/usbsdmux/default.nix b/pkgs/by-name/us/usbsdmux/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/usbsdmux/default.nix
rename to pkgs/by-name/us/usbsdmux/package.nix
diff --git a/pkgs/os-specific/linux/usbtop/default.nix b/pkgs/by-name/us/usbtop/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/usbtop/default.nix
rename to pkgs/by-name/us/usbtop/package.nix
diff --git a/pkgs/os-specific/linux/usbutils/fix-paths.patch b/pkgs/by-name/us/usbutils/fix-paths.patch
similarity index 100%
rename from pkgs/os-specific/linux/usbutils/fix-paths.patch
rename to pkgs/by-name/us/usbutils/fix-paths.patch
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/by-name/us/usbutils/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/usbutils/default.nix
rename to pkgs/by-name/us/usbutils/package.nix
diff --git a/pkgs/tools/misc/usbview/default.nix b/pkgs/by-name/us/usbview/package.nix
similarity index 100%
rename from pkgs/tools/misc/usbview/default.nix
rename to pkgs/by-name/us/usbview/package.nix
diff --git a/pkgs/tools/networking/userhosts/default.nix b/pkgs/by-name/us/userhosts/package.nix
similarity index 100%
rename from pkgs/tools/networking/userhosts/default.nix
rename to pkgs/by-name/us/userhosts/package.nix
diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/by-name/us/usermount/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/usermount/default.nix
rename to pkgs/by-name/us/usermount/package.nix
diff --git a/pkgs/development/libraries/usrsctp/clang-fix-build.patch b/pkgs/by-name/us/usrsctp/clang-fix-build.patch
similarity index 100%
rename from pkgs/development/libraries/usrsctp/clang-fix-build.patch
rename to pkgs/by-name/us/usrsctp/clang-fix-build.patch
diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/by-name/us/usrsctp/package.nix
similarity index 100%
rename from pkgs/development/libraries/usrsctp/default.nix
rename to pkgs/by-name/us/usrsctp/package.nix
diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/by-name/us/ustreamer/package.nix
similarity index 100%
rename from pkgs/applications/video/ustreamer/default.nix
rename to pkgs/by-name/us/ustreamer/package.nix
diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/by-name/us/usync/package.nix
similarity index 100%
rename from pkgs/applications/misc/usync/default.nix
rename to pkgs/by-name/us/usync/package.nix
diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/by-name/ut/utf8cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/utf8cpp/default.nix
rename to pkgs/by-name/ut/utf8cpp/package.nix
diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/by-name/ut/utf8proc/package.nix
similarity index 100%
rename from pkgs/development/libraries/utf8proc/default.nix
rename to pkgs/by-name/ut/utf8proc/package.nix
diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/by-name/ut/uthash/package.nix
similarity index 100%
rename from pkgs/development/libraries/uthash/default.nix
rename to pkgs/by-name/ut/uthash/package.nix
diff --git a/pkgs/development/libraries/uthenticode/default.nix b/pkgs/by-name/ut/uthenticode/package.nix
similarity index 100%
rename from pkgs/development/libraries/uthenticode/default.nix
rename to pkgs/by-name/ut/uthenticode/package.nix
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/by-name/ut/util-linux/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/util-linux/default.nix
rename to pkgs/by-name/ut/util-linux/package.nix
diff --git a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/pkgs/by-name/ut/util-linux/rtcwake-search-PATH-for-shutdown.patch
similarity index 100%
rename from pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
rename to pkgs/by-name/ut/util-linux/rtcwake-search-PATH-for-shutdown.patch
diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/by-name/ut/utm/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/utm/default.nix
rename to pkgs/by-name/ut/utm/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/by-name/ut/utox/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/utox/default.nix
rename to pkgs/by-name/ut/utox/package.nix
diff --git a/pkgs/data/themes/utterly-round-plasma-style/default.nix b/pkgs/by-name/ut/utterly-round-plasma-style/package.nix
similarity index 100%
rename from pkgs/data/themes/utterly-round-plasma-style/default.nix
rename to pkgs/by-name/ut/utterly-round-plasma-style/package.nix
diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/by-name/uu/uucp/package.nix
similarity index 100%
rename from pkgs/tools/misc/uucp/default.nix
rename to pkgs/by-name/uu/uucp/package.nix
diff --git a/pkgs/tools/misc/uudeview/matherr.patch b/pkgs/by-name/uu/uudeview/matherr.patch
similarity index 100%
rename from pkgs/tools/misc/uudeview/matherr.patch
rename to pkgs/by-name/uu/uudeview/matherr.patch
diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/by-name/uu/uudeview/package.nix
similarity index 100%
rename from pkgs/tools/misc/uudeview/default.nix
rename to pkgs/by-name/uu/uudeview/package.nix
diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/by-name/uv/uvccapture/package.nix
similarity index 100%
rename from pkgs/applications/video/uvccapture/default.nix
rename to pkgs/by-name/uv/uvccapture/package.nix
diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/by-name/uv/uvcdynctrl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/uvcdynctrl/default.nix
rename to pkgs/by-name/uv/uvcdynctrl/package.nix
diff --git a/pkgs/data/fonts/uw-ttyp0/determinism.patch b/pkgs/by-name/uw/uw-ttyp0/determinism.patch
similarity index 100%
rename from pkgs/data/fonts/uw-ttyp0/determinism.patch
rename to pkgs/by-name/uw/uw-ttyp0/determinism.patch
diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/pkgs/by-name/uw/uw-ttyp0/package.nix
similarity index 100%
rename from pkgs/data/fonts/uw-ttyp0/default.nix
rename to pkgs/by-name/uw/uw-ttyp0/package.nix
diff --git a/pkgs/tools/text/uwc/default.nix b/pkgs/by-name/uw/uwc/package.nix
similarity index 100%
rename from pkgs/tools/text/uwc/default.nix
rename to pkgs/by-name/uw/uwc/package.nix
diff --git a/pkgs/tools/networking/uwimap/clang-fix.patch b/pkgs/by-name/uw/uwimap/clang-fix.patch
similarity index 100%
rename from pkgs/tools/networking/uwimap/clang-fix.patch
rename to pkgs/by-name/uw/uwimap/clang-fix.patch
diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/by-name/uw/uwimap/package.nix
similarity index 100%
rename from pkgs/tools/networking/uwimap/default.nix
rename to pkgs/by-name/uw/uwimap/package.nix
diff --git a/pkgs/servers/uwsgi/additional-php-ldflags.patch b/pkgs/by-name/uw/uwsgi/additional-php-ldflags.patch
similarity index 100%
rename from pkgs/servers/uwsgi/additional-php-ldflags.patch
rename to pkgs/by-name/uw/uwsgi/additional-php-ldflags.patch
diff --git a/pkgs/servers/uwsgi/nixos.ini b/pkgs/by-name/uw/uwsgi/nixos.ini
similarity index 100%
rename from pkgs/servers/uwsgi/nixos.ini
rename to pkgs/by-name/uw/uwsgi/nixos.ini
diff --git a/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch b/pkgs/by-name/uw/uwsgi/no-ext-session-php_session.h-on-NixOS.patch
similarity index 100%
rename from pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch
rename to pkgs/by-name/uw/uwsgi/no-ext-session-php_session.h-on-NixOS.patch
diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/by-name/uw/uwsgi/package.nix
similarity index 100%
rename from pkgs/servers/uwsgi/default.nix
rename to pkgs/by-name/uw/uwsgi/package.nix
diff --git a/pkgs/tools/misc/uwufetch/default.nix b/pkgs/by-name/uw/uwufetch/package.nix
similarity index 100%
rename from pkgs/tools/misc/uwufetch/default.nix
rename to pkgs/by-name/uw/uwufetch/package.nix
diff --git a/pkgs/tools/misc/uwuify/default.nix b/pkgs/by-name/uw/uwuify/package.nix
similarity index 100%
rename from pkgs/tools/misc/uwuify/default.nix
rename to pkgs/by-name/uw/uwuify/package.nix
diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
similarity index 100%
rename from pkgs/data/misc/v2ray-domain-list-community/default.nix
rename to pkgs/by-name/v2/v2ray-domain-list-community/package.nix
diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/by-name/v2/v2ray-geoip/package.nix
similarity index 100%
rename from pkgs/data/misc/v2ray-geoip/default.nix
rename to pkgs/by-name/v2/v2ray-geoip/package.nix
diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/by-name/v2/v2ray/package.nix
similarity index 100%
rename from pkgs/tools/networking/v2ray/default.nix
rename to pkgs/by-name/v2/v2ray/package.nix
diff --git a/pkgs/tools/networking/v2raya/default.nix b/pkgs/by-name/v2/v2raya/package.nix
similarity index 100%
rename from pkgs/tools/networking/v2raya/default.nix
rename to pkgs/by-name/v2/v2raya/package.nix
diff --git a/pkgs/os-specific/linux/v4l2-relayd/default.nix b/pkgs/by-name/v4/v4l2-relayd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/v4l2-relayd/default.nix
rename to pkgs/by-name/v4/v4l2-relayd/package.nix
diff --git a/pkgs/os-specific/linux/v4l2-relayd/upstream-v4l2loopback-compatibility.patch b/pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch
similarity index 100%
rename from pkgs/os-specific/linux/v4l2-relayd/upstream-v4l2loopback-compatibility.patch
rename to pkgs/by-name/v4/v4l2-relayd/upstream-v4l2loopback-compatibility.patch
diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/by-name/va/vaapi-intel-hybrid/package.nix
similarity index 100%
rename from pkgs/development/libraries/vaapi-intel-hybrid/default.nix
rename to pkgs/by-name/va/vaapi-intel-hybrid/package.nix
diff --git a/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch b/pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
similarity index 100%
rename from pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
rename to pkgs/by-name/va/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
diff --git a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch b/pkgs/by-name/va/vagrant/0004-Support-system-installed-plugins.patch
similarity index 100%
rename from pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch
rename to pkgs/by-name/va/vagrant/0004-Support-system-installed-plugins.patch
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/by-name/va/vagrant/gemset.nix
similarity index 100%
rename from pkgs/development/tools/vagrant/gemset.nix
rename to pkgs/by-name/va/vagrant/gemset.nix
diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/by-name/va/vagrant/gemset_libvirt.nix
similarity index 100%
rename from pkgs/development/tools/vagrant/gemset_libvirt.nix
rename to pkgs/by-name/va/vagrant/gemset_libvirt.nix
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/by-name/va/vagrant/package.nix
similarity index 100%
rename from pkgs/development/tools/vagrant/default.nix
rename to pkgs/by-name/va/vagrant/package.nix
diff --git a/pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch b/pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch
similarity index 100%
rename from pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch
rename to pkgs/by-name/va/vagrant/unofficial-installation-nowarn.patch
diff --git a/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/pkgs/by-name/va/vagrant/use-system-bundler-version.patch
similarity index 100%
rename from pkgs/development/tools/vagrant/use-system-bundler-version.patch
rename to pkgs/by-name/va/vagrant/use-system-bundler-version.patch
diff --git a/pkgs/development/tools/vagrant/vagrant-libvirt.json.in b/pkgs/by-name/va/vagrant/vagrant-libvirt.json.in
similarity index 100%
rename from pkgs/development/tools/vagrant/vagrant-libvirt.json.in
rename to pkgs/by-name/va/vagrant/vagrant-libvirt.json.in
diff --git a/pkgs/development/tools/language-servers/vala-language-server/default.nix b/pkgs/by-name/va/vala-language-server/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/vala-language-server/default.nix
rename to pkgs/by-name/va/vala-language-server/package.nix
diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/by-name/va/vala-lint/package.nix
similarity index 100%
rename from pkgs/development/tools/vala-lint/default.nix
rename to pkgs/by-name/va/vala-lint/package.nix
diff --git a/pkgs/tools/text/validator-nu/default.nix b/pkgs/by-name/va/validator-nu/package.nix
similarity index 100%
rename from pkgs/tools/text/validator-nu/default.nix
rename to pkgs/by-name/va/validator-nu/package.nix
diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/by-name/va/vals/package.nix
similarity index 100%
rename from pkgs/tools/security/vals/default.nix
rename to pkgs/by-name/va/vals/package.nix
diff --git a/pkgs/development/web/valum/default.nix b/pkgs/by-name/va/valum/package.nix
similarity index 100%
rename from pkgs/development/web/valum/default.nix
rename to pkgs/by-name/va/valum/package.nix
diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/by-name/va/vamp-plugin-sdk/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
rename to pkgs/by-name/va/vamp-plugin-sdk/package.nix
diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/by-name/va/vanilla-dmz/package.nix
similarity index 100%
rename from pkgs/data/icons/vanilla-dmz/default.nix
rename to pkgs/by-name/va/vanilla-dmz/package.nix
diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/by-name/va/varscan/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/varscan/default.nix
rename to pkgs/by-name/va/varscan/package.nix
diff --git a/pkgs/games/vassal/default.nix b/pkgs/by-name/va/vassal/package.nix
similarity index 100%
rename from pkgs/games/vassal/default.nix
rename to pkgs/by-name/va/vassal/package.nix
diff --git a/pkgs/tools/security/vault-medusa/default.nix b/pkgs/by-name/va/vault-medusa/package.nix
similarity index 100%
rename from pkgs/tools/security/vault-medusa/default.nix
rename to pkgs/by-name/va/vault-medusa/package.nix
diff --git a/pkgs/tools/security/vault-ssh-plus/default.nix b/pkgs/by-name/va/vault-ssh-plus/package.nix
similarity index 100%
rename from pkgs/tools/security/vault-ssh-plus/default.nix
rename to pkgs/by-name/va/vault-ssh-plus/package.nix
diff --git a/pkgs/data/fonts/vazir-code-font/default.nix b/pkgs/by-name/va/vazir-code-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/vazir-code-font/default.nix
rename to pkgs/by-name/va/vazir-code-font/package.nix
diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/by-name/va/vazir-fonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/vazir-fonts/default.nix
rename to pkgs/by-name/va/vazir-fonts/package.nix
diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/by-name/vb/vbam/package.nix
similarity index 100%
rename from pkgs/applications/emulators/vbam/default.nix
rename to pkgs/by-name/vb/vbam/package.nix
diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/by-name/vb/vbetool/package.nix
similarity index 100%
rename from pkgs/tools/system/vbetool/default.nix
rename to pkgs/by-name/vb/vbetool/package.nix
diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/by-name/vb/vbindiff/package.nix
similarity index 100%
rename from pkgs/applications/editors/vbindiff/default.nix
rename to pkgs/by-name/vb/vbindiff/package.nix
diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/by-name/vb/vboot_reference/package.nix
similarity index 100%
rename from pkgs/tools/system/vboot_reference/default.nix
rename to pkgs/by-name/vb/vboot_reference/package.nix
diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/by-name/vc/vcal/package.nix
similarity index 100%
rename from pkgs/applications/misc/vcal/default.nix
rename to pkgs/by-name/vc/vcal/package.nix
diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/by-name/vc/vcdimager/package.nix
similarity index 100%
rename from pkgs/development/libraries/vcdimager/default.nix
rename to pkgs/by-name/vc/vcdimager/package.nix
diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/by-name/vc/vcftools/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/vcftools/default.nix
rename to pkgs/by-name/vc/vcftools/package.nix
diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/by-name/vc/vcg/package.nix
similarity index 100%
rename from pkgs/development/libraries/vcg/default.nix
rename to pkgs/by-name/vc/vcg/package.nix
diff --git a/pkgs/applications/video/vcs/fonts.patch b/pkgs/by-name/vc/vcs/fonts.patch
similarity index 100%
rename from pkgs/applications/video/vcs/fonts.patch
rename to pkgs/by-name/vc/vcs/fonts.patch
diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/by-name/vc/vcs/package.nix
similarity index 100%
rename from pkgs/applications/video/vcs/default.nix
rename to pkgs/by-name/vc/vcs/package.nix
diff --git a/pkgs/tools/misc/vcs_query/default.nix b/pkgs/by-name/vc/vcs_query/package.nix
similarity index 100%
rename from pkgs/tools/misc/vcs_query/default.nix
rename to pkgs/by-name/vc/vcs_query/package.nix
diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/by-name/vc/vcsh/package.nix
similarity index 100%
rename from pkgs/applications/version-management/vcsh/default.nix
rename to pkgs/by-name/vc/vcsh/package.nix
diff --git a/pkgs/tools/video/vcsi/default.nix b/pkgs/by-name/vc/vcsi/package.nix
similarity index 100%
rename from pkgs/tools/video/vcsi/default.nix
rename to pkgs/by-name/vc/vcsi/package.nix
diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/by-name/vc/vcstool/package.nix
similarity index 100%
rename from pkgs/development/tools/vcstool/default.nix
rename to pkgs/by-name/vc/vcstool/package.nix
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/by-name/vc/vcv-rack/package.nix
similarity index 100%
rename from pkgs/applications/audio/vcv-rack/default.nix
rename to pkgs/by-name/vc/vcv-rack/package.nix
diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch
similarity index 100%
rename from pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
rename to pkgs/by-name/vc/vcv-rack/rack-minimize-vendoring.patch
diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/by-name/vd/vde2/package.nix
similarity index 100%
rename from pkgs/tools/networking/vde2/default.nix
rename to pkgs/by-name/vd/vde2/package.nix
diff --git a/pkgs/applications/backup/vdmfec/default.nix b/pkgs/by-name/vd/vdmfec/package.nix
similarity index 100%
rename from pkgs/applications/backup/vdmfec/default.nix
rename to pkgs/by-name/vd/vdmfec/package.nix
diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/by-name/vd/vdo/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/vdo/default.nix
rename to pkgs/by-name/vd/vdo/package.nix
diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/by-name/vd/vdpauinfo/package.nix
similarity index 100%
rename from pkgs/tools/X11/vdpauinfo/default.nix
rename to pkgs/by-name/vd/vdpauinfo/package.nix
diff --git a/pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch b/pkgs/by-name/vd/vdrift/0001-Ignore-missing-data-for-installation.patch
similarity index 100%
rename from pkgs/games/vdrift/0001-Ignore-missing-data-for-installation.patch
rename to pkgs/by-name/vd/vdrift/0001-Ignore-missing-data-for-installation.patch
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/by-name/vd/vdrift/package.nix
similarity index 100%
rename from pkgs/games/vdrift/default.nix
rename to pkgs/by-name/vd/vdrift/package.nix
diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/by-name/vd/vdrsymbols/package.nix
similarity index 100%
rename from pkgs/data/fonts/vdrsymbols/default.nix
rename to pkgs/by-name/vd/vdrsymbols/package.nix
diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/by-name/ve/vectoroids/package.nix
similarity index 100%
rename from pkgs/games/vectoroids/default.nix
rename to pkgs/by-name/ve/vectoroids/package.nix
diff --git a/pkgs/development/libraries/vectorscan/default.nix b/pkgs/by-name/ve/vectorscan/package.nix
similarity index 100%
rename from pkgs/development/libraries/vectorscan/default.nix
rename to pkgs/by-name/ve/vectorscan/package.nix
diff --git a/pkgs/tools/networking/vegeta/default.nix b/pkgs/by-name/ve/vegeta/package.nix
similarity index 100%
rename from pkgs/tools/networking/vegeta/default.nix
rename to pkgs/by-name/ve/vegeta/package.nix
diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/by-name/ve/vegur/package.nix
similarity index 100%
rename from pkgs/data/fonts/vegur/default.nix
rename to pkgs/by-name/ve/vegur/package.nix
diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/by-name/ve/vendir/package.nix
similarity index 100%
rename from pkgs/development/tools/vendir/default.nix
rename to pkgs/by-name/ve/vendir/package.nix
diff --git a/pkgs/data/themes/venta/default.nix b/pkgs/by-name/ve/venta/package.nix
similarity index 100%
rename from pkgs/data/themes/venta/default.nix
rename to pkgs/by-name/ve/venta/package.nix
diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/by-name/ve/verbiste/package.nix
similarity index 100%
rename from pkgs/applications/misc/verbiste/default.nix
rename to pkgs/by-name/ve/verbiste/package.nix
diff --git a/pkgs/applications/version-management/verco/default.nix b/pkgs/by-name/ve/verco/package.nix
similarity index 100%
rename from pkgs/applications/version-management/verco/default.nix
rename to pkgs/by-name/ve/verco/package.nix
diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/by-name/ve/verifast/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/verifast/default.nix
rename to pkgs/by-name/ve/verifast/package.nix
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/by-name/ve/verilator/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/verilator/default.nix
rename to pkgs/by-name/ve/verilator/package.nix
diff --git a/pkgs/applications/networking/versus/default.nix b/pkgs/by-name/ve/versus/package.nix
similarity index 100%
rename from pkgs/applications/networking/versus/default.nix
rename to pkgs/by-name/ve/versus/package.nix
diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/by-name/ve/veryfasttree/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/veryfasttree/default.nix
rename to pkgs/by-name/ve/veryfasttree/package.nix
diff --git a/pkgs/tools/security/vexctl/default.nix b/pkgs/by-name/ve/vexctl/package.nix
similarity index 100%
rename from pkgs/tools/security/vexctl/default.nix
rename to pkgs/by-name/ve/vexctl/package.nix
diff --git a/pkgs/applications/audio/vgmplay-libvgm/default.nix b/pkgs/by-name/vg/vgmplay-libvgm/package.nix
similarity index 100%
rename from pkgs/applications/audio/vgmplay-libvgm/default.nix
rename to pkgs/by-name/vg/vgmplay-libvgm/package.nix
diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/by-name/vg/vgmtools/package.nix
similarity index 100%
rename from pkgs/tools/audio/vgmtools/default.nix
rename to pkgs/by-name/vg/vgmtools/package.nix
diff --git a/pkgs/tools/text/vgrep/default.nix b/pkgs/by-name/vg/vgrep/package.nix
similarity index 100%
rename from pkgs/tools/text/vgrep/default.nix
rename to pkgs/by-name/vg/vgrep/package.nix
diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/by-name/vh/vhd2vl/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/vhd2vl/default.nix
rename to pkgs/by-name/vh/vhd2vl/package.nix
diff --git a/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/pkgs/by-name/vh/vhdl-ls/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/vhdl-ls/default.nix
rename to pkgs/by-name/vh/vhdl-ls/package.nix
diff --git a/pkgs/applications/misc/vhs/default.nix b/pkgs/by-name/vh/vhs/package.nix
similarity index 100%
rename from pkgs/applications/misc/vhs/default.nix
rename to pkgs/by-name/vh/vhs/package.nix
diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/by-name/vi/via/package.nix
similarity index 100%
rename from pkgs/tools/misc/via/default.nix
rename to pkgs/by-name/vi/via/package.nix
diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/by-name/vi/vial/package.nix
similarity index 100%
rename from pkgs/tools/misc/vial/default.nix
rename to pkgs/by-name/vi/vial/package.nix
diff --git a/pkgs/applications/emulators/vice/default.nix b/pkgs/by-name/vi/vice/package.nix
similarity index 100%
rename from pkgs/applications/emulators/vice/default.nix
rename to pkgs/by-name/vi/vice/package.nix
diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/by-name/vi/victor-mono/package.nix
similarity index 100%
rename from pkgs/data/fonts/victor-mono/default.nix
rename to pkgs/by-name/vi/victor-mono/package.nix
diff --git a/pkgs/applications/science/molecular-dynamics/viennarna/default.nix b/pkgs/by-name/vi/viennarna/package.nix
similarity index 100%
rename from pkgs/applications/science/molecular-dynamics/viennarna/default.nix
rename to pkgs/by-name/vi/viennarna/package.nix
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/by-name/vi/viewnior/package.nix
similarity index 100%
rename from pkgs/applications/graphics/viewnior/default.nix
rename to pkgs/by-name/vi/viewnior/package.nix
diff --git a/pkgs/applications/file-managers/vifm/default.nix b/pkgs/by-name/vi/vifm/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/vifm/default.nix
rename to pkgs/by-name/vi/vifm/package.nix
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/by-name/vi/viking/package.nix
similarity index 100%
rename from pkgs/applications/misc/viking/default.nix
rename to pkgs/by-name/vi/viking/package.nix
diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/by-name/vi/vim-vint/package.nix
similarity index 100%
rename from pkgs/development/tools/vim-vint/default.nix
rename to pkgs/by-name/vi/vim-vint/package.nix
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/by-name/vi/vimb-unwrapped/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/vimb/default.nix
rename to pkgs/by-name/vi/vimb-unwrapped/package.nix
diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/by-name/vi/vimer/package.nix
similarity index 100%
rename from pkgs/tools/misc/vimer/default.nix
rename to pkgs/by-name/vi/vimer/package.nix
diff --git a/pkgs/applications/graphics/vimiv-qt/default.nix b/pkgs/by-name/vi/vimiv-qt/package.nix
similarity index 100%
rename from pkgs/applications/graphics/vimiv-qt/default.nix
rename to pkgs/by-name/vi/vimiv-qt/package.nix
diff --git a/pkgs/data/icons/vimix-cursor-theme/default.nix b/pkgs/by-name/vi/vimix-cursor-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/vimix-cursor-theme/default.nix
rename to pkgs/by-name/vi/vimix-cursor-theme/package.nix
diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/by-name/vi/vimix-gtk-themes/package.nix
similarity index 100%
rename from pkgs/data/themes/vimix/default.nix
rename to pkgs/by-name/vi/vimix-gtk-themes/package.nix
diff --git a/pkgs/data/icons/vimix-icon-theme/default.nix b/pkgs/by-name/vi/vimix-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/vimix-icon-theme/default.nix
rename to pkgs/by-name/vi/vimix-icon-theme/package.nix
diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/by-name/vi/vimpc/package.nix
similarity index 100%
rename from pkgs/applications/audio/vimpc/default.nix
rename to pkgs/by-name/vi/vimpc/package.nix
diff --git a/pkgs/tools/misc/vimv-rs/default.nix b/pkgs/by-name/vi/vimv-rs/package.nix
similarity index 100%
rename from pkgs/tools/misc/vimv-rs/default.nix
rename to pkgs/by-name/vi/vimv-rs/package.nix
diff --git a/pkgs/tools/misc/vimv/default.nix b/pkgs/by-name/vi/vimv/package.nix
similarity index 100%
rename from pkgs/tools/misc/vimv/default.nix
rename to pkgs/by-name/vi/vimv/package.nix
diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/by-name/vi/vintagestory/package.nix
similarity index 100%
rename from pkgs/games/vintagestory/default.nix
rename to pkgs/by-name/vi/vintagestory/package.nix
diff --git a/pkgs/applications/audio/viper4linux/default.nix b/pkgs/by-name/vi/viper4linux/package.nix
similarity index 100%
rename from pkgs/applications/audio/viper4linux/default.nix
rename to pkgs/by-name/vi/viper4linux/package.nix
diff --git a/pkgs/applications/graphics/vipsdisp/default.nix b/pkgs/by-name/vi/vipsdisp/package.nix
similarity index 100%
rename from pkgs/applications/graphics/vipsdisp/default.nix
rename to pkgs/by-name/vi/vipsdisp/package.nix
diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/by-name/vi/virglrenderer/package.nix
similarity index 100%
rename from pkgs/development/libraries/virglrenderer/default.nix
rename to pkgs/by-name/vi/virglrenderer/package.nix
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/by-name/vi/virt-viewer/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/virt-viewer/default.nix
rename to pkgs/by-name/vi/virt-viewer/package.nix
diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/by-name/vi/virt-what/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/virt-what/default.nix
rename to pkgs/by-name/vi/virt-what/package.nix
diff --git a/pkgs/applications/virtualization/virter/default.nix b/pkgs/by-name/vi/virter/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/virter/default.nix
rename to pkgs/by-name/vi/virter/package.nix
diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/by-name/vi/virtiofsd/package.nix
similarity index 100%
rename from pkgs/servers/misc/virtiofsd/default.nix
rename to pkgs/by-name/vi/virtiofsd/package.nix
diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/by-name/vi/virtual-ans/package.nix
similarity index 100%
rename from pkgs/applications/audio/virtual-ans/default.nix
rename to pkgs/by-name/vi/virtual-ans/package.nix
diff --git a/pkgs/development/libraries/virtualpg/default.nix b/pkgs/by-name/vi/virtualpg/package.nix
similarity index 100%
rename from pkgs/development/libraries/virtualpg/default.nix
rename to pkgs/by-name/vi/virtualpg/package.nix
diff --git a/pkgs/data/fonts/vista-fonts-chs/no-op.conf b/pkgs/by-name/vi/vistafonts-chs/no-op.conf
similarity index 100%
rename from pkgs/data/fonts/vista-fonts-chs/no-op.conf
rename to pkgs/by-name/vi/vistafonts-chs/no-op.conf
diff --git a/pkgs/data/fonts/vista-fonts-chs/default.nix b/pkgs/by-name/vi/vistafonts-chs/package.nix
similarity index 100%
rename from pkgs/data/fonts/vista-fonts-chs/default.nix
rename to pkgs/by-name/vi/vistafonts-chs/package.nix
diff --git a/pkgs/data/fonts/vista-fonts-cht/no-op.conf b/pkgs/by-name/vi/vistafonts-cht/no-op.conf
similarity index 100%
rename from pkgs/data/fonts/vista-fonts-cht/no-op.conf
rename to pkgs/by-name/vi/vistafonts-cht/no-op.conf
diff --git a/pkgs/data/fonts/vista-fonts-cht/default.nix b/pkgs/by-name/vi/vistafonts-cht/package.nix
similarity index 100%
rename from pkgs/data/fonts/vista-fonts-cht/default.nix
rename to pkgs/by-name/vi/vistafonts-cht/package.nix
diff --git a/pkgs/data/fonts/vista-fonts/no-op.conf b/pkgs/by-name/vi/vistafonts/no-op.conf
similarity index 100%
rename from pkgs/data/fonts/vista-fonts/no-op.conf
rename to pkgs/by-name/vi/vistafonts/no-op.conf
diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/by-name/vi/vistafonts/package.nix
similarity index 100%
rename from pkgs/data/fonts/vista-fonts/default.nix
rename to pkgs/by-name/vi/vistafonts/package.nix
diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/by-name/vi/visualvm/package.nix
similarity index 100%
rename from pkgs/development/tools/java/visualvm/default.nix
rename to pkgs/by-name/vi/visualvm/package.nix
diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/by-name/vi/vit/package.nix
similarity index 100%
rename from pkgs/applications/misc/vit/default.nix
rename to pkgs/by-name/vi/vit/package.nix
diff --git a/pkgs/applications/audio/vital/default.nix b/pkgs/by-name/vi/vital/package.nix
similarity index 100%
rename from pkgs/applications/audio/vital/default.nix
rename to pkgs/by-name/vi/vital/package.nix
diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/by-name/vi/vitess/package.nix
similarity index 100%
rename from pkgs/development/tools/database/vitess/default.nix
rename to pkgs/by-name/vi/vitess/package.nix
diff --git a/pkgs/games/vitetris/default.nix b/pkgs/by-name/vi/vitetris/package.nix
similarity index 100%
rename from pkgs/games/vitetris/default.nix
rename to pkgs/by-name/vi/vitetris/package.nix
diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/by-name/vi/viu/package.nix
similarity index 100%
rename from pkgs/tools/graphics/viu/default.nix
rename to pkgs/by-name/vi/viu/package.nix
diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/by-name/vi/vivid/package.nix
similarity index 100%
rename from pkgs/tools/misc/vivid/default.nix
rename to pkgs/by-name/vi/vivid/package.nix
diff --git a/pkgs/tools/misc/vix/default.nix b/pkgs/by-name/vi/vix/package.nix
similarity index 100%
rename from pkgs/tools/misc/vix/default.nix
rename to pkgs/by-name/vi/vix/package.nix
diff --git a/pkgs/development/libraries/vk-bootstrap/default.nix b/pkgs/by-name/vk/vk-bootstrap/package.nix
similarity index 100%
rename from pkgs/development/libraries/vk-bootstrap/default.nix
rename to pkgs/by-name/vk/vk-bootstrap/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix b/pkgs/by-name/vk/vk-cli/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/vk-cli/default.nix
rename to pkgs/by-name/vk/vk-cli/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/by-name/vk/vk-messenger/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
rename to pkgs/by-name/vk/vk-messenger/package.nix
diff --git a/pkgs/tools/graphics/vkbasalt-cli/default.nix b/pkgs/by-name/vk/vkbasalt-cli/package.nix
similarity index 100%
rename from pkgs/tools/graphics/vkbasalt-cli/default.nix
rename to pkgs/by-name/vk/vkbasalt-cli/package.nix
diff --git a/pkgs/tools/graphics/vkdisplayinfo/default.nix b/pkgs/by-name/vk/vkdisplayinfo/package.nix
similarity index 100%
rename from pkgs/tools/graphics/vkdisplayinfo/default.nix
rename to pkgs/by-name/vk/vkdisplayinfo/package.nix
diff --git a/pkgs/applications/graphics/vkdt/Cargo.lock b/pkgs/by-name/vk/vkdt/Cargo.lock
similarity index 100%
rename from pkgs/applications/graphics/vkdt/Cargo.lock
rename to pkgs/by-name/vk/vkdt/Cargo.lock
diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/by-name/vk/vkdt/package.nix
similarity index 100%
rename from pkgs/applications/graphics/vkdt/default.nix
rename to pkgs/by-name/vk/vkdt/package.nix
diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/by-name/vk/vkeybd/package.nix
similarity index 100%
rename from pkgs/applications/audio/vkeybd/default.nix
rename to pkgs/by-name/vk/vkeybd/package.nix
diff --git a/pkgs/tools/graphics/vkmark/default.nix b/pkgs/by-name/vk/vkmark/package.nix
similarity index 100%
rename from pkgs/tools/graphics/vkmark/default.nix
rename to pkgs/by-name/vk/vkmark/package.nix
diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/by-name/vl/vlan/package.nix
similarity index 100%
rename from pkgs/tools/networking/vlan/default.nix
rename to pkgs/by-name/vl/vlan/package.nix
diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/by-name/vl/vlang/package.nix
similarity index 100%
rename from pkgs/development/compilers/vlang/default.nix
rename to pkgs/by-name/vl/vlang/package.nix
diff --git a/pkgs/misc/screensavers/vlock/eintr.patch b/pkgs/by-name/vl/vlock/eintr.patch
similarity index 100%
rename from pkgs/misc/screensavers/vlock/eintr.patch
rename to pkgs/by-name/vl/vlock/eintr.patch
diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/by-name/vl/vlock/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/vlock/default.nix
rename to pkgs/by-name/vl/vlock/package.nix
diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/by-name/vm/vmfs-tools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/vmfs-tools/default.nix
rename to pkgs/by-name/vm/vmfs-tools/package.nix
diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/by-name/vm/vmime/package.nix
similarity index 100%
rename from pkgs/development/libraries/vmime/default.nix
rename to pkgs/by-name/vm/vmime/package.nix
diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/by-name/vm/vmtouch/package.nix
similarity index 100%
rename from pkgs/tools/misc/vmtouch/default.nix
rename to pkgs/by-name/vm/vmtouch/package.nix
diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/by-name/vm/vmware-workstation/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/vmware-workstation/default.nix
rename to pkgs/by-name/vm/vmware-workstation/package.nix
diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap b/pkgs/by-name/vm/vmware-workstation/vmware-bootstrap
similarity index 100%
rename from pkgs/applications/virtualization/vmware-workstation/vmware-bootstrap
rename to pkgs/by-name/vm/vmware-workstation/vmware-bootstrap
diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-config b/pkgs/by-name/vm/vmware-workstation/vmware-config
similarity index 100%
rename from pkgs/applications/virtualization/vmware-workstation/vmware-config
rename to pkgs/by-name/vm/vmware-workstation/vmware-config
diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap b/pkgs/by-name/vm/vmware-workstation/vmware-installer-bootstrap
similarity index 100%
rename from pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrap
rename to pkgs/by-name/vm/vmware-workstation/vmware-installer-bootstrap
diff --git a/pkgs/applications/virtualization/vmware-workstation/vmware-modconfig b/pkgs/by-name/vm/vmware-workstation/vmware-modconfig
similarity index 100%
rename from pkgs/applications/virtualization/vmware-workstation/vmware-modconfig
rename to pkgs/by-name/vm/vmware-workstation/vmware-modconfig
diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/by-name/vn/vncrec/package.nix
similarity index 100%
rename from pkgs/tools/video/vncrec/default.nix
rename to pkgs/by-name/vn/vncrec/package.nix
diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/by-name/vn/vnstat/package.nix
similarity index 100%
rename from pkgs/applications/networking/vnstat/default.nix
rename to pkgs/by-name/vn/vnstat/package.nix
diff --git a/pkgs/development/libraries/vo-aacenc/default.nix b/pkgs/by-name/vo/vo-aacenc/package.nix
similarity index 100%
rename from pkgs/development/libraries/vo-aacenc/default.nix
rename to pkgs/by-name/vo/vo-aacenc/package.nix
diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/by-name/vo/vo-amrwbenc/package.nix
similarity index 100%
rename from pkgs/development/libraries/vo-amrwbenc/default.nix
rename to pkgs/by-name/vo/vo-amrwbenc/package.nix
diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/by-name/vo/vobcopy/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/vobcopy/default.nix
rename to pkgs/by-name/vo/vobcopy/package.nix
diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/by-name/vo/vobsub2srt/package.nix
similarity index 100%
rename from pkgs/tools/cd-dvd/vobsub2srt/default.nix
rename to pkgs/by-name/vo/vobsub2srt/package.nix
diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/by-name/vo/vocal/package.nix
similarity index 100%
rename from pkgs/applications/audio/vocal/default.nix
rename to pkgs/by-name/vo/vocal/package.nix
diff --git a/pkgs/applications/audio/vocproc/default.nix b/pkgs/by-name/vo/vocproc/package.nix
similarity index 100%
rename from pkgs/applications/audio/vocproc/default.nix
rename to pkgs/by-name/vo/vocproc/package.nix
diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/by-name/vo/void/package.nix
similarity index 100%
rename from pkgs/tools/misc/void/default.nix
rename to pkgs/by-name/vo/void/package.nix
diff --git a/pkgs/data/icons/volantes-cursors/default.nix b/pkgs/by-name/vo/volantes-cursors/package.nix
similarity index 100%
rename from pkgs/data/icons/volantes-cursors/default.nix
rename to pkgs/by-name/vo/volantes-cursors/package.nix
diff --git a/pkgs/tools/security/volatility3/default.nix b/pkgs/by-name/vo/volatility3/package.nix
similarity index 100%
rename from pkgs/tools/security/volatility3/default.nix
rename to pkgs/by-name/vo/volatility3/package.nix
diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/by-name/vo/volctl/package.nix
similarity index 100%
rename from pkgs/tools/audio/volctl/default.nix
rename to pkgs/by-name/vo/volctl/package.nix
diff --git a/pkgs/data/fonts/vollkorn/default.nix b/pkgs/by-name/vo/vollkorn/package.nix
similarity index 100%
rename from pkgs/data/fonts/vollkorn/default.nix
rename to pkgs/by-name/vo/vollkorn/package.nix
diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/by-name/vo/volnoti/package.nix
similarity index 100%
rename from pkgs/applications/misc/volnoti/default.nix
rename to pkgs/by-name/vo/volnoti/package.nix
diff --git a/pkgs/development/tools/volta/Cargo.lock b/pkgs/by-name/vo/volta/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/volta/Cargo.lock
rename to pkgs/by-name/vo/volta/Cargo.lock
diff --git a/pkgs/development/tools/volta/default.nix b/pkgs/by-name/vo/volta/package.nix
similarity index 100%
rename from pkgs/development/tools/volta/default.nix
rename to pkgs/by-name/vo/volta/package.nix
diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/by-name/vo/volume_key/package.nix
similarity index 100%
rename from pkgs/development/libraries/volume-key/default.nix
rename to pkgs/by-name/vo/volume_key/package.nix
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/by-name/vo/volumeicon/package.nix
similarity index 100%
rename from pkgs/tools/audio/volumeicon/default.nix
rename to pkgs/by-name/vo/volumeicon/package.nix
diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/by-name/vo/vopono/package.nix
similarity index 100%
rename from pkgs/tools/networking/vopono/default.nix
rename to pkgs/by-name/vo/vopono/package.nix
diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/by-name/vo/vorbisgain/package.nix
similarity index 100%
rename from pkgs/tools/misc/vorbisgain/default.nix
rename to pkgs/by-name/vo/vorbisgain/package.nix
diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/by-name/vo/vouch-proxy/package.nix
similarity index 100%
rename from pkgs/servers/vouch-proxy/default.nix
rename to pkgs/by-name/vo/vouch-proxy/package.nix
diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/by-name/vo/vowpal-wabbit/package.nix
similarity index 100%
rename from pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
rename to pkgs/by-name/vo/vowpal-wabbit/package.nix
diff --git a/pkgs/games/voxelands/default.nix b/pkgs/by-name/vo/voxelands/package.nix
similarity index 100%
rename from pkgs/games/voxelands/default.nix
rename to pkgs/by-name/vo/voxelands/package.nix
diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/by-name/vp/vpnc-scripts/package.nix
similarity index 100%
rename from pkgs/tools/networking/vpnc-scripts/default.nix
rename to pkgs/by-name/vp/vpnc-scripts/package.nix
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/by-name/vp/vpnc/package.nix
similarity index 100%
rename from pkgs/tools/networking/vpnc/default.nix
rename to pkgs/by-name/vp/vpnc/package.nix
diff --git a/pkgs/applications/graphics/vpv/default.nix b/pkgs/by-name/vp/vpv/package.nix
similarity index 100%
rename from pkgs/applications/graphics/vpv/default.nix
rename to pkgs/by-name/vp/vpv/package.nix
diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/by-name/vr/vrb/package.nix
similarity index 100%
rename from pkgs/development/libraries/vrb/default.nix
rename to pkgs/by-name/vr/vrb/package.nix
diff --git a/pkgs/development/libraries/vrb/removed_options.patch b/pkgs/by-name/vr/vrb/removed_options.patch
similarity index 100%
rename from pkgs/development/libraries/vrb/removed_options.patch
rename to pkgs/by-name/vr/vrb/removed_options.patch
diff --git a/pkgs/development/libraries/vrb/unused-but-set-variable.patch b/pkgs/by-name/vr/vrb/unused-but-set-variable.patch
similarity index 100%
rename from pkgs/development/libraries/vrb/unused-but-set-variable.patch
rename to pkgs/by-name/vr/vrb/unused-but-set-variable.patch
diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/by-name/vr/vrpn/package.nix
similarity index 100%
rename from pkgs/development/libraries/vrpn/default.nix
rename to pkgs/by-name/vr/vrpn/package.nix
diff --git a/pkgs/tools/video/vrrtest/default.nix b/pkgs/by-name/vr/vrrtest/package.nix
similarity index 100%
rename from pkgs/tools/video/vrrtest/default.nix
rename to pkgs/by-name/vr/vrrtest/package.nix
diff --git a/pkgs/tools/misc/vsc-leetcode-cli/default.nix b/pkgs/by-name/vs/vsc-leetcode-cli/package.nix
similarity index 100%
rename from pkgs/tools/misc/vsc-leetcode-cli/default.nix
rename to pkgs/by-name/vs/vsc-leetcode-cli/package.nix
diff --git a/pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix b/pkgs/by-name/vs/vscode-langservers-extracted/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/vscode-langservers-extracted/default.nix
rename to pkgs/by-name/vs/vscode-langservers-extracted/package.nix
diff --git a/pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch b/pkgs/by-name/vs/vsftpd/CVE-2015-1419.patch
similarity index 100%
rename from pkgs/servers/ftp/vsftpd/CVE-2015-1419.patch
rename to pkgs/by-name/vs/vsftpd/CVE-2015-1419.patch
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/by-name/vs/vsftpd/package.nix
similarity index 100%
rename from pkgs/servers/ftp/vsftpd/default.nix
rename to pkgs/by-name/vs/vsftpd/package.nix
diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/by-name/vs/vsh/package.nix
similarity index 100%
rename from pkgs/tools/misc/vsh/default.nix
rename to pkgs/by-name/vs/vsh/package.nix
diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/by-name/vs/vsqlite/package.nix
similarity index 100%
rename from pkgs/development/libraries/vsqlite/default.nix
rename to pkgs/by-name/vs/vsqlite/package.nix
diff --git a/pkgs/tools/security/vt-cli/default.nix b/pkgs/by-name/vt/vt-cli/package.nix
similarity index 100%
rename from pkgs/tools/security/vt-cli/default.nix
rename to pkgs/by-name/vt/vt-cli/package.nix
diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/by-name/vt/vtable-dumper/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/vtable-dumper/default.nix
rename to pkgs/by-name/vt/vtable-dumper/package.nix
diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/by-name/vt/vte/package.nix
similarity index 100%
rename from pkgs/development/libraries/vte/default.nix
rename to pkgs/by-name/vt/vte/package.nix
diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/by-name/vt/vtm/package.nix
similarity index 100%
rename from pkgs/tools/misc/vtm/default.nix
rename to pkgs/by-name/vt/vtm/package.nix
diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/by-name/vt/vttest/package.nix
similarity index 100%
rename from pkgs/tools/misc/vttest/default.nix
rename to pkgs/by-name/vt/vttest/package.nix
diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/by-name/vu/vue/package.nix
similarity index 100%
rename from pkgs/applications/misc/vue/default.nix
rename to pkgs/by-name/vu/vue/package.nix
diff --git a/pkgs/applications/misc/vul/default.nix b/pkgs/by-name/vu/vul/package.nix
similarity index 100%
rename from pkgs/applications/misc/vul/default.nix
rename to pkgs/by-name/vu/vul/package.nix
diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
similarity index 100%
rename from pkgs/tools/graphics/vulkan-extension-layer/default.nix
rename to pkgs/by-name/vu/vulkan-extension-layer/package.nix
diff --git a/pkgs/tools/graphics/vulkan-helper/default.nix b/pkgs/by-name/vu/vulkan-helper/package.nix
similarity index 100%
rename from pkgs/tools/graphics/vulkan-helper/default.nix
rename to pkgs/by-name/vu/vulkan-helper/package.nix
diff --git a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/pkgs/by-name/vu/vulkan-loader/fix-pkgconfig.patch
similarity index 100%
rename from pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch
rename to pkgs/by-name/vu/vulkan-loader/fix-pkgconfig.patch
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/by-name/vu/vulkan-loader/package.nix
similarity index 100%
rename from pkgs/development/libraries/vulkan-loader/default.nix
rename to pkgs/by-name/vu/vulkan-loader/package.nix
diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
similarity index 100%
rename from pkgs/tools/graphics/vulkan-tools-lunarg/default.nix
rename to pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
similarity index 100%
rename from pkgs/development/libraries/vulkan-utility-libraries/default.nix
rename to pkgs/by-name/vu/vulkan-utility-libraries/package.nix
diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
similarity index 100%
rename from pkgs/development/tools/vulkan-validation-layers/default.nix
rename to pkgs/by-name/vu/vulkan-validation-layers/package.nix
diff --git a/pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix b/pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix
similarity index 100%
rename from pkgs/development/tools/vulkan-validation-layers/robin-hood-hashing.nix
rename to pkgs/by-name/vu/vulkan-validation-layers/robin-hood-hashing.nix
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/by-name/vu/vulnix/package.nix
similarity index 100%
rename from pkgs/tools/security/vulnix/default.nix
rename to pkgs/by-name/vu/vulnix/package.nix
diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/by-name/vu/vultr-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/vultr-cli/default.nix
rename to pkgs/by-name/vu/vultr-cli/package.nix
diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/by-name/vu/vultr/package.nix
similarity index 100%
rename from pkgs/development/tools/vultr/default.nix
rename to pkgs/by-name/vu/vultr/package.nix
diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/by-name/vw/vwm/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/vwm/default.nix
rename to pkgs/by-name/vw/vwm/package.nix
diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/by-name/vx/vxl/package.nix
similarity index 100%
rename from pkgs/development/libraries/vxl/default.nix
rename to pkgs/by-name/vx/vxl/package.nix
diff --git a/pkgs/applications/networking/browsers/w3m/RAND_egd.libressl.patch b/pkgs/by-name/w3/w3m/RAND_egd.libressl.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/w3m/RAND_egd.libressl.patch
rename to pkgs/by-name/w3/w3m/RAND_egd.libressl.patch
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/by-name/w3/w3m/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/w3m/default.nix
rename to pkgs/by-name/w3/w3m/package.nix
diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/by-name/w_/w_scan/package.nix
similarity index 100%
rename from pkgs/applications/video/w_scan/default.nix
rename to pkgs/by-name/w_/w_scan/package.nix
diff --git a/pkgs/applications/video/w_scan2/default.nix b/pkgs/by-name/w_/w_scan2/package.nix
similarity index 100%
rename from pkgs/applications/video/w_scan2/default.nix
rename to pkgs/by-name/w_/w_scan2/package.nix
diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/by-name/wa/wabt/package.nix
similarity index 100%
rename from pkgs/development/tools/wabt/default.nix
rename to pkgs/by-name/wa/wabt/package.nix
diff --git a/pkgs/tools/security/wad/default.nix b/pkgs/by-name/wa/wad/package.nix
similarity index 100%
rename from pkgs/tools/security/wad/default.nix
rename to pkgs/by-name/wa/wad/package.nix
diff --git a/pkgs/tools/security/waf-tester/default.nix b/pkgs/by-name/wa/waf-tester/package.nix
similarity index 100%
rename from pkgs/tools/security/waf-tester/default.nix
rename to pkgs/by-name/wa/waf-tester/package.nix
diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/by-name/wa/waffle/package.nix
similarity index 100%
rename from pkgs/development/libraries/waffle/default.nix
rename to pkgs/by-name/wa/waffle/package.nix
diff --git a/pkgs/tools/security/wafw00f/default.nix b/pkgs/by-name/wa/wafw00f/package.nix
similarity index 100%
rename from pkgs/tools/security/wafw00f/default.nix
rename to pkgs/by-name/wa/wafw00f/package.nix
diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/by-name/wa/waitron/package.nix
similarity index 100%
rename from pkgs/tools/networking/waitron/default.nix
rename to pkgs/by-name/wa/waitron/package.nix
diff --git a/pkgs/tools/networking/waitron/staticfiles-directory.patch b/pkgs/by-name/wa/waitron/staticfiles-directory.patch
similarity index 100%
rename from pkgs/tools/networking/waitron/staticfiles-directory.patch
rename to pkgs/by-name/wa/waitron/staticfiles-directory.patch
diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/by-name/wa/wakelan/package.nix
similarity index 100%
rename from pkgs/tools/networking/wakelan/default.nix
rename to pkgs/by-name/wa/wakelan/package.nix
diff --git a/pkgs/tools/networking/wakeonlan/default.nix b/pkgs/by-name/wa/wakeonlan/package.nix
similarity index 100%
rename from pkgs/tools/networking/wakeonlan/default.nix
rename to pkgs/by-name/wa/wakeonlan/package.nix
diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/by-name/wa/wal-g/package.nix
similarity index 100%
rename from pkgs/tools/backup/wal-g/default.nix
rename to pkgs/by-name/wa/wal-g/package.nix
diff --git a/pkgs/applications/file-managers/walk/default.nix b/pkgs/by-name/wa/walk/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/walk/default.nix
rename to pkgs/by-name/wa/walk/package.nix
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/by-name/wa/wallabag/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/wallabag/default.nix
rename to pkgs/by-name/wa/wallabag/package.nix
diff --git a/pkgs/servers/web-apps/wallabag/wallabag-data.patch b/pkgs/by-name/wa/wallabag/wallabag-data.patch
similarity index 100%
rename from pkgs/servers/web-apps/wallabag/wallabag-data.patch
rename to pkgs/by-name/wa/wallabag/wallabag-data.patch
diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/by-name/wa/wally-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/wally-cli/default.nix
rename to pkgs/by-name/wa/wally-cli/package.nix
diff --git a/pkgs/development/tools/wambo/default.nix b/pkgs/by-name/wa/wambo/package.nix
similarity index 100%
rename from pkgs/development/tools/wambo/default.nix
rename to pkgs/by-name/wa/wambo/package.nix
diff --git a/pkgs/tools/admin/wander/default.nix b/pkgs/by-name/wa/wander/package.nix
similarity index 100%
rename from pkgs/tools/admin/wander/default.nix
rename to pkgs/by-name/wa/wander/package.nix
diff --git a/pkgs/applications/audio/waon/default.nix b/pkgs/by-name/wa/waon/package.nix
similarity index 100%
rename from pkgs/applications/audio/waon/default.nix
rename to pkgs/by-name/wa/waon/package.nix
diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/by-name/wa/wapiti/package.nix
similarity index 100%
rename from pkgs/tools/security/wapiti/default.nix
rename to pkgs/by-name/wa/wapiti/package.nix
diff --git a/pkgs/games/wargus/default.nix b/pkgs/by-name/wa/wargus/package.nix
similarity index 100%
rename from pkgs/games/wargus/default.nix
rename to pkgs/by-name/wa/wargus/package.nix
diff --git a/pkgs/games/wargus/stratagus.nix b/pkgs/by-name/wa/wargus/stratagus.nix
similarity index 100%
rename from pkgs/games/wargus/stratagus.nix
rename to pkgs/by-name/wa/wargus/stratagus.nix
diff --git a/pkgs/games/warmux/default.nix b/pkgs/by-name/wa/warmux/package.nix
similarity index 100%
rename from pkgs/games/warmux/default.nix
rename to pkgs/by-name/wa/warmux/package.nix
diff --git a/pkgs/applications/misc/warpd/default.nix b/pkgs/by-name/wa/warpd/package.nix
similarity index 100%
rename from pkgs/applications/misc/warpd/default.nix
rename to pkgs/by-name/wa/warpd/package.nix
diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/by-name/wa/warzone2100/package.nix
similarity index 100%
rename from pkgs/games/warzone2100/default.nix
rename to pkgs/by-name/wa/warzone2100/package.nix
diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/by-name/wa/wasabibackend/deps.nix
similarity index 100%
rename from pkgs/applications/blockchains/wasabibackend/deps.nix
rename to pkgs/by-name/wa/wasabibackend/deps.nix
diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/by-name/wa/wasabibackend/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/wasabibackend/default.nix
rename to pkgs/by-name/wa/wasabibackend/package.nix
diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/by-name/wa/wasabiwallet/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/wasabiwallet/default.nix
rename to pkgs/by-name/wa/wasabiwallet/package.nix
diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/by-name/wa/wasm-pack/package.nix
similarity index 100%
rename from pkgs/development/tools/wasm-pack/default.nix
rename to pkgs/by-name/wa/wasm-pack/package.nix
diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/by-name/wa/wasm-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/wasm-tools/default.nix
rename to pkgs/by-name/wa/wasm-tools/package.nix
diff --git a/pkgs/development/interpreters/wasm3/default.nix b/pkgs/by-name/wa/wasm3/package.nix
similarity index 100%
rename from pkgs/development/interpreters/wasm3/default.nix
rename to pkgs/by-name/wa/wasm3/package.nix
diff --git a/pkgs/development/tools/misc/wasmer-pack/default.nix b/pkgs/by-name/wa/wasmer-pack/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/wasmer-pack/default.nix
rename to pkgs/by-name/wa/wasmer-pack/package.nix
diff --git a/pkgs/development/tools/wasmi/Cargo.lock b/pkgs/by-name/wa/wasmi/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/wasmi/Cargo.lock
rename to pkgs/by-name/wa/wasmi/Cargo.lock
diff --git a/pkgs/development/tools/wasmi/default.nix b/pkgs/by-name/wa/wasmi/package.nix
similarity index 100%
rename from pkgs/development/tools/wasmi/default.nix
rename to pkgs/by-name/wa/wasmi/package.nix
diff --git a/pkgs/development/tools/wasmserve/default.nix b/pkgs/by-name/wa/wasmserve/package.nix
similarity index 100%
rename from pkgs/development/tools/wasmserve/default.nix
rename to pkgs/by-name/wa/wasmserve/package.nix
diff --git a/pkgs/development/tools/wasynth/Cargo.lock b/pkgs/by-name/wa/wasynth/Cargo.lock
similarity index 100%
rename from pkgs/development/tools/wasynth/Cargo.lock
rename to pkgs/by-name/wa/wasynth/Cargo.lock
diff --git a/pkgs/development/tools/wasynth/default.nix b/pkgs/by-name/wa/wasynth/package.nix
similarity index 100%
rename from pkgs/development/tools/wasynth/default.nix
rename to pkgs/by-name/wa/wasynth/package.nix
diff --git a/pkgs/tools/misc/watchlog/default.nix b/pkgs/by-name/wa/watchlog/package.nix
similarity index 100%
rename from pkgs/tools/misc/watchlog/default.nix
rename to pkgs/by-name/wa/watchlog/package.nix
diff --git a/pkgs/applications/misc/watchmate/Cargo.lock b/pkgs/by-name/wa/watchmate/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/watchmate/Cargo.lock
rename to pkgs/by-name/wa/watchmate/Cargo.lock
diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/by-name/wa/watchmate/package.nix
similarity index 100%
rename from pkgs/applications/misc/watchmate/default.nix
rename to pkgs/by-name/wa/watchmate/package.nix
diff --git a/pkgs/applications/misc/watershot/default.nix b/pkgs/by-name/wa/watershot/package.nix
similarity index 100%
rename from pkgs/applications/misc/watershot/default.nix
rename to pkgs/by-name/wa/watershot/package.nix
diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/by-name/wa/watson/package.nix
similarity index 100%
rename from pkgs/applications/office/watson/default.nix
rename to pkgs/by-name/wa/watson/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/by-name/wa/wavebox/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/wavebox/default.nix
rename to pkgs/by-name/wa/wavebox/package.nix
diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/by-name/wa/wavefunctioncollapse/package.nix
similarity index 100%
rename from pkgs/tools/graphics/wavefunctioncollapse/default.nix
rename to pkgs/by-name/wa/wavefunctioncollapse/package.nix
diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/by-name/wa/wavegain/package.nix
similarity index 100%
rename from pkgs/applications/audio/wavegain/default.nix
rename to pkgs/by-name/wa/wavegain/package.nix
diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/by-name/wa/wavemon/package.nix
similarity index 100%
rename from pkgs/tools/networking/wavemon/default.nix
rename to pkgs/by-name/wa/wavemon/package.nix
diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/by-name/wa/wavpack/package.nix
similarity index 100%
rename from pkgs/development/libraries/wavpack/default.nix
rename to pkgs/by-name/wa/wavpack/package.nix
diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/by-name/wa/wavrsocvt/package.nix
similarity index 100%
rename from pkgs/applications/misc/audio/wavrsocvt/default.nix
rename to pkgs/by-name/wa/wavrsocvt/package.nix
diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/by-name/wa/way-displays/package.nix
similarity index 100%
rename from pkgs/tools/wayland/way-displays/default.nix
rename to pkgs/by-name/wa/way-displays/package.nix
diff --git a/pkgs/tools/misc/wayback-machine-archiver/default.nix b/pkgs/by-name/wa/wayback-machine-archiver/package.nix
similarity index 100%
rename from pkgs/tools/misc/wayback-machine-archiver/default.nix
rename to pkgs/by-name/wa/wayback-machine-archiver/package.nix
diff --git a/pkgs/tools/misc/wayback/default.nix b/pkgs/by-name/wa/wayback/package.nix
similarity index 100%
rename from pkgs/tools/misc/wayback/default.nix
rename to pkgs/by-name/wa/wayback/package.nix
diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/by-name/wa/wayland-proxy-virtwl/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
rename to pkgs/by-name/wa/wayland-proxy-virtwl/package.nix
diff --git a/pkgs/tools/wayland/wayland-utils/default.nix b/pkgs/by-name/wa/wayland-utils/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wayland-utils/default.nix
rename to pkgs/by-name/wa/wayland-utils/package.nix
diff --git a/pkgs/tools/misc/waylevel/default.nix b/pkgs/by-name/wa/waylevel/package.nix
similarity index 100%
rename from pkgs/tools/misc/waylevel/default.nix
rename to pkgs/by-name/wa/waylevel/package.nix
diff --git a/pkgs/tools/wayland/waylogout/default.nix b/pkgs/by-name/wa/waylogout/package.nix
similarity index 100%
rename from pkgs/tools/wayland/waylogout/default.nix
rename to pkgs/by-name/wa/waylogout/package.nix
diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/by-name/wa/waylyrics/package.nix
similarity index 100%
rename from pkgs/applications/audio/waylyrics/default.nix
rename to pkgs/by-name/wa/waylyrics/package.nix
diff --git a/pkgs/tools/wayland/waynergy/default.nix b/pkgs/by-name/wa/waynergy/package.nix
similarity index 100%
rename from pkgs/tools/wayland/waynergy/default.nix
rename to pkgs/by-name/wa/waynergy/package.nix
diff --git a/pkgs/tools/wayland/wayout/default.nix b/pkgs/by-name/wa/wayout/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wayout/default.nix
rename to pkgs/by-name/wa/wayout/package.nix
diff --git a/pkgs/applications/misc/waypaper/default.nix b/pkgs/by-name/wa/waypaper/package.nix
similarity index 100%
rename from pkgs/applications/misc/waypaper/default.nix
rename to pkgs/by-name/wa/waypaper/package.nix
diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/by-name/wa/waypipe/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/waypipe/default.nix
rename to pkgs/by-name/wa/waypipe/package.nix
diff --git a/pkgs/tools/misc/wayshot/default.nix b/pkgs/by-name/wa/wayshot/package.nix
similarity index 100%
rename from pkgs/tools/misc/wayshot/default.nix
rename to pkgs/by-name/wa/wayshot/package.nix
diff --git a/pkgs/applications/terminal-emulators/wayst/default.nix b/pkgs/by-name/wa/wayst/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/wayst/default.nix
rename to pkgs/by-name/wa/wayst/package.nix
diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/by-name/wa/wayv/package.nix
similarity index 100%
rename from pkgs/tools/X11/wayv/default.nix
rename to pkgs/by-name/wa/wayv/package.nix
diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/by-name/wa/wayvnc/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/wayvnc/default.nix
rename to pkgs/by-name/wa/wayvnc/package.nix
diff --git a/pkgs/development/interpreters/wazero/default.nix b/pkgs/by-name/wa/wazero/package.nix
similarity index 100%
rename from pkgs/development/interpreters/wazero/default.nix
rename to pkgs/by-name/wa/wazero/package.nix
diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/by-name/wb/wbox/package.nix
similarity index 100%
rename from pkgs/tools/networking/wbox/default.nix
rename to pkgs/by-name/wb/wbox/package.nix
diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/by-name/wc/wcalc/package.nix
similarity index 100%
rename from pkgs/applications/misc/wcalc/default.nix
rename to pkgs/by-name/wc/wcalc/package.nix
diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/by-name/wc/wcc/package.nix
similarity index 100%
rename from pkgs/development/compilers/wcc/default.nix
rename to pkgs/by-name/wc/wcc/package.nix
diff --git a/pkgs/development/embedded/wch-isp/default.nix b/pkgs/by-name/wc/wch-isp/package.nix
similarity index 100%
rename from pkgs/development/embedded/wch-isp/default.nix
rename to pkgs/by-name/wc/wch-isp/package.nix
diff --git a/pkgs/development/libraries/science/math/wcpg/default.nix b/pkgs/by-name/wc/wcpg/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/wcpg/default.nix
rename to pkgs/by-name/wc/wcpg/package.nix
diff --git a/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/pkgs/by-name/wc/wcslib/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/astronomy/wcslib/default.nix
rename to pkgs/by-name/wc/wcslib/package.nix
diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/by-name/wd/wdfs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/wdfs/default.nix
rename to pkgs/by-name/wd/wdfs/package.nix
diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/by-name/wd/wdiff/package.nix
similarity index 100%
rename from pkgs/tools/text/wdiff/default.nix
rename to pkgs/by-name/wd/wdiff/package.nix
diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/by-name/wd/wdisplays/package.nix
similarity index 100%
rename from pkgs/tools/graphics/wdisplays/default.nix
rename to pkgs/by-name/wd/wdisplays/package.nix
diff --git a/pkgs/tools/wayland/wdomirror/default.nix b/pkgs/by-name/wd/wdomirror/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wdomirror/default.nix
rename to pkgs/by-name/wd/wdomirror/package.nix
diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/by-name/wd/wdt/package.nix
similarity index 100%
rename from pkgs/applications/networking/sync/wdt/default.nix
rename to pkgs/by-name/wd/wdt/package.nix
diff --git a/pkgs/data/fonts/weather-icons/default.nix b/pkgs/by-name/we/weather-icons/package.nix
similarity index 100%
rename from pkgs/data/fonts/weather-icons/default.nix
rename to pkgs/by-name/we/weather-icons/package.nix
diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/by-name/we/weather/package.nix
similarity index 100%
rename from pkgs/applications/misc/weather/default.nix
rename to pkgs/by-name/we/weather/package.nix
diff --git a/pkgs/applications/networking/cluster/weave-gitops/default.nix b/pkgs/by-name/we/weave-gitops/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/weave-gitops/default.nix
rename to pkgs/by-name/we/weave-gitops/package.nix
diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/by-name/we/weaviate/package.nix
similarity index 100%
rename from pkgs/servers/search/weaviate/default.nix
rename to pkgs/by-name/we/weaviate/package.nix
diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/by-name/we/web-ext/package.nix
similarity index 100%
rename from pkgs/development/tools/web-ext/default.nix
rename to pkgs/by-name/we/web-ext/package.nix
diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/by-name/we/webalizer/package.nix
similarity index 100%
rename from pkgs/tools/networking/webalizer/default.nix
rename to pkgs/by-name/we/webalizer/package.nix
diff --git a/pkgs/tools/security/webanalyze/default.nix b/pkgs/by-name/we/webanalyze/package.nix
similarity index 100%
rename from pkgs/tools/security/webanalyze/default.nix
rename to pkgs/by-name/we/webanalyze/package.nix
diff --git a/pkgs/tools/misc/webcat/default.nix b/pkgs/by-name/we/webcat/package.nix
similarity index 100%
rename from pkgs/tools/misc/webcat/default.nix
rename to pkgs/by-name/we/webcat/package.nix
diff --git a/pkgs/servers/webdav-server-rs/default.nix b/pkgs/by-name/we/webdav-server-rs/package.nix
similarity index 100%
rename from pkgs/servers/webdav-server-rs/default.nix
rename to pkgs/by-name/we/webdav-server-rs/package.nix
diff --git a/pkgs/servers/webdav/default.nix b/pkgs/by-name/we/webdav/package.nix
similarity index 100%
rename from pkgs/servers/webdav/default.nix
rename to pkgs/by-name/we/webdav/package.nix
diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/by-name/we/webdis/package.nix
similarity index 100%
rename from pkgs/development/tools/database/webdis/default.nix
rename to pkgs/by-name/we/webdis/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/by-name/we/webex/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/webex/default.nix
rename to pkgs/by-name/we/webex/package.nix
diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/by-name/we/webhook/package.nix
similarity index 100%
rename from pkgs/servers/http/webhook/default.nix
rename to pkgs/by-name/we/webhook/package.nix
diff --git a/pkgs/servers/webmesh/default.nix b/pkgs/by-name/we/webmesh/package.nix
similarity index 100%
rename from pkgs/servers/webmesh/default.nix
rename to pkgs/by-name/we/webmesh/package.nix
diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/by-name/we/webmetro/package.nix
similarity index 100%
rename from pkgs/servers/webmetro/default.nix
rename to pkgs/by-name/we/webmetro/package.nix
diff --git a/pkgs/development/libraries/webp-pixbuf-loader/default.nix b/pkgs/by-name/we/webp-pixbuf-loader/package.nix
similarity index 100%
rename from pkgs/development/libraries/webp-pixbuf-loader/default.nix
rename to pkgs/by-name/we/webp-pixbuf-loader/package.nix
diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/by-name/we/websocketd/package.nix
similarity index 100%
rename from pkgs/applications/networking/websocketd/default.nix
rename to pkgs/by-name/we/websocketd/package.nix
diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/by-name/we/websocketpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/websocket++/default.nix
rename to pkgs/by-name/we/websocketpp/package.nix
diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/by-name/we/webtorrent_desktop/package.nix
similarity index 100%
rename from pkgs/applications/video/webtorrent_desktop/default.nix
rename to pkgs/by-name/we/webtorrent_desktop/package.nix
diff --git a/pkgs/tools/networking/webwormhole/default.nix b/pkgs/by-name/we/webwormhole/package.nix
similarity index 100%
rename from pkgs/tools/networking/webwormhole/default.nix
rename to pkgs/by-name/we/webwormhole/package.nix
diff --git a/pkgs/tools/security/weggli/default.nix b/pkgs/by-name/we/weggli/package.nix
similarity index 100%
rename from pkgs/tools/security/weggli/default.nix
rename to pkgs/by-name/we/weggli/package.nix
diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/by-name/we/wego/package.nix
similarity index 100%
rename from pkgs/applications/misc/wego/default.nix
rename to pkgs/by-name/we/wego/package.nix
diff --git a/pkgs/tools/games/weidu/default.nix b/pkgs/by-name/we/weidu/package.nix
similarity index 100%
rename from pkgs/tools/games/weidu/default.nix
rename to pkgs/by-name/we/weidu/package.nix
diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/by-name/we/welkin/package.nix
similarity index 100%
rename from pkgs/tools/graphics/welkin/default.nix
rename to pkgs/by-name/we/welkin/package.nix
diff --git a/pkgs/tools/misc/wemux/default.nix b/pkgs/by-name/we/wemux/package.nix
similarity index 100%
rename from pkgs/tools/misc/wemux/default.nix
rename to pkgs/by-name/we/wemux/package.nix
diff --git a/pkgs/servers/wesher/default.nix b/pkgs/by-name/we/wesher/package.nix
similarity index 100%
rename from pkgs/servers/wesher/default.nix
rename to pkgs/by-name/we/wesher/package.nix
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/by-name/we/weston/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/weston/default.nix
rename to pkgs/by-name/we/weston/package.nix
diff --git a/pkgs/tools/wayland/wev/default.nix b/pkgs/by-name/we/wev/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wev/default.nix
rename to pkgs/by-name/we/wev/package.nix
diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/by-name/wf/wf-recorder/package.nix
similarity index 100%
rename from pkgs/applications/video/wf-recorder/default.nix
rename to pkgs/by-name/wf/wf-recorder/package.nix
diff --git a/pkgs/development/libraries/wfa2-lib/default.nix b/pkgs/by-name/wf/wfa2-lib/package.nix
similarity index 100%
rename from pkgs/development/libraries/wfa2-lib/default.nix
rename to pkgs/by-name/wf/wfa2-lib/package.nix
diff --git a/pkgs/applications/networking/wg-bond/default.nix b/pkgs/by-name/wg/wg-bond/package.nix
similarity index 100%
rename from pkgs/applications/networking/wg-bond/default.nix
rename to pkgs/by-name/wg/wg-bond/package.nix
diff --git a/pkgs/tools/networking/wg-friendly-peer-names/default.nix b/pkgs/by-name/wg/wg-friendly-peer-names/package.nix
similarity index 100%
rename from pkgs/tools/networking/wg-friendly-peer-names/default.nix
rename to pkgs/by-name/wg/wg-friendly-peer-names/package.nix
diff --git a/pkgs/tools/networking/wgautomesh/default.nix b/pkgs/by-name/wg/wgautomesh/package.nix
similarity index 100%
rename from pkgs/tools/networking/wgautomesh/default.nix
rename to pkgs/by-name/wg/wgautomesh/package.nix
diff --git a/pkgs/applications/networking/wgcf/default.nix b/pkgs/by-name/wg/wgcf/package.nix
similarity index 100%
rename from pkgs/applications/networking/wgcf/default.nix
rename to pkgs/by-name/wg/wgcf/package.nix
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/by-name/wg/wget/package.nix
similarity index 100%
rename from pkgs/tools/networking/wget/default.nix
rename to pkgs/by-name/wg/wget/package.nix
diff --git a/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch b/pkgs/by-name/wg/wget/remove-runtime-dep-on-openssl-headers.patch
similarity index 100%
rename from pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch
rename to pkgs/by-name/wg/wget/remove-runtime-dep-on-openssl-headers.patch
diff --git a/pkgs/tools/networking/wget2/default.nix b/pkgs/by-name/wg/wget2/package.nix
similarity index 100%
rename from pkgs/tools/networking/wget2/default.nix
rename to pkgs/by-name/wg/wget2/package.nix
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/by-name/wg/wgetpaste/package.nix
similarity index 100%
rename from pkgs/tools/text/wgetpaste/default.nix
rename to pkgs/by-name/wg/wgetpaste/package.nix
diff --git a/pkgs/development/tools/wgo/default.nix b/pkgs/by-name/wg/wgo/package.nix
similarity index 100%
rename from pkgs/development/tools/wgo/default.nix
rename to pkgs/by-name/wg/wgo/package.nix
diff --git a/pkgs/tools/networking/whatip/default.nix b/pkgs/by-name/wh/whatip/package.nix
similarity index 100%
rename from pkgs/tools/networking/whatip/default.nix
rename to pkgs/by-name/wh/whatip/package.nix
diff --git a/pkgs/tools/misc/whatsapp-chat-exporter/default.nix b/pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
similarity index 100%
rename from pkgs/tools/misc/whatsapp-chat-exporter/default.nix
rename to pkgs/by-name/wh/whatsapp-chat-exporter/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/by-name/wh/whatsapp-for-linux/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
rename to pkgs/by-name/wh/whatsapp-for-linux/package.nix
diff --git a/pkgs/development/libraries/whereami/default.nix b/pkgs/by-name/wh/whereami/package.nix
similarity index 100%
rename from pkgs/development/libraries/whereami/default.nix
rename to pkgs/by-name/wh/whereami/package.nix
diff --git a/pkgs/tools/system/which/default.nix b/pkgs/by-name/wh/which/package.nix
similarity index 100%
rename from pkgs/tools/system/which/default.nix
rename to pkgs/by-name/wh/which/package.nix
diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/by-name/wh/whipper/package.nix
similarity index 100%
rename from pkgs/applications/audio/whipper/default.nix
rename to pkgs/by-name/wh/whipper/package.nix
diff --git a/pkgs/tools/audio/whisper-ctranslate2/default.nix b/pkgs/by-name/wh/whisper-ctranslate2/package.nix
similarity index 100%
rename from pkgs/tools/audio/whisper-ctranslate2/default.nix
rename to pkgs/by-name/wh/whisper-ctranslate2/package.nix
diff --git a/pkgs/applications/science/biology/whisper/default.nix b/pkgs/by-name/wh/whisper/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/whisper/default.nix
rename to pkgs/by-name/wh/whisper/package.nix
diff --git a/pkgs/servers/web-apps/whitebophir/default.nix b/pkgs/by-name/wh/whitebophir/package.nix
similarity index 100%
rename from pkgs/servers/web-apps/whitebophir/default.nix
rename to pkgs/by-name/wh/whitebophir/package.nix
diff --git a/pkgs/data/icons/whitesur-cursors/default.nix b/pkgs/by-name/wh/whitesur-cursors/package.nix
similarity index 100%
rename from pkgs/data/icons/whitesur-cursors/default.nix
rename to pkgs/by-name/wh/whitesur-cursors/package.nix
diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/by-name/wh/whitesur-gtk-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/whitesur/default.nix
rename to pkgs/by-name/wh/whitesur-gtk-theme/package.nix
diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/by-name/wh/whitesur-icon-theme/package.nix
similarity index 100%
rename from pkgs/data/icons/whitesur-icon-theme/default.nix
rename to pkgs/by-name/wh/whitesur-icon-theme/package.nix
diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/by-name/wh/whois/package.nix
similarity index 100%
rename from pkgs/tools/networking/whois/default.nix
rename to pkgs/by-name/wh/whois/package.nix
diff --git a/pkgs/applications/networking/sniffers/whsniff/default.nix b/pkgs/by-name/wh/whsniff/package.nix
similarity index 100%
rename from pkgs/applications/networking/sniffers/whsniff/default.nix
rename to pkgs/by-name/wh/whsniff/package.nix
diff --git a/pkgs/games/widelands/default.nix b/pkgs/by-name/wi/widelands/package.nix
similarity index 100%
rename from pkgs/games/widelands/default.nix
rename to pkgs/by-name/wi/widelands/package.nix
diff --git a/pkgs/os-specific/darwin/wifi-password/default.nix b/pkgs/by-name/wi/wifi-password/package.nix
similarity index 100%
rename from pkgs/os-specific/darwin/wifi-password/default.nix
rename to pkgs/by-name/wi/wifi-password/package.nix
diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/by-name/wi/wiggle/package.nix
similarity index 100%
rename from pkgs/development/tools/wiggle/default.nix
rename to pkgs/by-name/wi/wiggle/package.nix
diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/by-name/wi/wiiload/package.nix
similarity index 100%
rename from pkgs/development/tools/wiiload/default.nix
rename to pkgs/by-name/wi/wiiload/package.nix
diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff b/pkgs/by-name/wi/wiimms-iso-tools/fix-paths.diff
similarity index 100%
rename from pkgs/tools/filesystems/wiimms-iso-tools/fix-paths.diff
rename to pkgs/by-name/wi/wiimms-iso-tools/fix-paths.diff
diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/pkgs/by-name/wi/wiimms-iso-tools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/wiimms-iso-tools/default.nix
rename to pkgs/by-name/wi/wiimms-iso-tools/package.nix
diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/by-name/wi/wily/package.nix
similarity index 100%
rename from pkgs/applications/editors/wily/default.nix
rename to pkgs/by-name/wi/wily/package.nix
diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/by-name/wi/wimboot/package.nix
similarity index 100%
rename from pkgs/tools/misc/wimboot/default.nix
rename to pkgs/by-name/wi/wimboot/package.nix
diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/by-name/wi/wimlib/package.nix
similarity index 100%
rename from pkgs/tools/archivers/wimlib/default.nix
rename to pkgs/by-name/wi/wimlib/package.nix
diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/by-name/wi/win-spice/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/driver/win-spice/default.nix
rename to pkgs/by-name/wi/win-spice/package.nix
diff --git a/pkgs/applications/window-managers/windowchef/default.nix b/pkgs/by-name/wi/windowchef/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/windowchef/default.nix
rename to pkgs/by-name/wi/windowchef/package.nix
diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/by-name/wi/windowlab/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/windowlab/default.nix
rename to pkgs/by-name/wi/windowlab/package.nix
diff --git a/pkgs/applications/emulators/wineasio/default.nix b/pkgs/by-name/wi/wineasio/package.nix
similarity index 100%
rename from pkgs/applications/emulators/wineasio/default.nix
rename to pkgs/by-name/wi/wineasio/package.nix
diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch b/pkgs/by-name/wi/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
similarity index 100%
rename from pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
rename to pkgs/by-name/wi/wingpanel-indicator-ayatana/fix-libapplication-dir.patch
diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/pkgs/by-name/wi/wingpanel-indicator-ayatana/package.nix
similarity index 100%
rename from pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix
rename to pkgs/by-name/wi/wingpanel-indicator-ayatana/package.nix
diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/by-name/wi/wings/package.nix
similarity index 100%
rename from pkgs/applications/graphics/wings/default.nix
rename to pkgs/by-name/wi/wings/package.nix
diff --git a/pkgs/development/tools/winhelpcgi/default.nix b/pkgs/by-name/wi/winhelpcgi/package.nix
similarity index 100%
rename from pkgs/development/tools/winhelpcgi/default.nix
rename to pkgs/by-name/wi/winhelpcgi/package.nix
diff --git a/pkgs/tools/security/wipe/fix-install.patch b/pkgs/by-name/wi/wipe/fix-install.patch
similarity index 100%
rename from pkgs/tools/security/wipe/fix-install.patch
rename to pkgs/by-name/wi/wipe/fix-install.patch
diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/by-name/wi/wipe/package.nix
similarity index 100%
rename from pkgs/tools/security/wipe/default.nix
rename to pkgs/by-name/wi/wipe/package.nix
diff --git a/pkgs/tools/filesystems/wipefreespace/default.nix b/pkgs/by-name/wi/wipefreespace/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/wipefreespace/default.nix
rename to pkgs/by-name/wi/wipefreespace/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/by-name/wi/wire-desktop/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
rename to pkgs/by-name/wi/wire-desktop/package.nix
diff --git a/pkgs/development/tools/wire/go-modules.patch b/pkgs/by-name/wi/wire/go-modules.patch
similarity index 100%
rename from pkgs/development/tools/wire/go-modules.patch
rename to pkgs/by-name/wi/wire/go-modules.patch
diff --git a/pkgs/development/tools/wire/default.nix b/pkgs/by-name/wi/wire/package.nix
similarity index 100%
rename from pkgs/development/tools/wire/default.nix
rename to pkgs/by-name/wi/wire/package.nix
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/by-name/wi/wiredtiger/package.nix
similarity index 100%
rename from pkgs/development/libraries/wiredtiger/default.nix
rename to pkgs/by-name/wi/wiredtiger/package.nix
diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/by-name/wi/wireless-regdb/package.nix
similarity index 100%
rename from pkgs/data/misc/wireless-regdb/default.nix
rename to pkgs/by-name/wi/wireless-regdb/package.nix
diff --git a/pkgs/os-specific/linux/wireless-tools/default.nix b/pkgs/by-name/wi/wirelesstools/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/wireless-tools/default.nix
rename to pkgs/by-name/wi/wirelesstools/package.nix
diff --git a/pkgs/games/wireworld/default.nix b/pkgs/by-name/wi/wireworld/package.nix
similarity index 100%
rename from pkgs/games/wireworld/default.nix
rename to pkgs/by-name/wi/wireworld/package.nix
diff --git a/pkgs/os-specific/linux/wiringpi/default.nix b/pkgs/by-name/wi/wiringpi/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/wiringpi/default.nix
rename to pkgs/by-name/wi/wiringpi/package.nix
diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/by-name/wi/wishbone-tool/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/wishbone-tool/default.nix
rename to pkgs/by-name/wi/wishbone-tool/package.nix
diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/by-name/wi/wishlist/package.nix
similarity index 100%
rename from pkgs/servers/wishlist/default.nix
rename to pkgs/by-name/wi/wishlist/package.nix
diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/by-name/wi/witness/package.nix
similarity index 100%
rename from pkgs/tools/security/witness/default.nix
rename to pkgs/by-name/wi/witness/package.nix
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/by-name/wk/wkhtmltopdf/package.nix
similarity index 100%
rename from pkgs/tools/graphics/wkhtmltopdf/default.nix
rename to pkgs/by-name/wk/wkhtmltopdf/package.nix
diff --git a/pkgs/tools/wayland/wl-clipboard-x11/default.nix b/pkgs/by-name/wl/wl-clipboard-x11/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wl-clipboard-x11/default.nix
rename to pkgs/by-name/wl/wl-clipboard-x11/package.nix
diff --git a/pkgs/tools/wayland/wl-clipboard/default.nix b/pkgs/by-name/wl/wl-clipboard/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wl-clipboard/default.nix
rename to pkgs/by-name/wl/wl-clipboard/package.nix
diff --git a/pkgs/tools/wayland/wl-color-picker/default.nix b/pkgs/by-name/wl/wl-color-picker/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wl-color-picker/default.nix
rename to pkgs/by-name/wl/wl-color-picker/package.nix
diff --git a/pkgs/tools/wayland/wl-gammactl/dont-need-wlroots.diff b/pkgs/by-name/wl/wl-gammactl/dont-need-wlroots.diff
similarity index 100%
rename from pkgs/tools/wayland/wl-gammactl/dont-need-wlroots.diff
rename to pkgs/by-name/wl/wl-gammactl/dont-need-wlroots.diff
diff --git a/pkgs/tools/wayland/wl-gammactl/default.nix b/pkgs/by-name/wl/wl-gammactl/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wl-gammactl/default.nix
rename to pkgs/by-name/wl/wl-gammactl/package.nix
diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/by-name/wl/wl-mirror/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wl-mirror/default.nix
rename to pkgs/by-name/wl/wl-mirror/package.nix
diff --git a/pkgs/tools/wayland/wl-screenrec/default.nix b/pkgs/by-name/wl/wl-screenrec/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wl-screenrec/default.nix
rename to pkgs/by-name/wl/wl-screenrec/package.nix
diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/by-name/wl/wla-dx/package.nix
similarity index 100%
rename from pkgs/development/compilers/wla-dx/default.nix
rename to pkgs/by-name/wl/wla-dx/package.nix
diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/by-name/wl/wlc/package.nix
similarity index 100%
rename from pkgs/tools/misc/wlc/default.nix
rename to pkgs/by-name/wl/wlc/package.nix
diff --git a/pkgs/applications/misc/wlclock/default.nix b/pkgs/by-name/wl/wlclock/package.nix
similarity index 100%
rename from pkgs/applications/misc/wlclock/default.nix
rename to pkgs/by-name/wl/wlclock/package.nix
diff --git a/pkgs/development/tools/wlcs/default.nix b/pkgs/by-name/wl/wlcs/package.nix
similarity index 100%
rename from pkgs/development/tools/wlcs/default.nix
rename to pkgs/by-name/wl/wlcs/package.nix
diff --git a/pkgs/tools/wayland/wleave/default.nix b/pkgs/by-name/wl/wleave/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wleave/default.nix
rename to pkgs/by-name/wl/wleave/package.nix
diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/by-name/wl/wllvm/package.nix
similarity index 100%
rename from pkgs/development/tools/wllvm/default.nix
rename to pkgs/by-name/wl/wllvm/package.nix
diff --git a/pkgs/tools/wayland/wlopm/default.nix b/pkgs/by-name/wl/wlopm/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wlopm/default.nix
rename to pkgs/by-name/wl/wlopm/package.nix
diff --git a/pkgs/tools/wayland/wlprop/default.nix b/pkgs/by-name/wl/wlprop/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wlprop/default.nix
rename to pkgs/by-name/wl/wlprop/package.nix
diff --git a/pkgs/tools/wayland/wlr-randr/default.nix b/pkgs/by-name/wl/wlr-randr/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wlr-randr/default.nix
rename to pkgs/by-name/wl/wlr-randr/package.nix
diff --git a/pkgs/tools/wayland/wlr-which-key/default.nix b/pkgs/by-name/wl/wlr-which-key/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wlr-which-key/default.nix
rename to pkgs/by-name/wl/wlr-which-key/package.nix
diff --git a/pkgs/tools/wayland/wlrctl/default.nix b/pkgs/by-name/wl/wlrctl/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wlrctl/default.nix
rename to pkgs/by-name/wl/wlrctl/package.nix
diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/by-name/wl/wlsunset/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wlsunset/default.nix
rename to pkgs/by-name/wl/wlsunset/package.nix
diff --git a/pkgs/tools/wayland/wluma/default.nix b/pkgs/by-name/wl/wluma/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wluma/default.nix
rename to pkgs/by-name/wl/wluma/package.nix
diff --git a/pkgs/tools/X11/wmctrl/64-bit-data.patch b/pkgs/by-name/wm/wmctrl/64-bit-data.patch
similarity index 100%
rename from pkgs/tools/X11/wmctrl/64-bit-data.patch
rename to pkgs/by-name/wm/wmctrl/64-bit-data.patch
diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/by-name/wm/wmctrl/package.nix
similarity index 100%
rename from pkgs/tools/X11/wmctrl/default.nix
rename to pkgs/by-name/wm/wmctrl/package.nix
diff --git a/pkgs/applications/window-managers/wmderland/0001-remove-flto.patch b/pkgs/by-name/wm/wmderland/0001-remove-flto.patch
similarity index 100%
rename from pkgs/applications/window-managers/wmderland/0001-remove-flto.patch
rename to pkgs/by-name/wm/wmderland/0001-remove-flto.patch
diff --git a/pkgs/applications/window-managers/wmderland/default.nix b/pkgs/by-name/wm/wmderland/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/wmderland/default.nix
rename to pkgs/by-name/wm/wmderland/package.nix
diff --git a/pkgs/applications/window-managers/wmderlandc/default.nix b/pkgs/by-name/wm/wmderlandc/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/wmderlandc/default.nix
rename to pkgs/by-name/wm/wmderlandc/package.nix
diff --git a/pkgs/applications/misc/wmenu/default.nix b/pkgs/by-name/wm/wmenu/package.nix
similarity index 100%
rename from pkgs/applications/misc/wmenu/default.nix
rename to pkgs/by-name/wm/wmenu/package.nix
diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/by-name/wm/wmfs/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/wmfs/default.nix
rename to pkgs/by-name/wm/wmfs/package.nix
diff --git a/pkgs/servers/monitoring/wmic-bin/default.nix b/pkgs/by-name/wm/wmic-bin/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/wmic-bin/default.nix
rename to pkgs/by-name/wm/wmic-bin/package.nix
diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/by-name/wm/wmii/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/wmii/default.nix
rename to pkgs/by-name/wm/wmii/package.nix
diff --git a/pkgs/development/web/wml/dynaloader.patch b/pkgs/by-name/wm/wml/dynaloader.patch
similarity index 100%
rename from pkgs/development/web/wml/dynaloader.patch
rename to pkgs/by-name/wm/wml/dynaloader.patch
diff --git a/pkgs/development/web/wml/no_bitvector.patch b/pkgs/by-name/wm/wml/no_bitvector.patch
similarity index 100%
rename from pkgs/development/web/wml/no_bitvector.patch
rename to pkgs/by-name/wm/wml/no_bitvector.patch
diff --git a/pkgs/development/web/wml/default.nix b/pkgs/by-name/wm/wml/package.nix
similarity index 100%
rename from pkgs/development/web/wml/default.nix
rename to pkgs/by-name/wm/wml/package.nix
diff --git a/pkgs/development/web/wml/redhat-with-thr.patch b/pkgs/by-name/wm/wml/redhat-with-thr.patch
similarity index 100%
rename from pkgs/development/web/wml/redhat-with-thr.patch
rename to pkgs/by-name/wm/wml/redhat-with-thr.patch
diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/by-name/wm/wmname/package.nix
similarity index 100%
rename from pkgs/applications/misc/wmname/default.nix
rename to pkgs/by-name/wm/wmname/package.nix
diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/by-name/wm/wmutils-core/package.nix
similarity index 100%
rename from pkgs/tools/X11/wmutils-core/default.nix
rename to pkgs/by-name/wm/wmutils-core/package.nix
diff --git a/pkgs/tools/X11/wmutils-libwm/default.nix b/pkgs/by-name/wm/wmutils-libwm/package.nix
similarity index 100%
rename from pkgs/tools/X11/wmutils-libwm/default.nix
rename to pkgs/by-name/wm/wmutils-libwm/package.nix
diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/by-name/wm/wmutils-opt/package.nix
similarity index 100%
rename from pkgs/tools/X11/wmutils-opt/default.nix
rename to pkgs/by-name/wm/wmutils-opt/package.nix
diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/by-name/wo/wob/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wob/default.nix
rename to pkgs/by-name/wo/wob/package.nix
diff --git a/pkgs/tools/misc/woeusb-ng/default.nix b/pkgs/by-name/wo/woeusb-ng/package.nix
similarity index 100%
rename from pkgs/tools/misc/woeusb-ng/default.nix
rename to pkgs/by-name/wo/woeusb-ng/package.nix
diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/by-name/wo/woeusb/package.nix
similarity index 100%
rename from pkgs/tools/misc/woeusb/default.nix
rename to pkgs/by-name/wo/woeusb/package.nix
diff --git a/pkgs/development/web/woff2/brotli-static.patch b/pkgs/by-name/wo/woff2/brotli-static.patch
similarity index 100%
rename from pkgs/development/web/woff2/brotli-static.patch
rename to pkgs/by-name/wo/woff2/brotli-static.patch
diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/by-name/wo/woff2/package.nix
similarity index 100%
rename from pkgs/development/web/woff2/default.nix
rename to pkgs/by-name/wo/woff2/package.nix
diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/by-name/wo/wofi-emoji/package.nix
similarity index 100%
rename from pkgs/applications/misc/wofi-emoji/default.nix
rename to pkgs/by-name/wo/wofi-emoji/package.nix
diff --git a/pkgs/applications/misc/wofi/do_not_follow_symlinks.patch b/pkgs/by-name/wo/wofi/do_not_follow_symlinks.patch
similarity index 100%
rename from pkgs/applications/misc/wofi/do_not_follow_symlinks.patch
rename to pkgs/by-name/wo/wofi/do_not_follow_symlinks.patch
diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/by-name/wo/wofi/package.nix
similarity index 100%
rename from pkgs/applications/misc/wofi/default.nix
rename to pkgs/by-name/wo/wofi/package.nix
diff --git a/pkgs/tools/networking/wol/default.nix b/pkgs/by-name/wo/wol/package.nix
similarity index 100%
rename from pkgs/tools/networking/wol/default.nix
rename to pkgs/by-name/wo/wol/package.nix
diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/by-name/wo/wolf-shaper/package.nix
similarity index 100%
rename from pkgs/applications/audio/wolf-shaper/default.nix
rename to pkgs/by-name/wo/wolf-shaper/package.nix
diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/by-name/wo/wolfebin/package.nix
similarity index 100%
rename from pkgs/tools/networking/wolfebin/default.nix
rename to pkgs/by-name/wo/wolfebin/package.nix
diff --git a/pkgs/games/wolfstoneextract/default.nix b/pkgs/by-name/wo/wolfstoneextract/package.nix
similarity index 100%
rename from pkgs/games/wolfstoneextract/default.nix
rename to pkgs/by-name/wo/wolfstoneextract/package.nix
diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/by-name/wo/woodpecker-plugin-git/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix
rename to pkgs/by-name/wo/woodpecker-plugin-git/package.nix
diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/by-name/wo/woof/package.nix
similarity index 100%
rename from pkgs/tools/misc/woof/default.nix
rename to pkgs/by-name/wo/woof/package.nix
diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/by-name/wo/wootility/package.nix
similarity index 100%
rename from pkgs/tools/misc/wootility/default.nix
rename to pkgs/by-name/wo/wootility/package.nix
diff --git a/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/pkgs/by-name/wo/wooting-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/wooting-udev-rules/default.nix
rename to pkgs/by-name/wo/wooting-udev-rules/package.nix
diff --git a/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules b/pkgs/by-name/wo/wooting-udev-rules/wooting.rules
similarity index 100%
rename from pkgs/os-specific/linux/wooting-udev-rules/wooting.rules
rename to pkgs/by-name/wo/wooting-udev-rules/wooting.rules
diff --git a/pkgs/applications/misc/wordbook/default.nix b/pkgs/by-name/wo/wordbook/package.nix
similarity index 100%
rename from pkgs/applications/misc/wordbook/default.nix
rename to pkgs/by-name/wo/wordbook/package.nix
diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/by-name/wo/wordgrinder/package.nix
similarity index 100%
rename from pkgs/applications/office/wordgrinder/default.nix
rename to pkgs/by-name/wo/wordgrinder/package.nix
diff --git a/pkgs/data/fonts/work-sans/default.nix b/pkgs/by-name/wo/work-sans/package.nix
similarity index 100%
rename from pkgs/data/fonts/work-sans/default.nix
rename to pkgs/by-name/wo/work-sans/package.nix
diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/by-name/wo/workcraft/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/workcraft/default.nix
rename to pkgs/by-name/wo/workcraft/package.nix
diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/by-name/wo/worldofgoo/package.nix
similarity index 100%
rename from pkgs/games/worldofgoo/default.nix
rename to pkgs/by-name/wo/worldofgoo/package.nix
diff --git a/pkgs/tools/networking/wormhole-william/default.nix b/pkgs/by-name/wo/wormhole-william/package.nix
similarity index 100%
rename from pkgs/tools/networking/wormhole-william/default.nix
rename to pkgs/by-name/wo/wormhole-william/package.nix
diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/by-name/wo/wownero/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/wownero/default.nix
rename to pkgs/by-name/wo/wownero/package.nix
diff --git a/pkgs/development/tools/wp4nix/default.nix b/pkgs/by-name/wp/wp4nix/package.nix
similarity index 100%
rename from pkgs/development/tools/wp4nix/default.nix
rename to pkgs/by-name/wp/wp4nix/package.nix
diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/by-name/wp/wpgtk/package.nix
similarity index 100%
rename from pkgs/tools/X11/wpgtk/default.nix
rename to pkgs/by-name/wp/wpgtk/package.nix
diff --git a/pkgs/applications/misc/wpm/default.nix b/pkgs/by-name/wp/wpm/package.nix
similarity index 100%
rename from pkgs/applications/misc/wpm/default.nix
rename to pkgs/by-name/wp/wpm/package.nix
diff --git a/pkgs/tools/security/wprecon/default.nix b/pkgs/by-name/wp/wprecon/package.nix
similarity index 100%
rename from pkgs/tools/security/wprecon/default.nix
rename to pkgs/by-name/wp/wprecon/package.nix
diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/by-name/wq/wqy_microhei/package.nix
similarity index 100%
rename from pkgs/data/fonts/wqy-microhei/default.nix
rename to pkgs/by-name/wq/wqy_microhei/package.nix
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/by-name/wq/wqy_zenhei/package.nix
similarity index 100%
rename from pkgs/data/fonts/wqy-zenhei/default.nix
rename to pkgs/by-name/wq/wqy_zenhei/package.nix
diff --git a/pkgs/tools/text/wrap/default.nix b/pkgs/by-name/wr/wrap/package.nix
similarity index 100%
rename from pkgs/tools/text/wrap/default.nix
rename to pkgs/by-name/wr/wrap/package.nix
diff --git a/pkgs/tools/text/write-good/default.nix b/pkgs/by-name/wr/write-good/package.nix
similarity index 100%
rename from pkgs/tools/text/write-good/default.nix
rename to pkgs/by-name/wr/write-good/package.nix
diff --git a/pkgs/tools/misc/writedisk/default.nix b/pkgs/by-name/wr/writedisk/package.nix
similarity index 100%
rename from pkgs/tools/misc/writedisk/default.nix
rename to pkgs/by-name/wr/writedisk/package.nix
diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/by-name/wr/wrk/package.nix
similarity index 100%
rename from pkgs/tools/networking/wrk/default.nix
rename to pkgs/by-name/wr/wrk/package.nix
diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/by-name/wr/wrk2/package.nix
similarity index 100%
rename from pkgs/tools/networking/wrk2/default.nix
rename to pkgs/by-name/wr/wrk2/package.nix
diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/by-name/ws/wsdd/package.nix
similarity index 100%
rename from pkgs/servers/wsdd/default.nix
rename to pkgs/by-name/ws/wsdd/package.nix
diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/by-name/ws/wshowkeys/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wshowkeys/default.nix
rename to pkgs/by-name/ws/wshowkeys/package.nix
diff --git a/pkgs/tools/misc/wsl-open/default.nix b/pkgs/by-name/ws/wsl-open/package.nix
similarity index 100%
rename from pkgs/tools/misc/wsl-open/default.nix
rename to pkgs/by-name/ws/wsl-open/package.nix
diff --git a/pkgs/tools/networking/wsl-vpnkit/default.nix b/pkgs/by-name/ws/wsl-vpnkit/package.nix
similarity index 100%
rename from pkgs/tools/networking/wsl-vpnkit/default.nix
rename to pkgs/by-name/ws/wsl-vpnkit/package.nix
diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/by-name/ws/wsmancli/package.nix
similarity index 100%
rename from pkgs/tools/system/wsmancli/default.nix
rename to pkgs/by-name/ws/wsmancli/package.nix
diff --git a/pkgs/tools/system/wsysmon/dependencies.patch b/pkgs/by-name/ws/wsysmon/dependencies.patch
similarity index 100%
rename from pkgs/tools/system/wsysmon/dependencies.patch
rename to pkgs/by-name/ws/wsysmon/dependencies.patch
diff --git a/pkgs/tools/system/wsysmon/install.patch b/pkgs/by-name/ws/wsysmon/install.patch
similarity index 100%
rename from pkgs/tools/system/wsysmon/install.patch
rename to pkgs/by-name/ws/wsysmon/install.patch
diff --git a/pkgs/tools/system/wsysmon/default.nix b/pkgs/by-name/ws/wsysmon/package.nix
similarity index 100%
rename from pkgs/tools/system/wsysmon/default.nix
rename to pkgs/by-name/ws/wsysmon/package.nix
diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/by-name/wt/wtf/package.nix
similarity index 100%
rename from pkgs/applications/misc/wtf/default.nix
rename to pkgs/by-name/wt/wtf/package.nix
diff --git a/pkgs/applications/misc/wthrr/default.nix b/pkgs/by-name/wt/wthrr/package.nix
similarity index 100%
rename from pkgs/applications/misc/wthrr/default.nix
rename to pkgs/by-name/wt/wthrr/package.nix
diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/by-name/wt/wtk/builder.sh
similarity index 100%
rename from pkgs/development/libraries/wtk/builder.sh
rename to pkgs/by-name/wt/wtk/builder.sh
diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/by-name/wt/wtk/package.nix
similarity index 100%
rename from pkgs/development/libraries/wtk/default.nix
rename to pkgs/by-name/wt/wtk/package.nix
diff --git a/pkgs/tools/wayland/wtype/default.nix b/pkgs/by-name/wt/wtype/package.nix
similarity index 100%
rename from pkgs/tools/wayland/wtype/default.nix
rename to pkgs/by-name/wt/wtype/package.nix
diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/by-name/wu/wuzz/package.nix
similarity index 100%
rename from pkgs/tools/networking/wuzz/default.nix
rename to pkgs/by-name/wu/wuzz/package.nix
diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/by-name/wv/wv/package.nix
similarity index 100%
rename from pkgs/tools/misc/wv/default.nix
rename to pkgs/by-name/wv/wv/package.nix
diff --git a/pkgs/tools/misc/wv2/fix-include.patch b/pkgs/by-name/wv/wv2/fix-include.patch
similarity index 100%
rename from pkgs/tools/misc/wv2/fix-include.patch
rename to pkgs/by-name/wv/wv2/fix-include.patch
diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/by-name/wv/wv2/package.nix
similarity index 100%
rename from pkgs/tools/misc/wv2/default.nix
rename to pkgs/by-name/wv/wv2/package.nix
diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/by-name/wv/wvkbd/package.nix
similarity index 100%
rename from pkgs/applications/accessibility/wvkbd/default.nix
rename to pkgs/by-name/wv/wvkbd/package.nix
diff --git a/pkgs/tools/misc/wwcd/default.nix b/pkgs/by-name/ww/wwcd/package.nix
similarity index 100%
rename from pkgs/tools/misc/wwcd/default.nix
rename to pkgs/by-name/ww/wwcd/package.nix
diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/by-name/wx/wxformbuilder/package.nix
similarity index 100%
rename from pkgs/development/tools/wxformbuilder/default.nix
rename to pkgs/by-name/wx/wxformbuilder/package.nix
diff --git a/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/pkgs/by-name/wx/wxmacmolplt/package.nix
similarity index 100%
rename from pkgs/applications/science/chemistry/wxmacmolplt/default.nix
rename to pkgs/by-name/wx/wxmacmolplt/package.nix
diff --git a/pkgs/games/wyvern/cargo-lock.patch b/pkgs/by-name/wy/wyvern/cargo-lock.patch
similarity index 100%
rename from pkgs/games/wyvern/cargo-lock.patch
rename to pkgs/by-name/wy/wyvern/cargo-lock.patch
diff --git a/pkgs/games/wyvern/default.nix b/pkgs/by-name/wy/wyvern/package.nix
similarity index 100%
rename from pkgs/games/wyvern/default.nix
rename to pkgs/by-name/wy/wyvern/package.nix
diff --git a/pkgs/applications/window-managers/x-create-mouse-void/default.nix b/pkgs/by-name/x-/x-create-mouse-void/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/x-create-mouse-void/default.nix
rename to pkgs/by-name/x-/x-create-mouse-void/package.nix
diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/by-name/x1/x11_ssh_askpass/package.nix
similarity index 100%
rename from pkgs/tools/networking/x11-ssh-askpass/default.nix
rename to pkgs/by-name/x1/x11_ssh_askpass/package.nix
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/by-name/x1/x11docker/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/x11docker/default.nix
rename to pkgs/by-name/x1/x11docker/package.nix
diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/by-name/x1/x11idle/package.nix
similarity index 100%
rename from pkgs/tools/misc/x11idle/default.nix
rename to pkgs/by-name/x1/x11idle/package.nix
diff --git a/pkgs/tools/X11/x11spice/default.nix b/pkgs/by-name/x1/x11spice/package.nix
similarity index 100%
rename from pkgs/tools/X11/x11spice/default.nix
rename to pkgs/by-name/x1/x11spice/package.nix
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/by-name/x1/x11vnc/package.nix
similarity index 100%
rename from pkgs/tools/X11/x11vnc/default.nix
rename to pkgs/by-name/x1/x11vnc/package.nix
diff --git a/pkgs/development/libraries/x264/disable-arm-neon-default.patch b/pkgs/by-name/x2/x264/disable-arm-neon-default.patch
similarity index 100%
rename from pkgs/development/libraries/x264/disable-arm-neon-default.patch
rename to pkgs/by-name/x2/x264/disable-arm-neon-default.patch
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/by-name/x2/x264/package.nix
similarity index 100%
rename from pkgs/development/libraries/x264/default.nix
rename to pkgs/by-name/x2/x264/package.nix
diff --git a/pkgs/development/libraries/x265/darwin-__rdtsc.patch b/pkgs/by-name/x2/x265/darwin-__rdtsc.patch
similarity index 100%
rename from pkgs/development/libraries/x265/darwin-__rdtsc.patch
rename to pkgs/by-name/x2/x265/darwin-__rdtsc.patch
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/by-name/x2/x265/package.nix
similarity index 100%
rename from pkgs/development/libraries/x265/default.nix
rename to pkgs/by-name/x2/x265/package.nix
diff --git a/pkgs/applications/networking/remote/x2goserver/default.nix b/pkgs/by-name/x2/x2goserver/package.nix
similarity index 100%
rename from pkgs/applications/networking/remote/x2goserver/default.nix
rename to pkgs/by-name/x2/x2goserver/package.nix
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/by-name/x2/x2vnc/package.nix
similarity index 100%
rename from pkgs/tools/X11/x2vnc/default.nix
rename to pkgs/by-name/x2/x2vnc/package.nix
diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/by-name/x2/x2x/package.nix
similarity index 100%
rename from pkgs/tools/X11/x2x/default.nix
rename to pkgs/by-name/x2/x2x/package.nix
diff --git a/pkgs/applications/terminal-emulators/x3270/default.nix b/pkgs/by-name/x3/x3270/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/x3270/default.nix
rename to pkgs/by-name/x3/x3270/package.nix
diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/by-name/x4/x42-avldrums/package.nix
similarity index 100%
rename from pkgs/applications/audio/x42-avldrums/default.nix
rename to pkgs/by-name/x4/x42-avldrums/package.nix
diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/by-name/x4/x42-gmsynth/package.nix
similarity index 100%
rename from pkgs/applications/audio/x42-gmsynth/default.nix
rename to pkgs/by-name/x4/x42-gmsynth/package.nix
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/by-name/x4/x42-plugins/package.nix
similarity index 100%
rename from pkgs/applications/audio/x42-plugins/default.nix
rename to pkgs/by-name/x4/x42-plugins/package.nix
diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/by-name/x8/x86info/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/x86info/default.nix
rename to pkgs/by-name/x8/x86info/package.nix
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/by-name/xa/Xaw3d/package.nix
similarity index 100%
rename from pkgs/development/libraries/Xaw3d/default.nix
rename to pkgs/by-name/xa/Xaw3d/package.nix
diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/by-name/xa/xalanc/package.nix
similarity index 100%
rename from pkgs/development/libraries/xalanc/default.nix
rename to pkgs/by-name/xa/xalanc/package.nix
diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/by-name/xa/xannotate/package.nix
similarity index 100%
rename from pkgs/tools/X11/xannotate/default.nix
rename to pkgs/by-name/xa/xannotate/package.nix
diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/by-name/xa/xarchiver/package.nix
similarity index 100%
rename from pkgs/tools/archivers/xarchiver/default.nix
rename to pkgs/by-name/xa/xarchiver/package.nix
diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/by-name/xa/xastir/package.nix
similarity index 100%
rename from pkgs/applications/misc/xastir/default.nix
rename to pkgs/by-name/xa/xastir/package.nix
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/by-name/xa/xautoclick/package.nix
similarity index 100%
rename from pkgs/applications/misc/xautoclick/default.nix
rename to pkgs/by-name/xa/xautoclick/package.nix
diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/by-name/xa/xautolock/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/xautolock/default.nix
rename to pkgs/by-name/xa/xautolock/package.nix
diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/by-name/xa/xautomation/package.nix
similarity index 100%
rename from pkgs/tools/X11/xautomation/default.nix
rename to pkgs/by-name/xa/xautomation/package.nix
diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/by-name/xa/xavs/package.nix
similarity index 100%
rename from pkgs/development/libraries/xavs/default.nix
rename to pkgs/by-name/xa/xavs/package.nix
diff --git a/pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch b/pkgs/by-name/xa/xawtv/0001-Fix-build-for-glibc-2.32.patch
similarity index 100%
rename from pkgs/applications/video/xawtv/0001-Fix-build-for-glibc-2.32.patch
rename to pkgs/by-name/xa/xawtv/0001-Fix-build-for-glibc-2.32.patch
diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/by-name/xa/xawtv/package.nix
similarity index 100%
rename from pkgs/applications/video/xawtv/default.nix
rename to pkgs/by-name/xa/xawtv/package.nix
diff --git a/pkgs/tools/X11/xbanish/default.nix b/pkgs/by-name/xb/xbanish/package.nix
similarity index 100%
rename from pkgs/tools/X11/xbanish/default.nix
rename to pkgs/by-name/xb/xbanish/package.nix
diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/by-name/xb/xbase/package.nix
similarity index 100%
rename from pkgs/development/libraries/xbase/default.nix
rename to pkgs/by-name/xb/xbase/package.nix
diff --git a/pkgs/development/libraries/xbase/xbase-fixes.patch b/pkgs/by-name/xb/xbase/xbase-fixes.patch
similarity index 100%
rename from pkgs/development/libraries/xbase/xbase-fixes.patch
rename to pkgs/by-name/xb/xbase/xbase-fixes.patch
diff --git a/pkgs/applications/misc/xbattbar/default.nix b/pkgs/by-name/xb/xbattbar/package.nix
similarity index 100%
rename from pkgs/applications/misc/xbattbar/default.nix
rename to pkgs/by-name/xb/xbattbar/package.nix
diff --git a/pkgs/applications/misc/xbattbar/sys-by-default.patch b/pkgs/by-name/xb/xbattbar/sys-by-default.patch
similarity index 100%
rename from pkgs/applications/misc/xbattbar/sys-by-default.patch
rename to pkgs/by-name/xb/xbattbar/sys-by-default.patch
diff --git a/pkgs/games/xbill/default.nix b/pkgs/by-name/xb/xbill/package.nix
similarity index 100%
rename from pkgs/games/xbill/default.nix
rename to pkgs/by-name/xb/xbill/package.nix
diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/by-name/xb/xbindkeys/package.nix
similarity index 100%
rename from pkgs/tools/X11/xbindkeys/default.nix
rename to pkgs/by-name/xb/xbindkeys/package.nix
diff --git a/pkgs/games/xboard/default.nix b/pkgs/by-name/xb/xboard/package.nix
similarity index 100%
rename from pkgs/games/xboard/default.nix
rename to pkgs/by-name/xb/xboard/package.nix
diff --git a/pkgs/games/xbomb/default.nix b/pkgs/by-name/xb/xbomb/package.nix
similarity index 100%
rename from pkgs/games/xbomb/default.nix
rename to pkgs/by-name/xb/xbomb/package.nix
diff --git a/pkgs/tools/X11/xborders/default.nix b/pkgs/by-name/xb/xborders/package.nix
similarity index 100%
rename from pkgs/tools/X11/xborders/default.nix
rename to pkgs/by-name/xb/xborders/package.nix
diff --git a/pkgs/tools/X11/xborders/setup.py b/pkgs/by-name/xb/xborders/setup.py
similarity index 100%
rename from pkgs/tools/X11/xborders/setup.py
rename to pkgs/by-name/xb/xborders/setup.py
diff --git a/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch b/pkgs/by-name/xb/xboxdrv/fix-60-sec-delay.patch
similarity index 100%
rename from pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch
rename to pkgs/by-name/xb/xboxdrv/fix-60-sec-delay.patch
diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/by-name/xb/xboxdrv/package.nix
similarity index 100%
rename from pkgs/misc/drivers/xboxdrv/default.nix
rename to pkgs/by-name/xb/xboxdrv/package.nix
diff --git a/pkgs/misc/drivers/xboxdrv/scons-py3.patch b/pkgs/by-name/xb/xboxdrv/scons-py3.patch
similarity index 100%
rename from pkgs/misc/drivers/xboxdrv/scons-py3.patch
rename to pkgs/by-name/xb/xboxdrv/scons-py3.patch
diff --git a/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch b/pkgs/by-name/xb/xboxdrv/scons-v4.2.0.patch
similarity index 100%
rename from pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch
rename to pkgs/by-name/xb/xboxdrv/scons-v4.2.0.patch
diff --git a/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch b/pkgs/by-name/xb/xboxdrv/xboxdrvctl-py3.patch
similarity index 100%
rename from pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch
rename to pkgs/by-name/xb/xboxdrv/xboxdrvctl-py3.patch
diff --git a/pkgs/tools/package-management/xbps/cert-paths.patch b/pkgs/by-name/xb/xbps/cert-paths.patch
similarity index 100%
rename from pkgs/tools/package-management/xbps/cert-paths.patch
rename to pkgs/by-name/xb/xbps/cert-paths.patch
diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/by-name/xb/xbps/package.nix
similarity index 100%
rename from pkgs/tools/package-management/xbps/default.nix
rename to pkgs/by-name/xb/xbps/package.nix
diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/by-name/xb/xbrightness/package.nix
similarity index 100%
rename from pkgs/tools/X11/xbrightness/default.nix
rename to pkgs/by-name/xb/xbrightness/package.nix
diff --git a/pkgs/development/tools/xc/default.nix b/pkgs/by-name/xc/xc/package.nix
similarity index 100%
rename from pkgs/development/tools/xc/default.nix
rename to pkgs/by-name/xc/xc/package.nix
diff --git a/pkgs/development/embedded/xc3sprog/default.nix b/pkgs/by-name/xc/xc3sprog/package.nix
similarity index 100%
rename from pkgs/development/embedded/xc3sprog/default.nix
rename to pkgs/by-name/xc/xc3sprog/package.nix
diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/by-name/xc/xcalib/package.nix
similarity index 100%
rename from pkgs/tools/X11/xcalib/default.nix
rename to pkgs/by-name/xc/xcalib/package.nix
diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/by-name/xc/xcape/package.nix
similarity index 100%
rename from pkgs/tools/X11/xcape/default.nix
rename to pkgs/by-name/xc/xcape/package.nix
diff --git a/pkgs/tools/security/xcat/default.nix b/pkgs/by-name/xc/xcat/package.nix
similarity index 100%
rename from pkgs/tools/security/xcat/default.nix
rename to pkgs/by-name/xc/xcat/package.nix
diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/by-name/xc/xcb-imdkit/package.nix
similarity index 100%
rename from pkgs/development/libraries/xcb-imdkit/default.nix
rename to pkgs/by-name/xc/xcb-imdkit/package.nix
diff --git a/pkgs/tools/misc/xcd/default.nix b/pkgs/by-name/xc/xcd/package.nix
similarity index 100%
rename from pkgs/tools/misc/xcd/default.nix
rename to pkgs/by-name/xc/xcd/package.nix
diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/by-name/xc/xcftools/package.nix
similarity index 100%
rename from pkgs/tools/graphics/xcftools/default.nix
rename to pkgs/by-name/xc/xcftools/package.nix
diff --git a/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/pkgs/by-name/xc/xcfun/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/chemistry/xcfun/default.nix
rename to pkgs/by-name/xc/xcfun/package.nix
diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/by-name/xc/xchainkeys/package.nix
similarity index 100%
rename from pkgs/tools/X11/xchainkeys/default.nix
rename to pkgs/by-name/xc/xchainkeys/package.nix
diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/by-name/xc/xcircuit/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/xcircuit/default.nix
rename to pkgs/by-name/xc/xcircuit/package.nix
diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/by-name/xc/xclip/package.nix
similarity index 100%
rename from pkgs/tools/misc/xclip/default.nix
rename to pkgs/by-name/xc/xclip/package.nix
diff --git a/pkgs/tools/graphics/xcolor/default.nix b/pkgs/by-name/xc/xcolor/package.nix
similarity index 100%
rename from pkgs/tools/graphics/xcolor/default.nix
rename to pkgs/by-name/xc/xcolor/package.nix
diff --git a/pkgs/games/xconq/default.nix b/pkgs/by-name/xc/xconq/package.nix
similarity index 100%
rename from pkgs/games/xconq/default.nix
rename to pkgs/by-name/xc/xconq/package.nix
diff --git a/pkgs/games/xcowsay/default.nix b/pkgs/by-name/xc/xcowsay/package.nix
similarity index 100%
rename from pkgs/games/xcowsay/default.nix
rename to pkgs/by-name/xc/xcowsay/package.nix
diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/by-name/xc/xcp/package.nix
similarity index 100%
rename from pkgs/tools/misc/xcp/default.nix
rename to pkgs/by-name/xc/xcp/package.nix
diff --git a/pkgs/applications/emulators/xcpc/default.nix b/pkgs/by-name/xc/xcpc/package.nix
similarity index 100%
rename from pkgs/applications/emulators/xcpc/default.nix
rename to pkgs/by-name/xc/xcpc/package.nix
diff --git a/pkgs/tools/security/xcrawl3r/default.nix b/pkgs/by-name/xc/xcrawl3r/package.nix
similarity index 100%
rename from pkgs/tools/security/xcrawl3r/default.nix
rename to pkgs/by-name/xc/xcrawl3r/package.nix
diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/by-name/xc/xcruiser/package.nix
similarity index 100%
rename from pkgs/applications/misc/xcruiser/default.nix
rename to pkgs/by-name/xc/xcruiser/package.nix
diff --git a/pkgs/tools/graphics/xcur2png/malloc.diff b/pkgs/by-name/xc/xcur2png/malloc.diff
similarity index 100%
rename from pkgs/tools/graphics/xcur2png/malloc.diff
rename to pkgs/by-name/xc/xcur2png/malloc.diff
diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/by-name/xc/xcur2png/package.nix
similarity index 100%
rename from pkgs/tools/graphics/xcur2png/default.nix
rename to pkgs/by-name/xc/xcur2png/package.nix
diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/by-name/xc/xcwd/package.nix
similarity index 100%
rename from pkgs/tools/X11/xcwd/default.nix
rename to pkgs/by-name/xc/xcwd/package.nix
diff --git a/pkgs/applications/networking/p2p/xd/default.nix b/pkgs/by-name/xd/xd/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/xd/default.nix
rename to pkgs/by-name/xd/xd/package.nix
diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/by-name/xd/xdaliclock/package.nix
similarity index 100%
rename from pkgs/tools/misc/xdaliclock/default.nix
rename to pkgs/by-name/xd/xdaliclock/package.nix
diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/by-name/xd/xdg-dbus-proxy/package.nix
similarity index 100%
rename from pkgs/development/libraries/xdg-dbus-proxy/default.nix
rename to pkgs/by-name/xd/xdg-dbus-proxy/package.nix
diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
similarity index 100%
rename from pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix
rename to pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix
similarity index 100%
rename from pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
rename to pkgs/by-name/xd/xdg-desktop-portal-gtk/package.nix
diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
similarity index 100%
rename from pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix
rename to pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
similarity index 100%
rename from pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
rename to pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
diff --git a/pkgs/applications/misc/xdg-launch/default.nix b/pkgs/by-name/xd/xdg-launch/package.nix
similarity index 100%
rename from pkgs/applications/misc/xdg-launch/default.nix
rename to pkgs/by-name/xd/xdg-launch/package.nix
diff --git a/pkgs/tools/misc/xdg-ninja/default.nix b/pkgs/by-name/xd/xdg-ninja/package.nix
similarity index 100%
rename from pkgs/tools/misc/xdg-ninja/default.nix
rename to pkgs/by-name/xd/xdg-ninja/package.nix
diff --git a/pkgs/tools/X11/xdg-utils/allow-forcing-portal-use.patch b/pkgs/by-name/xd/xdg-utils/allow-forcing-portal-use.patch
similarity index 100%
rename from pkgs/tools/X11/xdg-utils/allow-forcing-portal-use.patch
rename to pkgs/by-name/xd/xdg-utils/allow-forcing-portal-use.patch
diff --git a/pkgs/tools/X11/xdg-utils/enable-xdg-terminal.patch b/pkgs/by-name/xd/xdg-utils/enable-xdg-terminal.patch
similarity index 100%
rename from pkgs/tools/X11/xdg-utils/enable-xdg-terminal.patch
rename to pkgs/by-name/xd/xdg-utils/enable-xdg-terminal.patch
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/by-name/xd/xdg-utils/package.nix
similarity index 100%
rename from pkgs/tools/X11/xdg-utils/default.nix
rename to pkgs/by-name/xd/xdg-utils/package.nix
diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/by-name/xd/xdgmenumaker/package.nix
similarity index 100%
rename from pkgs/applications/misc/xdgmenumaker/default.nix
rename to pkgs/by-name/xd/xdgmenumaker/package.nix
diff --git a/pkgs/tools/misc/xdiskusage/default.nix b/pkgs/by-name/xd/xdiskusage/package.nix
similarity index 100%
rename from pkgs/tools/misc/xdiskusage/default.nix
rename to pkgs/by-name/xd/xdiskusage/package.nix
diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/by-name/xd/xdo/package.nix
similarity index 100%
rename from pkgs/tools/misc/xdo/default.nix
rename to pkgs/by-name/xd/xdo/package.nix
diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/by-name/xd/xdotool/package.nix
similarity index 100%
rename from pkgs/tools/X11/xdotool/default.nix
rename to pkgs/by-name/xd/xdotool/package.nix
diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/by-name/xd/xdummy/package.nix
similarity index 100%
rename from pkgs/tools/misc/xdummy/default.nix
rename to pkgs/by-name/xd/xdummy/package.nix
diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/by-name/xd/xdxf2slob/package.nix
similarity index 100%
rename from pkgs/tools/misc/xdxf2slob/default.nix
rename to pkgs/by-name/xd/xdxf2slob/package.nix
diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/by-name/xe/xe-guest-utilities/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/xe-guest-utilities/default.nix
rename to pkgs/by-name/xe/xe-guest-utilities/package.nix
diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/by-name/xe/xe/package.nix
similarity index 100%
rename from pkgs/tools/system/xe/default.nix
rename to pkgs/by-name/xe/xe/package.nix
diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/by-name/xe/xearth/package.nix
similarity index 100%
rename from pkgs/applications/science/astronomy/xearth/default.nix
rename to pkgs/by-name/xe/xearth/package.nix
diff --git a/pkgs/development/libraries/xed/default.nix b/pkgs/by-name/xe/xed/package.nix
similarity index 100%
rename from pkgs/development/libraries/xed/default.nix
rename to pkgs/by-name/xe/xed/package.nix
diff --git a/pkgs/applications/editors/xedit/default.nix b/pkgs/by-name/xe/xedit/package.nix
similarity index 100%
rename from pkgs/applications/editors/xedit/default.nix
rename to pkgs/by-name/xe/xedit/package.nix
diff --git a/pkgs/applications/science/biology/xenomapper/default.nix b/pkgs/by-name/xe/xenomapper/package.nix
similarity index 100%
rename from pkgs/applications/science/biology/xenomapper/default.nix
rename to pkgs/by-name/xe/xenomapper/package.nix
diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/by-name/xe/xercesc/package.nix
similarity index 100%
rename from pkgs/development/libraries/xercesc/default.nix
rename to pkgs/by-name/xe/xercesc/package.nix
diff --git a/pkgs/development/libraries/xeus-zmq/default.nix b/pkgs/by-name/xe/xeus-zmq/package.nix
similarity index 100%
rename from pkgs/development/libraries/xeus-zmq/default.nix
rename to pkgs/by-name/xe/xeus-zmq/package.nix
diff --git a/pkgs/development/libraries/xeus/default.nix b/pkgs/by-name/xe/xeus/package.nix
similarity index 100%
rename from pkgs/development/libraries/xeus/default.nix
rename to pkgs/by-name/xe/xeus/package.nix
diff --git a/pkgs/os-specific/linux/xf86-input-cmt/default.nix b/pkgs/by-name/xf/xf86_input_cmt/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/xf86-input-cmt/default.nix
rename to pkgs/by-name/xf/xf86_input_cmt/package.nix
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/by-name/xf/xf86_input_wacom/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/xf86-input-wacom/default.nix
rename to pkgs/by-name/xf/xf86_input_wacom/package.nix
diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/by-name/xf/xf86_video_nested/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/xf86-video-nested/default.nix
rename to pkgs/by-name/xf/xf86_video_nested/package.nix
diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/by-name/xf/xfig/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xfig/default.nix
rename to pkgs/by-name/xf/xfig/package.nix
diff --git a/pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch b/pkgs/by-name/xf/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
similarity index 100%
rename from pkgs/applications/science/physics/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
rename to pkgs/by-name/xf/xfitter/0001-src-GetChisquare.f-use-correct-types-in-calls-to-DSY.patch
diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/by-name/xf/xfitter/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/xfitter/default.nix
rename to pkgs/by-name/xf/xfitter/package.nix
diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/by-name/xf/xfontsel/package.nix
similarity index 100%
rename from pkgs/applications/misc/xfontsel/default.nix
rename to pkgs/by-name/xf/xfontsel/package.nix
diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/by-name/xf/xfractint/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xfractint/default.nix
rename to pkgs/by-name/xf/xfractint/package.nix
diff --git a/pkgs/tools/filesystems/xfsdump/default.nix b/pkgs/by-name/xf/xfsdump/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/xfsdump/default.nix
rename to pkgs/by-name/xf/xfsdump/package.nix
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/by-name/xf/xfsprogs/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/xfsprogs/default.nix
rename to pkgs/by-name/xf/xfsprogs/package.nix
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/by-name/xf/xfstests/package.nix
similarity index 100%
rename from pkgs/tools/misc/xfstests/default.nix
rename to pkgs/by-name/xf/xfstests/package.nix
diff --git a/pkgs/games/xgalaga++/default.nix b/pkgs/by-name/xg/xgalagapp/package.nix
similarity index 100%
rename from pkgs/games/xgalaga++/default.nix
rename to pkgs/by-name/xg/xgalagapp/package.nix
diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/by-name/xg/xgboost/package.nix
similarity index 100%
rename from pkgs/development/libraries/xgboost/default.nix
rename to pkgs/by-name/xg/xgboost/package.nix
diff --git a/pkgs/tools/X11/xgeometry-select/default.nix b/pkgs/by-name/xg/xgeometry-select/package.nix
similarity index 100%
rename from pkgs/tools/X11/xgeometry-select/default.nix
rename to pkgs/by-name/xg/xgeometry-select/package.nix
diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/by-name/xh/xh/package.nix
similarity index 100%
rename from pkgs/tools/networking/xh/default.nix
rename to pkgs/by-name/xh/xh/package.nix
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/by-name/xh/xhtml1/package.nix
similarity index 100%
rename from pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix
rename to pkgs/by-name/xh/xhtml1/package.nix
diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/by-name/xi/xiccd/package.nix
similarity index 100%
rename from pkgs/tools/misc/xiccd/default.nix
rename to pkgs/by-name/xi/xiccd/package.nix
diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/by-name/xi/xidel/package.nix
similarity index 100%
rename from pkgs/tools/text/xidel/default.nix
rename to pkgs/by-name/xi/xidel/package.nix
diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/by-name/xi/xinetd/package.nix
similarity index 100%
rename from pkgs/servers/xinetd/default.nix
rename to pkgs/by-name/xi/xinetd/package.nix
diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/by-name/xi/xinput_calibrator/package.nix
similarity index 100%
rename from pkgs/tools/X11/xinput_calibrator/default.nix
rename to pkgs/by-name/xi/xinput_calibrator/package.nix
diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/by-name/xi/xits-math/package.nix
similarity index 100%
rename from pkgs/data/fonts/xits-math/default.nix
rename to pkgs/by-name/xi/xits-math/package.nix
diff --git a/pkgs/tools/video/xjadeo/default.nix b/pkgs/by-name/xj/xjadeo/package.nix
similarity index 100%
rename from pkgs/tools/video/xjadeo/default.nix
rename to pkgs/by-name/xj/xjadeo/package.nix
diff --git a/pkgs/tools/misc/xjobs/default.nix b/pkgs/by-name/xj/xjobs/package.nix
similarity index 100%
rename from pkgs/tools/misc/xjobs/default.nix
rename to pkgs/by-name/xj/xjobs/package.nix
diff --git a/pkgs/games/xjump/darwin.patch b/pkgs/by-name/xj/xjump/darwin.patch
similarity index 100%
rename from pkgs/games/xjump/darwin.patch
rename to pkgs/by-name/xj/xjump/darwin.patch
diff --git a/pkgs/games/xjump/default.nix b/pkgs/by-name/xj/xjump/package.nix
similarity index 100%
rename from pkgs/games/xjump/default.nix
rename to pkgs/by-name/xj/xjump/package.nix
diff --git a/pkgs/tools/X11/xkb-switch-i3/default.nix b/pkgs/by-name/xk/xkb-switch-i3/package.nix
similarity index 100%
rename from pkgs/tools/X11/xkb-switch-i3/default.nix
rename to pkgs/by-name/xk/xkb-switch-i3/package.nix
diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/by-name/xk/xkb-switch/package.nix
similarity index 100%
rename from pkgs/tools/X11/xkb-switch/default.nix
rename to pkgs/by-name/xk/xkb-switch/package.nix
diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/by-name/xk/xkbd/package.nix
similarity index 100%
rename from pkgs/applications/misc/xkbd/default.nix
rename to pkgs/by-name/xk/xkbd/package.nix
diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/by-name/xk/xkblayout-state/package.nix
similarity index 100%
rename from pkgs/applications/misc/xkblayout-state/default.nix
rename to pkgs/by-name/xk/xkblayout-state/package.nix
diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/by-name/xk/xkbmon/package.nix
similarity index 100%
rename from pkgs/applications/misc/xkbmon/default.nix
rename to pkgs/by-name/xk/xkbmon/package.nix
diff --git a/pkgs/tools/X11/xkbset/default.nix b/pkgs/by-name/xk/xkbset/package.nix
similarity index 100%
rename from pkgs/tools/X11/xkbset/default.nix
rename to pkgs/by-name/xk/xkbset/package.nix
diff --git a/pkgs/tools/X11/xkbvalidate/default.nix b/pkgs/by-name/xk/xkbvalidate/package.nix
similarity index 100%
rename from pkgs/tools/X11/xkbvalidate/default.nix
rename to pkgs/by-name/xk/xkbvalidate/package.nix
diff --git a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c b/pkgs/by-name/xk/xkbvalidate/xkbvalidate.c
similarity index 100%
rename from pkgs/tools/X11/xkbvalidate/xkbvalidate.c
rename to pkgs/by-name/xk/xkbvalidate/xkbvalidate.c
diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/by-name/xk/xkcd-font/package.nix
similarity index 100%
rename from pkgs/data/fonts/xkcd-font/default.nix
rename to pkgs/by-name/xk/xkcd-font/package.nix
diff --git a/pkgs/tools/X11/xkeysnail/browser-emacs-bindings.py b/pkgs/by-name/xk/xkeysnail/browser-emacs-bindings.py
similarity index 100%
rename from pkgs/tools/X11/xkeysnail/browser-emacs-bindings.py
rename to pkgs/by-name/xk/xkeysnail/browser-emacs-bindings.py
diff --git a/pkgs/tools/X11/xkeysnail/default.nix b/pkgs/by-name/xk/xkeysnail/package.nix
similarity index 100%
rename from pkgs/tools/X11/xkeysnail/default.nix
rename to pkgs/by-name/xk/xkeysnail/package.nix
diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/by-name/xl/xl2tpd/package.nix
similarity index 100%
rename from pkgs/tools/networking/xl2tpd/default.nix
rename to pkgs/by-name/xl/xl2tpd/package.nix
diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/by-name/xl/xlayoutdisplay/package.nix
similarity index 100%
rename from pkgs/tools/X11/xlayoutdisplay/default.nix
rename to pkgs/by-name/xl/xlayoutdisplay/package.nix
diff --git a/pkgs/tools/inputmethods/xlibinput_calibrator/default.nix b/pkgs/by-name/xl/xlibinput-calibrator/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/xlibinput_calibrator/default.nix
rename to pkgs/by-name/xl/xlibinput-calibrator/package.nix
diff --git a/pkgs/applications/graphics/xlife/default.nix b/pkgs/by-name/xl/xlife/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xlife/default.nix
rename to pkgs/by-name/xl/xlife/package.nix
diff --git a/pkgs/tools/X11/xloadimage/default.nix b/pkgs/by-name/xl/xloadimage/package.nix
similarity index 100%
rename from pkgs/tools/X11/xloadimage/default.nix
rename to pkgs/by-name/xl/xloadimage/package.nix
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/by-name/xl/xlockmore/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/xlockmore/default.nix
rename to pkgs/by-name/xl/xlockmore/package.nix
diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/by-name/xl/xlog/package.nix
similarity index 100%
rename from pkgs/applications/radio/xlog/default.nix
rename to pkgs/by-name/xl/xlog/package.nix
diff --git a/pkgs/tools/X11/xlogo/default.nix b/pkgs/by-name/xl/xlogo/package.nix
similarity index 100%
rename from pkgs/tools/X11/xlogo/default.nix
rename to pkgs/by-name/xl/xlogo/package.nix
diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/by-name/xl/xlslib/package.nix
similarity index 100%
rename from pkgs/development/libraries/xlslib/default.nix
rename to pkgs/by-name/xl/xlslib/package.nix
diff --git a/pkgs/tools/X11/xmacro/default.nix b/pkgs/by-name/xm/xmacro/package.nix
similarity index 100%
rename from pkgs/tools/X11/xmacro/default.nix
rename to pkgs/by-name/xm/xmacro/package.nix
diff --git a/pkgs/games/xmage/default.nix b/pkgs/by-name/xm/xmage/package.nix
similarity index 100%
rename from pkgs/games/xmage/default.nix
rename to pkgs/by-name/xm/xmage/package.nix
diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/by-name/xm/xmagnify/package.nix
similarity index 100%
rename from pkgs/tools/X11/xmagnify/default.nix
rename to pkgs/by-name/xm/xmagnify/package.nix
diff --git a/pkgs/tools/X11/xmcp/default.nix b/pkgs/by-name/xm/xmcp/package.nix
similarity index 100%
rename from pkgs/tools/X11/xmcp/default.nix
rename to pkgs/by-name/xm/xmcp/package.nix
diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/by-name/xm/xmedcon/package.nix
similarity index 100%
rename from pkgs/applications/science/medicine/xmedcon/default.nix
rename to pkgs/by-name/xm/xmedcon/package.nix
diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/by-name/xm/xmenu/package.nix
similarity index 100%
rename from pkgs/applications/misc/xmenu/default.nix
rename to pkgs/by-name/xm/xmenu/package.nix
diff --git a/pkgs/applications/misc/xmind/java-env-config-fixes.patch b/pkgs/by-name/xm/xmind/java-env-config-fixes.patch
similarity index 100%
rename from pkgs/applications/misc/xmind/java-env-config-fixes.patch
rename to pkgs/by-name/xm/xmind/java-env-config-fixes.patch
diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/by-name/xm/xmind/package.nix
similarity index 100%
rename from pkgs/applications/misc/xmind/default.nix
rename to pkgs/by-name/xm/xmind/package.nix
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/by-name/xm/xml-security-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/xml-security-c/default.nix
rename to pkgs/by-name/xm/xml-security-c/package.nix
diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/by-name/xm/xml2/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/xml2/default.nix
rename to pkgs/by-name/xm/xml2/package.nix
diff --git a/pkgs/tools/misc/xmlbeans/default.nix b/pkgs/by-name/xm/xmlbeans/package.nix
similarity index 100%
rename from pkgs/tools/misc/xmlbeans/default.nix
rename to pkgs/by-name/xm/xmlbeans/package.nix
diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/pkgs/by-name/xm/xmlformat/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/xmlformat/default.nix
rename to pkgs/by-name/xm/xmlformat/package.nix
diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/by-name/xm/xmlindent/package.nix
similarity index 100%
rename from pkgs/development/web/xmlindent/default.nix
rename to pkgs/by-name/xm/xmlindent/package.nix
diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/by-name/xm/xmloscopy/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/xmloscopy/default.nix
rename to pkgs/by-name/xm/xmloscopy/package.nix
diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/by-name/xm/xmlroff/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/xmlroff/default.nix
rename to pkgs/by-name/xm/xmlroff/package.nix
diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/by-name/xm/xmlrpc_c/package.nix
similarity index 100%
rename from pkgs/development/libraries/xmlrpc-c/default.nix
rename to pkgs/by-name/xm/xmlrpc_c/package.nix
diff --git a/pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch b/pkgs/by-name/xm/xmlsec/lt_dladdsearchdir.patch
similarity index 100%
rename from pkgs/development/libraries/xmlsec/lt_dladdsearchdir.patch
rename to pkgs/by-name/xm/xmlsec/lt_dladdsearchdir.patch
diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/by-name/xm/xmlsec/package.nix
similarity index 100%
rename from pkgs/development/libraries/xmlsec/default.nix
rename to pkgs/by-name/xm/xmlsec/package.nix
diff --git a/pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch b/pkgs/by-name/xm/xmlsec/remove_bsd_base64_decode_flag.patch
similarity index 100%
rename from pkgs/development/libraries/xmlsec/remove_bsd_base64_decode_flag.patch
rename to pkgs/by-name/xm/xmlsec/remove_bsd_base64_decode_flag.patch
diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/by-name/xm/xmlstarlet/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/xmlstarlet/default.nix
rename to pkgs/by-name/xm/xmlstarlet/package.nix
diff --git a/pkgs/games/xmoto/default.nix b/pkgs/by-name/xm/xmoto/package.nix
similarity index 100%
rename from pkgs/games/xmoto/default.nix
rename to pkgs/by-name/xm/xmoto/package.nix
diff --git a/pkgs/applications/graphics/xmountains/default.nix b/pkgs/by-name/xm/xmountains/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xmountains/default.nix
rename to pkgs/by-name/xm/xmountains/package.nix
diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/by-name/xm/xmousepasteblock/package.nix
similarity index 100%
rename from pkgs/tools/X11/xmousepasteblock/default.nix
rename to pkgs/by-name/xm/xmousepasteblock/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/xmppc/default.nix b/pkgs/by-name/xm/xmppc/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/xmppc/default.nix
rename to pkgs/by-name/xm/xmppc/package.nix
diff --git a/pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch b/pkgs/by-name/xn/xnbd/0001-Fix-build-for-glibc-2.28.patch
similarity index 100%
rename from pkgs/tools/networking/xnbd/0001-Fix-build-for-glibc-2.28.patch
rename to pkgs/by-name/xn/xnbd/0001-Fix-build-for-glibc-2.28.patch
diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/by-name/xn/xnbd/package.nix
similarity index 100%
rename from pkgs/tools/networking/xnbd/default.nix
rename to pkgs/by-name/xn/xnbd/package.nix
diff --git a/pkgs/applications/science/physics/xnec2c/default.nix b/pkgs/by-name/xn/xnec2c/package.nix
similarity index 100%
rename from pkgs/applications/science/physics/xnec2c/default.nix
rename to pkgs/by-name/xn/xnec2c/package.nix
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/by-name/xn/xnee/package.nix
similarity index 100%
rename from pkgs/tools/X11/xnee/default.nix
rename to pkgs/by-name/xn/xnee/package.nix
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/by-name/xn/xneur/package.nix
similarity index 100%
rename from pkgs/applications/misc/xneur/default.nix
rename to pkgs/by-name/xn/xneur/package.nix
diff --git a/pkgs/tools/X11/xnotify/default.nix b/pkgs/by-name/xn/xnotify/package.nix
similarity index 100%
rename from pkgs/tools/X11/xnotify/default.nix
rename to pkgs/by-name/xn/xnotify/package.nix
diff --git a/pkgs/tools/X11/xob/default.nix b/pkgs/by-name/xo/xob/package.nix
similarity index 100%
rename from pkgs/tools/X11/xob/default.nix
rename to pkgs/by-name/xo/xob/package.nix
diff --git a/pkgs/tools/security/xorex/default.nix b/pkgs/by-name/xo/xorex/package.nix
similarity index 100%
rename from pkgs/tools/security/xorex/default.nix
rename to pkgs/by-name/xo/xorex/package.nix
diff --git a/pkgs/development/tools/misc/xorg-autoconf/default.nix b/pkgs/by-name/xo/xorg-autoconf/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/xorg-autoconf/default.nix
rename to pkgs/by-name/xo/xorg-autoconf/package.nix
diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/by-name/xo/xorg-rgb/package.nix
similarity index 100%
rename from pkgs/data/misc/xorg-rgb/default.nix
rename to pkgs/by-name/xo/xorg-rgb/package.nix
diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/by-name/xo/xorg_sys_opengl/builder.sh
similarity index 100%
rename from pkgs/os-specific/linux/opengl/xorg-sys/builder.sh
rename to pkgs/by-name/xo/xorg_sys_opengl/builder.sh
diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/by-name/xo/xorg_sys_opengl/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/opengl/xorg-sys/default.nix
rename to pkgs/by-name/xo/xorg_sys_opengl/package.nix
diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/by-name/xo/xoscope/package.nix
similarity index 100%
rename from pkgs/applications/science/electronics/xoscope/default.nix
rename to pkgs/by-name/xo/xoscope/package.nix
diff --git a/pkgs/misc/xosd/default.nix b/pkgs/by-name/xo/xosd/package.nix
similarity index 100%
rename from pkgs/misc/xosd/default.nix
rename to pkgs/by-name/xo/xosd/package.nix
diff --git a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/pkgs/by-name/xo/xow_dongle-firmware/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix
rename to pkgs/by-name/xo/xow_dongle-firmware/package.nix
diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/by-name/xp/xpad/package.nix
similarity index 100%
rename from pkgs/applications/misc/xpad/default.nix
rename to pkgs/by-name/xp/xpad/package.nix
diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/by-name/xp/xpano/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xpano/default.nix
rename to pkgs/by-name/xp/xpano/package.nix
diff --git a/pkgs/tools/text/xpaste/default.nix b/pkgs/by-name/xp/xpaste/package.nix
similarity index 100%
rename from pkgs/tools/text/xpaste/default.nix
rename to pkgs/by-name/xp/xpaste/package.nix
diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/by-name/xp/xpipe/package.nix
similarity index 100%
rename from pkgs/applications/networking/xpipe/default.nix
rename to pkgs/by-name/xp/xpipe/package.nix
diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/by-name/xp/xplanet/package.nix
similarity index 100%
rename from pkgs/applications/science/astronomy/xplanet/default.nix
rename to pkgs/by-name/xp/xplanet/package.nix
diff --git a/pkgs/applications/file-managers/xplorer/Cargo.lock b/pkgs/by-name/xp/xplorer/Cargo.lock
similarity index 100%
rename from pkgs/applications/file-managers/xplorer/Cargo.lock
rename to pkgs/by-name/xp/xplorer/Cargo.lock
diff --git a/pkgs/applications/file-managers/xplorer/default.nix b/pkgs/by-name/xp/xplorer/package.nix
similarity index 100%
rename from pkgs/applications/file-managers/xplorer/default.nix
rename to pkgs/by-name/xp/xplorer/package.nix
diff --git a/pkgs/tools/X11/xplugd/default.nix b/pkgs/by-name/xp/xplugd/package.nix
similarity index 100%
rename from pkgs/tools/X11/xplugd/default.nix
rename to pkgs/by-name/xp/xplugd/package.nix
diff --git a/pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch b/pkgs/by-name/xp/xprintidle-ng/fix-config_h-includes-should-be-first.patch
similarity index 100%
rename from pkgs/tools/X11/xprintidle-ng/fix-config_h-includes-should-be-first.patch
rename to pkgs/by-name/xp/xprintidle-ng/fix-config_h-includes-should-be-first.patch
diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/by-name/xp/xprintidle-ng/package.nix
similarity index 100%
rename from pkgs/tools/X11/xprintidle-ng/default.nix
rename to pkgs/by-name/xp/xprintidle-ng/package.nix
diff --git a/pkgs/tools/X11/xprintidle/default.nix b/pkgs/by-name/xp/xprintidle/package.nix
similarity index 100%
rename from pkgs/tools/X11/xprintidle/default.nix
rename to pkgs/by-name/xp/xprintidle/package.nix
diff --git a/pkgs/tools/X11/xprompt/default.nix b/pkgs/by-name/xp/xprompt/package.nix
similarity index 100%
rename from pkgs/tools/X11/xprompt/default.nix
rename to pkgs/by-name/xp/xprompt/package.nix
diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/by-name/xp/xpwn/package.nix
similarity index 100%
rename from pkgs/development/mobile/xpwn/default.nix
rename to pkgs/by-name/xp/xpwn/package.nix
diff --git a/pkgs/tools/text/xml/xq/default.nix b/pkgs/by-name/xq/xq-xml/package.nix
similarity index 100%
rename from pkgs/tools/text/xml/xq/default.nix
rename to pkgs/by-name/xq/xq-xml/package.nix
diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/by-name/xq/xq/package.nix
similarity index 100%
rename from pkgs/tools/misc/xq/default.nix
rename to pkgs/by-name/xq/xq/package.nix
diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/by-name/xq/xqilla/package.nix
similarity index 100%
rename from pkgs/development/tools/xqilla/default.nix
rename to pkgs/by-name/xq/xqilla/package.nix
diff --git a/pkgs/servers/x11/xquartz/10-fontdir.sh b/pkgs/by-name/xq/xquartz/10-fontdir.sh
similarity index 100%
rename from pkgs/servers/x11/xquartz/10-fontdir.sh
rename to pkgs/by-name/xq/xquartz/10-fontdir.sh
diff --git a/pkgs/servers/x11/xquartz/98-user.sh b/pkgs/by-name/xq/xquartz/98-user.sh
similarity index 100%
rename from pkgs/servers/x11/xquartz/98-user.sh
rename to pkgs/by-name/xq/xquartz/98-user.sh
diff --git a/pkgs/servers/x11/xquartz/font_cache b/pkgs/by-name/xq/xquartz/font_cache
similarity index 100%
rename from pkgs/servers/x11/xquartz/font_cache
rename to pkgs/by-name/xq/xquartz/font_cache
diff --git a/pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist b/pkgs/by-name/xq/xquartz/org.nixos.xquartz.privileged_startx.plist
similarity index 100%
rename from pkgs/servers/x11/xquartz/org.nixos.xquartz.privileged_startx.plist
rename to pkgs/by-name/xq/xquartz/org.nixos.xquartz.privileged_startx.plist
diff --git a/pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist b/pkgs/by-name/xq/xquartz/org.nixos.xquartz.startx.plist
similarity index 100%
rename from pkgs/servers/x11/xquartz/org.nixos.xquartz.startx.plist
rename to pkgs/by-name/xq/xquartz/org.nixos.xquartz.startx.plist
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/by-name/xq/xquartz/package.nix
similarity index 100%
rename from pkgs/servers/x11/xquartz/default.nix
rename to pkgs/by-name/xq/xquartz/package.nix
diff --git a/pkgs/servers/x11/xquartz/system-fonts.nix b/pkgs/by-name/xq/xquartz/system-fonts.nix
similarity index 100%
rename from pkgs/servers/x11/xquartz/system-fonts.nix
rename to pkgs/by-name/xq/xquartz/system-fonts.nix
diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/by-name/xr/xrandr-invert-colors/package.nix
similarity index 100%
rename from pkgs/applications/misc/xrandr-invert-colors/default.nix
rename to pkgs/by-name/xr/xrandr-invert-colors/package.nix
diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/by-name/xr/xray/package.nix
similarity index 100%
rename from pkgs/tools/networking/xray/default.nix
rename to pkgs/by-name/xr/xray/package.nix
diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/by-name/xr/xrectsel/package.nix
similarity index 100%
rename from pkgs/tools/X11/xrectsel/default.nix
rename to pkgs/by-name/xr/xrectsel/package.nix
diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/by-name/xr/xrestop/package.nix
similarity index 100%
rename from pkgs/tools/X11/xrestop/default.nix
rename to pkgs/by-name/xr/xrestop/package.nix
diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/by-name/xr/xrq/package.nix
similarity index 100%
rename from pkgs/applications/misc/xrq/default.nix
rename to pkgs/by-name/xr/xrq/package.nix
diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/by-name/xs/xscast/package.nix
similarity index 100%
rename from pkgs/applications/video/xscast/default.nix
rename to pkgs/by-name/xs/xscast/package.nix
diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/by-name/xs/xscope/package.nix
similarity index 100%
rename from pkgs/applications/misc/xscope/default.nix
rename to pkgs/by-name/xs/xscope/package.nix
diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/by-name/xs/xsecurelock/package.nix
similarity index 100%
rename from pkgs/tools/X11/xsecurelock/default.nix
rename to pkgs/by-name/xs/xsecurelock/package.nix
diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/by-name/xs/xsel/package.nix
similarity index 100%
rename from pkgs/tools/misc/xsel/default.nix
rename to pkgs/by-name/xs/xsel/package.nix
diff --git a/pkgs/os-specific/linux/xsensors/default.nix b/pkgs/by-name/xs/xsensors/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/xsensors/default.nix
rename to pkgs/by-name/xs/xsensors/package.nix
diff --git a/pkgs/os-specific/linux/xsensors/remove-unused-variables.patch b/pkgs/by-name/xs/xsensors/remove-unused-variables.patch
similarity index 100%
rename from pkgs/os-specific/linux/xsensors/remove-unused-variables.patch
rename to pkgs/by-name/xs/xsensors/remove-unused-variables.patch
diff --git a/pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch b/pkgs/by-name/xs/xsensors/replace-deprecated-gtk.patch
similarity index 100%
rename from pkgs/os-specific/linux/xsensors/replace-deprecated-gtk.patch
rename to pkgs/by-name/xs/xsensors/replace-deprecated-gtk.patch
diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/by-name/xs/xsettingsd/package.nix
similarity index 100%
rename from pkgs/tools/X11/xsettingsd/default.nix
rename to pkgs/by-name/xs/xsettingsd/package.nix
diff --git a/pkgs/games/xskat/default.nix b/pkgs/by-name/xs/xskat/package.nix
similarity index 100%
rename from pkgs/games/xskat/default.nix
rename to pkgs/by-name/xs/xskat/package.nix
diff --git a/pkgs/games/xsnow/default.nix b/pkgs/by-name/xs/xsnow/package.nix
similarity index 100%
rename from pkgs/games/xsnow/default.nix
rename to pkgs/by-name/xs/xsnow/package.nix
diff --git a/pkgs/games/xsok/default.nix b/pkgs/by-name/xs/xsok/package.nix
similarity index 100%
rename from pkgs/games/xsok/default.nix
rename to pkgs/by-name/xs/xsok/package.nix
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/by-name/xs/xsokoban/package.nix
similarity index 100%
rename from pkgs/games/xsokoban/default.nix
rename to pkgs/by-name/xs/xsokoban/package.nix
diff --git a/pkgs/os-specific/linux/xsos/default.nix b/pkgs/by-name/xs/xsos/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/xsos/default.nix
rename to pkgs/by-name/xs/xsos/package.nix
diff --git a/pkgs/development/tools/misc/xspim/default.nix b/pkgs/by-name/xs/xspim/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/xspim/default.nix
rename to pkgs/by-name/xs/xspim/package.nix
diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/by-name/xs/xss-lock/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/xss-lock/default.nix
rename to pkgs/by-name/xs/xss-lock/package.nix
diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/by-name/xs/xssproxy/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/xssproxy/default.nix
rename to pkgs/by-name/xs/xssproxy/package.nix
diff --git a/pkgs/tools/X11/xssstate/default.nix b/pkgs/by-name/xs/xssstate/package.nix
similarity index 100%
rename from pkgs/tools/X11/xssstate/default.nix
rename to pkgs/by-name/xs/xssstate/package.nix
diff --git a/pkgs/tools/misc/xstow/default.nix b/pkgs/by-name/xs/xstow/package.nix
similarity index 100%
rename from pkgs/tools/misc/xstow/default.nix
rename to pkgs/by-name/xs/xstow/package.nix
diff --git a/pkgs/tools/security/xsubfind3r/default.nix b/pkgs/by-name/xs/xsubfind3r/package.nix
similarity index 100%
rename from pkgs/tools/security/xsubfind3r/default.nix
rename to pkgs/by-name/xs/xsubfind3r/package.nix
diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/by-name/xs/xsuspender/package.nix
similarity index 100%
rename from pkgs/applications/misc/xsuspender/default.nix
rename to pkgs/by-name/xs/xsuspender/package.nix
diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/by-name/xs/xsynth_dssi/package.nix
similarity index 100%
rename from pkgs/applications/audio/xsynth-dssi/default.nix
rename to pkgs/by-name/xs/xsynth_dssi/package.nix
diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/by-name/xt/xteddy/package.nix
similarity index 100%
rename from pkgs/applications/misc/xteddy/default.nix
rename to pkgs/by-name/xt/xteddy/package.nix
diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/by-name/xt/xtensor/package.nix
similarity index 100%
rename from pkgs/development/libraries/xtensor/default.nix
rename to pkgs/by-name/xt/xtensor/package.nix
diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/by-name/xt/xterm/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/xterm/default.nix
rename to pkgs/by-name/xt/xterm/package.nix
diff --git a/pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch b/pkgs/by-name/xt/xterm/sixel-256.support.patch
similarity index 100%
rename from pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch
rename to pkgs/by-name/xt/xterm/sixel-256.support.patch
diff --git a/pkgs/applications/terminal-emulators/xtermcontrol/default.nix b/pkgs/by-name/xt/xtermcontrol/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/xtermcontrol/default.nix
rename to pkgs/by-name/xt/xtermcontrol/package.nix
diff --git a/pkgs/servers/xteve/default.nix b/pkgs/by-name/xt/xteve/package.nix
similarity index 100%
rename from pkgs/servers/xteve/default.nix
rename to pkgs/by-name/xt/xteve/package.nix
diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/by-name/xt/xtitle/package.nix
similarity index 100%
rename from pkgs/tools/misc/xtitle/default.nix
rename to pkgs/by-name/xt/xtitle/package.nix
diff --git a/pkgs/development/libraries/xtl/default.nix b/pkgs/by-name/xt/xtl/package.nix
similarity index 100%
rename from pkgs/development/libraries/xtl/default.nix
rename to pkgs/by-name/xt/xtl/package.nix
diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/by-name/xt/xtrace/package.nix
similarity index 100%
rename from pkgs/tools/X11/xtrace/default.nix
rename to pkgs/by-name/xt/xtrace/package.nix
diff --git a/pkgs/games/xtris/default.nix b/pkgs/by-name/xt/xtris/package.nix
similarity index 100%
rename from pkgs/games/xtris/default.nix
rename to pkgs/by-name/xt/xtris/package.nix
diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/by-name/xt/xtrlock-pam/package.nix
similarity index 100%
rename from pkgs/misc/screensavers/xtrlock-pam/default.nix
rename to pkgs/by-name/xt/xtrlock-pam/package.nix
diff --git a/pkgs/tools/X11/xtruss/default.nix b/pkgs/by-name/xt/xtruss/package.nix
similarity index 100%
rename from pkgs/tools/X11/xtruss/default.nix
rename to pkgs/by-name/xt/xtruss/package.nix
diff --git a/pkgs/applications/audio/xtuner/default.nix b/pkgs/by-name/xt/xtuner/package.nix
similarity index 100%
rename from pkgs/applications/audio/xtuner/default.nix
rename to pkgs/by-name/xt/xtuner/package.nix
diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/by-name/xu/xurls/package.nix
similarity index 100%
rename from pkgs/tools/text/xurls/default.nix
rename to pkgs/by-name/xu/xurls/package.nix
diff --git a/pkgs/applications/graphics/xv/default.nix b/pkgs/by-name/xv/xv/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xv/default.nix
rename to pkgs/by-name/xv/xv/package.nix
diff --git a/pkgs/tools/virtualization/xva-img/default.nix b/pkgs/by-name/xv/xva-img/package.nix
similarity index 100%
rename from pkgs/tools/virtualization/xva-img/default.nix
rename to pkgs/by-name/xv/xva-img/package.nix
diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/by-name/xv/xvidcore/package.nix
similarity index 100%
rename from pkgs/development/libraries/xvidcore/default.nix
rename to pkgs/by-name/xv/xvidcore/package.nix
diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/by-name/xv/xvkbd/package.nix
similarity index 100%
rename from pkgs/tools/X11/xvkbd/default.nix
rename to pkgs/by-name/xv/xvkbd/package.nix
diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/by-name/xw/xwallpaper/package.nix
similarity index 100%
rename from pkgs/tools/X11/xwallpaper/default.nix
rename to pkgs/by-name/xw/xwallpaper/package.nix
diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/by-name/xw/xwinmosaic/package.nix
similarity index 100%
rename from pkgs/tools/X11/xwinmosaic/default.nix
rename to pkgs/by-name/xw/xwinmosaic/package.nix
diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/by-name/xw/xwinwrap/package.nix
similarity index 100%
rename from pkgs/tools/X11/xwinwrap/default.nix
rename to pkgs/by-name/xw/xwinwrap/package.nix
diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/by-name/xx/xxHash/package.nix
similarity index 100%
rename from pkgs/development/libraries/xxHash/default.nix
rename to pkgs/by-name/xx/xxHash/package.nix
diff --git a/pkgs/development/tools/misc/xxgdb/default.nix b/pkgs/by-name/xx/xxgdb/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/xxgdb/default.nix
rename to pkgs/by-name/xx/xxgdb/package.nix
diff --git a/pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch b/pkgs/by-name/xx/xxgdb/xxgdb-pty.patch
similarity index 100%
rename from pkgs/development/tools/misc/xxgdb/xxgdb-pty.patch
rename to pkgs/by-name/xx/xxgdb/xxgdb-pty.patch
diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/by-name/xx/xxh/package.nix
similarity index 100%
rename from pkgs/tools/networking/xxh/default.nix
rename to pkgs/by-name/xx/xxh/package.nix
diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/by-name/xx/xxkb/package.nix
similarity index 100%
rename from pkgs/applications/misc/xxkb/default.nix
rename to pkgs/by-name/xx/xxkb/package.nix
diff --git a/pkgs/tools/misc/xxv/default.nix b/pkgs/by-name/xx/xxv/package.nix
similarity index 100%
rename from pkgs/tools/misc/xxv/default.nix
rename to pkgs/by-name/xx/xxv/package.nix
diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/by-name/xy/xylib/package.nix
similarity index 100%
rename from pkgs/development/libraries/xylib/default.nix
rename to pkgs/by-name/xy/xylib/package.nix
diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/by-name/xz/xzgv/package.nix
similarity index 100%
rename from pkgs/applications/graphics/xzgv/default.nix
rename to pkgs/by-name/xz/xzgv/package.nix
diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/by-name/xz/xzoom/package.nix
similarity index 100%
rename from pkgs/tools/X11/xzoom/default.nix
rename to pkgs/by-name/xz/xzoom/package.nix
diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/by-name/ya/yad/package.nix
similarity index 100%
rename from pkgs/tools/misc/yad/default.nix
rename to pkgs/by-name/ya/yad/package.nix
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/by-name/ya/yadm/package.nix
similarity index 100%
rename from pkgs/applications/version-management/yadm/default.nix
rename to pkgs/by-name/ya/yadm/package.nix
diff --git a/pkgs/development/interpreters/yaegi/default.nix b/pkgs/by-name/ya/yaegi/package.nix
similarity index 100%
rename from pkgs/development/interpreters/yaegi/default.nix
rename to pkgs/by-name/ya/yaegi/package.nix
diff --git a/pkgs/applications/terminal-emulators/yaft/default.nix b/pkgs/by-name/ya/yaft/package.nix
similarity index 100%
rename from pkgs/applications/terminal-emulators/yaft/default.nix
rename to pkgs/by-name/ya/yaft/package.nix
diff --git a/pkgs/tools/misc/yai/default.nix b/pkgs/by-name/ya/yai/package.nix
similarity index 100%
rename from pkgs/tools/misc/yai/default.nix
rename to pkgs/by-name/ya/yai/package.nix
diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/by-name/ya/yajl/package.nix
similarity index 100%
rename from pkgs/development/libraries/yajl/default.nix
rename to pkgs/by-name/ya/yajl/package.nix
diff --git a/pkgs/tools/misc/yajsv/default.nix b/pkgs/by-name/ya/yajsv/package.nix
similarity index 100%
rename from pkgs/tools/misc/yajsv/default.nix
rename to pkgs/by-name/ya/yajsv/package.nix
diff --git a/pkgs/development/tools/analysis/yallback/default.nix b/pkgs/by-name/ya/yallback/package.nix
similarity index 100%
rename from pkgs/development/tools/analysis/yallback/default.nix
rename to pkgs/by-name/ya/yallback/package.nix
diff --git a/pkgs/applications/misc/yambar-hyprland-wses/default.nix b/pkgs/by-name/ya/yambar-hyprland-wses/package.nix
similarity index 100%
rename from pkgs/applications/misc/yambar-hyprland-wses/default.nix
rename to pkgs/by-name/ya/yambar-hyprland-wses/package.nix
diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/by-name/ya/yamdi/package.nix
similarity index 100%
rename from pkgs/tools/video/yamdi/default.nix
rename to pkgs/by-name/ya/yamdi/package.nix
diff --git a/pkgs/development/tools/language-servers/yaml-language-server/package.json b/pkgs/by-name/ya/yaml-language-server/package.json
similarity index 100%
rename from pkgs/development/tools/language-servers/yaml-language-server/package.json
rename to pkgs/by-name/ya/yaml-language-server/package.json
diff --git a/pkgs/development/tools/language-servers/yaml-language-server/default.nix b/pkgs/by-name/ya/yaml-language-server/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/yaml-language-server/default.nix
rename to pkgs/by-name/ya/yaml-language-server/package.nix
diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/by-name/ya/yaml-merge/package.nix
similarity index 100%
rename from pkgs/tools/text/yaml-merge/default.nix
rename to pkgs/by-name/ya/yaml-merge/package.nix
diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/by-name/ya/yaml2json/package.nix
similarity index 100%
rename from pkgs/development/tools/yaml2json/default.nix
rename to pkgs/by-name/ya/yaml2json/package.nix
diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/by-name/ya/yamlfmt/package.nix
similarity index 100%
rename from pkgs/development/tools/yamlfmt/default.nix
rename to pkgs/by-name/ya/yamlfmt/package.nix
diff --git a/pkgs/development/tools/yamlpath/default.nix b/pkgs/by-name/ya/yamlpath/package.nix
similarity index 100%
rename from pkgs/development/tools/yamlpath/default.nix
rename to pkgs/by-name/ya/yamlpath/package.nix
diff --git a/pkgs/applications/audio/yams/default.nix b/pkgs/by-name/ya/yams/package.nix
similarity index 100%
rename from pkgs/applications/audio/yams/default.nix
rename to pkgs/by-name/ya/yams/package.nix
diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/by-name/ya/yandex-browser/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/yandex-browser/default.nix
rename to pkgs/by-name/ya/yandex-browser/package.nix
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/by-name/ya/yandex-disk/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/yandex-disk/default.nix
rename to pkgs/by-name/ya/yandex-disk/package.nix
diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/by-name/ya/yank/package.nix
similarity index 100%
rename from pkgs/tools/misc/yank/default.nix
rename to pkgs/by-name/ya/yank/package.nix
diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/pkgs/by-name/ya/yanone-kaffeesatz/package.nix
similarity index 100%
rename from pkgs/data/fonts/yanone-kaffeesatz/default.nix
rename to pkgs/by-name/ya/yanone-kaffeesatz/package.nix
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/by-name/ya/yap/package.nix
similarity index 100%
rename from pkgs/development/compilers/yap/default.nix
rename to pkgs/by-name/ya/yap/package.nix
diff --git a/pkgs/tools/security/yarGen/default.nix b/pkgs/by-name/ya/yarGen/package.nix
similarity index 100%
rename from pkgs/tools/security/yarGen/default.nix
rename to pkgs/by-name/ya/yarGen/package.nix
diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/by-name/ya/yara/package.nix
similarity index 100%
rename from pkgs/tools/security/yara/default.nix
rename to pkgs/by-name/ya/yara/package.nix
diff --git a/pkgs/tools/security/yaralyzer/default.nix b/pkgs/by-name/ya/yaralyzer/package.nix
similarity index 100%
rename from pkgs/tools/security/yaralyzer/default.nix
rename to pkgs/by-name/ya/yaralyzer/package.nix
diff --git a/pkgs/shells/bash/yarn-completion/default.nix b/pkgs/by-name/ya/yarn-bash-completion/package.nix
similarity index 100%
rename from pkgs/shells/bash/yarn-completion/default.nix
rename to pkgs/by-name/ya/yarn-bash-completion/package.nix
diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/by-name/ya/yarn/package.nix
similarity index 100%
rename from pkgs/development/tools/yarn/default.nix
rename to pkgs/by-name/ya/yarn/package.nix
diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/by-name/ya/yarp/package.nix
similarity index 100%
rename from pkgs/applications/science/robotics/yarp/default.nix
rename to pkgs/by-name/ya/yarp/package.nix
diff --git a/pkgs/applications/networking/feedreaders/yarr/default.nix b/pkgs/by-name/ya/yarr/package.nix
similarity index 100%
rename from pkgs/applications/networking/feedreaders/yarr/default.nix
rename to pkgs/by-name/ya/yarr/package.nix
diff --git a/pkgs/data/themes/yaru-remix/default.nix b/pkgs/by-name/ya/yaru-remix-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/yaru-remix/default.nix
rename to pkgs/by-name/ya/yaru-remix-theme/package.nix
diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/by-name/ya/yaru-theme/package.nix
similarity index 100%
rename from pkgs/data/themes/yaru/default.nix
rename to pkgs/by-name/ya/yaru-theme/package.nix
diff --git a/pkgs/development/libraries/yas/default.nix b/pkgs/by-name/ya/yas/package.nix
similarity index 100%
rename from pkgs/development/libraries/yas/default.nix
rename to pkgs/by-name/ya/yas/package.nix
diff --git a/pkgs/development/libraries/yascreen/default.nix b/pkgs/by-name/ya/yascreen/package.nix
similarity index 100%
rename from pkgs/development/libraries/yascreen/default.nix
rename to pkgs/by-name/ya/yascreen/package.nix
diff --git a/pkgs/shells/yash/default.nix b/pkgs/by-name/ya/yash/package.nix
similarity index 100%
rename from pkgs/shells/yash/default.nix
rename to pkgs/by-name/ya/yash/package.nix
diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/by-name/ya/yasm/package.nix
similarity index 100%
rename from pkgs/development/compilers/yasm/default.nix
rename to pkgs/by-name/ya/yasm/package.nix
diff --git a/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations.patch b/pkgs/by-name/ya/yasr/10_fix_openpty_forkpty_declarations.patch
similarity index 100%
rename from pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations.patch
rename to pkgs/by-name/ya/yasr/10_fix_openpty_forkpty_declarations.patch
diff --git a/pkgs/applications/audio/yasr/20_maxpathlen.patch b/pkgs/by-name/ya/yasr/20_maxpathlen.patch
similarity index 100%
rename from pkgs/applications/audio/yasr/20_maxpathlen.patch
rename to pkgs/by-name/ya/yasr/20_maxpathlen.patch
diff --git a/pkgs/applications/audio/yasr/30_conf.patch b/pkgs/by-name/ya/yasr/30_conf.patch
similarity index 100%
rename from pkgs/applications/audio/yasr/30_conf.patch
rename to pkgs/by-name/ya/yasr/30_conf.patch
diff --git a/pkgs/applications/audio/yasr/40_dectalk_extended_chars.patch b/pkgs/by-name/ya/yasr/40_dectalk_extended_chars.patch
similarity index 100%
rename from pkgs/applications/audio/yasr/40_dectalk_extended_chars.patch
rename to pkgs/by-name/ya/yasr/40_dectalk_extended_chars.patch
diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/by-name/ya/yasr/package.nix
similarity index 100%
rename from pkgs/applications/audio/yasr/default.nix
rename to pkgs/by-name/ya/yasr/package.nix
diff --git a/pkgs/tools/security/yatas/default.nix b/pkgs/by-name/ya/yatas/package.nix
similarity index 100%
rename from pkgs/tools/security/yatas/default.nix
rename to pkgs/by-name/ya/yatas/package.nix
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/by-name/ya/yate/package.nix
similarity index 100%
rename from pkgs/applications/misc/yate/default.nix
rename to pkgs/by-name/ya/yate/package.nix
diff --git a/pkgs/applications/networking/yaup/default.nix b/pkgs/by-name/ya/yaup/package.nix
similarity index 100%
rename from pkgs/applications/networking/yaup/default.nix
rename to pkgs/by-name/ya/yaup/package.nix
diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/by-name/ya/yaws/package.nix
similarity index 100%
rename from pkgs/servers/http/yaws/default.nix
rename to pkgs/by-name/ya/yaws/package.nix
diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/by-name/ya/yaxg/package.nix
similarity index 100%
rename from pkgs/tools/graphics/yaxg/default.nix
rename to pkgs/by-name/ya/yaxg/package.nix
diff --git a/pkgs/development/libraries/yder/fix-pkgconfig.patch b/pkgs/by-name/yd/yder/fix-pkgconfig.patch
similarity index 100%
rename from pkgs/development/libraries/yder/fix-pkgconfig.patch
rename to pkgs/by-name/yd/yder/fix-pkgconfig.patch
diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/by-name/yd/yder/package.nix
similarity index 100%
rename from pkgs/development/libraries/yder/default.nix
rename to pkgs/by-name/yd/yder/package.nix
diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/by-name/yd/ydict/package.nix
similarity index 100%
rename from pkgs/applications/misc/ydict/default.nix
rename to pkgs/by-name/yd/ydict/package.nix
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/by-name/ye/yed/package.nix
similarity index 100%
rename from pkgs/applications/graphics/yed/default.nix
rename to pkgs/by-name/ye/yed/package.nix
diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/pkgs/by-name/ye/yeetgif/package.nix
similarity index 100%
rename from pkgs/applications/graphics/yeetgif/default.nix
rename to pkgs/by-name/ye/yeetgif/package.nix
diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/by-name/ye/yelp-tools/package.nix
similarity index 100%
rename from pkgs/development/misc/yelp-tools/default.nix
rename to pkgs/by-name/ye/yelp-tools/package.nix
diff --git a/pkgs/tools/security/yersinia/default.nix b/pkgs/by-name/ye/yersinia/package.nix
similarity index 100%
rename from pkgs/tools/security/yersinia/default.nix
rename to pkgs/by-name/ye/yersinia/package.nix
diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/by-name/ye/yeshup/package.nix
similarity index 100%
rename from pkgs/tools/system/yeshup/default.nix
rename to pkgs/by-name/ye/yeshup/package.nix
diff --git a/pkgs/applications/misc/yewtube/default.nix b/pkgs/by-name/ye/yewtube/package.nix
similarity index 100%
rename from pkgs/applications/misc/yewtube/default.nix
rename to pkgs/by-name/ye/yewtube/package.nix
diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/by-name/yl/yle-dl/package.nix
similarity index 100%
rename from pkgs/tools/misc/yle-dl/default.nix
rename to pkgs/by-name/yl/yle-dl/package.nix
diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/by-name/ym/ympd/package.nix
similarity index 100%
rename from pkgs/applications/audio/ympd/default.nix
rename to pkgs/by-name/ym/ympd/package.nix
diff --git a/pkgs/applications/audio/ymuse/default.nix b/pkgs/by-name/ym/ymuse/package.nix
similarity index 100%
rename from pkgs/applications/audio/ymuse/default.nix
rename to pkgs/by-name/ym/ymuse/package.nix
diff --git a/pkgs/development/tools/yo/default.nix b/pkgs/by-name/yo/yo/package.nix
similarity index 100%
rename from pkgs/development/tools/yo/default.nix
rename to pkgs/by-name/yo/yo/package.nix
diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/by-name/yo/yodl/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/yodl/default.nix
rename to pkgs/by-name/yo/yodl/package.nix
diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/by-name/yo/yojimbo/package.nix
similarity index 100%
rename from pkgs/development/libraries/yojimbo/default.nix
rename to pkgs/by-name/yo/yojimbo/package.nix
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/by-name/yo/yoshimi/package.nix
similarity index 100%
rename from pkgs/applications/audio/yoshimi/default.nix
rename to pkgs/by-name/yo/yoshimi/package.nix
diff --git a/pkgs/tools/misc/you-get/ffmpeg-path.patch b/pkgs/by-name/yo/you-get/ffmpeg-path.patch
similarity index 100%
rename from pkgs/tools/misc/you-get/ffmpeg-path.patch
rename to pkgs/by-name/yo/you-get/ffmpeg-path.patch
diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/by-name/yo/you-get/package.nix
similarity index 100%
rename from pkgs/tools/misc/you-get/default.nix
rename to pkgs/by-name/yo/you-get/package.nix
diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/by-name/yq/yq-go/package.nix
similarity index 100%
rename from pkgs/development/tools/yq-go/default.nix
rename to pkgs/by-name/yq/yq-go/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/ytalk/default.nix b/pkgs/by-name/yt/ytalk/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/ytalk/default.nix
rename to pkgs/by-name/yt/ytalk/package.nix
diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/by-name/yt/ytarchive/package.nix
similarity index 100%
rename from pkgs/tools/misc/ytarchive/default.nix
rename to pkgs/by-name/yt/ytarchive/package.nix
diff --git a/pkgs/tools/misc/ytcast/default.nix b/pkgs/by-name/yt/ytcast/package.nix
similarity index 100%
rename from pkgs/tools/misc/ytcast/default.nix
rename to pkgs/by-name/yt/ytcast/package.nix
diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/by-name/yt/ytcc/package.nix
similarity index 100%
rename from pkgs/tools/networking/ytcc/default.nix
rename to pkgs/by-name/yt/ytcc/package.nix
diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/by-name/yt/ytfzf/package.nix
similarity index 100%
rename from pkgs/tools/misc/ytfzf/default.nix
rename to pkgs/by-name/yt/ytfzf/package.nix
diff --git a/pkgs/tools/misc/ytmdl/default.nix b/pkgs/by-name/yt/ytmdl/package.nix
similarity index 100%
rename from pkgs/tools/misc/ytmdl/default.nix
rename to pkgs/by-name/yt/ytmdl/package.nix
diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/by-name/yt/ytt/package.nix
similarity index 100%
rename from pkgs/development/tools/ytt/default.nix
rename to pkgs/by-name/yt/ytt/package.nix
diff --git a/pkgs/tools/security/yubihsm-connector/default.nix b/pkgs/by-name/yu/yubihsm-connector/package.nix
similarity index 100%
rename from pkgs/tools/security/yubihsm-connector/default.nix
rename to pkgs/by-name/yu/yubihsm-connector/package.nix
diff --git a/pkgs/tools/security/yubihsm-shell/default.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix
similarity index 100%
rename from pkgs/tools/security/yubihsm-shell/default.nix
rename to pkgs/by-name/yu/yubihsm-shell/package.nix
diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/by-name/yu/yubikey-agent/package.nix
similarity index 100%
rename from pkgs/tools/security/yubikey-agent/default.nix
rename to pkgs/by-name/yu/yubikey-agent/package.nix
diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/by-name/yu/yubikey-manager/package.nix
similarity index 100%
rename from pkgs/tools/misc/yubikey-manager/default.nix
rename to pkgs/by-name/yu/yubikey-manager/package.nix
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/by-name/yu/yubikey-personalization/package.nix
similarity index 100%
rename from pkgs/tools/misc/yubikey-personalization/default.nix
rename to pkgs/by-name/yu/yubikey-personalization/package.nix
diff --git a/pkgs/tools/security/yubikey-touch-detector/default.nix b/pkgs/by-name/yu/yubikey-touch-detector/package.nix
similarity index 100%
rename from pkgs/tools/security/yubikey-touch-detector/default.nix
rename to pkgs/by-name/yu/yubikey-touch-detector/package.nix
diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/by-name/yu/yubioath-flutter/helper.nix
similarity index 100%
rename from pkgs/applications/misc/yubioath-flutter/helper.nix
rename to pkgs/by-name/yu/yubioath-flutter/helper.nix
diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/by-name/yu/yubioath-flutter/package.nix
similarity index 100%
rename from pkgs/applications/misc/yubioath-flutter/default.nix
rename to pkgs/by-name/yu/yubioath-flutter/package.nix
diff --git a/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json b/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json
similarity index 100%
rename from pkgs/applications/misc/yubioath-flutter/pubspec.lock.json
rename to pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json
diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/by-name/yu/yuicompressor/package.nix
similarity index 100%
rename from pkgs/development/tools/yuicompressor/default.nix
rename to pkgs/by-name/yu/yuicompressor/package.nix
diff --git a/pkgs/tools/text/yx/0001-Don-t-strip-binary-when-installing.patch b/pkgs/by-name/yx/yx/0001-Don-t-strip-binary-when-installing.patch
similarity index 100%
rename from pkgs/tools/text/yx/0001-Don-t-strip-binary-when-installing.patch
rename to pkgs/by-name/yx/yx/0001-Don-t-strip-binary-when-installing.patch
diff --git a/pkgs/tools/text/yx/default.nix b/pkgs/by-name/yx/yx/package.nix
similarity index 100%
rename from pkgs/tools/text/yx/default.nix
rename to pkgs/by-name/yx/yx/package.nix
diff --git a/pkgs/development/libraries/yyjson/default.nix b/pkgs/by-name/yy/yyjson/package.nix
similarity index 100%
rename from pkgs/development/libraries/yyjson/default.nix
rename to pkgs/by-name/yy/yyjson/package.nix
diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/by-name/z-/z-lua/package.nix
similarity index 100%
rename from pkgs/tools/misc/z-lua/default.nix
rename to pkgs/by-name/z-/z-lua/package.nix
diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/by-name/z8/z88dk/package.nix
similarity index 100%
rename from pkgs/development/compilers/z88dk/default.nix
rename to pkgs/by-name/z8/z88dk/package.nix
diff --git a/pkgs/tools/misc/zabbixctl/default.nix b/pkgs/by-name/za/zabbixctl/package.nix
similarity index 100%
rename from pkgs/tools/misc/zabbixctl/default.nix
rename to pkgs/by-name/za/zabbixctl/package.nix
diff --git a/pkgs/tools/misc/zalgo/default.nix b/pkgs/by-name/za/zalgo/package.nix
similarity index 100%
rename from pkgs/tools/misc/zalgo/default.nix
rename to pkgs/by-name/za/zalgo/package.nix
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/by-name/za/zam-plugins/package.nix
similarity index 100%
rename from pkgs/applications/audio/zam-plugins/default.nix
rename to pkgs/by-name/za/zam-plugins/package.nix
diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/by-name/za/zap/package.nix
similarity index 100%
rename from pkgs/tools/networking/zap/default.nix
rename to pkgs/by-name/za/zap/package.nix
diff --git a/pkgs/tools/archivers/zarchive/default.nix b/pkgs/by-name/za/zarchive/package.nix
similarity index 100%
rename from pkgs/tools/archivers/zarchive/default.nix
rename to pkgs/by-name/za/zarchive/package.nix
diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/by-name/za/zarf/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/zarf/default.nix
rename to pkgs/by-name/za/zarf/package.nix
diff --git a/pkgs/development/compilers/zasm/default.nix b/pkgs/by-name/za/zasm/package.nix
similarity index 100%
rename from pkgs/development/compilers/zasm/default.nix
rename to pkgs/by-name/za/zasm/package.nix
diff --git a/pkgs/games/zaz/default.nix b/pkgs/by-name/za/zaz/package.nix
similarity index 100%
rename from pkgs/games/zaz/default.nix
rename to pkgs/by-name/za/zaz/package.nix
diff --git a/pkgs/tools/admin/zbctl/default.nix b/pkgs/by-name/zb/zbctl/package.nix
similarity index 100%
rename from pkgs/tools/admin/zbctl/default.nix
rename to pkgs/by-name/zb/zbctl/package.nix
diff --git a/pkgs/applications/science/logic/zchaff/default.nix b/pkgs/by-name/zc/zchaff/package.nix
similarity index 100%
rename from pkgs/applications/science/logic/zchaff/default.nix
rename to pkgs/by-name/zc/zchaff/package.nix
diff --git a/pkgs/applications/science/logic/zchaff/sat_solver.patch b/pkgs/by-name/zc/zchaff/sat_solver.patch
similarity index 100%
rename from pkgs/applications/science/logic/zchaff/sat_solver.patch
rename to pkgs/by-name/zc/zchaff/sat_solver.patch
diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/by-name/zd/zd1211fw/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/firmware/zd1211/default.nix
rename to pkgs/by-name/zd/zd1211fw/package.nix
diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/by-name/zd/zdelta/package.nix
similarity index 100%
rename from pkgs/tools/compression/zdelta/default.nix
rename to pkgs/by-name/zd/zdelta/package.nix
diff --git a/pkgs/tools/security/zdns/default.nix b/pkgs/by-name/zd/zdns/package.nix
similarity index 100%
rename from pkgs/tools/security/zdns/default.nix
rename to pkgs/by-name/zd/zdns/package.nix
diff --git a/pkgs/applications/blockchains/zecwallet-lite/default.nix b/pkgs/by-name/ze/zecwallet-lite/package.nix
similarity index 100%
rename from pkgs/applications/blockchains/zecwallet-lite/default.nix
rename to pkgs/by-name/ze/zecwallet-lite/package.nix
diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/by-name/ze/zed/package.nix
similarity index 100%
rename from pkgs/development/tools/zed/default.nix
rename to pkgs/by-name/ze/zed/package.nix
diff --git a/pkgs/tools/security/zeekscript/default.nix b/pkgs/by-name/ze/zeekscript/package.nix
similarity index 100%
rename from pkgs/tools/security/zeekscript/default.nix
rename to pkgs/by-name/ze/zeekscript/package.nix
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/by-name/ze/zeitgeist/package.nix
similarity index 100%
rename from pkgs/development/libraries/zeitgeist/default.nix
rename to pkgs/by-name/ze/zeitgeist/package.nix
diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/by-name/ze/zenmonitor/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/zenmonitor/default.nix
rename to pkgs/by-name/ze/zenmonitor/package.nix
diff --git a/pkgs/os-specific/linux/zenstates/default.nix b/pkgs/by-name/ze/zenstates/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/zenstates/default.nix
rename to pkgs/by-name/ze/zenstates/package.nix
diff --git a/pkgs/applications/networking/zerobin/default.nix b/pkgs/by-name/ze/zerobin/package.nix
similarity index 100%
rename from pkgs/applications/networking/zerobin/default.nix
rename to pkgs/by-name/ze/zerobin/package.nix
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/by-name/ze/zeroc-ice/package.nix
similarity index 100%
rename from pkgs/development/libraries/zeroc-ice/default.nix
rename to pkgs/by-name/ze/zeroc-ice/package.nix
diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/by-name/ze/zerofree/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/zerofree/default.nix
rename to pkgs/by-name/ze/zerofree/package.nix
diff --git a/pkgs/applications/networking/p2p/zeronet-conservancy/default.nix b/pkgs/by-name/ze/zeronet-conservancy/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/zeronet-conservancy/default.nix
rename to pkgs/by-name/ze/zeronet-conservancy/package.nix
diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/by-name/ze/zeronet/package.nix
similarity index 100%
rename from pkgs/applications/networking/p2p/zeronet/default.nix
rename to pkgs/by-name/ze/zeronet/package.nix
diff --git a/pkgs/tools/text/zet/default.nix b/pkgs/by-name/ze/zet/package.nix
similarity index 100%
rename from pkgs/tools/text/zet/default.nix
rename to pkgs/by-name/ze/zet/package.nix
diff --git a/pkgs/misc/zeyple/default.nix b/pkgs/by-name/ze/zeyple/package.nix
similarity index 100%
rename from pkgs/misc/zeyple/default.nix
rename to pkgs/by-name/ze/zeyple/package.nix
diff --git a/pkgs/tools/misc/zf/deps.nix b/pkgs/by-name/zf/zf/deps.nix
similarity index 100%
rename from pkgs/tools/misc/zf/deps.nix
rename to pkgs/by-name/zf/zf/deps.nix
diff --git a/pkgs/tools/misc/zf/default.nix b/pkgs/by-name/zf/zf/package.nix
similarity index 100%
rename from pkgs/tools/misc/zf/default.nix
rename to pkgs/by-name/zf/zf/package.nix
diff --git a/pkgs/tools/backup/zfs-autobackup/default.nix b/pkgs/by-name/zf/zfs-autobackup/package.nix
similarity index 100%
rename from pkgs/tools/backup/zfs-autobackup/default.nix
rename to pkgs/by-name/zf/zfs-autobackup/package.nix
diff --git a/pkgs/tools/backup/zfs-prune-snapshots/default.nix b/pkgs/by-name/zf/zfs-prune-snapshots/package.nix
similarity index 100%
rename from pkgs/tools/backup/zfs-prune-snapshots/default.nix
rename to pkgs/by-name/zf/zfs-prune-snapshots/package.nix
diff --git a/pkgs/tools/backup/zfsbackup/default.nix b/pkgs/by-name/zf/zfsbackup/package.nix
similarity index 100%
rename from pkgs/tools/backup/zfsbackup/default.nix
rename to pkgs/by-name/zf/zfsbackup/package.nix
diff --git a/pkgs/tools/backup/zfsnap/default.nix b/pkgs/by-name/zf/zfsnap/package.nix
similarity index 100%
rename from pkgs/tools/backup/zfsnap/default.nix
rename to pkgs/by-name/zf/zfsnap/package.nix
diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/by-name/zf/zfstools/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/zfstools/default.nix
rename to pkgs/by-name/zf/zfstools/package.nix
diff --git a/pkgs/tools/system/zfxtop/default.nix b/pkgs/by-name/zf/zfxtop/package.nix
similarity index 100%
rename from pkgs/tools/system/zfxtop/default.nix
rename to pkgs/by-name/zf/zfxtop/package.nix
diff --git a/pkgs/tools/security/zgrab2/fix-go-version-error.patch b/pkgs/by-name/zg/zgrab2/fix-go-version-error.patch
similarity index 100%
rename from pkgs/tools/security/zgrab2/fix-go-version-error.patch
rename to pkgs/by-name/zg/zgrab2/fix-go-version-error.patch
diff --git a/pkgs/tools/security/zgrab2/default.nix b/pkgs/by-name/zg/zgrab2/package.nix
similarity index 100%
rename from pkgs/tools/security/zgrab2/default.nix
rename to pkgs/by-name/zg/zgrab2/package.nix
diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/by-name/zg/zgrviewer/package.nix
similarity index 100%
rename from pkgs/applications/graphics/zgrviewer/default.nix
rename to pkgs/by-name/zg/zgrviewer/package.nix
diff --git a/pkgs/shells/zsh/zi/default.nix b/pkgs/by-name/zi/zi/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zi/default.nix
rename to pkgs/by-name/zi/zi/package.nix
diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/by-name/zi/zigbee2mqtt/package.nix
similarity index 100%
rename from pkgs/servers/zigbee2mqtt/default.nix
rename to pkgs/by-name/zi/zigbee2mqtt/package.nix
diff --git a/pkgs/data/fonts/zilla-slab/default.nix b/pkgs/by-name/zi/zilla-slab/package.nix
similarity index 100%
rename from pkgs/data/fonts/zilla-slab/default.nix
rename to pkgs/by-name/zi/zilla-slab/package.nix
diff --git a/pkgs/tools/text/zim-tools/default.nix b/pkgs/by-name/zi/zim-tools/package.nix
similarity index 100%
rename from pkgs/tools/text/zim-tools/default.nix
rename to pkgs/by-name/zi/zim-tools/package.nix
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/by-name/zi/zim/package.nix
similarity index 100%
rename from pkgs/applications/office/zim/default.nix
rename to pkgs/by-name/zi/zim/package.nix
diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/by-name/zi/zimfw/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zimfw/default.nix
rename to pkgs/by-name/zi/zimfw/package.nix
diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/by-name/zi/zimg/package.nix
similarity index 100%
rename from pkgs/development/libraries/zimg/default.nix
rename to pkgs/by-name/zi/zimg/package.nix
diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/by-name/zi/zimlib/package.nix
similarity index 100%
rename from pkgs/development/libraries/zimlib/default.nix
rename to pkgs/by-name/zi/zimlib/package.nix
diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/by-name/zi/zine/package.nix
similarity index 100%
rename from pkgs/applications/misc/zine/default.nix
rename to pkgs/by-name/zi/zine/package.nix
diff --git a/pkgs/applications/misc/zine/update-time-crate.patch b/pkgs/by-name/zi/zine/update-time-crate.patch
similarity index 100%
rename from pkgs/applications/misc/zine/update-time-crate.patch
rename to pkgs/by-name/zi/zine/update-time-crate.patch
diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/by-name/zi/zinit/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zinit/default.nix
rename to pkgs/by-name/zi/zinit/package.nix
diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/by-name/zi/zinnia/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/zinnia/default.nix
rename to pkgs/by-name/zi/zinnia/package.nix
diff --git a/pkgs/tools/archivers/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch b/pkgs/by-name/zi/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch
similarity index 100%
rename from pkgs/tools/archivers/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch
rename to pkgs/by-name/zi/zip/buffer-overflow-on-utf8-rh-bug-2165653.patch
diff --git a/pkgs/tools/archivers/zip/fix-implicit-declarations.patch b/pkgs/by-name/zi/zip/fix-implicit-declarations.patch
similarity index 100%
rename from pkgs/tools/archivers/zip/fix-implicit-declarations.patch
rename to pkgs/by-name/zi/zip/fix-implicit-declarations.patch
diff --git a/pkgs/tools/archivers/zip/fix-memset-detection.patch b/pkgs/by-name/zi/zip/fix-memset-detection.patch
similarity index 100%
rename from pkgs/tools/archivers/zip/fix-memset-detection.patch
rename to pkgs/by-name/zi/zip/fix-memset-detection.patch
diff --git a/pkgs/tools/archivers/zip/fix-time.h-not-included.patch b/pkgs/by-name/zi/zip/fix-time.h-not-included.patch
similarity index 100%
rename from pkgs/tools/archivers/zip/fix-time.h-not-included.patch
rename to pkgs/by-name/zi/zip/fix-time.h-not-included.patch
diff --git a/pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2 b/pkgs/by-name/zi/zip/natspec-gentoo.patch.bz2
similarity index 100%
rename from pkgs/tools/archivers/zip/natspec-gentoo.patch.bz2
rename to pkgs/by-name/zi/zip/natspec-gentoo.patch.bz2
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/by-name/zi/zip/package.nix
similarity index 100%
rename from pkgs/tools/archivers/zip/default.nix
rename to pkgs/by-name/zi/zip/package.nix
diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/by-name/zi/zipkin/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/zipkin/default.nix
rename to pkgs/by-name/zi/zipkin/package.nix
diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/by-name/zi/zita-ajbridge/package.nix
similarity index 100%
rename from pkgs/applications/audio/zita-ajbridge/default.nix
rename to pkgs/by-name/zi/zita-ajbridge/package.nix
diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/by-name/zi/zita-alsa-pcmi/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
rename to pkgs/by-name/zi/zita-alsa-pcmi/package.nix
diff --git a/pkgs/applications/audio/zita-at1/default.nix b/pkgs/by-name/zi/zita-at1/package.nix
similarity index 100%
rename from pkgs/applications/audio/zita-at1/default.nix
rename to pkgs/by-name/zi/zita-at1/package.nix
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/by-name/zi/zita-convolver/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/zita-convolver/default.nix
rename to pkgs/by-name/zi/zita-convolver/package.nix
diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/pkgs/by-name/zi/zita-njbridge/package.nix
similarity index 100%
rename from pkgs/applications/audio/zita-njbridge/default.nix
rename to pkgs/by-name/zi/zita-njbridge/package.nix
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/by-name/zi/zita-resampler/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/zita-resampler/default.nix
rename to pkgs/by-name/zi/zita-resampler/package.nix
diff --git a/pkgs/tools/misc/zitadel-tools/default.nix b/pkgs/by-name/zi/zitadel-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/zitadel-tools/default.nix
rename to pkgs/by-name/zi/zitadel-tools/package.nix
diff --git a/pkgs/development/libraries/audio/zix/default.nix b/pkgs/by-name/zi/zix/package.nix
similarity index 100%
rename from pkgs/development/libraries/audio/zix/default.nix
rename to pkgs/by-name/zi/zix/package.nix
diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/by-name/zk/zk/package.nix
similarity index 100%
rename from pkgs/applications/office/zk/default.nix
rename to pkgs/by-name/zk/zk/package.nix
diff --git a/pkgs/tools/security/zkar/default.nix b/pkgs/by-name/zk/zkar/package.nix
similarity index 100%
rename from pkgs/tools/security/zkar/default.nix
rename to pkgs/by-name/zk/zkar/package.nix
diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/by-name/zk/zkfuse/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/zkfuse/default.nix
rename to pkgs/by-name/zk/zkfuse/package.nix
diff --git a/pkgs/applications/misc/zktree/default.nix b/pkgs/by-name/zk/zktree/package.nix
similarity index 100%
rename from pkgs/applications/misc/zktree/default.nix
rename to pkgs/by-name/zk/zktree/package.nix
diff --git a/pkgs/development/tools/zld/default.nix b/pkgs/by-name/zl/zld/package.nix
similarity index 100%
rename from pkgs/development/tools/zld/default.nix
rename to pkgs/by-name/zl/zld/package.nix
diff --git a/pkgs/development/libraries/zlib-ng/default.nix b/pkgs/by-name/zl/zlib-ng/package.nix
similarity index 100%
rename from pkgs/development/libraries/zlib-ng/default.nix
rename to pkgs/by-name/zl/zlib-ng/package.nix
diff --git a/pkgs/tools/security/zlint/default.nix b/pkgs/by-name/zl/zlint/package.nix
similarity index 100%
rename from pkgs/tools/security/zlint/default.nix
rename to pkgs/by-name/zl/zlint/package.nix
diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/by-name/zl/zlog/package.nix
similarity index 100%
rename from pkgs/development/libraries/zlog/default.nix
rename to pkgs/by-name/zl/zlog/package.nix
diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/by-name/zm/zmap/package.nix
similarity index 100%
rename from pkgs/tools/security/zmap/default.nix
rename to pkgs/by-name/zm/zmap/package.nix
diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/by-name/zm/zmqpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/zmqpp/default.nix
rename to pkgs/by-name/zm/zmqpp/package.nix
diff --git a/pkgs/development/libraries/zmusic/fluidsynth.patch b/pkgs/by-name/zm/zmusic/fluidsynth.patch
similarity index 100%
rename from pkgs/development/libraries/zmusic/fluidsynth.patch
rename to pkgs/by-name/zm/zmusic/fluidsynth.patch
diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/by-name/zm/zmusic/package.nix
similarity index 100%
rename from pkgs/development/libraries/zmusic/default.nix
rename to pkgs/by-name/zm/zmusic/package.nix
diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/by-name/zn/zn_poly/package.nix
similarity index 100%
rename from pkgs/development/libraries/science/math/zn_poly/default.nix
rename to pkgs/by-name/zn/zn_poly/package.nix
diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/by-name/zn/znapzend/package.nix
similarity index 100%
rename from pkgs/tools/backup/znapzend/default.nix
rename to pkgs/by-name/zn/znapzend/package.nix
diff --git a/pkgs/games/zod/0002-add-scaling-factor-to-source.patch b/pkgs/by-name/zo/zod/0002-add-scaling-factor-to-source.patch
similarity index 100%
rename from pkgs/games/zod/0002-add-scaling-factor-to-source.patch
rename to pkgs/by-name/zo/zod/0002-add-scaling-factor-to-source.patch
diff --git a/pkgs/games/zod/default.nix b/pkgs/by-name/zo/zod/package.nix
similarity index 100%
rename from pkgs/games/zod/default.nix
rename to pkgs/by-name/zo/zod/package.nix
diff --git a/pkgs/tools/nix/zon2nix/default.nix b/pkgs/by-name/zo/zon2nix/package.nix
similarity index 100%
rename from pkgs/tools/nix/zon2nix/default.nix
rename to pkgs/by-name/zo/zon2nix/package.nix
diff --git a/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch b/pkgs/by-name/zo/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
similarity index 100%
rename from pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
rename to pkgs/by-name/zo/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
diff --git a/pkgs/servers/zoneminder/default-to-http-1dot1.patch b/pkgs/by-name/zo/zoneminder/default-to-http-1dot1.patch
similarity index 100%
rename from pkgs/servers/zoneminder/default-to-http-1dot1.patch
rename to pkgs/by-name/zo/zoneminder/default-to-http-1dot1.patch
diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/by-name/zo/zoneminder/package.nix
similarity index 100%
rename from pkgs/servers/zoneminder/default.nix
rename to pkgs/by-name/zo/zoneminder/package.nix
diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/by-name/zo/zookeeper/package.nix
similarity index 100%
rename from pkgs/servers/zookeeper/default.nix
rename to pkgs/by-name/zo/zookeeper/package.nix
diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/by-name/zo/zookeeper_mt/package.nix
similarity index 100%
rename from pkgs/development/libraries/zookeeper_mt/default.nix
rename to pkgs/by-name/zo/zookeeper_mt/package.nix
diff --git a/pkgs/games/zoom/default.nix b/pkgs/by-name/zo/zoom/package.nix
similarity index 100%
rename from pkgs/games/zoom/default.nix
rename to pkgs/by-name/zo/zoom/package.nix
diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/by-name/zo/zopfli/package.nix
similarity index 100%
rename from pkgs/tools/compression/zopfli/default.nix
rename to pkgs/by-name/zo/zopfli/package.nix
diff --git a/pkgs/tools/misc/zotero-translation-server/default.nix b/pkgs/by-name/zo/zotero-translation-server/package.nix
similarity index 100%
rename from pkgs/tools/misc/zotero-translation-server/default.nix
rename to pkgs/by-name/zo/zotero-translation-server/package.nix
diff --git a/pkgs/applications/office/zotero/darwin.nix b/pkgs/by-name/zo/zotero/darwin.nix
similarity index 100%
rename from pkgs/applications/office/zotero/darwin.nix
rename to pkgs/by-name/zo/zotero/darwin.nix
diff --git a/pkgs/applications/office/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix
similarity index 100%
rename from pkgs/applications/office/zotero/linux.nix
rename to pkgs/by-name/zo/zotero/linux.nix
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/by-name/zo/zotero/package.nix
similarity index 100%
rename from pkgs/applications/office/zotero/default.nix
rename to pkgs/by-name/zo/zotero/package.nix
diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/by-name/zo/zoxide/package.nix
similarity index 100%
rename from pkgs/tools/misc/zoxide/default.nix
rename to pkgs/by-name/zo/zoxide/package.nix
diff --git a/pkgs/shells/zsh/zplug/default.nix b/pkgs/by-name/zp/zplug/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zplug/default.nix
rename to pkgs/by-name/zp/zplug/package.nix
diff --git a/pkgs/tools/filesystems/zpool-auto-expand-partitions/Cargo.lock b/pkgs/by-name/zp/zpool-auto-expand-partitions/Cargo.lock
similarity index 100%
rename from pkgs/tools/filesystems/zpool-auto-expand-partitions/Cargo.lock
rename to pkgs/by-name/zp/zpool-auto-expand-partitions/Cargo.lock
diff --git a/pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix b/pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/zpool-auto-expand-partitions/default.nix
rename to pkgs/by-name/zp/zpool-auto-expand-partitions/package.nix
diff --git a/pkgs/tools/filesystems/zpool-iostat-viz/default.nix b/pkgs/by-name/zp/zpool-iostat-viz/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/zpool-iostat-viz/default.nix
rename to pkgs/by-name/zp/zpool-iostat-viz/package.nix
diff --git a/pkgs/development/tools/zprint/default.nix b/pkgs/by-name/zp/zprint/package.nix
similarity index 100%
rename from pkgs/development/tools/zprint/default.nix
rename to pkgs/by-name/zp/zprint/package.nix
diff --git a/pkgs/tools/system/zps/default.nix b/pkgs/by-name/zp/zps/package.nix
similarity index 100%
rename from pkgs/tools/system/zps/default.nix
rename to pkgs/by-name/zp/zps/package.nix
diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/by-name/zr/zrepl/package.nix
similarity index 100%
rename from pkgs/tools/backup/zrepl/default.nix
rename to pkgs/by-name/zr/zrepl/package.nix
diff --git a/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix b/pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix
similarity index 100%
rename from pkgs/tools/networking/zs-apc-spdu-ctl/default.nix
rename to pkgs/by-name/zs/zs-apc-spdu-ctl/package.nix
diff --git a/pkgs/tools/networking/zs-wait4host/default.nix b/pkgs/by-name/zs/zs-wait4host/package.nix
similarity index 100%
rename from pkgs/tools/networking/zs-wait4host/default.nix
rename to pkgs/by-name/zs/zs-wait4host/package.nix
diff --git a/pkgs/os-specific/linux/zsa-udev-rules/default.nix b/pkgs/by-name/zs/zsa-udev-rules/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/zsa-udev-rules/default.nix
rename to pkgs/by-name/zs/zsa-udev-rules/package.nix
diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/by-name/zs/zscroll/package.nix
similarity index 100%
rename from pkgs/applications/misc/zscroll/default.nix
rename to pkgs/by-name/zs/zscroll/package.nix
diff --git a/pkgs/shells/zsh/zsh-abbr/default.nix b/pkgs/by-name/zs/zsh-abbr/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-abbr/default.nix
rename to pkgs/by-name/zs/zsh-abbr/package.nix
diff --git a/pkgs/shells/zsh/zsh-autocomplete/default.nix b/pkgs/by-name/zs/zsh-autocomplete/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-autocomplete/default.nix
rename to pkgs/by-name/zs/zsh-autocomplete/package.nix
diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/by-name/zs/zsh-autoenv/package.nix
similarity index 100%
rename from pkgs/tools/misc/zsh-autoenv/default.nix
rename to pkgs/by-name/zs/zsh-autoenv/package.nix
diff --git a/pkgs/shells/zsh/zsh-autopair/default.nix b/pkgs/by-name/zs/zsh-autopair/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-autopair/default.nix
rename to pkgs/by-name/zs/zsh-autopair/package.nix
diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/by-name/zs/zsh-autosuggestions/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-autosuggestions/default.nix
rename to pkgs/by-name/zs/zsh-autosuggestions/package.nix
diff --git a/pkgs/shells/zsh/zsh-bd/default.nix b/pkgs/by-name/zs/zsh-bd/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-bd/default.nix
rename to pkgs/by-name/zs/zsh-bd/package.nix
diff --git a/pkgs/shells/zsh/zsh-better-npm-completion/default.nix b/pkgs/by-name/zs/zsh-better-npm-completion/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-better-npm-completion/default.nix
rename to pkgs/by-name/zs/zsh-better-npm-completion/package.nix
diff --git a/pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh b/pkgs/by-name/zs/zsh-clipboard/clipboard.plugin.zsh
similarity index 100%
rename from pkgs/shells/zsh/zsh-clipboard/clipboard.plugin.zsh
rename to pkgs/by-name/zs/zsh-clipboard/clipboard.plugin.zsh
diff --git a/pkgs/shells/zsh/zsh-clipboard/default.nix b/pkgs/by-name/zs/zsh-clipboard/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-clipboard/default.nix
rename to pkgs/by-name/zs/zsh-clipboard/package.nix
diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/by-name/zs/zsh-command-time/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-command-time/default.nix
rename to pkgs/by-name/zs/zsh-command-time/package.nix
diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/by-name/zs/zsh-completions/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-completions/default.nix
rename to pkgs/by-name/zs/zsh-completions/package.nix
diff --git a/pkgs/shells/zsh/zsh-defer/default.nix b/pkgs/by-name/zs/zsh-defer/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-defer/default.nix
rename to pkgs/by-name/zs/zsh-defer/package.nix
diff --git a/pkgs/shells/zsh/zsh-edit/default.nix b/pkgs/by-name/zs/zsh-edit/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-edit/default.nix
rename to pkgs/by-name/zs/zsh-edit/package.nix
diff --git a/pkgs/shells/zsh/zsh-f-sy-h/default.nix b/pkgs/by-name/zs/zsh-f-sy-h/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-f-sy-h/default.nix
rename to pkgs/by-name/zs/zsh-f-sy-h/package.nix
diff --git a/pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix b/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-fast-syntax-highlighting/default.nix
rename to pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/by-name/zs/zsh-forgit/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-forgit/default.nix
rename to pkgs/by-name/zs/zsh-forgit/package.nix
diff --git a/pkgs/shells/zsh/zsh-fzf-history-search/default.nix b/pkgs/by-name/zs/zsh-fzf-history-search/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-fzf-history-search/default.nix
rename to pkgs/by-name/zs/zsh-fzf-history-search/package.nix
diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/by-name/zs/zsh-fzf-tab/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-fzf-tab/default.nix
rename to pkgs/by-name/zs/zsh-fzf-tab/package.nix
diff --git a/pkgs/shells/zsh/zsh-git-prompt/default.nix b/pkgs/by-name/zs/zsh-git-prompt/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-git-prompt/default.nix
rename to pkgs/by-name/zs/zsh-git-prompt/package.nix
diff --git a/pkgs/shells/zsh/zsh-history-search-multi-word/default.nix b/pkgs/by-name/zs/zsh-history-search-multi-word/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-history-search-multi-word/default.nix
rename to pkgs/by-name/zs/zsh-history-search-multi-word/package.nix
diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/by-name/zs/zsh-history-substring-search/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-history-substring-search/default.nix
rename to pkgs/by-name/zs/zsh-history-substring-search/package.nix
diff --git a/pkgs/tools/misc/zsh-history-to-fish/default.nix b/pkgs/by-name/zs/zsh-history-to-fish/package.nix
similarity index 100%
rename from pkgs/tools/misc/zsh-history-to-fish/default.nix
rename to pkgs/by-name/zs/zsh-history-to-fish/package.nix
diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/by-name/zs/zsh-history/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-history/default.nix
rename to pkgs/by-name/zs/zsh-history/package.nix
diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/by-name/zs/zsh-navigation-tools/package.nix
similarity index 100%
rename from pkgs/tools/misc/zsh-navigation-tools/default.nix
rename to pkgs/by-name/zs/zsh-navigation-tools/package.nix
diff --git a/pkgs/shells/zsh/zsh-nix-shell/default.nix b/pkgs/by-name/zs/zsh-nix-shell/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-nix-shell/default.nix
rename to pkgs/by-name/zs/zsh-nix-shell/package.nix
diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch b/pkgs/by-name/zs/zsh-powerlevel10k/gitstatusd.patch
similarity index 100%
rename from pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch
rename to pkgs/by-name/zs/zsh-powerlevel10k/gitstatusd.patch
diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-powerlevel10k/default.nix
rename to pkgs/by-name/zs/zsh-powerlevel10k/package.nix
diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/by-name/zs/zsh-powerlevel9k/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-powerlevel9k/default.nix
rename to pkgs/by-name/zs/zsh-powerlevel9k/package.nix
diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/by-name/zs/zsh-prezto/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-prezto/default.nix
rename to pkgs/by-name/zs/zsh-prezto/package.nix
diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/by-name/zs/zsh-syntax-highlighting/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
rename to pkgs/by-name/zs/zsh-syntax-highlighting/package.nix
diff --git a/pkgs/shells/zsh/zsh-system-clipboard/default.nix b/pkgs/by-name/zs/zsh-system-clipboard/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-system-clipboard/default.nix
rename to pkgs/by-name/zs/zsh-system-clipboard/package.nix
diff --git a/pkgs/shells/zsh/zsh-vi-mode/default.nix b/pkgs/by-name/zs/zsh-vi-mode/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-vi-mode/default.nix
rename to pkgs/by-name/zs/zsh-vi-mode/package.nix
diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/by-name/zs/zsh-you-should-use/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-you-should-use/default.nix
rename to pkgs/by-name/zs/zsh-you-should-use/package.nix
diff --git a/pkgs/shells/zsh/zsh-z/default.nix b/pkgs/by-name/zs/zsh-z/package.nix
similarity index 100%
rename from pkgs/shells/zsh/zsh-z/default.nix
rename to pkgs/by-name/zs/zsh-z/package.nix
diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/by-name/zs/zssh/package.nix
similarity index 100%
rename from pkgs/tools/networking/zssh/default.nix
rename to pkgs/by-name/zs/zssh/package.nix
diff --git a/pkgs/tools/text/zstxtns-utils/default.nix b/pkgs/by-name/zs/zstxtns-utils/package.nix
similarity index 100%
rename from pkgs/tools/text/zstxtns-utils/default.nix
rename to pkgs/by-name/zs/zstxtns-utils/package.nix
diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/by-name/zs/zsv/package.nix
similarity index 100%
rename from pkgs/development/tools/zsv/default.nix
rename to pkgs/by-name/zs/zsv/package.nix
diff --git a/pkgs/development/tools/misc/ztags/default.nix b/pkgs/by-name/zt/ztags/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/ztags/default.nix
rename to pkgs/by-name/zt/ztags/package.nix
diff --git a/pkgs/tools/misc/zthrottle/default.nix b/pkgs/by-name/zt/zthrottle/package.nix
similarity index 100%
rename from pkgs/tools/misc/zthrottle/default.nix
rename to pkgs/by-name/zt/zthrottle/package.nix
diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/by-name/zu/zuki-themes/package.nix
similarity index 100%
rename from pkgs/data/themes/zuki/default.nix
rename to pkgs/by-name/zu/zuki-themes/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/by-name/zu/zulip-term/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/zulip-term/default.nix
rename to pkgs/by-name/zu/zulip-term/package.nix
diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch b/pkgs/by-name/zu/zulip-term/pytest-executable-name.patch
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch
rename to pkgs/by-name/zu/zulip-term/pytest-executable-name.patch
diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/by-name/zu/zulip/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/zulip/default.nix
rename to pkgs/by-name/zu/zulip/package.nix
diff --git a/pkgs/development/interpreters/zuo/default.nix b/pkgs/by-name/zu/zuo/package.nix
similarity index 100%
rename from pkgs/development/interpreters/zuo/default.nix
rename to pkgs/by-name/zu/zuo/package.nix
diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/by-name/zx/zx/package.nix
similarity index 100%
rename from pkgs/tools/system/zx/default.nix
rename to pkgs/by-name/zx/zx/package.nix
diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/by-name/zx/zxcvbn-c/package.nix
similarity index 100%
rename from pkgs/development/libraries/zxcvbn-c/default.nix
rename to pkgs/by-name/zx/zxcvbn-c/package.nix
diff --git a/pkgs/applications/system/zxfer/default.nix b/pkgs/by-name/zx/zxfer/package.nix
similarity index 100%
rename from pkgs/applications/system/zxfer/default.nix
rename to pkgs/by-name/zx/zxfer/package.nix
diff --git a/pkgs/tools/graphics/zxing/java-zxing.sh b/pkgs/by-name/zx/zxing/java-zxing.sh
similarity index 100%
rename from pkgs/tools/graphics/zxing/java-zxing.sh
rename to pkgs/by-name/zx/zxing/java-zxing.sh
diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/by-name/zx/zxing/package.nix
similarity index 100%
rename from pkgs/tools/graphics/zxing/default.nix
rename to pkgs/by-name/zx/zxing/package.nix
diff --git a/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh b/pkgs/by-name/zx/zxing/zxing-cmdline-encoder.sh
similarity index 100%
rename from pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh
rename to pkgs/by-name/zx/zxing/zxing-cmdline-encoder.sh
diff --git a/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh b/pkgs/by-name/zx/zxing/zxing-cmdline-runner.sh
similarity index 100%
rename from pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh
rename to pkgs/by-name/zx/zxing/zxing-cmdline-runner.sh
diff --git a/pkgs/tools/graphics/zxing/zxing.sh b/pkgs/by-name/zx/zxing/zxing.sh
similarity index 100%
rename from pkgs/tools/graphics/zxing/zxing.sh
rename to pkgs/by-name/zx/zxing/zxing.sh
diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/by-name/zz/zzuf/package.nix
similarity index 100%
rename from pkgs/tools/security/zzuf/default.nix
rename to pkgs/by-name/zz/zzuf/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d66f3e35373e..2f5f592e8399 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -183,21 +183,15 @@ with pkgs;
     autoconf = autoconf271;
   };
 
-  autorestic = callPackage ../tools/backup/autorestic { };
-
   autoPatchelfHook = makeSetupHook {
     name = "auto-patchelf-hook";
     propagatedBuildInputs = [ auto-patchelf bintools ];
   } ../build-support/setup-hooks/auto-patchelf.sh;
 
-  appflowy = callPackage ../applications/office/appflowy { };
-
   appimageTools = callPackage ../build-support/appimage { };
 
   appimageupdate-qt = appimageupdate.override { withQtUI = true; };
 
-  appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { };
-
   bindle = callPackage ../servers/bindle {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -223,94 +217,20 @@ with pkgs;
 
   # addDriverRunpath is the preferred package name, as this enables
   # many more scenarios than just opengl now.
-  addDriverRunpath = callPackage ../build-support/add-driver-runpath { };
-
-  quickgui = callPackage ../applications/virtualization/quickgui { };
-
-  alda = callPackage ../development/interpreters/alda { };
-
-  align = callPackage ../tools/text/align { };
-
-  alire = callPackage ../development/tools/build-managers/alire { };
-
-  althttpd = callPackage ../servers/althttpd { };
-
-  anders = callPackage ../applications/science/logic/anders { };
-
-  ariang = callPackage ../servers/ariang { };
-
-  ani-cli = callPackage ../applications/video/ani-cli { };
-
-  dra-cla = callPackage ../applications/video/dra-cla { };
-
   anime-downloader = callPackage ../applications/video/anime-downloader { };
 
   aocd = with python3Packages; toPythonApplication aocd;
 
-  aesfix = callPackage ../tools/security/aesfix { };
-
-  aeskeyfind = callPackage ../tools/security/aeskeyfind { };
-
-  alterx = callPackage ../tools/security/alterx { };
-
-  altserver-linux = callPackage ../tools/misc/altserver-linux { };
-
   archipelago-minecraft = callPackage ../by-name/ar/archipelago/package.nix { extraPackages = [jdk17]; };
 
-  asciicam = callPackage ../applications/video/asciicam { };
-
   asitop = pkgs.python3Packages.callPackage ../os-specific/darwin/asitop { };
 
-  asnmap = callPackage ../tools/security/asnmap { };
-
-  astrolog = callPackage ../applications/science/astronomy/astrolog { };
-
-  astronomer = callPackage ../tools/misc/astronomer { };
-
-  atkinson-hyperlegible = callPackage ../data/fonts/atkinson-hyperlegible { };
-
-  automatic-timezoned = callPackage ../tools/system/automatic-timezoned { };
-
   cve = with python3Packages; toPythonApplication cvelib;
 
-  db-rest = callPackage ../servers/db-rest { };
-
-  fiche = callPackage ../servers/fiche { };
-
-  fishnet = callPackage ../servers/fishnet { };
-
-  fission = callPackage ../development/tools/fission { };
-
   apko = callPackage ../development/tools/apko {
     buildGoModule = buildGo123Module;
   };
 
-  melange = callPackage ../development/tools/melange { };
-
-  activate-linux = callPackage ../applications/misc/activate-linux { };
-
-  ansi = callPackage ../development/tools/ansi { };
-
-  ares-rs = callPackage ../tools/security/ares-rs { };
-
-  asn1c = callPackage ../development/compilers/asn1c { };
-
-  authz0 = callPackage ../tools/security/authz0 { };
-
-  auth0-cli = callPackage ../tools/admin/auth0-cli { };
-
-  atomic-operator = callPackage ../tools/security/atomic-operator { };
-
-  atomic-swap = callPackage ../applications/blockchains/atomic-swap { };
-
-  bacnet-stack = callPackage ../tools/networking/bacnet-stack { };
-
-  bada-bib = callPackage ../applications/science/misc/bada-bib { };
-
-  badlion-client = callPackage ../games/badlion-client {};
-
-  banana-accounting = callPackage ../applications/office/banana-accounting { };
-
   basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix {
     tbb = tbb_2021_11;
     cereal = cereal_1_3_2;
@@ -319,48 +239,12 @@ with pkgs;
 
   beebeep = libsForQt5.callPackage ../applications/office/beebeep { };
 
-  beeper = callPackage ../applications/networking/instant-messengers/beeper { };
-
-  bearer = callPackage ../development/tools/bearer { };
-
-  benthos = callPackage ../development/tools/benthos { };
-
-  beyond-identity = callPackage ../tools/security/beyond-identity { };
-
-  bibtex-tidy = callPackage ../tools/typesetting/bibtex-tidy { };
-
-  bililiverecorder = callPackage ../servers/bililiverecorder { };
-
-  binbloom = callPackage ../tools/security/binbloom { };
-
-  bin2c = callPackage ../development/tools/bin2c { };
-
   binserve = callPackage ../servers/binserve {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  blst = callPackage ../development/libraries/blst { };
-
   bloodhound-py = with python3Packages; toPythonApplication bloodhound-py;
 
-  bodyclose = callPackage ../development/tools/bodyclose { };
-
-  bootstrap-studio = callPackage ../development/web/bootstrap-studio { };
-
-  breakpad = callPackage ../development/misc/breakpad { };
-
-  brev-cli = callPackage ../development/misc/brev-cli { };
-
-  cbfmt = callPackage ../development/tools/cbfmt { };
-
-  circumflex = callPackage ../applications/networking/circumflex { };
-
-  citron = callPackage ../tools/misc/citron { };
-
-  cxx-rs = callPackage ../development/libraries/cxx-rs { };
-
-  elfcat = callPackage ../tools/misc/elfcat { };
-
   # Zip file format only allows times after year 1980, which makes e.g. Python
   # wheel building fail with:
   # ValueError: ZIP does not support timestamps before 1980
@@ -386,74 +270,30 @@ with pkgs;
   buildFHSEnvChroot = callPackage ../build-support/build-fhsenv-chroot { }; # Deprecated; use buildFHSEnv/buildFHSEnvBubblewrap
   buildFHSEnvBubblewrap = callPackage ../build-support/build-fhsenv-bubblewrap { };
 
-  c64-debugger = callPackage ../applications/emulators/c64-debugger { };
-
   cameractrls-gtk4 = cameractrls.override { withGtk = 4; };
 
   cameractrls-gtk3 = cameractrls.override { withGtk = 3; };
 
-  camunda-modeler = callPackage ../applications/misc/camunda-modeler { };
-
   checkpointBuildTools = callPackage ../build-support/checkpoint-build.nix {};
 
-  caroline = callPackage ../development/libraries/caroline { };
-
-  castget = callPackage ../applications/networking/feedreaders/castget { };
-
-  catatonit = callPackage ../applications/virtualization/catatonit { };
-
-  catppuccin-kde = callPackage ../data/themes/catppuccin-kde { };
-
-  catppuccin-kvantum = callPackage ../data/themes/catppuccin-kvantum { };
-
-  catppuccin-papirus-folders = callPackage ../data/icons/catppuccin-papirus-folders { };
-
-  btdu = callPackage ../tools/misc/btdu { };
-
-  ccal = callPackage ../tools/misc/ccal { };
-
   celeste-classic-pm = pkgs.celeste-classic.override {
     practiceMod = true;
   };
 
   cereal = cereal_1_3_0;
 
-  cdecrypt = callPackage ../development/tools/cdecrypt { };
-
-  certgraph = callPackage ../tools/security/certgraph { };
-
-  certinfo = callPackage ../tools/security/certinfo { };
-
-  certsync = callPackage ../tools/security/certsync { };
-
   cewl = callPackage ../tools/security/cewl { };
 
-  chatgpt-cli = callPackage ../tools/misc/chatgpt-cli { };
-
-  chatgpt-retrieval-plugin = callPackage ../servers/chatgpt-retrieval-plugin { };
-
-  mswatch = callPackage ../applications/networking/mailreaders/mswatch { };
-
   chef-cli = callPackage ../tools/misc/chef-cli { };
 
   checkov = callPackage ../development/tools/analysis/checkov {
     python3 = python311;
   };
 
-  checkpwn = callPackage ../tools/misc/checkpwn { };
-
-  banana-vera = callPackage ../development/tools/analysis/banana-vera { };
-
-  ciel = callPackage ../tools/package-management/ciel { };
-
   clang-uml = callPackage ../by-name/cl/clang-uml/package.nix {
     stdenv = clangStdenv;
   };
 
-  classicube = callPackage ../games/classicube { };
-
-  clj-kondo = callPackage ../development/tools/clj-kondo { };
-
   cloak = callPackage ../applications/misc/cloak {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -467,76 +307,20 @@ with pkgs;
     perlPackages = perl538Packages;
   };
 
-  cmark = callPackage ../development/libraries/cmark { };
-
-  cmark-gfm = callPackage ../development/libraries/cmark-gfm { };
-
-  cm256cc = callPackage ../development/libraries/cm256cc {  };
-
-  cnquery = callPackage ../tools/security/cnquery { };
-
   cocogitto = callPackage ../development/tools/cocogitto {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  conftest = callPackage ../development/tools/conftest { };
-
   coldsnap = callPackage ../tools/admin/coldsnap {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  colemak-dh = callPackage ../data/misc/colemak-dh { };
-
   collision = callPackage ../applications/misc/collision { };
 
-  colmena = callPackage ../tools/admin/colmena { };
-
-  colorz = callPackage ../tools/misc/colorz { };
-
-  colorpanes = callPackage ../tools/misc/colorpanes { };
-
-  colorstorm = callPackage ../applications/misc/colorstorm { };
-
-  comedilib = callPackage ../development/libraries/comedilib {  };
-
-  commix = callPackage ../tools/security/commix { };
-
-  comodoro = callPackage ../applications/misc/comodoro { };
-
-  compdb = callPackage ../tools/misc/compdb { };
-
-  conserve = callPackage ../tools/backup/conserve { };
-
-  conserver = callPackage ../tools/misc/conserver { };
-
   coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { });
 
-  confetty = callPackage ../applications/misc/confetty { };
-
-  confy = callPackage ../applications/misc/confy { };
-
-  coordgenlibs  = callPackage ../development/libraries/coordgenlibs { };
-
-  copilot-cli = callPackage ../tools/admin/copilot-cli { };
-
-  cp210x-program = callPackage ../tools/misc/cp210x-program { };
-
-  cp437 = callPackage ../tools/misc/cp437 { };
-
-  cpm-cmake = callPackage ../development/tools/cpm-cmake { };
-
-  crackle = callPackage ../tools/networking/crackle { };
-
-  crackql = callPackage ../tools/security/crackql { };
-
-  dae = callPackage ../tools/networking/dae { };
-
-  darling = callPackage ../applications/emulators/darling { };
-
   databricks-sql-cli = python3Packages.callPackage ../applications/misc/databricks-sql-cli { };
 
-  dcgm = callPackage ../os-specific/linux/dcgm { };
-
   deck = callPackage ../by-name/de/deck/package.nix {
     buildGoModule = buildGo123Module;
   };
@@ -555,38 +339,14 @@ with pkgs;
 
   djhtml = python3Packages.callPackage ../development/tools/djhtml { };
 
-  deadnix = callPackage ../development/tools/deadnix { };
-
-  dec-decode = callPackage ../development/tools/dec-decode { };
-
   dnf-plugins-core = with python3Packages; toPythonApplication dnf-plugins-core;
 
   dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { };
 
-  dnf5 = callPackage ../tools/package-management/dnf5 { };
-
-  documenso = callPackage ../applications/office/documenso { };
-
-  domine = callPackage ../tools/misc/domine { };
-
-  dsq = callPackage ../tools/misc/dsq { };
-
-  dt = callPackage ../tools/text/dt { };
-
-  dufs = callPackage ../servers/http/dufs { };
-
   dynein = callPackage ../development/tools/database/dynein {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  ea = callPackage ../tools/misc/ea { };
-
-  each = callPackage ../tools/text/each { };
-
-  ebusd = callPackage ../servers/ebusd { };
-
-  eclipse-mat = callPackage ../development/tools/eclipse-mat { };
-
   ebpf-verifier = callPackage ../tools/networking/ebpf-verifier {
     catch2 = catch2_3;
   };
@@ -595,69 +355,14 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
 
-  efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { };
-
   eludris = callPackage ../tools/misc/eludris {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { };
 
-  enumer = callPackage ../tools/misc/enumer { };
-
-  evans = callPackage ../development/tools/evans { };
-
-  evhz = callPackage ../tools/misc/evhz { };
-
-  expand-response-params = callPackage ../build-support/expand-response-params { };
-
-  expressvpn = callPackage ../applications/networking/expressvpn { };
-
-  faq = callPackage ../development/tools/faq { };
-
-  femtolisp = callPackage ../development/interpreters/femtolisp { };
-
-  fh = callPackage ../tools/nix/fh { };
-
-  firefly-desktop = callPackage ../applications/misc/firefly-desktop { };
-
-  frece = callPackage ../development/tools/frece { };
-
-  frida-tools = callPackage ../tools/security/frida-tools { };
-
-  frink = callPackage ../development/tools/frink { };
-
-  frugal = callPackage ../development/tools/frugal { };
-
-  frugally-deep = callPackage ../development/libraries/frugally-deep { };
-
-  functiontrace-server = callPackage ../development/tools/functiontrace-server { };
-
-  gendef = callPackage ../development/tools/gendef { };
-
-  glade = callPackage ../development/tools/glade { };
-
-  glamoroustoolkit = callPackage ../development/tools/glamoroustoolkit { };
-
-  gobble = callPackage ../tools/X11/gobble { };
-
-  gokrazy = callPackage ../development/misc/gokrazy { };
-
-  govulncheck = callPackage ../tools/security/govulncheck { };
-
-  gpick = callPackage ../tools/misc/gpick { };
-
-  gradescope-submit = callPackage ../tools/misc/gradescope-submit { };
-
-  gridlock = callPackage ../tools/nix/gridlock { };
   inherit (gridlock) nyarr;
 
-  hwatch = callPackage ../tools/misc/hwatch { };
-
-  hobbes = callPackage ../development/tools/hobbes { };
-
-  honeycomb-refinery = callPackage ../servers/tracing/honeycomb/refinery { };
-
   html5validator = python3Packages.callPackage ../applications/misc/html5validator { };
 
   inspec = callPackage ../tools/misc/inspec { };
@@ -675,58 +380,16 @@ with pkgs;
 
   mumps_par = callPackage ../by-name/mu/mumps/package.nix { mpiSupport = true; };
 
-  mix2nix = callPackage ../development/tools/mix2nix { };
-
-  n98-magerun = callPackage ../development/tools/misc/n98-magerun { };
-
   prisma-engines = callPackage ../development/tools/database/prisma-engines {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  pridecat = callPackage ../tools/misc/pridecat { };
-
-  pridefetch = callPackage ../tools/misc/pridefetch { };
-
-  proto-contrib = callPackage ../development/tools/proto-contrib { };
-
   protoc-gen-dart = callPackage ../development/tools/protoc-gen-dart { };
 
-  protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { };
-
-  protoc-gen-entgrpc = callPackage ../development/tools/protoc-gen-entgrpc { };
-
-  protoc-gen-go = callPackage ../development/tools/protoc-gen-go { };
-
-  protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { };
-
-  protoc-gen-go-vtproto = callPackage ../development/tools/protoc-gen-go-vtproto { };
-
   protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web {
     protobuf = protobuf_21;
   };
 
-  protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { };
-
-  protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { };
-
-  protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { };
-
-  protoc-gen-twirp_swagger = callPackage ../development/tools/protoc-gen-twirp_swagger { };
-
-  protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { };
-
-  protoc-gen-validate = callPackage ../development/tools/protoc-gen-validate { };
-
-  protolint = callPackage ../development/tools/protolint { };
-
-  ptags = callPackage ../development/tools/misc/ptags { };
-
-  resolve-march-native = callPackage ../development/tools/resolve-march-native { };
-
-  riot-redis = callPackage ../development/tools/riot-redis { };
-
-  sea-orm-cli = callPackage ../development/tools/sea-orm-cli { };
-
   vcpkg-tool = callPackage ../by-name/vc/vcpkg-tool/package.nix {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
     fmt = fmt_10;
@@ -734,22 +397,8 @@ with pkgs;
 
   r3ctl = qt5.callPackage ../tools/misc/r3ctl { };
 
-  ptouch-print = callPackage ../misc/ptouch-print { };
-
-  demoit = callPackage ../servers/demoit { };
-
   deviceTree = callPackage ../os-specific/linux/device-tree { };
 
-  enum4linux = callPackage ../tools/security/enum4linux { };
-
-  enum4linux-ng = callPackage ../tools/security/enum4linux-ng { };
-
-  enumerepo = callPackage ../tools/security/enumerepo {};
-
-  erosmb = callPackage ../tools/security/erosmb { };
-
-  oauth2c = callPackage ../tools/security/oauth2c { };
-
   octodns = python3Packages.callPackage ../tools/networking/octodns { };
 
   octodns-providers = recurseIntoAttrs {
@@ -759,41 +408,23 @@ with pkgs;
     powerdns = python3Packages.callPackage ../tools/networking/octodns/providers/powerdns { };
   };
 
-  octosuite = callPackage ../tools/security/octosuite { };
-
-  onesixtyone = callPackage ../tools/security/onesixtyone { };
-
   oletools = with python3.pkgs; toPythonApplication oletools;
 
   ollama-rocm = callPackage ../by-name/ol/ollama/package.nix { acceleration = "rocm"; };
   ollama-cuda = callPackage ../by-name/ol/ollama/package.nix { acceleration = "cuda"; };
 
-  ots = callPackage ../tools/security/ots {  };
-
-  credential-detector = callPackage ../tools/security/credential-detector { };
-
-  creds = callPackage ../tools/security/creds { };
-
-  credslayer = callPackage ../tools/security/credslayer { };
-
   device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix { };
 
-  devour = callPackage ../tools/X11/devour { };
-
   didyoumean = callPackage ../tools/misc/didyoumean {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  didu = callPackage ../tools/misc/didu { };
-
   diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
 
   dieHook = makeSetupHook {
     name = "die-hook";
   } ../build-support/setup-hooks/die.sh;
 
-  archiver = callPackage ../applications/misc/archiver { };
-
   digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
@@ -802,38 +433,18 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Accelerate;
   };
 
-  grsync = callPackage ../applications/misc/grsync { };
-
   devShellTools = callPackage ../build-support/dev-shell-tools { };
 
   dockerTools = callPackage ../build-support/docker {
     writePython3 = buildPackages.writers.writePython3;
   };
 
-  fakeNss = callPackage ../build-support/fake-nss { };
-
   tarsum = callPackage ../build-support/docker/tarsum.nix { };
 
   nix-prefetch-docker = callPackage ../build-support/docker/nix-prefetch-docker.nix { };
 
-  docker-ls = callPackage ../tools/misc/docker-ls { };
-
-  docker-slim = callPackage ../applications/virtualization/docker-slim { };
-
-  doc2go = callPackage ../development/tools/doc2go { };
-
   docker-sync = callPackage ../tools/misc/docker-sync { };
 
-  undocker = callPackage ../tools/misc/undocker { };
-
-  dockle = callPackage ../development/tools/dockle { };
-
-  docui = callPackage ../tools/misc/docui { };
-
-  done = callPackage ../applications/misc/done { };
-
-  dotfiles = callPackage ../applications/misc/dotfiles { };
-
   # Dotnet
 
   dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {});
@@ -854,13 +465,8 @@ with pkgs;
   dotnet-runtime = dotnetCorePackages.runtime_6_0;
   dotnet-aspnetcore = dotnetCorePackages.aspnetcore_6_0;
 
-  nuget-to-nix = callPackage ../build-support/dotnet/nuget-to-nix { };
   inherit (dotnetCorePackages) buildDotnetModule buildDotnetGlobalTool mkNugetSource mkNugetDeps;
 
-  fsautocomplete = callPackage ../development/tools/fsautocomplete { };
-
-  pbm = callPackage ../tools/admin/pbm { };
-
   fable = callPackage ../development/tools/fable { };
 
   dotnetenv = callPackage ../build-support/dotnet/dotnetenv {
@@ -869,38 +475,12 @@ with pkgs;
 
   buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { };
   fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { };
-  dotnetbuildhelpers = callPackage ../build-support/dotnet/dotnetbuildhelpers { };
-
-  dumb-init = callPackage ../applications/virtualization/dumb-init { };
-
-  umoci = callPackage ../applications/virtualization/umoci { };
-
-  diswall = callPackage ../applications/networking/diswall { };
-
   dupeguru = callPackage ../applications/misc/dupeguru {
     python3Packages = python311Packages;
   };
 
-  dump1090 = callPackage ../applications/radio/dump1090 { };
-
-  dwarf2json = callPackage ../tools/misc/dwarf2json { };
-
-  ebook2cw = callPackage ../applications/radio/ebook2cw { };
-
   qdmr = libsForQt5.callPackage ../applications/radio/qdmr { };
 
-  edwin = callPackage ../data/fonts/edwin { };
-
-  edwood = callPackage ../applications/editors/edwood { };
-
-  etBook = callPackage ../data/fonts/et-book { };
-
-  fntsample = callPackage ../tools/misc/fntsample { };
-
-  fetchutils = callPackage ../tools/misc/fetchutils { };
-
-  fet-sh = callPackage ../tools/misc/fet-sh { };
-
   fetchbower = callPackage ../build-support/fetchbower { };
 
   fetchbzr = callPackage ../build-support/fetchbzr { };
@@ -944,66 +524,18 @@ with pkgs;
     yarnInstallHook
     fetchYarnDeps;
 
-  find-cursor = callPackage ../tools/X11/find-cursor { };
-
-  flare-floss = callPackage ../tools/security/flare-floss { };
-
-  flare-signal = callPackage ../applications/networking/instant-messengers/flare-signal { };
-
   prefer-remote-fetch = import ../build-support/prefer-remote-fetch;
 
-  global-platform-pro = callPackage ../development/tools/global-platform-pro { };
-
-  gomi = callPackage ../tools/misc/gomi { };
-
-  go-ios = callPackage ../tools/misc/go-ios { };
-
-  graph-easy = callPackage ../tools/graphics/graph-easy { };
-
-  mermaid-filter = callPackage ../tools/misc/mermaid-filter { };
-
-  graphw00f = callPackage ../tools/security/graphw00f { };
-
-  graphite-cursors = callPackage ../data/icons/graphite-cursors { };
-
   opendrop = python3Packages.callPackage ../tools/networking/opendrop { };
 
-  owl = callPackage ../tools/networking/owl { };
-
-  mutmut = callPackage ../development/tools/mutmut { };
-
-  packcc = callPackage ../development/tools/packcc { };
-
-  packr = callPackage ../development/libraries/packr { };
-
-  pacup = callPackage ../tools/package-management/pacup { };
-
-  patcher9x = callPackage ../development/tools/patcher9x { };
-
   perseus-cli = callPackage ../development/tools/perseus-cli {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  pet = callPackage ../development/tools/pet { };
-
   pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear { };
 
-  pkger = callPackage ../development/libraries/pkger { };
-
-  tapview = callPackage ../development/tools/tapview { };
-
-  run = callPackage ../development/tools/run { };
-
-  ruler = callPackage ../tools/security/ruler { };
-
   magika = with python3Packages; toPythonApplication magika;
 
-  mblock-mlink = callPackage ../development/tools/mblock-mlink { };
-
-  mod = callPackage ../development/tools/mod { };
-
-  mya = callPackage ../applications/misc/mya { };
-
   mysql-shell = mysql-shell_8;
 
   inherit ({
@@ -1026,8 +558,6 @@ with pkgs;
     protobuf = protobuf_24;
   };
 
-  broadlink-cli = callPackage ../tools/misc/broadlink-cli { };
-
   fetchpatch = callPackage ../build-support/fetchpatch {
     # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154
     patchutils = __splicedPackages.patchutils_0_3_3;
@@ -1128,8 +658,6 @@ with pkgs;
 
   fetchipfs = callPackage ../build-support/fetchipfs { };
 
-  fetchit = callPackage ../applications/networking/cluster/fetchit { };
-
   fetchzip = callPackage ../build-support/fetchzip { }
     // {
       tests = pkgs.tests.fetchzip;
@@ -1171,19 +699,9 @@ with pkgs;
     inherit url;
   };
 
-  lazydocker = callPackage ../tools/misc/lazydocker { };
-
   ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; }
     ../build-support/setup-hooks/ld-is-cc-hook.sh;
 
-  libgflow = callPackage ../development/libraries/libgflow { };
-  libgtkflow3 = callPackage ../development/libraries/libgtkflow3 { };
-  libgtkflow4 = callPackage ../development/libraries/libgtkflow4 { };
-
-  libredirect = callPackage ../build-support/libredirect { };
-
-  madonctl = callPackage ../applications/misc/madonctl { };
-
   copyDesktopItems = makeSetupHook {
     name = "copy-desktop-items-hook";
   } ../build-support/setup-hooks/copy-desktop-items.sh;
@@ -1221,8 +739,6 @@ with pkgs;
     };
   } ../build-support/setup-hooks/make-wrapper.sh;
 
-  makeBinaryWrapper = callPackage ../build-support/setup-hooks/make-binary-wrapper { };
-
   compressFirmwareXz = callPackage ../build-support/kernel/compress-firmware.nix { type = "xz"; };
 
   compressFirmwareZstd = callPackage ../build-support/kernel/compress-firmware.nix { type = "zstd"; };
@@ -1237,8 +753,6 @@ with pkgs;
   mkShell = callPackage ../build-support/mkshell { };
   mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; };
 
-  mokutil = callPackage ../tools/security/mokutil { };
-
   mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { };
 
   nixBufferBuilders = import ../applications/editors/emacs/build-support/buffer.nix {
@@ -1248,8 +762,6 @@ with pkgs;
 
   nix-gitignore = callPackage ../build-support/nix-gitignore { };
 
-  numworks-epsilon = callPackage ../applications/science/math/numworks-epsilon { };
-
   ociTools = callPackage ../build-support/oci-tools { };
 
   inherit (
@@ -1263,8 +775,6 @@ with pkgs;
 
   closureInfo = callPackage ../build-support/closure-info.nix { };
 
-  sensible-utils = callPackage ../tools/misc/sensible-utils { };
-
   serverspec = callPackage ../tools/misc/serverspec { };
 
   setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { };
@@ -1277,14 +787,8 @@ with pkgs;
   singularity-tools = callPackage ../build-support/singularity-tools { };
 
 
-  sirula = callPackage ../tools/wayland/sirula { };
-
-  sitelen-seli-kiwen = callPackage ../data/fonts/sitelen-seli-kiwen { };
-
   srcOnly = callPackage ../build-support/src-only { };
 
-  subnetcalc = callPackage ../tools/networking/subnetcalc { };
-
   substitute = callPackage ../build-support/substitute/substitute.nix { };
 
   substituteAll = callPackage ../build-support/substitute/substitute-all.nix { };
@@ -1395,14 +899,10 @@ with pkgs;
     name = "use-old-cxx-abi-hook";
   } ../build-support/setup-hooks/use-old-cxx-abi.sh;
 
-  iconConvTools = callPackage ../build-support/icon-conv-tools { };
-
   validatePkgConfig = makeSetupHook
     { name = "validate-pkg-config"; propagatedBuildInputs = [ findutils pkg-config ]; }
     ../build-support/setup-hooks/validate-pkg-config.sh;
 
-  patchPpdFilesHook = callPackage ../build-support/setup-hooks/patch-ppd-files { };
-
   #package writers
   writers = callPackage ../build-support/writers { };
 
@@ -1420,59 +920,21 @@ with pkgs;
 
   _3llo = callPackage ../tools/misc/3llo { };
 
-  _3mux = callPackage ../tools/misc/3mux { };
-
   _1password-gui = callPackage ../applications/misc/1password-gui { };
 
   _1password-gui-beta = callPackage ../applications/misc/1password-gui { channel = "beta"; };
 
-  _6tunnel = callPackage ../tools/networking/6tunnel { };
-
   _7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { };
   _7zz-rar = _7zz.override { enableUnfree = true; };
 
-  _9pfs = callPackage ../tools/filesystems/9pfs { };
-
-  _9ptls = callPackage ../os-specific/linux/9ptls { };
-
-  aaa = callPackage ../tools/misc/aaa { };
-
-  aardvark-dns = callPackage ../tools/networking/aardvark-dns { };
-
-  a2ps = callPackage ../tools/text/a2ps { };
-
-  abbreviate = callPackage ../tools/text/abbreviate { };
-
-  abcm2ps = callPackage ../tools/audio/abcm2ps { };
-
-  abduco = callPackage ../tools/misc/abduco { };
-
-  acct = callPackage ../tools/system/acct { };
-
-  accuraterip-checksum = callPackage ../tools/audio/accuraterip-checksum { };
-
   acme-dns = callPackage ../servers/dns/acme-dns/default.nix {
     buildGoModule = buildGo122Module; # https://github.com/joohoi/acme-dns/issues/365
   };
 
-  acme-sh = callPackage ../tools/admin/acme-sh { };
-
-  alsaequal = callPackage ../tools/audio/alsaequal { };
-
   acquire = with python3Packages; toPythonApplication acquire;
 
   actdiag = with python3.pkgs; toPythonApplication actdiag;
 
-  actkbd = callPackage ../tools/system/actkbd { };
-
-  adafruit-ampy = callPackage ../tools/misc/adafruit-ampy { };
-
-  addic7ed-cli = callPackage ../tools/misc/addic7ed-cli { };
-
-  addlicense = callPackage ../tools/misc/addlicense { };
-
-  adenum  = callPackage ../tools/security/adenum { };
-
   adlplug = callPackage ../applications/audio/adlplug {
     inherit (darwin.apple_sdk.frameworks) Foundation Cocoa Carbon CoreServices ApplicationServices CoreAudio CoreMIDI AudioToolbox Accelerate CoreImage IOKit AudioUnit QuartzCore WebKit DiscRecording CoreAudioKit;
     jack = libjack2;
@@ -1481,10 +943,6 @@ with pkgs;
     type = "OPN";
   };
 
-  arc_unpacker = callPackage ../tools/archivers/arc_unpacker { };
-
-  adminer = callPackage ../servers/adminer { };
-
   akkoma = callPackage ../servers/akkoma {
     elixir = elixir_1_16;
     beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_16; });
@@ -1501,40 +959,16 @@ with pkgs;
     blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { };
   };
 
-  advancecomp = callPackage ../tools/compression/advancecomp { };
-
-  aefs = callPackage ../tools/filesystems/aefs { };
-
   aegisub = callPackage ../by-name/ae/aegisub/package.nix ({
     boost = boost179;
     luajit = luajit.override { enable52Compat = true; };
     wxGTK = wxGTK32;
   } // (config.aegisub or {}));
 
-  aerospike = callPackage ../servers/nosql/aerospike { };
-
-  aespipe = callPackage ../tools/security/aespipe { };
-
-  aescrypt = callPackage ../tools/misc/aescrypt { };
-
-  aether-lv2 = callPackage ../applications/audio/aether-lv2 { };
-
   acme-client = callPackage ../tools/networking/acme-client {
     stdenv = gccStdenv;
   };
 
-  adrgen = callPackage ../tools/misc/adrgen { };
-
-  adriconf = callPackage ../tools/graphics/adriconf { };
-
-  amass = callPackage ../tools/networking/amass { };
-
-  afew = callPackage ../applications/networking/mailreaders/afew { };
-
-  afetch = callPackage ../tools/misc/afetch { };
-
-  afio = callPackage ../tools/archivers/afio { };
-
   honggfuzz = callPackage ../tools/security/honggfuzz {
     clang = clang_16;
     llvm = llvm_16;
@@ -1547,56 +981,14 @@ with pkgs;
     wine = null;
   };
 
-  ledfx = callPackage ../applications/audio/ledfx { };
-
   libdislocator = callPackage ../tools/security/aflplusplus/libdislocator.nix { };
 
-  afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { };
-
   afsctool = callPackage ../tools/filesystems/afsctool {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  agi = callPackage ../tools/graphics/agi { };
-
-  agola = callPackage ../development/tools/continuous-integration/agola { };
-
-  agrep = callPackage ../tools/text/agrep { };
-
-  aha = callPackage ../tools/text/aha { };
-
-  ahcpd = callPackage ../tools/networking/ahcpd { };
-
-  aichat = callPackage ../tools/misc/aichat { };
-
-  aide = callPackage ../tools/security/aide { };
-
-  ain = callPackage ../tools/networking/ain { };
-
   aioblescan = with python3Packages; toPythonApplication aioblescan;
 
-  aiodnsbrute = callPackage ../tools/security/aiodnsbrute { };
-
-  aircrack-ng = callPackage ../tools/networking/aircrack-ng { };
-
-  airgeddon = callPackage ../tools/networking/airgeddon { };
-
-  apache-airflow = callPackage ../servers/apache-airflow { };
-
-  apachetomcatscanner = callPackage ../tools/security/apachetomcatscanner { };
-
-  airsonic = callPackage ../servers/misc/airsonic { };
-
-  airspy = callPackage ../applications/radio/airspy { };
-
-  airspyhf = callPackage ../applications/radio/airspyhf { };
-
-  airwindows-lv2 = callPackage ../applications/audio/airwindows-lv2 { };
-
-  aixlog = callPackage ../development/libraries/aixlog { };
-
-  aj-snapshot  = callPackage ../applications/audio/aj-snapshot { };
-
   ajour = callPackage ../tools/games/ajour {
     inherit (plasma5Packages) kdialog;
   };
@@ -1612,78 +1004,20 @@ with pkgs;
 
   alice-tools-qt6 = qt6Packages.callPackage ../tools/games/alice-tools { };
 
-  allure = callPackage ../development/tools/allure { };
-
-  aquosctl = callPackage ../tools/misc/aquosctl { };
-
-  arch-install-scripts = callPackage ../tools/misc/arch-install-scripts { };
-
-  argocd-vault-plugin = callPackage ../tools/security/argocd-vault-plugin { };
-
-  arubaotp-seed-extractor = callPackage ../tools/security/arubaotp-seed-extractor { };
-
   auditwheel = with python3Packages; toPythonApplication auditwheel;
 
-  amidst = callPackage ../tools/games/minecraft/amidst { };
-
-  asar = callPackage ../tools/compression/asar { };
-
-  askalono = callPackage ../tools/misc/askalono { };
-
   awsbck = callPackage ../tools/backup/awsbck {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  balena-cli = callPackage ../tools/admin/balena-cli { };
-
-  basez = callPackage ../tools/misc/basez { };
-
-  btc-rpc-explorer = callPackage ../tools/misc/btc-rpc-explorer { };
-
-  carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { };
-
-  cf-vault = callPackage ../tools/admin/cf-vault { };
-
-  cfspeedtest = callPackage ../tools/networking/cfspeedtest { };
-
-  cfonts = callPackage ../tools/misc/cfonts { };
-
   bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { };
 
-  cie-middleware-linux = callPackage ../tools/security/cie-middleware-linux { };
-
-  cidrgrep = callPackage ../tools/text/cidrgrep { };
-
-  clematis = callPackage ../tools/misc/clematis { };
-
-  clubhouse-cli = callPackage ../tools/misc/clubhouse-cli { };
-
-  colorless = callPackage ../tools/misc/colorless { };
-
-  configurable-http-proxy = callPackage ../tools/networking/configurable-http-proxy { };
-
-  crypto-tracker = callPackage ../tools/misc/crypto-tracker { };
-
-  ejson2env = callPackage ../tools/admin/ejson2env { };
-
   davinci-resolve = callPackage ../applications/video/davinci-resolve { };
 
   davinci-resolve-studio = callPackage ../applications/video/davinci-resolve { studioVariant = true; };
 
   dehinter = with python3Packages; toPythonApplication dehinter;
 
-  dolbybcsoftwaredecode = callPackage ../applications/audio/dolbybcsoftwaredecode { };
-
-  donkey = callPackage ../tools/security/donkey { };
-
-  dwarfs = callPackage ../tools/filesystems/dwarfs { };
-
-  dysk = callPackage ../tools/filesystems/dysk { };
-
-  fscan = callPackage ../tools/security/fscan { };
-
-  copier = callPackage ../tools/misc/copier { };
-
   gamemode = callPackage ../tools/games/gamemode {
     libgamemode32 = pkgsi686Linux.gamemode.lib;
   };
@@ -1702,168 +1036,66 @@ with pkgs;
     wlroots = wlroots_0_17;
   };
 
-  elkhound = callPackage ../development/tools/elkhound { };
-
-  ethq = callPackage ../os-specific/linux/ethq { };
-
   font-v = with python3Packages; toPythonApplication font-v;
 
   fontbakery = with python3Packages; toPythonApplication fontbakery;
 
-  weidu = callPackage ../tools/games/weidu { };
-
   weylus = callPackage ../applications/graphics/weylus  {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa VideoToolbox;
   };
 
-  gam = callPackage ../tools/admin/gam { };
-
-  gen6dns = callPackage ../tools/networking/gen6dns { };
-
-  github-copilot-cli = callPackage ../tools/misc/github-copilot-cli { };
-
   # This is to workaround gfal2-python broken against Python 3.12 or later.
   # TODO: Remove these lines after solving the breakage.
   gfal2-util = callPackage ../by-name/gf/gfal2-util/package.nix (lib.optionalAttrs python3Packages.gfal2-python.meta.broken {
     python3Packages = python311Packages;
   });
 
-  gfshare = callPackage ../tools/security/gfshare { };
-
   gh-cal = callPackage ../tools/misc/gh-cal {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  ghostie = callPackage ../tools/misc/ghostie { };
-
-  glooctl = callPackage ../applications/networking/cluster/glooctl { };
-
-  gobgp = callPackage ../tools/networking/gobgp { };
-
-  gof5 = callPackage ../tools/networking/gof5 { };
-
-  goflow = callPackage ../tools/networking/goflow { };
-
-  gofu = callPackage ../applications/misc/gofu { };
-
-  godspeed = callPackage ../tools/networking/godspeed { };
-
-  goodhosts = callPackage ../tools/networking/goodhosts { };
-
-  goose = callPackage ../tools/misc/goose { };
-
   gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { };
 
-  grizzly = callPackage ../tools/misc/grizzly { };
-
-  fabs = callPackage ../tools/backup/fabs { };
-
-  fm = callPackage ../applications/file-managers/fm { };
-
   fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { };
 
-  hblock = callPackage ../tools/networking/hblock { };
-
-  headsetcontrol = callPackage ../tools/audio/headsetcontrol { };
-
-  headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { };
-
-  hexdiff = callPackage ../tools/misc/hexdiff { };
-
-  hexo-cli = callPackage ../development/tools/hexo-cli { };
-
-  hostmux = callPackage ../tools/misc/hostmux { };
-
-  hsd = callPackage ../tools/misc/hsd { };
-
-  hyperpotamus = callPackage ../tools/misc/hyperpotamus { };
-
   inherit (callPackages ../tools/networking/ivpn/default.nix { buildGoModule = buildGo122Module; }) ivpn ivpn-service;
 
-  jobber = callPackage ../tools/system/jobber { };
-
-  kanata = callPackage ../tools/system/kanata { };
-
   kanata-with-cmd = kanata.override { withCmd = true; };
 
-  kaufkauflist = callPackage ../applications/misc/kaufkauflist { };
-
   kdocker = libsForQt5.callPackage ../tools/X11/kdocker { };
 
-  kicli = callPackage ../tools/misc/kicli { };
-
-  ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { };
-
   ksnip = libsForQt5.callPackage ../tools/misc/ksnip { };
 
-  kstart = callPackage ../tools/security/kstart { };
-
-  kubevirt = callPackage ../tools/virtualization/kubevirt { };
-
-  lektor = callPackage ../tools/misc/lektor { };
-
-  licenseclassifier = callPackage ../development/tools/misc/licenseclassifier { };
-
-  license-cli = callPackage ../tools/misc/license-cli { };
-
-  linux-router = callPackage ../tools/networking/linux-router { };
-
   linux-router-without-wifi = linux-router.override { useWifiDependencies = false; };
 
   makehuman = libsForQt5.callPackage ../applications/misc/makehuman { };
 
-  markdownlint-cli = callPackage ../tools/text/markdownlint-cli { };
-
-  markdownlint-cli2 = callPackage ../tools/text/markdownlint-cli2 { };
-
-  mbidled = callPackage ../tools/networking/mbidled { };
-
   mcaselector = callPackage ../tools/games/minecraft/mcaselector {
     jre = jre.override {
       enableJavaFX = true;
     };
   };
 
-  metapixel = callPackage ../tools/graphics/metapixel { };
-
   memos = callPackage ../servers/memos { };
 
-  midimonster = callPackage ../tools/audio/midimonster { };
-
-  midi-trigger = callPackage ../applications/audio/midi-trigger { };
-
-  mnc = callPackage ../tools/misc/mnc { };
-
-  mgmt = callPackage ../applications/system/mgmt { };
-
   mkosi = python3Packages.callPackage ../tools/virtualization/mkosi { inherit systemd; };
 
   mkosi-full = mkosi.override { withQemu = true; };
 
-  monica = callPackage ../servers/web-apps/monica { };
-
   mpremote = python3Packages.callPackage ../tools/misc/mpremote { };
 
-  mprocs = callPackage ../tools/misc/mprocs { };
-
   mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { };
 
   mymcplus = python3Packages.callPackage ../tools/games/mymcplus { };
 
-  near-cli = callPackage ../tools/misc/near-cli { };
-
   networkd-notify = python3Packages.callPackage ../tools/networking/networkd-notify {
     systemd = pkgs.systemd;
   };
 
-  node-glob = callPackage ../tools/misc/node-glob { };
-
   nominatim = callPackage ../servers/nominatim {
     postgresql = postgresql_14;
   };
 
-  npm-check-updates = callPackage ../tools/package-management/npm-check-updates { };
-
   ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { };
 
   openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { };
@@ -1875,114 +1107,46 @@ with pkgs;
 
   osquery = callPackage ../tools/system/osquery { };
 
-  paperview = callPackage ../tools/X11/paperview { };
-
-  pferd = callPackage ../tools/misc/pferd { };
-
-  polygon-cli = callPackage ../tools/networking/polygon-cli { };
-
   pricehist = python3Packages.callPackage ../tools/misc/pricehist { };
 
-  proycon-wayout = callPackage ../tools/wayland/proycon-wayout { };
-
   q = callPackage ../tools/networking/q { };
 
   qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { };
 
-  quich = callPackage ../tools/misc/quich { } ;
-
-  rabtap = callPackage ../tools/networking/rabtap { } ;
-
-  redfang = callPackage ../tools/networking/redfang { };
-
   ronin = callPackage ../tools/security/ronin { };
 
   scarab = callPackage ../tools/games/scarab { };
 
   inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2;
 
-  sdlookup = callPackage ../tools/security/sdlookup { };
-
   sdkmanager = with python3Packages; toPythonApplication sdkmanager;
 
-  sgrep = callPackage ../tools/text/sgrep { };
-
   shaperglot = with python3Packages; toPythonApplication shaperglot;
 
-  shell-genie = callPackage  ../applications/misc/shell-genie { };
-
-  sloth = callPackage ../tools/misc/sloth { };
-
   snagboot = python3.pkgs.callPackage  ../applications/misc/snagboot { };
 
-  simple-dlna-browser = callPackage ../tools/networking/simple-dlna-browser { };
-
-  sitespeed-io = callPackage ../tools/networking/sitespeed-io { };
-
   slipstream = callPackage ../tools/games/slipstream {
     jdk = jdk8;
   };
 
-  sorted-grep = callPackage ../tools/text/sorted-grep { };
-
-  smbmap = callPackage ../tools/security/smbmap { };
-
-  smbscan = callPackage ../tools/security/smbscan { };
-
-  spectre-cli = callPackage ../tools/security/spectre-cli { };
-
-  speedtest-go = callPackage ../tools/networking/speedtest-go { };
-
-  speedtest-rs = callPackage ../tools/networking/speedtest-rs { };
-
   stargazer = callPackage ../servers/gemini/stargazer {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  steamtinkerlaunch = callPackage ../tools/games/steamtinkerlaunch { };
-
-  supercronic = callPackage ../tools/system/supercronic { };
-
   supermin = callPackage ../tools/virtualization/supermin {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  sx-go = callPackage ../tools/security/sx-go { };
-
-  systeroid = callPackage ../tools/system/systeroid { };
-
   tailwindcss = callPackage ../development/tools/tailwindcss { };
 
-  tauon = callPackage ../applications/audio/tauon { };
-
-  tere = callPackage ../tools/misc/tere { };
-
   termusic = darwin.apple_sdk_11_0.callPackage ../applications/audio/termusic {
     inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security;
   };
 
-  tfk8s = callPackage ../tools/misc/tfk8s { };
-
-  thumbs = callPackage ../tools/misc/thumbs { };
-
-  tnat64 = callPackage ../tools/networking/tnat64 { };
-
-  toast = callPackage ../development/tools/toast { };
-
-  topicctl = callPackage ../tools/misc/topicctl { };
-
-  transmission-rss = callPackage ../tools/networking/transmission-rss { };
-
   trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; };
 
-  ttchat = callPackage ../tools/misc/ttchat { };
-
   ufolint = with python3Packages; toPythonApplication ufolint;
 
-  ukmm = callPackage ../tools/games/ukmm { };
-
-  unflac = callPackage ../tools/audio/unflac { };
-
   valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };
 
   veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { };
@@ -1994,31 +1158,17 @@ with pkgs;
     withNtfs = true;
   };
 
-  vitess = callPackage ../development/tools/database/vitess { };
-
-  vopono = callPackage ../tools/networking/vopono { };
-
   vprof = with python3Packages; toPythonApplication vprof;
 
   vrc-get = callPackage ../tools/misc/vrc-get {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  vrrtest = callPackage ../tools/video/vrrtest { };
-
   winbox = winbox3;
   winbox3 = callPackage ../tools/admin/winbox {
     wine = wineWowPackages.stable;
   };
 
-  wwcd = callPackage ../tools/misc/wwcd { };
-
-  writedisk = callPackage ../tools/misc/writedisk { };
-
-  xcd = callPackage ../tools/misc/xcd { };
-
-  xpaste = callPackage ../tools/text/xpaste { };
-
   yabridge = callPackage ../tools/audio/yabridge {
     wine = wineWowPackages.staging;
   };
@@ -2033,8 +1183,6 @@ with pkgs;
 
   yarn-lock-converter = callPackage ../tools/package-management/yarn-lock-converter { };
 
-  zsh-history-to-fish = callPackage ../tools/misc/zsh-history-to-fish { };
-
   archi = callPackage ../tools/misc/archi { };
 
   breitbandmessung = callPackage ../applications/networking/breitbandmessung {
@@ -2043,8 +1191,6 @@ with pkgs;
 
   ### APPLICATIONS/VERSION-MANAGEMENT
 
-  deepgit = callPackage ../applications/version-management/deepgit { };
-
   git = callPackage ../applications/version-management/git {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
     perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
@@ -2082,10 +1228,6 @@ with pkgs;
     withpcre2 = false;
   };
 
-  bfg-repo-cleaner = callPackage ../applications/version-management/bfg-repo-cleaner { };
-
-  bit = callPackage ../applications/version-management/bit { };
-
   bitbucket-server-cli = callPackage ../applications/version-management/bitbucket-server-cli { };
 
   bump2version = with python3Packages; toPythonApplication bump2version;
@@ -2094,26 +1236,16 @@ with pkgs;
 
   cgit-pink = callPackage ../applications/version-management/cgit/pink.nix { };
 
-  commit-formatter = callPackage ../applications/version-management/commit-formatter { };
-
   commitlint = nodePackages."@commitlint/cli";
 
-  conform = callPackage ../applications/version-management/conform { };
-
   datalad = with python3Packages; toPythonApplication datalad;
 
   datalad-gooey = with python3Packages; toPythonApplication datalad-gooey;
 
-  degit = callPackage ../applications/version-management/degit { };
-
-  delta = callPackage ../applications/version-management/delta { };
-
   debase = callPackage ../by-name/de/debase/package.nix {
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
 
-  diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { };
-
   forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { };
 
   gfold = callPackage ../applications/version-management/gfold {
@@ -2126,23 +1258,11 @@ with pkgs;
     inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration;
   };
 
-  gg-scm = callPackage ../applications/version-management/gg { };
-
   github-cli = gh;
-  gh = callPackage ../applications/version-management/gh { };
-
-  ghorg = callPackage ../applications/version-management/ghorg { };
-
-  ghq = callPackage ../applications/version-management/ghq { };
-
-  ghr = callPackage ../applications/version-management/ghr { };
-
   git-absorb = callPackage ../applications/version-management/git-absorb {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git-aggregator = callPackage ../applications/version-management/git-aggregator { };
-
   git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-annex-metadata-gui {
     inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
   };
@@ -2157,32 +1277,12 @@ with pkgs;
 
   git-annex-remote-googledrive = python3Packages.callPackage ../applications/version-management/git-annex-remote-googledrive { };
 
-  git-annex-remote-rclone = callPackage ../applications/version-management/git-annex-remote-rclone { };
-
-  git-annex-utils = callPackage ../applications/version-management/git-annex-utils { };
-
-  git-appraise = callPackage ../applications/version-management/git-appraise { };
-
   git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { };
 
-  git-backdate = callPackage ../applications/version-management/git-backdate { };
-
-  git-big-picture = callPackage ../applications/version-management/git-big-picture { };
-
-  git-bars = callPackage ../applications/version-management/git-bars { };
-
   git-branchless = callPackage ../applications/version-management/git-branchless {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  git-bug = callPackage ../applications/version-management/git-bug { };
-
-  git-bug-migration = callPackage ../applications/version-management/git-bug-migration { };
-
-  git-cache = callPackage ../applications/version-management/git-cache { };
-
-  git-chglog = callPackage ../applications/version-management/git-chglog { };
-
   git-cinnabar = callPackage ../applications/version-management/git-cinnabar {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -2191,123 +1291,49 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  git-codereview = callPackage ../applications/version-management/git-codereview { };
-
-  git-cola = callPackage ../applications/version-management/git-cola { };
-
-  git-crecord = callPackage ../applications/version-management/git-crecord { };
-
   git-credential-keepassxc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-credential-keepassxc {
     inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
   };
 
   git-credential-manager = callPackage ../applications/version-management/git-credential-manager { };
 
-  git-credential-oauth = callPackage ../applications/version-management/git-credential-oauth { };
-
-  git-crypt = callPackage ../applications/version-management/git-crypt { };
-
-  git-delete-merged-branches = callPackage ../applications/version-management/git-delete-merged-branches { };
-
-  git-dive = callPackage ../applications/version-management/git-dive { };
-
-  git-extras = callPackage ../applications/version-management/git-extras { };
-
   git-fame = callPackage ../applications/version-management/git-fame { };
 
-  git-fire = callPackage ../applications/version-management/git-fire { };
-
-  git-ftp = callPackage ../applications/version-management/git-ftp { };
-
   git-gone = callPackage ../applications/version-management/git-gone {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git-graph = callPackage ../applications/version-management/git-graph { };
-
-  git-hound = callPackage ../applications/version-management/git-hound { };
-
-  git-hub = callPackage ../applications/version-management/git-hub { };
-
-  git-ignore = callPackage ../applications/version-management/git-ignore { };
-
   git-imerge = python3Packages.callPackage ../applications/version-management/git-imerge { };
 
-  git-interactive-rebase-tool = callPackage ../applications/version-management/git-interactive-rebase-tool { };
-
   git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { });
 
-  git-mit = callPackage ../applications/version-management/git-mit { };
-
   git-machete = python3Packages.callPackage ../applications/version-management/git-machete { };
 
-  git-octopus = callPackage ../applications/version-management/git-octopus { };
-
-  git-open = callPackage ../applications/version-management/git-open { };
-
-  git-privacy = callPackage ../applications/version-management/git-privacy { };
-
   git-ps-rs = callPackage ../development/tools/git-ps-rs {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   git-publish = python3Packages.callPackage ../applications/version-management/git-publish { };
 
-  git-quick-stats = callPackage ../applications/version-management/git-quick-stats { };
-
   git-quickfix = callPackage ../applications/version-management/git-quickfix {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  git-radar = callPackage ../applications/version-management/git-radar { };
-
   git-recent = callPackage ../applications/version-management/git-recent {
     util-linux = if stdenv.hostPlatform.isLinux then util-linuxMinimal else util-linux;
   };
 
-  git-relevant-history = callPackage ../applications/version-management/git-relevant-history { };
-
   git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-remote-codecommit { };
 
   gitRepo = git-repo;
-  git-repo = callPackage ../applications/version-management/git-repo { };
-
   git-repo-updater = python3Packages.callPackage ../applications/version-management/git-repo-updater { };
 
   git-review = python3Packages.callPackage ../applications/version-management/git-review { };
 
-  git-remote-gcrypt = callPackage ../applications/version-management/git-remote-gcrypt { };
-
-  git-remote-hg = callPackage ../applications/version-management/git-remote-hg { };
-
-  git-reparent = callPackage ../applications/version-management/git-reparent { };
-
-  git-secret = callPackage ../applications/version-management/git-secret { };
-
-  git-secrets = callPackage ../applications/version-management/git-secrets { };
-
-  git-series = callPackage ../applications/version-management/git-series { };
-
-  git-sizer = callPackage ../applications/version-management/git-sizer { };
-
   git-stack = callPackage ../applications/version-management/git-stack {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git-stree = callPackage ../applications/version-management/git-stree { };
-
-  git-subrepo = callPackage ../applications/version-management/git-subrepo { };
-
-  git-subtrac = callPackage ../applications/version-management/git-subtrac { };
-
-  git-sync = callPackage ../applications/version-management/git-sync { };
-
-  git-team = callPackage ../applications/version-management/git-team { };
-
-  git-test = callPackage ../applications/version-management/git-test { };
-
-  git-town = callPackage ../applications/version-management/git-town { };
-
   git-trim = darwin.apple_sdk_11_0.callPackage ../applications/version-management/git-trim {
     inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Security;
   };
@@ -2316,70 +1342,16 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  git-vanity-hash = callPackage ../applications/version-management/git-vanity-hash { };
-
-  git-vendor = callPackage ../applications/version-management/git-vendor { };
-
-  git-when-merged = callPackage ../applications/version-management/git-when-merged { };
-
   git-workspace = callPackage ../applications/version-management/git-workspace {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git2cl = callPackage ../applications/version-management/git2cl { };
-
-  gitbatch = callPackage ../applications/version-management/gitbatch { };
-
-  gitflow = callPackage ../applications/version-management/gitflow { };
-
-  gitfs = callPackage ../tools/filesystems/gitfs { };
-
-  gitless = callPackage ../applications/version-management/gitless { };
-
   gitlint = python3Packages.callPackage ../applications/version-management/gitlint { };
 
-  gitls = callPackage ../applications/version-management/gitls { };
-
   gitmux = callPackage ../applications/version-management/gitmux { buildGoModule = buildGo122Module; };
 
-  gitnuro = callPackage ../applications/version-management/gitnuro { };
-
-  gitnr = callPackage ../applications/version-management/gitnr { };
-
-  gitsign = callPackage ../applications/version-management/gitsign { };
-
-  gitstats = callPackage ../applications/version-management/gitstats { };
-
-  gitstatus = callPackage ../applications/version-management/gitstatus { };
-
-  gitty = callPackage ../applications/version-management/gitty { };
-
   gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { };
 
-  gitweb = callPackage ../applications/version-management/gitweb { };
-
-  glitter = callPackage ../applications/version-management/glitter { };
-
-  globalping-cli = callPackage ../tools/networking/globalping-cli { };
-
-  gst = callPackage ../applications/version-management/gst { };
-
-  guilt = callPackage ../applications/version-management/guilt { };
-
-  gut = callPackage ../applications/version-management/gut { };
-
-  hub = callPackage ../applications/version-management/hub { };
-
-  hut = callPackage ../applications/version-management/hut { };
-
-  josh = callPackage ../applications/version-management/josh { };
-
-  lab = callPackage ../applications/version-management/lab { };
-
-  legit = callPackage ../applications/version-management/legit { };
-
-  legit-web = callPackage ../applications/version-management/legit-web { };
-
   lucky-commit = callPackage ../applications/version-management/lucky-commit {
     inherit (darwin.apple_sdk.frameworks) OpenCL;
   };
@@ -2392,32 +1364,14 @@ with pkgs;
 
   qgit = qt5.callPackage ../applications/version-management/qgit { };
 
-  rs-git-fsmonitor = callPackage ../applications/version-management/rs-git-fsmonitor { };
-
-  scmpuff = callPackage ../applications/version-management/scmpuff { };
-
   silver-platter = python3Packages.callPackage ../applications/version-management/silver-platter { };
 
-  stgit = callPackage ../applications/version-management/stgit { };
-
-  subgit = callPackage ../applications/version-management/subgit { };
-
   svn-all-fast-export = libsForQt5.callPackage ../applications/version-management/svn-all-fast-export { };
 
   svn2git = callPackage ../applications/version-management/svn2git {
     git = gitSVN;
   };
 
-  thicket = callPackage ../applications/version-management/thicket { };
-
-  tig = callPackage ../applications/version-management/tig { };
-
-  top-git = callPackage ../applications/version-management/topgit { };
-
-  transcrypt = callPackage ../applications/version-management/transcrypt { };
-
-  ungit = callPackage ../applications/version-management/ungit { };
-
   inherit (haskellPackages) git-annex;
 
   inherit (haskellPackages) git-brunch;
@@ -2439,8 +1393,6 @@ with pkgs;
     unfreeEnableDiscord = true;
   };
 
-  basiliskii = callPackage ../applications/emulators/basiliskii { };
-
   box64 = callPackage ../applications/emulators/box64 {
     hello-x86_64 = if stdenv.hostPlatform.isx86_64 then
       hello
@@ -2466,26 +1418,12 @@ with pkgs;
     else
       throw "Don't know 32-bit platform for cross from: ${stdenv.hostPlatform.stdenv}";
 
-  caprice32 = callPackage ../applications/emulators/caprice32 { };
-
-  ccemux = callPackage ../applications/emulators/ccemux { };
-
   cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { };
 
   cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { };
 
-  cen64 = callPackage ../applications/emulators/cen64 { };
-
-  collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { };
-
   coltrane = callPackage ../applications/misc/coltrane { };
 
-  craftos-pc = callPackage ../applications/emulators/craftos-pc { };
-
-  darcnes = callPackage ../applications/emulators/darcnes { };
-
-  dlx = callPackage ../applications/emulators/dlx { };
-
   dosbox = callPackage ../applications/emulators/dosbox {
     inherit (darwin.apple_sdk.frameworks ) OpenGL;
     SDL = if stdenv.hostPlatform.isDarwin then SDL else SDL_compat;
@@ -2500,22 +1438,8 @@ with pkgs;
 
   firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { };
 
-  flycast = callPackage ../applications/emulators/flycast { };
-
-  flix = callPackage ../development/compilers/flix { };
-
-  fsrx = callPackage ../tools/misc/fsrx { };
-
-  fuc = callPackage ../tools/misc/fuc { };
-
-  fuse-emulator = callPackage ../applications/emulators/fuse-emulator { };
-
   fusesoc = python3Packages.callPackage ../tools/package-management/fusesoc { };
 
-  fw = callPackage ../tools/misc/fw { };
-
-  g810-led = callPackage ../misc/g810-led { };
-
   gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
 
   gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { };
@@ -2524,46 +1448,18 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  gopsuinfo = callPackage ../tools/system/gopsuinfo { };
-
-  hatari = callPackage ../applications/emulators/hatari { };
-
-  hostapd-mana = callPackage ../tools/networking/hostapd-mana { };
-
   image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { };
 
   kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { };
 
-  lambda-delta = callPackage ../applications/emulators/lambda-delta { };
-
-  libdsk = callPackage ../applications/emulators/libdsk { };
-
   libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };
 
-  ludusavi = callPackage ../applications/backup/ludusavi { };
-
-  maiko = callPackage ../applications/emulators/maiko { };
-
-  mainsail = callPackage ../applications/misc/mainsail { };
-
   mame = libsForQt5.callPackage ../applications/emulators/mame { };
 
   mame-tools = lib.addMetaAttrs {
     description = mame.meta.description + " (tools only)";
   } (lib.getOutput "tools" mame);
 
-  mupen64plus = callPackage ../applications/emulators/mupen64plus { };
-
-  np2kai = callPackage ../applications/emulators/np2kai { };
-
-  nuked-md = callPackage ../applications/emulators/nuked-md { };
-
-  oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { };
-
-  packwiz = callPackage ../tools/games/minecraft/packwiz { };
-
-  pcem = callPackage ../applications/emulators/pcem { };
-
   ppsspp-sdl = let
     argset = {
       enableQt = false;
@@ -2591,48 +1487,24 @@ with pkgs;
   in
     ppsspp.override argset;
 
-  proton-caller = callPackage ../applications/emulators/proton-caller { };
-
   punes = libsForQt5.callPackage ../applications/emulators/punes { };
 
   punes-qt6 = qt6Packages.callPackage ../applications/emulators/punes { };
 
   py65 = with python3.pkgs; toPythonApplication py65;
 
-  retrofe = callPackage ../applications/emulators/retrofe { };
-
   ripes = qt6Packages.callPackage ../applications/emulators/ripes { };
 
   rmg-wayland = callPackage ../by-name/rm/rmg/package.nix {
     withWayland = true;
   };
 
-  ruffle = callPackage ../applications/emulators/ruffle { };
-
-  sameboy = callPackage ../applications/emulators/sameboy { };
-
-  simplenes = callPackage ../applications/emulators/simplenes { };
-
   snes9x-gtk = snes9x.override {
     withGtk = true;
   };
 
-  tamatool = callPackage ../applications/emulators/tamatool { };
-
-  termtekst = callPackage ../applications/emulators/termtekst { };
-
-  tilem = callPackage ../applications/emulators/tilem { };
-
-  uae = callPackage ../applications/emulators/uae { };
-
-  vbam = callPackage ../applications/emulators/vbam { };
-
-  vice = callPackage ../applications/emulators/vice { };
-
   winetricks = callPackage ../applications/emulators/wine/winetricks.nix { };
 
-  xcpc = callPackage ../applications/emulators/xcpc { };
-
   zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };
   zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { };
 
@@ -2642,8 +1514,6 @@ with pkgs;
 
   bsnes-hd = darwin.apple_sdk_11_0.callPackage ../applications/emulators/bsnes/bsnes-hd { };
 
-  higan = callPackage ../applications/emulators/bsnes/higan { };
-
   ### APPLICATIONS/EMULATORS/DOLPHIN-EMU
 
   dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu {
@@ -2708,22 +1578,12 @@ with pkgs;
 
   ### APPLICATIONS/FILE-MANAGERS
 
-  browsr = callPackage ../applications/file-managers/browsr { };
-
-  cfm = callPackage ../applications/file-managers/cfm { };
-
-  clex = callPackage ../applications/file-managers/clex { };
-
-  clifm = callPackage ../applications/file-managers/clifm { };
-
   doublecmd = callPackage ../by-name/do/doublecmd/package.nix {
     inherit (qt5) wrapQtAppsHook;
   };
 
   krusader = libsForQt5.callPackage ../applications/file-managers/krusader { };
 
-  lesscpy = callPackage ../development/compilers/lesscpy { };
-
   lf = callPackage ../applications/file-managers/lf { };
 
   ctpv = callPackage ../applications/file-managers/lf/ctpv.nix { };
@@ -2736,47 +1596,21 @@ with pkgs;
     boost = boost185;
   };
 
-  nnn = callPackage ../applications/file-managers/nnn { };
-
-  noice = callPackage ../applications/file-managers/noice { };
-
-  pcmanfm = callPackage ../applications/file-managers/pcmanfm { };
-
-  portfolio-filemanager = callPackage ../applications/file-managers/portfolio-filemanager { };
-
-  potreeconverter = callPackage ../applications/graphics/potreeconverter { };
-
-  ranger = callPackage ../applications/file-managers/ranger { };
-
-  sfm = callPackage ../applications/file-managers/sfm { };
-
-  spaceFM = callPackage ../applications/file-managers/spacefm { };
-
-  vifm = callPackage ../applications/file-managers/vifm { };
-
   vifm-full = vifm.override {
     mediaSupport = true;
     inherit lib udisks2 python3;
   };
 
-  walk = callPackage ../applications/file-managers/walk { };
-
   xfe = callPackage ../applications/file-managers/xfe {
     fox = fox_1_6;
   };
 
-  xplorer = callPackage ../applications/file-managers/xplorer { };
-
   johnny-reborn-engine = callPackage ../applications/misc/johnny-reborn { };
 
   johnny-reborn = callPackage ../applications/misc/johnny-reborn/with-data.nix { };
 
   ### APPLICATIONS/TERMINAL-EMULATORS
 
-  alacritty = callPackage ../applications/terminal-emulators/alacritty { };
-
-  blackbox-terminal = callPackage ../applications/terminal-emulators/blackbox-terminal { };
-
   contour = qt6.callPackage ../applications/terminal-emulators/contour {
     inherit (darwin.apple_sdk_11_0.libs) utmp;
     inherit (darwin) sigtool;
@@ -2787,18 +1621,6 @@ with pkgs;
 
   cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };
 
-  darktile = callPackage ../applications/terminal-emulators/darktile { };
-
-  dterm = callPackage ../applications/terminal-emulators/dterm { };
-
-  foot = callPackage ../applications/terminal-emulators/foot { };
-
-  guake = callPackage ../applications/terminal-emulators/guake { };
-
-  hyper = callPackage ../applications/terminal-emulators/hyper { };
-
-  iterm2 = callPackage ../applications/terminal-emulators/iterm2 { };
-
   kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty {
     harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; };
     inherit (darwin.apple_sdk_11_0) Libsystem;
@@ -2812,17 +1634,11 @@ with pkgs;
 
   kitty-themes  = callPackage ../applications/terminal-emulators/kitty/themes.nix { };
 
-  lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
-
-  microcom = callPackage ../applications/terminal-emulators/microcom { };
-
   mlterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/mlterm { };
   mlterm-wayland = mlterm.override {
     enableX11 = false;
   };
 
-  mrxvt = callPackage ../applications/terminal-emulators/mrxvt { };
-
   rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { };
 
   rxvt-unicode-emoji = rxvt-unicode.override {
@@ -2843,7 +1659,6 @@ with pkgs;
     extraLibs = config.st.extraLibs or [];
   };
   xst = callPackage ../applications/terminal-emulators/st/xst.nix { };
-  lukesmithxyz-st = callPackage ../applications/terminal-emulators/st/lukesmithxyz-st { };
   mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { };
   siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { };
 
@@ -2851,71 +1666,17 @@ with pkgs;
     gtk = gtk3;
   };
 
-  terminator = callPackage ../applications/terminal-emulators/terminator { };
-
   termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix {
     termite = termite-unwrapped;
   };
   termite-unwrapped = callPackage ../applications/terminal-emulators/termite { };
 
-  termonad = callPackage ../applications/terminal-emulators/termonad { };
-
-  tym = callPackage ../applications/terminal-emulators/tym { };
-
-  wayst = callPackage ../applications/terminal-emulators/wayst { };
-
   wezterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/wezterm {
     inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications System;
   };
 
-  x3270 = callPackage ../applications/terminal-emulators/x3270 { };
-
-  xterm = callPackage ../applications/terminal-emulators/xterm { };
-
-  xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol { };
-
-  yaft = callPackage ../applications/terminal-emulators/yaft { };
-
-  iqueue = callPackage ../development/libraries/iqueue { };
-
-  lifecycled = callPackage ../tools/misc/lifecycled { };
-
-  lil-pwny = callPackage ../tools/security/lil-pwny { };
-
-  lilo = callPackage ../tools/misc/lilo { };
-
-  natls = callPackage ../tools/misc/natls { };
-
-  notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { };
-
-  pikchr = callPackage ../tools/graphics/pikchr { };
-
-  poop = callPackage ../tools/misc/poop { };
-
-  popl = callPackage ../development/libraries/popl { };
-
-  popsicle = callPackage ../tools/misc/popsicle { };
-
-  terminal-colors = callPackage ../applications/misc/terminal-colors { };
-
-  termsyn = callPackage ../data/fonts/termsyn { };
-
-  tvnamer = callPackage ../tools/misc/tvnamer { };
-
   twine = with python3Packages; toPythonApplication twine;
 
-  accelergy = callPackage ../applications/science/computer-architecture/accelergy { };
-
-  aldo = callPackage ../applications/radio/aldo { };
-
-  alglib = callPackage ../development/libraries/alglib { };
-
-  almanah = callPackage ../applications/misc/almanah { };
-
-  alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { };
-
-  amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { };
-
   amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -2933,20 +1694,8 @@ with pkgs;
     ammonite_2_13;
   ammonite = ammonite_2_13;
 
-  ams = callPackage ../applications/audio/ams { };
-
-  amtterm = callPackage ../tools/system/amtterm { };
-
-  analog = callPackage ../tools/admin/analog { };
-
-  android-backup-extractor = callPackage ../tools/backup/android-backup-extractor { };
-
   android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools { });
 
-  anew = callPackage ../tools/text/anew { };
-
-  anewer = callPackage ../tools/text/anewer { };
-
   angie = callPackage ../servers/http/angie {
     zlib = zlib-ng.override { withZlibCompat = true; };
     withPerl = false;
@@ -2968,26 +1717,10 @@ with pkgs;
 
   angie-console-light = callPackage ../servers/http/angie/console-light.nix { };
 
-  angle-grinder = callPackage ../tools/text/angle-grinder { };
-
-  ansifilter = callPackage ../tools/text/ansifilter { };
-
-  apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { };
-
   apk-tools = callPackage ../tools/package-management/apk-tools {
     lua = lua5_3;
   };
 
-  apkid = callPackage ../development/tools/apkid { };
-
-  apkleaks = callPackage ../tools/security/apkleaks { };
-
-  apksigcopier = callPackage ../development/tools/apksigcopier { };
-
-  apksigner = callPackage ../development/tools/apksigner { };
-
-  apktool = callPackage ../development/tools/apktool { };
-
   appimage-run = callPackage ../tools/package-management/appimage-run { };
   appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix {
     appimage-run = appimage-run.override {
@@ -2995,96 +1728,34 @@ with pkgs;
     };
   };
 
-  appimagekit = callPackage ../tools/package-management/appimagekit { };
-
-  apt-cacher-ng = callPackage ../servers/http/apt-cacher-ng { };
-
-  aptly = callPackage ../tools/misc/aptly { };
-
   ArchiSteamFarm = callPackage ../applications/misc/ArchiSteamFarm { };
 
-  archivebox = callPackage ../applications/misc/archivebox { };
-
-  archivy = callPackage ../applications/misc/archivy { };
-
-  arandr = callPackage ../tools/X11/arandr { };
-
-  arangodb = callPackage ../servers/nosql/arangodb { };
-
   arduino = arduino-core.override { withGui = true; };
 
-  arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { };
-
   arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { };
   arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { };
 
-  arduino-language-server = callPackage ../development/embedded/arduino/arduino-language-server { };
-
-  arduino-mk = callPackage ../development/embedded/arduino/arduino-mk { };
-
-  arduinoOTA = callPackage ../development/embedded/arduino/arduinoOTA { };
-
   apio = python3Packages.callPackage ../development/embedded/fpga/apio { };
 
   apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { };
 
-  arguments = callPackage ../development/libraries/arguments { };
-
-  argus = callPackage ../tools/networking/argus { };
-
-  argus-clients = callPackage ../tools/networking/argus-clients { };
-
-  argyllcms = callPackage ../tools/graphics/argyllcms { };
-
   arj = callPackage ../tools/archivers/arj {
     stdenv = gccStdenv;
   };
 
-  arp-scan = callPackage ../tools/misc/arp-scan { };
-
   inherit (callPackages ../data/fonts/arphic {})
     arphic-ukai arphic-uming;
 
-  artyFX = callPackage ../applications/audio/artyFX { };
-
-  oggvideotools = callPackage ../tools/misc/oggvideotools { };
-
-  owl-lisp = callPackage ../development/compilers/owl-lisp { };
-
-  ascii = callPackage ../tools/text/ascii { };
-
-  asciinema = callPackage ../tools/misc/asciinema { };
-
   asciinema-agg = callPackage ../tools/misc/asciinema-agg {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  asciinema-scenario = callPackage ../tools/misc/asciinema-scenario { };
-
-  asciiquarium = callPackage ../applications/misc/asciiquarium { };
-
-  ashuffle = callPackage ../applications/audio/ashuffle { };
-
-  ashpd-demo = callPackage ../development/tools/ashpd-demo { };
-
-  astc-encoder = callPackage ../tools/graphics/astc-encoder { };
-
   asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { };
 
-  async = callPackage ../development/tools/async { };
-
-  atheme = callPackage ../servers/irc/atheme { };
-
-  atinout = callPackage ../tools/networking/atinout { };
-
   atomicparsley = callPackage ../tools/video/atomicparsley {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  audiowaveform = callPackage ../tools/audio/audiowaveform { };
-
-  authenticator = callPackage ../applications/misc/authenticator { };
-
   authelia = callPackage ../servers/authelia {
     buildGoModule = buildGo123Module;
   };
@@ -3093,62 +1764,18 @@ with pkgs;
 
   autoflake = with python3.pkgs; toPythonApplication autoflake;
 
-  autospotting = callPackage ../applications/misc/autospotting { };
-
-  avfs = callPackage ../tools/filesystems/avfs { };
-
-  aliyun-cli = callPackage ../tools/admin/aliyun-cli { };
-
-  aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator { };
-
-  awscli = callPackage ../tools/admin/awscli { };
-
-  okta-aws-cli = callPackage ../tools/admin/okta-aws-cli { };
-
-  awslimitchecker = callPackage ../tools/admin/awslimitchecker { };
-
-  awslogs = callPackage ../tools/admin/awslogs { };
-
   awsume = python3Packages.callPackage ../tools/admin/awsume { };
 
-  aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { };
-
   aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { };
 
-  aws-nuke = callPackage ../tools/admin/aws-nuke { };
-
-  aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { };
-
-  aws-sam-cli = callPackage ../development/tools/aws-sam-cli { };
-
-  aws-sso-creds = callPackage ../tools/admin/aws-sso-creds { };
-
-  iamy = callPackage ../tools/admin/iamy { };
-
-  azeret-mono = callPackage ../data/fonts/azeret-mono { };
-
   azure-cli-extensions = recurseIntoAttrs azure-cli.extensions;
 
-  azure-functions-core-tools = callPackage ../development/tools/azure-functions-core-tools { };
-
   azure-static-sites-client = callPackage ../development/tools/azure-static-sites-client { };
 
-  azure-storage-azcopy = callPackage ../development/tools/azcopy { };
-
-  bark = callPackage ../tools/audio/bark { };
-
-  bashblog = callPackage ../tools/text/bashblog { };
-
-  berglas = callPackage ../tools/admin/berglas { };
-
-  betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { };
-
   binocle = callPackage ../applications/misc/binocle {
     inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreVideo Foundation Metal QuartzCore;
   };
 
-  bitwise = callPackage ../tools/misc/bitwise { };
-
   blisp = darwin.apple_sdk_11_0.callPackage ../development/embedded/blisp {
     inherit (darwin.apple_sdk_11_0.frameworks) IOKit;
   };
@@ -3157,8 +1784,6 @@ with pkgs;
 
   brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ;
 
-  bootspec = callPackage ../tools/misc/bootspec { };
-
   # Derivation's result is not used by nixpkgs. Useful for validation for
   # regressions of bootstrapTools on hydra and on ofborg. Example:
   #     pkgsCross.aarch64-multiplatform.freshBootstrapTools.build
@@ -3174,44 +1799,14 @@ with pkgs;
     callPackage ../stdenv/freebsd/make-bootstrap-tools.nix {}
   else throw "freshBootstrapTools: unknown hostPlatform ${stdenv.hostPlatform.config}";
 
-  boxes = callPackage ../tools/text/boxes { };
-
-  boxxy = callPackage ../tools/misc/boxxy { };
-
-  chamber = callPackage ../tools/admin/chamber {  };
-
-  chaos = callPackage ../tools/networking/chaos {  };
-
-  charm = callPackage ../applications/misc/charm { };
-
   chars = callPackage ../tools/text/chars {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  checkip = callPackage ../tools/networking/checkip { };
-
   crystfel = callPackage ../applications/science/physics/crystfel { };
 
   crystfel-headless = callPackage ../applications/science/physics/crystfel { withGui = false; };
 
-  cyberchef = callPackage ../tools/misc/cyberchef { };
-
-  cw = callPackage ../tools/admin/cw { };
-
-  ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { };
-
-  ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { };
-
-  ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { };
-
-  exoscale-cli = callPackage ../tools/admin/exoscale-cli { };
-
-  altermime = callPackage ../tools/networking/altermime { };
-
-  alttab = callPackage ../tools/X11/alttab { };
-
-  amule = callPackage ../tools/networking/p2p/amule { };
-
   amule-daemon = amule.override {
     monolithic = false;
     enableDaemon = true;
@@ -3227,68 +1822,24 @@ with pkgs;
     httpServer = true;
   };
 
-  apg = callPackage ../tools/security/apg { };
-
   apt-dater = callPackage ../tools/package-management/apt-dater {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  asusctl = callPackage ../applications/system/asusctl { };
-
-  autorevision = callPackage ../tools/misc/autorevision { };
-
-  automirror = callPackage ../tools/misc/automirror { };
-
-  barman = callPackage ../tools/misc/barman { };
-
-  bartib = callPackage ../tools/misc/bartib { };
-
-  base16-universal-manager = callPackage ../applications/misc/base16-universal-manager { };
-
-  base16384 = callPackage ../tools/text/base16384 { };
-
   bashate = python3Packages.callPackage ../development/tools/bashate {
     python3Packages = python311Packages;
   };
 
-  bash-my-aws = callPackage ../tools/admin/bash-my-aws { };
-
-  bashcards = callPackage ../tools/misc/bashcards { };
-
-  bazarr = callPackage ../servers/bazarr { };
-
   bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { };
 
-  bic = callPackage ../development/interpreters/bic { };
-
-  biscuit-cli = callPackage ../tools/security/biscuit-cli { };
-
   inherit (callPackages ../tools/security/bitwarden-directory-connector { }) bitwarden-directory-connector-cli bitwarden-directory-connector;
 
   bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { };
 
-  bklk = callPackage ../applications/misc/bklk { };
-
-  bkt = callPackage ../tools/misc/bkt {  };
-
-  bkyml = callPackage ../tools/misc/bkyml { };
-
   blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
 
-  bolliedelayxt-lv2 = callPackage ../applications/audio/bolliedelayxt.lv2 { };
-
-  bonnmotion = callPackage ../development/tools/misc/bonnmotion { };
-
-  bonnie = callPackage ../tools/filesystems/bonnie { };
-
-  boron = callPackage ../development/interpreters/boron { };
-
   botamusique = callPackage ../tools/audio/botamusique { };
 
-  boulder = callPackage ../tools/admin/boulder { };
-
-  btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { };
-
   bucklespring = bucklespring-x11;
   bucklespring-libinput = callPackage ../applications/audio/bucklespring { };
   bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; };
@@ -3296,71 +1847,21 @@ with pkgs;
   buildbotPackages = recurseIntoAttrs (python3.pkgs.callPackage ../development/tools/continuous-integration/buildbot { });
   inherit (buildbotPackages) buildbot buildbot-ui buildbot-full buildbot-plugins buildbot-worker;
 
-  bunyan-rs = callPackage ../development/tools/bunyan-rs { };
-
-  calcure = callPackage ../applications/misc/calcure { };
-
-  callaudiod = callPackage ../applications/audio/callaudiod { };
-
   castopod = callPackage ../applications/audio/castopod { };
 
-  calls = callPackage ../applications/networking/calls { };
-
-  castnow = callPackage ../tools/networking/castnow { };
-
-  castty = callPackage ../tools/misc/castty { };
-
-  certigo = callPackage ../tools/admin/certigo { };
-
   certipy = with python3Packages; toPythonApplication certipy-ad;
 
   catcli = python3Packages.callPackage ../tools/filesystems/catcli { };
 
-  changelogger = callPackage ../tools/misc/changelogger { };
-
   chipsec = callPackage ../tools/security/chipsec {
     kernel = null;
     withDriver = false;
   };
 
-  chroma = callPackage ../tools/text/chroma { };
-
-  clair = callPackage ../tools/admin/clair { };
-
-  clairvoyance = callPackage ../tools/security/clairvoyance { };
-
-  cloudfox = callPackage ../tools/security/cloudfox { };
-
-  cloudhunter = callPackage ../tools/security/cloudhunter { };
-
-  cloudsmith-cli = callPackage ../development/tools/cloudsmith-cli { };
-
-  codeql = callPackage ../development/tools/analysis/codeql { };
-
   fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { };
 
-  cconv = callPackage ../tools/text/cconv { };
-
-  go-check = callPackage ../development/tools/check { };
-
-  go-cve-search = callPackage ../tools/security/go-cve-search { };
-
-  go-dork = callPackage ../tools/security/go-dork { };
-
-  chkcrontab = callPackage ../tools/admin/chkcrontab { };
-
-  claws = callPackage ../tools/misc/claws { };
-
-  cloud-custodian = callPackage ../tools/networking/cloud-custodian  { };
-
   coconut = with python3Packages; toPythonApplication coconut;
 
-  cod = callPackage ../tools/misc/cod { };
-
-  codespell = callPackage ../development/tools/codespell { };
-
-  conjure = callPackage ../applications/graphics/conjure { };
-
   coolreader = libsForQt5.callPackage ../applications/misc/coolreader { };
 
   corsair = with python3Packages; toPythonApplication corsair-scan;
@@ -3369,162 +1870,54 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) PCSC;
   };
 
-  coze = callPackage ../tools/security/coze { } ;
-
-  cozy = callPackage ../applications/audio/cozy { };
-
-  cpptoml = callPackage ../development/libraries/cpptoml { };
-
-  cpuid = callPackage ../os-specific/linux/cpuid { };
-
-  ctre = callPackage ../development/libraries/ctre { };
-
-  ctrtool = callPackage ../tools/archivers/ctrtool { };
-
-  crowbar = callPackage ../tools/security/crowbar { };
-
-  crumbs = callPackage ../applications/misc/crumbs { };
-
-  crc32c = callPackage ../development/libraries/crc32c { };
-
-  crcpp = callPackage ../development/libraries/crcpp { };
-
-  cudd = callPackage ../development/libraries/cudd { };
-
   inherit (cue) writeCueValidator;
 
-  cuelsp = callPackage ../development/tools/cuelsp { };
-
-  cyclonedds = callPackage ../development/libraries/cyclonedds { };
-
-  cyclone-scheme = callPackage ../development/interpreters/cyclone { };
-
   cyclonedx-gomod = callPackage ../tools/security/cyclonedx-gomod {
     buildGoModule = buildGo123Module;
   };
 
-  cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { };
-
   dazel = python3Packages.callPackage ../development/tools/dazel { };
 
-  dcap = callPackage ../tools/networking/dcap { };
-
-  deltachat-cursed = callPackage ../applications/networking/instant-messengers/deltachat-cursed { };
-
-  delayarchitect = callPackage ../applications/audio/delayarchitect { };
-
-  dell-command-configure = callPackage ../tools/system/dell-command-configure { };
-
-  deskew = callPackage ../applications/graphics/deskew { };
-
   detect-secrets = with python3Packages; toPythonApplication detect-secrets;
 
-  deterministic-uname = callPackage ../build-support/deterministic-uname { };
-
   deterministic-host-uname = deterministic-uname.override {
     forPlatform = stdenv.targetPlatform; # offset by 1 so it works in nativeBuildInputs
   };
 
-  dfmt = callPackage ../tools/text/dfmt { };
-
-  diopser = callPackage ../applications/audio/diopser { };
-
-  diskonaut = callPackage ../tools/misc/diskonaut { };
-
   diskus = callPackage ../tools/misc/diskus {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  distrobox = callPackage ../applications/virtualization/distrobox { };
-
-  djmount = callPackage ../tools/filesystems/djmount { };
-
   dkimpy = with python3Packages; toPythonApplication dkimpy;
 
-  dl-librescore = callPackage ../tools/audio/dl-librescore { };
-
-  dontgo403 = callPackage ../tools/security/dontgo403 { };
-
-  dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { };
-
-  doona = callPackage ../tools/security/doona { };
-
-  droidcam = callPackage ../applications/video/droidcam { };
-
-  droidmote = callPackage ../tools/inputmethods/droidmote { };
-
-  eartag = callPackage ../applications/audio/eartag { };
-
-  ecdsautils = callPackage ../tools/security/ecdsautils { };
-
   echidna = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/security/echidna { });
 
-  sedutil = callPackage ../tools/security/sedutil { };
-
-  enchive = callPackage ../tools/security/enchive { };
-
-  enjarify = callPackage ../tools/misc/enjarify { };
-
-  enpass = callPackage ../tools/security/enpass { };
-
   esbuild = callPackage ../development/tools/esbuild { };
 
   esbuild_netlify = callPackage ../development/tools/esbuild/netlify.nix { };
 
-  essentia-extractor = callPackage ../tools/audio/essentia-extractor { };
-
-  esh = callPackage ../tools/text/esh { };
-
-  ezstream = callPackage ../tools/audio/ezstream { };
-
   libfx2 = with python3Packages; toPythonApplication fx2;
 
   fastmod = callPackage ../tools/text/fastmod {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  fedifetcher = callPackage ../tools/misc/fedifetcher { };
-
-  flavours = callPackage ../applications/misc/flavours { };
-
   flirc = libsForQt5.callPackage ../applications/video/flirc {
     readline = readline70;
   };
 
-  flood = callPackage ../applications/networking/p2p/flood { };
-
-  flood-for-transmission = callPackage ../applications/networking/p2p/flood-for-transmission { };
-
-  font-config-info = callPackage ../tools/misc/font-config-info { };
-
   foxdot = with python3Packages; toPythonApplication foxdot;
 
-  fspy = callPackage ../applications/misc/fspy { };
-
-  fluffychat = callPackage  ../applications/networking/instant-messengers/fluffychat { };
-
   fluffychat-web = fluffychat.override { targetFlutterPlatform = "web"; };
 
-  fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { };
-
   gbl = callPackage ../tools/archivers/gbl {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  genann = callPackage ../development/libraries/genann { };
-
   genpass = callPackage ../tools/security/genpass {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
 
-  genymotion = callPackage ../development/mobile/genymotion { };
-
-  galene = callPackage ../servers/web-apps/galene { };
-
-  galaxy-buds-client = callPackage ../applications/audio/galaxy-buds-client { };
-
-  gamecube-tools = callPackage ../development/tools/gamecube-tools { };
-
   gammaray = qt6Packages.callPackage ../development/tools/gammaray { };
 
   gams = callPackage ../tools/misc/gams (config.gams or {});
@@ -3533,59 +1926,21 @@ with pkgs;
     callPackage ../by-name/ga/gancio/plugins.nix { inherit (gancio) nodejs; }
   );
 
-  gem = callPackage ../applications/audio/pd-plugins/gem { };
-
   github-changelog-generator = callPackage ../development/tools/github-changelog-generator { };
 
-  github-commenter = callPackage ../development/tools/github-commenter { };
-
-  github-copilot-intellij-agent = callPackage ../development/tools/github-copilot-intellij-agent { };
-
   github-to-sqlite = with python3Packages; toPythonApplication github-to-sqlite;
 
   gistyc = with python3Packages; toPythonApplication gistyc;
 
-  gjs = callPackage ../development/libraries/gjs { };
-
-  gjo = callPackage ../tools/text/gjo { };
-
   glances = python3Packages.callPackage ../applications/system/glances { };
 
-  glasgow = callPackage ../tools/misc/glasgow { };
-
-  glasstty-ttf = callPackage ../data/fonts/glasstty-ttf { };
-
   glaxnimate = libsForQt5.callPackage ../applications/video/glaxnimate { };
 
-  gluesql = callPackage ../servers/sql/gluesql { };
-
-  gmni = callPackage ../applications/networking/browsers/gmni { };
-
-  gmnisrv = callPackage ../servers/gemini/gmnisrv { };
-
-  gmnitohtml = callPackage ../applications/misc/gmnitohtml { };
-
   go2tv = darwin.apple_sdk_11_0.callPackage ../applications/video/go2tv {
     inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa Kernel UserNotifications;
   };
   go2tv-lite = go2tv.override { withGui = false; };
 
-  go2rtc = callPackage ../tools/video/go2rtc { };
-
-  goimapnotify = callPackage ../tools/networking/goimapnotify { };
-
-  gojsontoyaml = callPackage ../development/tools/gojsontoyaml { };
-
-  gomatrix = callPackage ../applications/misc/gomatrix { };
-
-  gomapenum = callPackage ../tools/security/gomapenum { };
-
-  gopacked = callPackage ../applications/misc/gopacked { };
-
-  goperf = callPackage ../development/tools/goperf { };
-
-  gucci = callPackage ../tools/text/gucci { };
-
   guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { };
 
   grc = python3Packages.callPackage ../tools/misc/grc { };
@@ -3606,93 +1961,19 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  gcsfuse = callPackage ../tools/filesystems/gcsfuse { };
-
-  glyr = callPackage ../tools/audio/glyr { };
-
-  google-amber = callPackage ../tools/graphics/amber { };
-
-  hakrawler = callPackage ../tools/security/hakrawler { };
-
-  harsh = callPackage ../applications/misc/harsh { };
-
-  headset = callPackage ../applications/audio/headset { };
-
-  hilbish = callPackage ../shells/hilbish { };
-
-  hime = callPackage ../tools/inputmethods/hime { };
-
-  himitsu = callPackage ../tools/security/himitsu { };
-
-  himitsu-firefox = callPackage ../tools/security/himitsu-firefox { };
-
   hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit;
 
-  hostctl = callPackage ../tools/system/hostctl { };
-
-  hp2p = callPackage ../tools/networking/hp2p { };
-
-  hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { };
-
-  http2tcp = callPackage ../tools/networking/http2tcp { };
-
-  httperf = callPackage ../tools/networking/httperf { };
-
   hwi = with python3Packages; toPythonApplication hwi;
 
-  ili2c = callPackage ../tools/misc/ili2c { };
-
-  imagelol = callPackage ../tools/compression/imagelol { };
-
-  imgpatchtools = callPackage ../development/mobile/imgpatchtools { };
-
-  imgcrypt = callPackage ../applications/virtualization/imgcrypt { };
-
-  ipgrep = callPackage ../tools/networking/ipgrep { };
-
-  ipp-usb = callPackage ../os-specific/linux/ipp-usb { };
-
-  itchiodl = callPackage ../games/itchiodl { };
-
-  itd = callPackage ../applications/misc/itd { };
-
   kavita = callPackage ../servers/web-apps/kavita { };
 
-  keka = callPackage ../tools/compression/keka { };
-
-  kord = callPackage ../applications/misc/kord { };
-
-  lastpass-cli = callPackage ../tools/security/lastpass-cli { };
-
-  leetcode-cli = callPackage ../applications/misc/leetcode-cli { };
-
-  lesspass-cli = callPackage ../tools/security/lesspass-cli { };
-
   livebook = callPackage ../servers/web-apps/livebook {
     elixir = elixir_1_17;
     beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; });
   };
 
-  lsix = callPackage ../tools/graphics/lsix { };
-
-  mdr = callPackage ../tools/misc/mdr { };
-
-  mobilecoin-wallet = callPackage ../applications/misc/mobilecoin-wallet { };
-
-  pacparser = callPackage ../tools/networking/pacparser { };
-
-  pairdrop = callPackage ../applications/misc/pairdrop { };
-
-  opencbm = callPackage ../tools/misc/opencbm { };
-
-  parquet-tools = callPackage ../tools/misc/parquet-tools { };
-
   pass = callPackage ../tools/security/pass { };
 
-  passage = callPackage ../tools/security/passage { };
-
-  passphrase2pgp = callPackage ../tools/security/passphrase2pgp { };
-
   pass-nodmenu = callPackage ../tools/security/pass {
     dmenuSupport = false;
     pass = pass-nodmenu;
@@ -3705,16 +1986,10 @@ with pkgs;
 
   passExtensions = recurseIntoAttrs pass.extensions;
 
-  pbpctrl = callPackage ../applications/audio/pbpctrl { };
-
   inherd-quake = callPackage ../applications/misc/inherd-quake {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
 
-  xjadeo = callPackage ../tools/video/xjadeo { };
-
-  go-audit = callPackage ../tools/system/go-audit { };
-
   gopass = callPackage ../tools/security/gopass { };
 
   gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { };
@@ -3725,24 +2000,6 @@ with pkgs;
 
   gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { };
 
-  gosh = callPackage ../tools/security/gosh { };
-
-  gospider = callPackage ../tools/security/gospider { };
-
-  browserpass = callPackage ../tools/security/browserpass { };
-
-  passff-host = callPackage ../tools/security/passff-host { };
-
-  oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };
-
-  goku = callPackage ../os-specific/darwin/goku { };
-
-  grandperspective = callPackage ../os-specific/darwin/grandperspective { };
-
-  hexfiend = callPackage ../os-specific/darwin/hexfiend { };
-
-  grb = callPackage ../applications/misc/grb { };
-
   kerf   = kerf_1; /* kerf2 is WIP */
   kerf_1 = callPackage ../development/interpreters/kerf {
     stdenv = clangStdenv;
@@ -3751,10 +2008,6 @@ with pkgs;
     ;
   };
 
-  kwakd = callPackage ../servers/kwakd { };
-
-  kwm = callPackage ../os-specific/darwin/kwm { };
-
   khd = callPackage ../os-specific/darwin/khd {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };
@@ -3763,37 +2016,17 @@ with pkgs;
 
   lukesmithxyz-bible-kjv = callPackage ../applications/misc/kjv/lukesmithxyz-kjv.nix { };
 
-  luigi = callPackage ../applications/networking/cluster/luigi { };
-
-  m-cli = callPackage ../os-specific/darwin/m-cli { };
-
-  pebble = callPackage ../tools/admin/pebble { };
-
-  play-with-mpv = callPackage ../tools/video/play-with-mpv { };
-
   plausible = callPackage ../servers/web-apps/plausible {
     elixir = elixir_1_14;
     beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
   };
 
-  pam-reattach = callPackage ../os-specific/darwin/pam-reattach { };
-
   reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { };
 
   qes = callPackage ../os-specific/darwin/qes {
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
-  wgo = callPackage ../development/tools/wgo { };
-
-  wiiload = callPackage ../development/tools/wiiload { };
-
-  winhelpcgi = callPackage ../development/tools/winhelpcgi { };
-
-  wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { };
-
-  xc = callPackage ../development/tools/xc { };
-
   xcodeenv = callPackage ../development/mobile/xcodeenv { };
 
   xcodes = swiftPackages.callPackage ../development/tools/xcodes {
@@ -3803,34 +2036,12 @@ with pkgs;
 
   gomobile = callPackage ../development/mobile/gomobile { };
 
-  ssh-agents = callPackage ../tools/networking/ssh-agents { };
-
-  ssh-key-confirmer = callPackage ../tools/networking/ssh-key-confirmer { };
-
-  ssh-mitm = callPackage ../tools/security/ssh-mitm { };
-
-  sshchecker = callPackage ../tools/security/sshchecker { };
-
-  sshs = callPackage ../development/tools/sshs { };
-
-  supergfxctl = callPackage ../applications/system/supergfxctl { };
-
-  titanium = callPackage ../development/mobile/titanium { };
-
-  titanium-alloy = callPackage ../development/mobile/titanium-alloy { };
-
   titaniumenv = callPackage ../development/mobile/titaniumenv { };
 
-  abootimg = callPackage ../development/mobile/abootimg { };
-
-  adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { };
-
   adb-sync = callPackage ../development/mobile/adb-sync {
     inherit (androidenv.androidPkgs) platform-tools;
   };
 
-  amoco = callPackage ../tools/security/amoco { };
-
   anbox = callPackage ../os-specific/linux/anbox {
     protobuf = protobuf_21;
   };
@@ -3863,24 +2074,12 @@ with pkgs;
 
   apprise = with python3Packages; toPythonApplication apprise;
 
-  aptdec = callPackage ../development/libraries/aptdec { };
-
   aria2 = callPackage ../tools/networking/aria2 {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  as-tree = callPackage ../tools/misc/as-tree { };
-
-  asmfmt = callPackage ../development/tools/asmfmt { };
-
   asmrepl = callPackage ../development/interpreters/asmrepl { };
 
-  aspcud = callPackage ../tools/misc/aspcud { };
-
-  at = callPackage ../tools/system/at { };
-
-  atftp = callPackage ../tools/networking/atftp { };
-
   atlas = callPackage ../by-name/at/atlas/package.nix {
     buildGoModule = buildGo123Module;
   };
@@ -3889,92 +2088,34 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  autogen = callPackage ../development/tools/misc/autogen { };
-
-  autojump = callPackage ../tools/misc/autojump { };
-
-  automysqlbackup = callPackage ../tools/backup/automysqlbackup { };
-
-  autorandr = callPackage ../tools/misc/autorandr { };
-
   avahi = callPackage ../development/libraries/avahi { };
 
   avahi-compat = callPackage ../development/libraries/avahi {
     withLibdnssdCompat = true;
   };
 
-  avro-c = callPackage ../development/libraries/avro-c { };
-
-  avro-cpp = callPackage ../development/libraries/avro-c++ { };
-
-  aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { };
-
-  awsls = callPackage ../tools/admin/awsls { };
-
-  awsrm = callPackage ../tools/admin/awsrm { };
-
-  awstats = callPackage ../tools/system/awstats { };
-
-  awsweeper = callPackage ../tools/admin/awsweeper { };
-
   axel = callPackage ../tools/networking/axel {
     libssl = openssl;
   };
 
-  backblaze-b2 = callPackage ../development/tools/backblaze-b2 { };
-
   bandwhich = callPackage ../tools/networking/bandwhich {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  badrobot = callPackage ../tools/security/badrobot { };
-
-  bao = callPackage ../tools/security/bao { };
-
-  bar = callPackage ../tools/system/bar { };
-
   base16-builder = callPackage ../misc/base16-builder { };
 
-  basex = callPackage ../tools/text/xml/basex { };
-
-  bashplotlib = callPackage ../tools/misc/bashplotlib { };
-
-  babeld = callPackage ../tools/networking/babeld { };
-
   babelfish = callPackage ../shells/fish/babelfish.nix { };
 
-  baboossh = callPackage ../tools/security/baboossh { };
-
   badchars = python3Packages.callPackage ../tools/security/badchars { };
 
-  badvpn = callPackage ../tools/networking/badvpn { };
-
-  barcode = callPackage ../tools/graphics/barcode { };
-
-  bashmount = callPackage ../tools/filesystems/bashmount { };
-
   bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { });
 
-  beats = callPackage ../tools/misc/beats { };
-
   beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme {
     inherit (plasma5Packages) breeze-icons;
   };
 
   beautysh = with python3.pkgs; toPythonApplication beautysh;
 
-  bc = callPackage ../tools/misc/bc { };
-
-  bdf2psf = callPackage ../tools/misc/bdf2psf { };
-
-  bdf2sfd = callPackage ../tools/misc/bdf2sfd { };
-
-  bdfresize = callPackage ../tools/misc/bdfresize { };
-
-  bcache-tools = callPackage ../tools/filesystems/bcache-tools { };
-
-  bchunk = callPackage ../tools/cd-dvd/bchunk { };
-
   inherit (callPackages ../misc/logging/beats/7.x.nix { })
     auditbeat7
     filebeat7
@@ -3988,44 +2129,12 @@ with pkgs;
   metricbeat = metricbeat7;
   packetbeat = packetbeat7;
 
-  bfr = callPackage ../tools/misc/bfr { };
-
-  bfscripts = callPackage ../tools/misc/bfscripts { };
-
-  bibtool = callPackage ../tools/misc/bibtool { };
-
-  bibutils = callPackage ../tools/misc/bibutils { };
-
-  bibtex2html = callPackage ../tools/misc/bibtex2html { };
-
-  bicon = callPackage ../applications/misc/bicon { };
-
   biliass = with python3.pkgs; toPythonApplication biliass;
 
-  bindfs = callPackage ../tools/filesystems/bindfs { };
-
   binwalk = with python3Packages; toPythonApplication binwalk;
 
   birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };
 
-  blitz = callPackage ../development/libraries/blitz { };
-
-  blockbook = callPackage ../servers/blockbook { };
-
-  blockhash = callPackage ../tools/graphics/blockhash { };
-
-  bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
-
-  bluewalker = callPackage ../tools/bluetooth/bluewalker { };
-
-  blur-effect = callPackage ../tools/graphics/blur-effect { };
-
-  bootiso = callPackage ../tools/cd-dvd/bootiso { };
-
-  butane = callPackage ../development/tools/butane { };
-
-  buttercup-desktop = callPackage ../tools/security/buttercup-desktop { };
-
   charles = charles4;
   inherit (callPackages ../applications/networking/charles {})
     charles3
@@ -4042,120 +2151,38 @@ with pkgs;
 
   libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { };
 
-  tensorflow-lite = callPackage ../development/libraries/science/math/tensorflow-lite { };
-
-  tiny-cuda-nn = callPackage ../development/libraries/science/math/tiny-cuda-nn { };
-
-  tezos-rust-libs = callPackage ../development/libraries/tezos-rust-libs { };
-
   behave = with python3Packages; toPythonApplication behave;
 
-  behdad-fonts = callPackage ../data/fonts/behdad-fonts { };
-
-  bfetch = callPackage ../tools/misc/bfetch { };
-
   blink = darwin.apple_sdk_11_0.callPackage ../applications/emulators/blink { };
 
-  blink1-tool = callPackage ../tools/misc/blink1-tool { };
-
-  blis = callPackage ../development/libraries/science/math/blis { };
-
-  bliss = callPackage ../applications/science/math/bliss { };
-
-  blobfuse = callPackage ../tools/filesystems/blobfuse { };
-
   blockdiag = with python3Packages; toPythonApplication blockdiag;
 
-  bmon = callPackage ../tools/misc/bmon { };
-
-  boca = callPackage ../development/libraries/boca { };
-
-  bubblewrap = callPackage ../tools/admin/bubblewrap { };
-
-  borgbackup = callPackage ../tools/backup/borgbackup { };
-
-  borgmatic = callPackage ../tools/backup/borgmatic { };
-
-  borg-sans-mono = callPackage ../data/fonts/borg-sans-mono { };
-
-  boringtun = callPackage ../tools/networking/boringtun { };
-
-  book-summary = callPackage ../tools/text/book-summary { };
-
   bookstack = callPackage ../servers/web-apps/bookstack { };
 
   boomerang = libsForQt5.callPackage ../development/tools/boomerang { };
 
-  boost-build = callPackage ../development/tools/boost-build { };
-
-  boot = callPackage ../development/tools/build-managers/boot { };
-
-  bowtie = callPackage ../applications/science/biology/bowtie { };
-
-  bowtie2 = callPackage ../applications/science/biology/bowtie2 { };
-
-  boxfs = callPackage ../tools/filesystems/boxfs { };
-
   bozohttpd-minimal = bozohttpd.override { minimal = true; };
 
   brasero-unwrapped = callPackage ../tools/cd-dvd/brasero { };
 
   brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { };
 
-  brigand = callPackage ../development/libraries/brigand { };
-
-  brltty = callPackage ../tools/misc/brltty { };
-
-  brook = callPackage ../tools/networking/brook { };
-
   broot = callPackage ../tools/misc/broot {
     inherit (darwin.apple_sdk.frameworks) Foundation Security;
   };
 
-  bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };
-
-  brutespray = callPackage ../tools/security/brutespray { };
-
-  btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
-
-  btrfs-snap = callPackage ../tools/filesystems/btrfs-snap { };
-
   ssdfs-utils = callPackage ../tools/filesystems/ssdfs-utils { };
 
   btlejack = python3Packages.callPackage ../applications/radio/btlejack { };
 
-  btrbk = callPackage ../tools/backup/btrbk { };
-
-  bonk = callPackage ../tools/misc/bonk { };
-
-  bottom-rs = callPackage ../tools/misc/bottom-rs { };
-
-  bsp-layout = callPackage ../tools/misc/bsp-layout { };
-
-  buildtorrent = callPackage ../tools/misc/buildtorrent { };
-
-  bwm_ng = callPackage ../tools/networking/bwm-ng { };
-
-  bwbasic = callPackage ../development/interpreters/bwbasic { };
-
-  bws = callPackage ../tools/security/bws { };
-
   bsh = fetchurl {
     url = "http://www.beanshell.org/bsh-2.0b5.jar";
     hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw=";
   };
 
-  btfs = callPackage ../os-specific/linux/btfs { };
-
   buildah = callPackage ../development/tools/buildah/wrapper.nix { };
   buildah-unwrapped = callPackage ../development/tools/buildah { };
 
-  buildkit = callPackage ../development/tools/buildkit { };
-
-  bukubrow = callPackage ../tools/networking/bukubrow { };
-
-  burpsuite = callPackage ../tools/networking/burpsuite { };
-
   c3d = callPackage ../applications/graphics/c3d {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
@@ -4181,30 +2208,16 @@ with pkgs;
     '';
   });
 
-  traefik = callPackage ../servers/traefik { };
-
-  traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { };
-
-  caffeine = callPackage ../tools/misc/caffeine { };
-
   calamares = libsForQt5.callPackage ../tools/misc/calamares {
     python = python3;
     boost = boost.override { enablePython = true; python = python3; };
   };
   calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; });
-  calamares-nixos-extensions = callPackage ../tools/misc/calamares-nixos-extensions { };
-
-  calendar-cli = callPackage ../tools/networking/calendar-cli { };
-
-  cameradar = callPackage ../tools/security/cameradar { };
-
   candle = libsForQt5.callPackage ../applications/misc/candle { };
 
   capstone = callPackage ../development/libraries/capstone { };
   capstone_4 = callPackage ../development/libraries/capstone/4.nix { };
 
-  keystone = callPackage ../development/libraries/keystone { };
-
   casync = callPackage ../applications/networking/sync/casync {
     sphinx = buildPackages.python3Packages.sphinx;
   };
@@ -4212,74 +2225,26 @@ with pkgs;
   cataract          = callPackage ../applications/misc/cataract { };
   cataract-unstable = callPackage ../applications/misc/cataract/unstable.nix { };
 
-  catch = callPackage ../development/libraries/catch { };
-
   catch2 = callPackage ../development/libraries/catch2 { };
 
   catch2_3 = callPackage ../development/libraries/catch2/3.nix { };
 
-  catdoc = callPackage ../tools/text/catdoc { };
-
-  catdocx = callPackage ../tools/text/catdocx { };
-
-  catclock = callPackage ../applications/misc/catclock { };
-
   cardpeek = callPackage ../applications/misc/cardpeek { inherit (darwin.apple_sdk.frameworks) PCSC; };
 
-  cde = callPackage ../tools/package-management/cde { };
-
-  cdxgen = callPackage ../tools/security/cdxgen { };
-
   ceres-solver = callPackage ../development/libraries/ceres-solver {
     gflags = null; # only required for examples/tests
   };
 
-  cassowary = callPackage ../tools/networking/cassowary { };
-
-  croc = callPackage ../tools/networking/croc { };
-
   cedille = callPackage ../applications/science/logic/cedille
                           { inherit (haskellPackages) alex happy Agda ghcWithPackages;
                           };
 
-  cel-go = callPackage ../development/interpreters/cel-go { };
-
-  cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { };
-
-  cf-terraforming = callPackage ../tools/misc/cf-terraforming { };
-
-  charliecloud = callPackage ../applications/virtualization/charliecloud { };
-
-  chelf = callPackage ../tools/misc/chelf { };
-
-  chisel = callPackage ../tools/networking/chisel { };
-
-  cht-sh = callPackage ../tools/misc/cht.sh { };
-
-  ckbcomp = callPackage ../tools/X11/ckbcomp { };
-
-  clac = callPackage ../tools/misc/clac { };
-
-  map-cmd = callPackage ../tools/misc/map { };
-
   clevercsv = with python3Packages; toPythonApplication clevercsv;
 
-  cli53 = callPackage ../tools/admin/cli53 { };
-
-  cli-visualizer = callPackage ../applications/misc/cli-visualizer { };
-
-  cliam = callPackage ../tools/security/cliam { };
-
-  clickclack = callPackage ../tools/misc/clickclack { };
-
   clickgen = with python3Packages; toPythonApplication clickgen;
 
-  clog-cli = callPackage ../development/tools/clog-cli { };
-
   cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { inherit systemd; };
 
-  cloudbrute = callPackage ../tools/security/cloudbrute { };
-
   cloudflared = callPackage ../applications/networking/cloudflared {
     # https://github.com/cloudflare/cloudflared/issues/1151#issuecomment-1888819250
     buildGoModule = buildGoModule.override {
@@ -4296,46 +2261,24 @@ with pkgs;
     };
   };
 
-  cloudflare-dyndns = callPackage ../applications/networking/cloudflare-dyndns { };
-
-  cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { };
-
-  clib = callPackage ../tools/package-management/clib { };
-
   clingo = callPackage ../applications/science/logic/potassco/clingo.nix { };
 
   clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { };
 
   clprover = callPackage ../applications/science/logic/clprover/clprover.nix { };
 
-  clusterctl = callPackage ../applications/networking/cluster/clusterctl { };
-
   coloredlogs = with python3Packages; toPythonApplication coloredlogs;
 
-  colpack = callPackage ../applications/science/math/colpack { };
-
-  cz-cli = callPackage ../applications/version-management/cz-cli { };
-
   czkawka-full = czkawka.wrapper.override {
     extraPackages = [ ffmpeg ];
   };
 
-  comma = callPackage ../tools/package-management/comma { };
-
   commitizen = with python3Packages; toPythonApplication commitizen;
 
-  common-licenses = callPackage ../data/misc/common-licenses { };
-
   compactor = callPackage ../applications/networking/compactor {
     protobuf = protobuf_21;
   };
 
-  consul-alerts = callPackage ../servers/monitoring/consul-alerts { };
-
-  consul-template = callPackage ../tools/system/consul-template { };
-
-  copyright-update = callPackage ../tools/text/copyright-update { };
-
   inherit (callPackages ../tools/misc/coreboot-utils { })
     msrtool
     cbmem
@@ -4352,116 +2295,16 @@ with pkgs;
 
   coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { };
 
-  corosync = callPackage ../servers/corosync { };
-
-  fw-ectool = callPackage ../os-specific/linux/fw-ectool { };
-
-  chayang = callPackage ../tools/wayland/chayang { };
-
-  cherrytree = callPackage ../applications/misc/cherrytree { };
-
-  chntpw = callPackage ../tools/security/chntpw { };
-
-  chopchop = callPackage ../tools/security/chopchop { };
-
-  clapboard = callPackage ../tools/wayland/clapboard { };
-
-  clipman = callPackage ../tools/wayland/clipman { };
-
-  kabeljau = callPackage ../games/kabeljau { };
-
-  kanshi = callPackage ../tools/wayland/kanshi { };
-
-  shikane = callPackage ../tools/wayland/shikane { };
-
-  shotman = callPackage ../tools/wayland/shotman { };
-
   sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix {
     wlroots = wlroots_0_18;
   };
 
-  swayr = callPackage ../tools/wayland/swayr { };
-
-  swayrbar = callPackage ../tools/wayland/swayrbar { };
-
-  swaysome = callPackage ../tools/wayland/swaysome { };
-
   swaytools = python3Packages.callPackage ../tools/wayland/swaytools { };
 
-  wayland-utils = callPackage ../tools/wayland/wayland-utils { };
-
-  wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { };
-
-  waylogout = callPackage ../tools/wayland/waylogout { };
-
-  waynergy = callPackage ../tools/wayland/waynergy { };
-
-  wayout = callPackage ../tools/wayland/wayout { };
-
-  way-displays = callPackage ../tools/wayland/way-displays { };
-
-  wev = callPackage ../tools/wayland/wev { };
-
-  wdomirror = callPackage ../tools/wayland/wdomirror { };
-
-  wdt = callPackage ../applications/networking/sync/wdt { };
-
-  wl-clipboard = callPackage ../tools/wayland/wl-clipboard { };
-
-  wl-clipboard-x11 = callPackage ../tools/wayland/wl-clipboard-x11 { };
-
-  wl-color-picker = callPackage ../tools/wayland/wl-color-picker { };
-
-  wl-mirror = callPackage ../tools/wayland/wl-mirror { };
-
-  wl-screenrec = callPackage ../tools/wayland/wl-screenrec { };
-
-  wleave = callPackage ../tools/wayland/wleave { };
-
-  wlopm = callPackage ../tools/wayland/wlopm { };
-
-  wlprop = callPackage ../tools/wayland/wlprop { };
-
-  wlr-randr = callPackage ../tools/wayland/wlr-randr { };
-
-  wlr-which-key = callPackage ../tools/wayland/wlr-which-key { };
-
-  wlrctl = callPackage ../tools/wayland/wlrctl { };
-
-  wlsunset = callPackage ../tools/wayland/wlsunset { };
-
-  wl-gammactl = callPackage ../tools/wayland/wl-gammactl { };
-
-  wluma = callPackage ../tools/wayland/wluma {  };
-
-  wob = callPackage ../tools/wayland/wob { };
-
-  wshowkeys = callPackage ../tools/wayland/wshowkeys { };
-
-  wtype = callPackage ../tools/wayland/wtype { };
-
-  cambalache = callPackage ../development/tools/cambalache { };
-
   cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };
 
-  changedetection-io = callPackage ../servers/web-apps/changedetection-io { };
-
-  clini = callPackage ../tools/misc/clini { };
-
-  clipster = callPackage ../tools/misc/clipster { };
-
-  clockify = callPackage ../applications/office/clockify { };
-
   cplex = callPackage ../applications/science/math/cplex (config.cplex or {});
 
-  cpulimit = callPackage ../tools/misc/cpulimit { };
-
-  code-minimap = callPackage ../tools/misc/code-minimap { };
-
-  codesearch = callPackage ../tools/text/codesearch { };
-
-  codec2 = callPackage ../development/libraries/codec2 { };
-
   contacts = callPackage ../tools/misc/contacts {
     inherit (darwin.apple_sdk.frameworks) Foundation AddressBook;
   };
@@ -4472,138 +2315,30 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  compsize = callPackage ../os-specific/linux/compsize { };
-
-  comrak = callPackage ../tools/text/comrak { };
-
   cot = with python3Packages; toPythonApplication cot;
 
-  coturn = callPackage ../servers/coturn { };
-
-  coursier = callPackage ../development/tools/coursier { };
-
-  cppclean = callPackage ../development/tools/cppclean { };
-
-  credhub-cli = callPackage ../tools/admin/credhub-cli { };
-
-  crex = callPackage ../tools/misc/crex { };
-
-  cri-tools = callPackage ../tools/virtualization/cri-tools { };
-
-  crip = callPackage ../applications/audio/crip { };
-
   crosvm = callPackage ../applications/virtualization/crosvm { };
 
   crossplane = with python3Packages; toPythonApplication crossplane;
 
-  crowdsec = callPackage ../tools/security/crowdsec { };
-
-  crunch = callPackage ../tools/security/crunch { };
-
-  crudini = callPackage ../tools/misc/crudini { };
-
   csv2md = with python3Packages; toPythonApplication csv2md;
 
-  csv2odf = callPackage ../applications/office/csv2odf { };
-
-  csv2parquet = callPackage ../tools/misc/csv2parquet { };
-
-  csvdiff = callPackage ../tools/text/csvdiff { };
-
-  csview = callPackage ../tools/text/csview { };
-
-  csvquote = callPackage ../tools/text/csvquote { };
-
   csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { };
 
-  csv2latex = callPackage ../tools/misc/csv2latex { };
-
-  csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { };
-
   cutemarked-ng = libsForQt5.callPackage ../applications/office/cutemarked-ng { };
 
-  dab_lib = callPackage ../development/libraries/dab_lib { };
-
-  dabet = callPackage ../tools/misc/dabet { };
-
-  dabtools = callPackage ../applications/radio/dabtools { };
-
-  daemontools = callPackage ../tools/admin/daemontools { };
-
-  dale = callPackage ../development/compilers/dale { };
-
-  damon = callPackage ../tools/admin/damon { };
-
-  dancing-script = callPackage ../data/fonts/dancing-script { };
-
-  dante = callPackage ../servers/dante { };
-
-  dasel = callPackage ../applications/misc/dasel { };
-
-  dasher = callPackage ../applications/accessibility/dasher { };
-
   dataclass-wizard = with python3Packages; toPythonApplication dataclass-wizard;
 
-  datafusion-cli = callPackage ../development/misc/datafusion { };
-
-  datamash = callPackage ../tools/misc/datamash { };
-
   datasette = with python3Packages; toPythonApplication datasette;
 
-  howard-hinnant-date = callPackage ../development/libraries/howard-hinnant-date { };
-
-  datefmt = callPackage ../tools/misc/datefmt { };
-
-  datefudge = callPackage ../tools/system/datefudge { };
-
-  dateutils = callPackage ../tools/misc/dateutils { };
-
   datovka = libsForQt5.callPackage ../applications/networking/datovka { };
 
-  dave = callPackage ../servers/http/dave { };
-
-  dconf = callPackage ../development/libraries/dconf { };
-
-  ddate = callPackage ../tools/misc/ddate { };
-
-  ddosify = callPackage ../development/tools/ddosify { };
-
-  dduper = callPackage ../tools/filesystems/dduper { };
-
-  dedup = callPackage ../tools/backup/dedup { };
-
-  deheader = callPackage ../development/tools/misc/deheader { };
-
-  dehydrated = callPackage ../tools/admin/dehydrated { };
-
-  deja-dup = callPackage ../applications/backup/deja-dup { };
-
-  dejsonlz4 = callPackage ../tools/compression/dejsonlz4 { };
-
-  desync = callPackage ../applications/networking/sync/desync { };
-
-  devdocs-desktop = callPackage ../applications/misc/devdocs-desktop { };
-
-  devmem2 = callPackage ../os-specific/linux/devmem2 { };
-
-  dbus-broker = callPackage ../os-specific/linux/dbus-broker { };
-
-  dblab = callPackage ../development/tools/database/dblab { };
-
-  dbx = callPackage ../applications/misc/dbx { };
-
-  ioport = callPackage ../os-specific/linux/ioport { };
-
   diagrams-builder = callPackage ../tools/graphics/diagrams-builder {
     inherit (haskellPackages) ghcWithPackages diagrams-builder;
   };
 
   dialogbox = libsForQt5.callPackage ../tools/misc/dialogbox { };
 
-  dieharder = callPackage ../tools/security/dieharder { };
-
-  digitemp = callPackage ../tools/misc/digitemp { };
-
   dijo = callPackage ../tools/misc/dijo {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -4613,92 +2348,34 @@ with pkgs;
     aspellDicts_en = aspellDicts.en;
   };
 
-  dirb = callPackage ../tools/networking/dirb { };
-
-  dirstalk = callPackage ../tools/security/dirstalk { };
-
   h = callPackage ../tools/misc/h { };
 
-  discount = callPackage ../tools/text/discount { };
-
   discourse = callPackage ../servers/web-apps/discourse { };
 
   discourseAllPlugins = discourse.override {
     plugins = lib.filter (p: p ? pluginName) (builtins.attrValues discourse.plugins);
   };
 
-  discourse-mail-receiver = callPackage ../servers/web-apps/discourse/mail_receiver { };
-
-  discocss = callPackage ../tools/misc/discocss { };
-
-  disfetch = callPackage ../tools/misc/disfetch { };
-
-  disk-inventory-x = callPackage ../tools/filesystems/disk-inventory-x { };
-
-  diskscan = callPackage ../tools/misc/diskscan { };
-
   disorderfs = callPackage ../tools/filesystems/disorderfs {
     asciidoc = asciidoc-full;
   };
 
-  dislocker = callPackage ../tools/filesystems/dislocker { };
-
-  distgen = callPackage ../development/tools/distgen { };
-
-  distrobuilder = callPackage ../tools/virtualization/distrobuilder { };
-
-  ditaa = callPackage ../tools/graphics/ditaa { };
-
   dino = callPackage ../applications/networking/instant-messengers/dino {
     inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad gst-vaapi;
     gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
   };
 
-  djot-js = callPackage ../tools/text/djot-js { };
-
-  djv = callPackage ../applications/graphics/djv { };
-
   dnschef = python3Packages.callPackage ../tools/networking/dnschef { };
 
-  doitlive = callPackage ../tools/misc/doitlive { };
-
-  dokuwiki = callPackage ../servers/web-apps/dokuwiki { };
-
-  dolibarr = callPackage ../servers/web-apps/dolibarr { };
-
-  dosage = callPackage ../applications/graphics/dosage { };
-
   dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  dotool = callPackage ../tools/dotool { };
-
   inherit (ocamlPackages) dot-merlin-reader;
 
-  dozenal = callPackage ../applications/misc/dozenal { };
-
-  dpic = callPackage ../tools/graphics/dpic { };
-
-  dsdcc = callPackage ../development/libraries/dsdcc { };
-
-  dstp = callPackage ../development/tools/dstp { };
-
-  dsvpn = callPackage ../applications/networking/dsvpn { };
-
-  dwt1-shell-color-scripts = callPackage ../tools/misc/dwt1-shell-color-scripts { };
-
-  dtrx = callPackage ../tools/compression/dtrx { };
-
-  duf = callPackage ../tools/misc/duf { };
-
-  dum = callPackage ../development/tools/dum { };
-
   inherit (ocaml-ng.ocamlPackages_4_10) dune_1;
   inherit (ocamlPackages) dune_2 dune_3 dune-release;
 
-  duperemove = callPackage ../tools/filesystems/duperemove { };
-
   dvc = with python3.pkgs; toPythonApplication dvc;
 
   dvc-with-remotes = dvc.override {
@@ -4708,18 +2385,6 @@ with pkgs;
     enableSSH = true;
   };
 
-  dynamic-colors = callPackage ../tools/misc/dynamic-colors { };
-
-  dynamic-wallpaper = callPackage ../tools/graphics/dynamic-wallpaper { };
-
-  dyncall = callPackage ../development/libraries/dyncall { };
-
-  dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { };
-
-  earthly = callPackage ../development/tools/earthly { };
-
-  earlybird = callPackage ../tools/security/earlybird { };
-
   easyabc = callPackage ../applications/audio/easyabc { };
 
   easyaudiosync = qt6Packages.callPackage ../applications/audio/easyaudiosync {};
@@ -4732,26 +2397,10 @@ with pkgs;
 
   easyocr = with python3.pkgs; toPythonApplication easyocr;
 
-  ecasound = callPackage ../applications/audio/ecasound { };
-
-  edac-utils = callPackage ../os-specific/linux/edac-utils { };
-
   eddy = libsForQt5.callPackage ../applications/graphics/eddy { };
 
-  eggdrop = callPackage ../tools/networking/eggdrop { };
-
-  egglog = callPackage ../applications/science/logic/egglog { };
-
-  ego = callPackage ../tools/misc/ego { };
-
-  ekam = callPackage ../development/tools/build-managers/ekam { };
-
   electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { };
 
-  electron-mail = callPackage ../applications/networking/mailreaders/electron-mail { };
-
-  element = callPackage ../applications/science/chemistry/element { };
-
   element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix {
     inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices;
     electron = electron_32;
@@ -4767,39 +2416,8 @@ with pkgs;
     conf = config.element-web.conf or { };
   };
 
-  elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { };
-
-  ell = callPackage ../os-specific/linux/ell { };
-
   elm-github-install = callPackage ../tools/package-management/elm-github-install { };
 
-  elogind = callPackage ../applications/misc/elogind { };
-
-  elpa = callPackage ../development/libraries/elpa { };
-
-  enca = callPackage ../tools/text/enca { };
-
-  encpipe = callPackage ../tools/misc/encpipe { };
-
-  ent = callPackage ../tools/misc/ent { };
-
-  entwine = callPackage ../applications/graphics/entwine { };
-
-  envconsul = callPackage ../tools/system/envconsul { };
-
-  envsubst = callPackage ../tools/misc/envsubst { };
-
-  envfs = callPackage ../tools/filesystems/envfs { };
-
-  er-patcher = callPackage ../tools/games/er-patcher { };
-
-  erdtree = callPackage ../tools/system/erdtree { };
-
-  errcheck = callPackage ../development/tools/errcheck { };
-
-  eschalot = callPackage ../tools/security/eschalot { };
-
-  espanso = callPackage ../applications/office/espanso { };
   espanso-wayland = espanso.override {
     x11Support = false;
     waylandSupport = true;
@@ -4808,138 +2426,44 @@ with pkgs;
 
   esphome = callPackage ../tools/misc/esphome { };
 
-  esptool = callPackage ../tools/misc/esptool { };
-
-  esptool-ck = callPackage ../tools/misc/esptool-ck { };
-
-  ephemeralpg = callPackage ../development/tools/database/ephemeralpg { };
-
-  et = callPackage ../applications/misc/et { };
-
-  ejson = callPackage ../development/tools/ejson { };
-
-  eternal-terminal = callPackage ../tools/networking/eternal-terminal { };
-
-  extism-cli = callPackage ../development/tools/extism-cli { };
-
-  extrude = callPackage ../tools/security/extrude { };
-
   fastly = callPackage ../misc/fastly {
     # If buildGoModule is overridden, provide a matching version of the go attribute
   };
 
-  f2 = callPackage ../tools/misc/f2 { };
-
-  f3 = callPackage ../tools/filesystems/f3 { };
-
   f3d = callPackage ../applications/graphics/f3d {
     inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
   };
 
   f3d_egl = f3d.override { vtk_9 = vtk_9_egl; };
 
-  facedetect = callPackage ../tools/graphics/facedetect { };
-
-  faketty = callPackage ../tools/misc/faketty { };
-
-  fasd = callPackage ../tools/misc/fasd { };
-
-  fastJson = callPackage ../development/libraries/fastjson { };
-
   fast-cli = nodePackages.fast-cli;
 
-  fast-cpp-csv-parser = callPackage ../development/libraries/fast-cpp-csv-parser { };
-
   fast-ssh = callPackage ../tools/networking/fast-ssh {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  faudio = callPackage ../development/libraries/faudio { };
-
-  fblog = callPackage ../development/tools/fblog { };
-
-  fd = callPackage ../tools/misc/fd { };
-
   fdroidcl = pkgs.callPackage ../development/mobile/fdroidcl { };
 
   fedimint = callPackage ../by-name/fe/fedimint/package.nix {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  fetch-scm = callPackage ../tools/misc/fetch-scm { };
-
-  fiano = callPackage ../tools/misc/fiano { };
-
-  filebench = callPackage ../tools/misc/filebench { };
-
-  fileshare = callPackage ../servers/fileshare { };
-
-  fileshelter = callPackage ../servers/web-apps/fileshelter { };
-
-  fioctl = callPackage ../tools/admin/fioctl { };
-
-  firectl = callPackage ../applications/virtualization/firectl { };
-
-  firestarter = callPackage ../applications/misc/firestarter { };
-
-  fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { };
-
-  flitter = callPackage ../tools/misc/flitter { };
-
   flowgger = callPackage ../tools/misc/flowgger {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  frangipanni = callPackage ../tools/text/frangipanni { };
-
-  frawk = callPackage ../tools/text/frawk { };
-
-  fre = callPackage ../tools/misc/fre { };
-
-  frei = callPackage ../tools/misc/frei { };
-
-  frogmouth = callPackage ../tools/text/frogmouth { };
-
-  fselect = callPackage ../tools/misc/fselect { };
-
-  fsmon = callPackage ../tools/misc/fsmon { };
-
-  fst = callPackage ../tools/text/fst { };
-
-  fsql = callPackage ../tools/misc/fsql { };
-
-  kitty-img = callPackage ../tools/misc/kitty-img { };
-
   ### TOOLS/TYPESETTING/TEX
 
   advi = callPackage ../tools/typesetting/tex/advi {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  auctex = callPackage ../tools/typesetting/tex/auctex { };
-
-  blahtexml = callPackage ../tools/typesetting/tex/blahtexml { };
-
-  catdvi = callPackage ../tools/typesetting/tex/catdvi { };
-
-  dblatex = callPackage ../tools/typesetting/tex/dblatex { };
-
   dblatexFull = dblatex.override { enableAllFeatures = true; };
 
-  gladtex = callPackage ../tools/typesetting/tex/gladtex { };
-
   latex2mathml = with python3Packages; toPythonApplication latex2mathml;
 
-  latexrun = callPackage ../tools/typesetting/tex/latexrun { };
-
-  lkproof = callPackage ../tools/typesetting/tex/lkproof { };
-
-  mftrace = callPackage ../tools/typesetting/tex/mftrace { };
-
   pgf = pgf2;
 
-  pplatex = callPackage ../tools/typesetting/tex/pplatex { };
-
   tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
 
   texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
@@ -4949,63 +2473,22 @@ with pkgs;
   inherit (texlive.schemes) texliveBasic texliveBookPub texliveConTeXt texliveFull texliveGUST texliveInfraOnly texliveMedium texliveMinimal texliveSmall texliveTeTeX;
   texlivePackages = recurseIntoAttrs (lib.mapAttrs (_: v: v.build) texlive.pkgs);
 
-  fop = callPackage ../tools/typesetting/fop { };
-
   fondu = callPackage ../tools/misc/fondu {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  fpp = callPackage ../tools/misc/fpp { };
-
-  fsmark = callPackage ../tools/misc/fsmark { };
-
   futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark;
 
-  fcft = callPackage ../development/libraries/fcft { };
-
-  fuzzel = callPackage ../applications/misc/fuzzel { };
-
-  fuzzylite = callPackage ../development/libraries/fuzzylite { };
-
-  flashfocus = callPackage ../misc/flashfocus { };
-
   qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { };
 
   fwup = callPackage ../tools/misc/fwup {
     inherit (darwin.apple_sdk.frameworks) DiskArbitration;
   };
 
-  fx-cast-bridge = callPackage ../tools/misc/fx-cast-bridge { };
-
-  fzf-obc = callPackage ../shells/bash/fzf-obc { };
-
-  fzf-zsh = callPackage ../shells/zsh/fzf-zsh { };
-
-  fzy = callPackage ../tools/misc/fzy { };
-
   g2o = libsForQt5.callPackage ../development/libraries/g2o { };
 
-  gb-backup = callPackage ../tools/backup/gamerbackup { };
-
-  gdrive = callPackage ../applications/networking/gdrive { };
-
-  gdrive3 = callPackage ../applications/networking/gdrive3 { };
-
-  gdu = callPackage ../tools/system/gdu { };
-
-  gfxreconstruct = callPackage ../tools/graphics/gfxreconstruct { };
-
-  go-containerregistry = callPackage ../development/tools/go-containerregistry { };
   inherit (go-containerregistry) crane gcrane;
 
-  go-rice = callPackage ../tools/misc/go.rice { };
-
-  go-2fa = callPackage ../tools/security/2fa { };
-
-  go-neb = callPackage ../applications/networking/instant-messengers/go-neb { };
-
-  google-cursor = callPackage ../data/icons/google-cursor { };
-
   geckodriver = callPackage ../development/tools/geckodriver {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -5015,16 +2498,6 @@ with pkgs;
   geekbench_6 = callPackage ../tools/misc/geekbench/6.nix { };
   geekbench = geekbench_6;
 
-  gencfsm = callPackage ../tools/security/gencfsm { };
-
-  genromfs = callPackage ../tools/filesystems/genromfs { };
-
-  gh-ost = callPackage ../tools/misc/gh-ost { };
-
-  ghauri = callPackage ../tools/security/ghauri { };
-
-  ghdorker = callPackage ../tools/security/ghdorker { };
-
   ghidra = darwin.apple_sdk_11_0.callPackage ../tools/security/ghidra/build.nix {
     protobuf = protobuf_21;
   };
@@ -5033,26 +2506,6 @@ with pkgs;
 
   ghidra-bin = callPackage ../tools/security/ghidra { };
 
-  gh2md = callPackage ../tools/backup/gh2md { };
-
-  gif-for-cli = callPackage ../tools/misc/gif-for-cli { };
-
-  giph = callPackage ../applications/video/giph { };
-
-  gir-rs = callPackage ../development/tools/gir { };
-
-  girsh = callPackage ../tools/networking/girsh { };
-
-  gitjacker = callPackage ../tools/security/gitjacker { };
-
-  gixy = callPackage ../tools/admin/gixy { };
-
-  glpaper = callPackage ../development/tools/glpaper { };
-
-  gllvm = callPackage ../development/tools/gllvm { };
-
-  globalarrays = callPackage ../development/libraries/globalarrays { };
-
   glslviewer = callPackage ../development/tools/glslviewer {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
@@ -5062,24 +2515,6 @@ with pkgs;
     inherit (darwin) libobjc libresolv;
   };
 
-  goa = callPackage ../development/tools/goa { };
-
-  goawk = callPackage ../tools/text/goawk { };
-
-  gohai = callPackage ../tools/system/gohai { };
-
-  gorilla-bin = callPackage ../tools/security/gorilla-bin { };
-
-  gorilla-cli = callPackage ../tools/llm/gorilla-cli { };
-
-  godu = callPackage ../tools/misc/godu { };
-
-  gosu = callPackage ../tools/misc/gosu { };
-
-  gotify-cli = callPackage ../tools/misc/gotify-cli { };
-
-  gotify-desktop = callPackage ../tools/misc/gotify-desktop { };
-
   gping = callPackage ../tools/networking/gping {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -5088,42 +2523,10 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  grit = callPackage ../tools/misc/grit { };
-
-  grobi = callPackage ../tools/X11/grobi { };
-
   grype = callPackage ../by-name/gr/grype/package.nix {
     buildGoModule = buildGo123Module;
   };
 
-  gsctl = callPackage ../applications/misc/gsctl { };
-
-  gsocket = callPackage ../tools/networking/gsocket { };
-
-  gthree = callPackage ../development/libraries/gthree { };
-
-  gtg = callPackage ../applications/office/gtg { };
-
-  gti = callPackage ../tools/misc/gti { };
-
-  has = callPackage ../applications/misc/has { };
-
-  hdate = callPackage ../applications/misc/hdate { };
-
-  headache = callPackage ../development/tools/headache { };
-
-  heatseeker = callPackage ../tools/misc/heatseeker { };
-
-  hebcal = callPackage ../tools/misc/hebcal { };
-
-  hexio = callPackage ../development/tools/hexio { };
-
-  hid-listen = callPackage ../tools/misc/hid-listen { };
-
-  hid-tools = callPackage ../tools/misc/hid-tools { };
-
-  hidrd = callPackage ../tools/misc/hidrd { };
-
   hiksink = callPackage ../tools/misc/hiksink {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -5134,16 +2537,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  hostsblock = callPackage ../tools/misc/hostsblock { };
-
   hopper = qt5.callPackage ../development/tools/analysis/hopper { };
 
-  hr = callPackage ../applications/misc/hr { };
-
-  huniq = callPackage ../tools/text/huniq { };
-
-  hunt = callPackage ../tools/misc/hunt { };
-
   hypr = callPackage ../applications/window-managers/hyprwm/hypr {
     cairo = cairo.override { xcbSupport = true; };  };
 
@@ -5151,16 +2546,6 @@ with pkgs;
     stdenv = gcc14Stdenv;
   };
 
-  hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { };
-
-  hyprland-per-window-layout = callPackage ../tools/wayland/hyprland-per-window-layout { };
-
-  hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { };
-
-  hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
-
-  hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { };
-
   hyprpolkitagent = callPackage ../by-name/hy/hyprpolkitagent/package.nix {
     stdenv = gcc14Stdenv;
   };
@@ -5169,40 +2554,8 @@ with pkgs;
 
   hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland-plugins { });
 
-  hysteria = callPackage ../tools/networking/hysteria { };
-
-  hyx = callPackage ../tools/text/hyx { };
-
-  icdiff = callPackage ../tools/text/icdiff { };
-
-  ictree = callPackage ../tools/misc/ictree { };
-
-  inchi = callPackage ../development/libraries/inchi { };
-
-  icon-slicer = callPackage ../tools/X11/icon-slicer { };
-
-  ifm = callPackage ../tools/graphics/ifm { };
-
-  ink = callPackage ../tools/misc/ink { };
-
-  inklecate = callPackage ../development/compilers/inklecate { };
-
   intensity-normalization = with python3Packages; toPythonApplication intensity-normalization;
 
-  interactsh = callPackage ../tools/misc/interactsh { };
-
-  interlock = callPackage ../servers/interlock { };
-
-  invoice = callPackage ../tools/misc/invoice { };
-
-  invoiceplane = callPackage ../servers/web-apps/invoiceplane { };
-
-  iotas = callPackage ../applications/office/iotas { };
-
-  jellycli = callPackage ../applications/audio/jellycli { };
-
-  jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { };
-
   jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
   };
@@ -5211,40 +2564,18 @@ with pkgs;
 
   jellyseerr = callPackage ../servers/jellyseerr { };
 
-  jiten = callPackage ../applications/misc/jiten { };
-
-  kanjidraw = callPackage ../applications/misc/kanjidraw { };
-
-  jotta-cli = callPackage ../applications/misc/jotta-cli { };
-
-  joycond = callPackage ../os-specific/linux/joycond { };
-
-  joystickwake = callPackage ../tools/games/joystickwake { };
-
   juce = callPackage ../development/misc/juce {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
   };
 
-  jumppad = callPackage ../tools/virtualization/jumppad { };
-
   jwt-cli = callPackage ../tools/security/jwt-cli {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  jwt-hack = callPackage ../tools/security/jwt-hack { } ;
-
-  jwx = callPackage ../tools/security/jwx { } ;
-
-  karma = callPackage ../servers/monitoring/karma { };
-
   kaldi = callPackage ../tools/audio/kaldi {
     inherit (darwin.apple_sdk.frameworks) Accelerate;
   };
 
-  kalker = callPackage ../tools/misc/kalker { };
-
-  kisslicer = callPackage ../tools/misc/kisslicer { };
-
   klaus = with python3Packages; toPythonApplication klaus;
 
   klipper = callPackage ../servers/klipper { };
@@ -5259,18 +2590,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  klipperscreen = callPackage ../applications/misc/klipperscreen { };
-
   klog = qt5.callPackage ../applications/radio/klog { };
 
-  komga = callPackage ../servers/komga { };
-
-  komorebi = callPackage ../applications/graphics/komorebi { };
-
-  konsave = callPackage ../applications/misc/konsave { };
-
-  krapslog = callPackage ../tools/misc/krapslog { };
-
   krill = callPackage ../servers/krill {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -5280,107 +2601,33 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security CoreServices ApplicationServices Carbon AppKit;
   };
 
-  lcdproc = callPackage ../servers/monitoring/lcdproc { };
-
-  languagetool = callPackage ../tools/text/languagetool {  };
-
   languagetool-rust = callPackage ../tools/text/languagetool-rust {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  ldtk = callPackage ../applications/editors/ldtk { };
-
-  lepton = callPackage ../tools/graphics/lepton { };
-
-  lepton-eda = callPackage ../applications/science/electronics/lepton-eda { };
-
-  lexend = callPackage ../data/fonts/lexend { };
-
   lexicon = with python3Packages; toPythonApplication dns-lexicon;
 
-  lenpaste = callPackage ../servers/lenpaste { };
-
   lief = callPackage ../development/libraries/lief {
     python = python3;
   };
 
-  libndtypes = callPackage ../development/libraries/libndtypes { };
-
-  libnss-mysql = callPackage ../os-specific/linux/libnss-mysql { };
-
-  libnvme = callPackage ../os-specific/linux/libnvme { };
-
-  librenms = callPackage ../servers/monitoring/librenms { };
-
-  libxnd = callPackage ../development/libraries/libxnd { };
-
-  libzbc = callPackage ../os-specific/linux/libzbc { };
-
-  libzbd = callPackage ../os-specific/linux/libzbd { };
-
-  lifeograph = callPackage ../applications/editors/lifeograph { };
-
-  limitcpu = callPackage ../tools/misc/limitcpu { };
-
-  lineselect = callPackage ../tools/misc/lineselect { };
-
-  link-grammar = callPackage ../tools/text/link-grammar { };
-
-  linuxptp = callPackage ../os-specific/linux/linuxptp { };
-
-  linuxdoc-tools = callPackage ../tools/text/sgml/linuxdoc-tools { };
-
-  lisgd = callPackage ../tools/inputmethods/lisgd { };
-
-  lite = callPackage ../applications/editors/lite { };
-
   lite-xl = callPackage ../applications/editors/lite-xl {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  loadwatch = callPackage ../tools/system/loadwatch { };
-
-  loccount = callPackage ../development/tools/misc/loccount { };
-
-  long-shebang = callPackage ../misc/long-shebang { };
-
-  lssecret = callPackage ../misc/lssecret {};
-
-  lowdown = callPackage ../tools/typesetting/lowdown { };
-
   # Less secure variant of lowdown for use inside Nix builds.
   lowdown-unsandboxed = lowdown.override {
     enableDarwinSandbox = false;
   };
 
-  numatop = callPackage ../os-specific/linux/numatop { };
-
-  numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { };
-
-  num-utils = callPackage ../tools/text/num-utils { };
-
-  iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { };
-
-  ipvsadm = callPackage ../os-specific/linux/ipvsadm { };
-
-  ir-standard-fonts = callPackage ../data/fonts/ir-standard-fonts { };
-
   kaggle = with python3Packages; toPythonApplication kaggle;
 
-  lynis = callPackage ../tools/security/lynis { };
-
   maigret = callPackage ../tools/security/maigret { };
 
   maliit-framework = libsForQt5.callPackage ../applications/misc/maliit-framework { };
 
   maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { };
 
-  mandown = callPackage ../tools/misc/mandown { };
-
-  mantra = callPackage ../tools/security/mantra { };
-
-  mapcidr = callPackage ../tools/misc/mapcidr { };
-
   maple-mono = (callPackage ../data/fonts/maple-font { }).Mono;
   maple-mono-NF = (callPackage ../data/fonts/maple-font { }).NF;
   maple-mono-SC-NF = (callPackage ../data/fonts/maple-font { }).SC-NF;
@@ -5388,32 +2635,12 @@ with pkgs;
   maple-mono-woff2 = (callPackage ../data/fonts/maple-font { }).woff2;
   maple-mono-autohint = (callPackage ../data/fonts/maple-font { }).autohint;
 
-  marl = callPackage ../development/libraries/marl { };
-
-  marlin-calc = callPackage ../tools/misc/marlin-calc { };
-
-  marp-cli = callPackage ../tools/typesetting/marp { };
-
-  masscan = callPackage ../tools/security/masscan { };
-
-  massren = callPackage ../tools/misc/massren { };
-
   mat2 = with python3.pkgs; toPythonApplication mat2;
 
   materialx = with python3Packages; toPythonApplication materialx;
 
-  maxcso = callPackage ../tools/archivers/maxcso { };
-
-  medusa = callPackage ../tools/security/medusa { };
-
   megasync = libsForQt5.callPackage ../applications/misc/megasync { };
 
-  megacmd = callPackage ../applications/misc/megacmd { };
-
-  merriweather = callPackage ../data/fonts/merriweather { };
-
-  merriweather-sans = callPackage ../data/fonts/merriweather-sans { };
-
   # while building documentation meson may want to run binaries for host
   # which needs an emulator
   # example of an error which this fixes
@@ -5437,8 +2664,6 @@ with pkgs;
        else
          throw "mesonEmulatorHook may only be added to nativeBuildInputs when the target binaries can't be executed; however you are attempting to use it in a situation where ${stdenv.hostPlatform.config} can execute ${stdenv.targetPlatform.config}. Consider only adding mesonEmulatorHook according to a conditional based canExecute in your package expression.");
 
-  meson-tools = callPackage ../misc/meson-tools { };
-
   metabase = callPackage ../servers/metabase {
     jdk11 = jdk11_headless;
   };
@@ -5447,96 +2672,24 @@ with pkgs;
     electron = electron_27;
   };
 
-  midicsv = callPackage ../tools/audio/midicsv { };
-
-  miniscript = callPackage ../applications/blockchains/miniscript { };
-
-  miniserve = callPackage ../tools/misc/miniserve { };
-
   mkspiffs = callPackage ../tools/filesystems/mkspiffs { };
 
   mkspiffs-presets = recurseIntoAttrs (callPackages ../tools/filesystems/mkspiffs/presets.nix { });
 
-  mlarchive2maildir = callPackage ../applications/networking/mailreaders/mlarchive2maildir { };
-
-  mmctl = callPackage ../tools/misc/mmctl { };
-
-  moar = callPackage ../tools/misc/moar { };
-
   mobilizon = callPackage ../servers/mobilizon {
     elixir = elixir_1_15;
     beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_15; });
     mobilizon-frontend = callPackage ../servers/mobilizon/frontend.nix { };
   };
 
-  molly-brown = callPackage ../servers/gemini/molly-brown { };
-
-  monetdb = callPackage ../servers/sql/monetdb { };
-
   monado = callPackage ../by-name/mo/monado/package.nix {
     inherit (gst_all_1) gstreamer gst-plugins-base;
   };
 
-  mons = callPackage ../tools/misc/mons { };
-
-  monsoon = callPackage ../tools/security/monsoon { };
-
-  moodle-dl = callPackage ../tools/networking/moodle-dl { };
-
-  moon-phases = callPackage ../tools/misc/moon-phases { };
-
-  moonraker = callPackage ../servers/moonraker { };
-
-  morsel = callPackage ../tools/text/morsel { };
-
-  mousetweaks = callPackage ../applications/accessibility/mousetweaks { };
-
-  mp3blaster = callPackage ../applications/audio/mp3blaster { };
-
-  mp3cat = callPackage ../tools/audio/mp3cat { };
-
-  mp3fs = callPackage ../tools/filesystems/mp3fs { };
-
-  mpdas = callPackage ../tools/audio/mpdas { };
-
   mpdcron = callPackage ../tools/audio/mpdcron { };
 
-  mpdris2 = callPackage ../tools/audio/mpdris2 { };
-
-  mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { };
-
-  mpd-mpris = callPackage ../tools/audio/mpd-mpris { };
-
-  mpd-notification = callPackage ../tools/audio/mpd-notification { };
-
   mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { };
 
-  mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { };
-
-  mpd-touch-screen-gui = callPackage ../applications/audio/mpd-touch-screen-gui { };
-
-  mq-cli = callPackage ../tools/system/mq-cli { };
-
-  mrkd = callPackage ../tools/text/mrkd { };
-
-  nautilus-open-any-terminal = callPackage ../tools/misc/nautilus-open-any-terminal { };
-
-  n2n = callPackage ../tools/networking/n2n { };
-
-  nest-cli = callPackage ../development/tools/nest-cli { };
-
-  nextdns = callPackage ../applications/networking/nextdns { };
-
-  nexttrace = callPackage ../tools/networking/nexttrace { };
-
-  ngadmin = callPackage ../applications/networking/ngadmin { };
-
-  nfdump = callPackage ../tools/networking/nfdump { };
-
-  nfstrace = callPackage ../tools/networking/nfstrace { };
-
-  nixel = callPackage ../tools/nix/nixel { };
-
   nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { };
 
   nix-template = callPackage ../tools/package-management/nix-template {
@@ -5555,50 +2708,14 @@ with pkgs;
 
   nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools;
 
-  nostr-rs-relay = callPackage ../servers/nostr-rs-relay { };
-
-  notemap = callPackage ../tools/networking/notemap { };
-
-  noteshrink = callPackage ../tools/misc/noteshrink { };
-
   noti = callPackage ../tools/misc/noti {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  notify = callPackage ../tools/misc/notify { };
-
-  notifymuch = callPackage ../applications/misc/notifymuch { };
-
-  nmh = callPackage ../tools/networking/nmh { };
-
-  npins = callPackage ../tools/nix/npins { };
-
-  nrsc5 = callPackage ../applications/misc/nrsc5 { };
-
-  nsync = callPackage ../development/libraries/nsync { };
-
   nsz = with python3.pkgs; toPythonApplication nsz;
 
-  nx2elf = callPackage ../tools/compression/nx2elf { };
-
-  nx-libs = callPackage ../tools/X11/nx-libs { };
-
-  nyx = callPackage ../tools/networking/nyx { };
-
-  oci-cli = callPackage ../tools/admin/oci-cli { };
-
-  oci-seccomp-bpf-hook = callPackage ../os-specific/linux/oci-seccomp-bpf-hook { };
-
   ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf;
 
-  ocrfeeder = callPackage ../applications/graphics/ocrfeeder { };
-
-  onboard = callPackage ../applications/misc/onboard { };
-
-  oneshot = callPackage ../tools/networking/oneshot { };
-
-  orjail = callPackage ../tools/security/orjail { };
-
   online-judge-template-generator = python3Packages.callPackage ../tools/misc/online-judge-template-generator { };
 
   online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools;
@@ -5607,37 +2724,12 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  xkbd = callPackage ../applications/misc/xkbd { };
-
-  libpsm2 = callPackage ../os-specific/linux/libpsm2 { };
-
-  optar = callPackage ../tools/graphics/optar { };
-
-
   ockam = callPackage ../tools/networking/ockam {
     inherit (darwin.apple_sdk.frameworks) AppKit Security;
   };
 
   odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter { };
 
-  oil-buku = callPackage ../applications/misc/oil-buku { };
-
-  ondir = callPackage ../tools/misc/ondir { };
-
-  opam-publish = callPackage ../development/tools/ocaml/opam-publish { };
-
-  osdlyrics = callPackage ../applications/audio/osdlyrics { };
-
-  ossutil = callPackage ../tools/admin/ossutil { };
-
-  ospd-openvas = callPackage ../tools/security/ospd-openvas { };
-
-  osv-detector = callPackage ../tools/security/osv-detector { };
-
-  osv-scanner = callPackage ../tools/security/osv-scanner { };
-
-  otf2bdf = callPackage ../applications/misc/otf2bdf { };
-
   pastel = callPackage ../applications/misc/pastel {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -5646,60 +2738,10 @@ with pkgs;
 
   patool = with python3Packages; toPythonApplication patool;
 
-  pbgopy = callPackage ../tools/text/pbgopy { };
-
-  pbzx = callPackage ../tools/compression/pbzx { };
-
-  pc = callPackage ../tools/misc/pc { };
-
-  pcb2gcode = callPackage ../tools/misc/pcb2gcode { };
-
-  pcp = callPackage ../tools/misc/pcp { };
-
-  pev = callPackage ../development/tools/analysis/pev { };
-
-  phd2 = callPackage ../applications/science/astronomy/phd2 { };
-
-  phoronix-test-suite = callPackage ../tools/misc/phoronix-test-suite { };
-
-  photon = callPackage ../tools/networking/photon { };
-
-  photofield = callPackage ../servers/photofield { };
-
-  photoprism = callPackage ../servers/photoprism { };
-
-  piglit = callPackage ../tools/graphics/piglit { };
-
-  pika = callPackage ../applications/graphics/pika { };
-
-  pkg = callPackage ../tools/package-management/pkg { };
-
-  playerctl = callPackage ../tools/audio/playerctl { };
-
-  pn = callPackage ../tools/text/pn { };
-
   pocket-casts = callPackage ../applications/audio/pocket-casts {
     electron = electron_31;
   };
 
-  portal = callPackage ../tools/misc/portal { };
-
-  pouf = callPackage ../tools/misc/pouf { };
-
-  poweralertd = callPackage ../tools/misc/poweralertd { };
-
-  pscale = callPackage ../development/tools/pscale { };
-
-  pulsarctl = callPackage ../tools/admin/pulsarctl { };
-
-  psstop = callPackage ../tools/system/psstop { };
-
-  precice = callPackage ../development/libraries/precice { };
-
-  precice-config-visualizer = callPackage ../tools/misc/precice-config-visualizer { };
-
-  proxmox-backup-client = callPackage ../applications/backup/proxmox-backup-client { };
-
   pueue = darwin.apple_sdk_11_0.callPackage ../applications/misc/pueue {
     inherit (darwin.apple_sdk_11_0) Libsystem;
     inherit (darwin.apple_sdk_11_0.frameworks) SystemConfiguration;
@@ -5707,12 +2749,6 @@ with pkgs;
 
   pixcat = with python3Packages; toPythonApplication pixcat;
 
-  pixiecore = callPackage ../tools/networking/pixiecore { };
-
-  waitron = callPackage ../tools/networking/waitron { };
-
-  pyCA = callPackage ../applications/video/pyca { };
-
   pyznap = python3Packages.callPackage ../tools/backup/pyznap { };
 
   procs = darwin.apple_sdk_11_0.callPackage ../tools/admin/procs {
@@ -5720,16 +2756,8 @@ with pkgs;
     inherit (darwin.apple_sdk_11_0) Libsystem;
   };
 
-  procyon = callPackage ../tools/misc/procyon { };
-
-  profetch = callPackage ../tools/misc/profetch { };
-
   psrecord = python3Packages.callPackage ../tools/misc/psrecord { };
 
-  pyenv = callPackage ../development/tools/pyenv { };
-
-  r53-ddns = callPackage ../applications/networking/r53-ddns { };
-
   rare = python3Packages.callPackage ../games/rare { };
 
   rblake2sum = callPackage ../tools/security/rblake2sum {
@@ -5740,142 +2768,46 @@ with pkgs;
       inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  reg = callPackage ../tools/virtualization/reg { };
-
-  rex = callPackage ../tools/system/rex { };
-
-  rivercarro = callPackage ../applications/misc/rivercarro { };
-
-  river-luatile = callPackage ../applications/misc/river-luatile{ };
-
-  rmapi = callPackage ../applications/misc/remarkable/rmapi { };
-
-  rmate-sh = callPackage ../tools/misc/rmate-sh { };
-
   rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { };
 
-  rm-improved = callPackage ../applications/misc/rm-improved { };
-
   remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };
 
-  restream = callPackage ../applications/misc/remarkable/restream { };
-
   ropgadget = with python3Packages; toPythonApplication ropgadget;
 
   scour = with python3Packages; toPythonApplication scour;
 
-  see = callPackage ../tools/misc/see { };
-
-  s2png = callPackage ../tools/graphics/s2png { };
-
-  sfz = callPackage ../tools/misc/sfz { };
-
-  sgp4 = callPackage ../development/libraries/sgp4 { };
-
   sheldon = callPackage ../tools/misc/sheldon {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  shell-hist = callPackage ../tools/misc/shell-hist { };
-
-  shellhub-agent = callPackage ../applications/networking/shellhub-agent { };
-
-  shellclear = callPackage ../tools/security/shellclear { };
-
-  shellnoob = callPackage ../tools/security/shellnoob { };
-
   sheesy-cli = callPackage ../tools/security/sheesy-cli {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  simdjson = callPackage ../development/libraries/simdjson { };
-
-  shisho = callPackage ../tools/security/shisho { };
-
-  sigslot = callPackage ../development/libraries/sigslot { };
-
-  siglo = callPackage ../applications/misc/siglo { };
-
-  simg2img = callPackage ../tools/filesystems/simg2img { };
-
-  snazy = callPackage ../development/tools/snazy { };
-
-  snippetpixie = callPackage ../tools/text/snippetpixie { };
-
-  snowcat = callPackage ../tools/security/snowcat { };
-
-  socklog = callPackage ../tools/system/socklog { };
-
-  spacevim = callPackage ../applications/editors/spacevim { };
-
-  ssmsh = callPackage ../tools/admin/ssmsh { };
-
-  stacs = callPackage ../tools/security/stacs { };
-
-  stagit = callPackage ../development/tools/stagit { };
-
-  starboard = callPackage ../applications/networking/cluster/starboard { };
-
-  statserial = callPackage ../tools/misc/statserial { };
-
   steampipePackages = recurseIntoAttrs (
     callPackage ../tools/misc/steampipe-packages { }
   );
 
-  step-kms-plugin = callPackage ../tools/security/step-kms-plugin { };
-
-  string-machine = callPackage ../applications/audio/string-machine { };
-
-  stripe-cli = callPackage ../tools/admin/stripe-cli { };
-
-  bash-supergenpass = callPackage ../tools/security/bash-supergenpass { };
-
   swappy = callPackage ../applications/misc/swappy { gtk = gtk3; };
 
-  swapspace = callPackage ../tools/admin/swapspace { };
-
-  swego = callPackage ../servers/swego { };
-
-  sydbox = callPackage ../os-specific/linux/sydbox { };
-
   synth = callPackage ../tools/misc/synth {
     inherit (darwin.apple_sdk.frameworks) AppKit Security;
   };
 
-  syscall_limiter = callPackage ../os-specific/linux/syscall_limiter { };
-
-  svt-av1 = callPackage ../tools/video/svt-av1 { };
-
   inherit (callPackages ../servers/rainloop { })
     rainloop-community
     rainloop-standard;
 
-  raven-reader = callPackage ../applications/networking/newsreaders/raven-reader { };
-
   razergenie = libsForQt5.callPackage ../applications/misc/razergenie { };
 
-  tsduck = callPackage ../tools/video/tsduck { };
-
-  turso-cli = callPackage ../development/tools/turso-cli {};
-
   ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix {
     inherit (darwin.apple_sdk.frameworks) AppKit Security;
   };
 
-  ripe-atlas-tools = callPackage ../tools/networking/ripe-atlas-tools { };
-
   roundcube = callPackage ../servers/roundcube { };
 
   roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { });
 
-  routersploit = callPackage ../tools/security/routersploit { };
-
-  rsbep = callPackage ../tools/backup/rsbep { };
-
-  rsbkb = callPackage ../tools/text/rsbkb { };
-
-  rsign2 = callPackage ../tools/security/rsign2 { };
-
   rsyslog = callPackage ../tools/system/rsyslog {
     withHadoop = false; # Currently Broken
     withKsi = false; # Currently Broken
@@ -5912,62 +2844,16 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  xlogo = callPackage ../tools/X11/xlogo { };
-
-  xmlbeans = callPackage ../tools/misc/xmlbeans { };
-
   xmlsort = perlPackages.XMLFilterSort;
 
-  xmousepasteblock = callPackage ../tools/X11/xmousepasteblock { };
-
-  mcrypt = callPackage ../tools/misc/mcrypt { };
-
-  mongoaudit = callPackage ../tools/security/mongoaudit { };
-
-  mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
-
-  moosefs = callPackage ../tools/filesystems/moosefs { };
-
-  mountain-duck = callPackage ../tools/filesystems/mountain-duck { };
-
-  mox = callPackage ../servers/mail/mox { };
-
-  mozlz4a = callPackage ../tools/compression/mozlz4a { };
-
-  msr-tools = callPackage ../os-specific/linux/msr-tools { };
-
-  mstflint = callPackage ../tools/misc/mstflint { };
-
-  msldapdump = callPackage ../tools/security/msldapdump { };
-
-  mslink = callPackage ../tools/misc/mslink { };
-
-  mceinject = callPackage ../os-specific/linux/mceinject { };
-
   mcelog = callPackage ../os-specific/linux/mcelog {
     util-linux = util-linuxMinimal;
   };
 
-  sqldef = callPackage ../development/tools/sqldef { };
-
   sqlint = callPackage ../development/tools/sqlint { };
 
-  squawk = callPackage ../development/tools/squawk { };
-
-  antibody = callPackage ../shells/zsh/antibody { };
-
-  antidote = callPackage ../shells/zsh/antidote { };
-
-  antigen = callPackage ../shells/zsh/antigen { };
-
-  apparix = callPackage ../tools/misc/apparix { };
-
   apc-temp-fetch = with python3.pkgs; callPackage ../tools/networking/apc-temp-fetch { };
 
-  arping = callPackage ../tools/networking/arping { };
-
-  arpoison = callPackage ../tools/networking/arpoison { };
-
   asciidoc = callPackage ../tools/typesetting/asciidoc {
     inherit (python3.pkgs) pygments matplotlib numpy aafigure recursive-pth-loader;
     w3m = w3m-batch;
@@ -5987,14 +2873,6 @@ with pkgs;
 
   asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { };
 
-  asciidoctorj = callPackage ../tools/typesetting/asciidoctorj { };
-
-  asunder = callPackage ../applications/audio/asunder { };
-
-  autossh = callPackage ../tools/networking/autossh { };
-
-  assh = callPackage ../tools/networking/assh { };
-
   b2sum = callPackage ../tools/security/b2sum {
     inherit (llvmPackages) openmp;
   };
@@ -6003,14 +2881,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit Kerberos;
   };
 
-  bats = callPackage ../development/interpreters/bats { };
-
-  bbe = callPackage ../tools/misc/bbe { };
-
-  bkcrack = callPackage ../tools/security/bkcrack { };
-
-  bdsync = callPackage ../tools/backup/bdsync { };
-
   beamerpresenter = beamerpresenter-mupdf;
 
   beamerpresenter-mupdf = qt6Packages.callPackage ../applications/office/beamerpresenter {
@@ -6026,75 +2896,19 @@ with pkgs;
   beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { });
   inherit (beetsPackages) beets beets-unstable;
 
-  bento4 = callPackage ../tools/video/bento4 { };
-
-  bepasty = callPackage ../tools/misc/bepasty { };
-
-  bettercap = callPackage ../tools/security/bettercap { };
-
-  bfs = callPackage ../tools/system/bfs { };
-
-  bgs = callPackage ../tools/X11/bgs { };
-
-  bibclean = callPackage ../tools/typesetting/bibclean { };
-
-  biber = callPackage ../tools/typesetting/biber { };
-
   biber-for-tectonic = callPackage ../tools/typesetting/tectonic/biber.nix { };
 
-  biber-ms = callPackage ../tools/typesetting/biber-ms { };
-
-  biblatex-check = callPackage ../tools/typesetting/biblatex-check { };
-
   binlore = callPackage ../development/tools/analysis/binlore { };
 
   birdfont = callPackage ../tools/misc/birdfont { };
   xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; };
 
-  blueberry = callPackage ../tools/bluetooth/blueberry { };
-
-  blueman = callPackage ../tools/bluetooth/blueman { };
-
   bmrsa = callPackage ../tools/security/bmrsa/11.nix { };
 
-  bogofilter = callPackage ../tools/misc/bogofilter { };
-
-  bom = callPackage ../tools/admin/bom { };
-
-  bomber-go = callPackage ../development/tools/bomber-go { };
-
-  bomutils = callPackage ../tools/archivers/bomutils { };
-
-  boofuzz= callPackage ../tools/security/boofuzz { };
-
-  briar-desktop = callPackage ../applications/networking/instant-messengers/briar-desktop { };
-
-  bsdbuild = callPackage ../development/tools/misc/bsdbuild { };
-
-  bsdiff = callPackage ../tools/compression/bsdiff { };
-
-  btar = callPackage ../tools/backup/btar { };
-
-  bumpver = callPackage ../applications/version-management/bumpver { };
-
   bupstash = darwin.apple_sdk_11_0.callPackage ../tools/backup/bupstash { };
 
-  burp = callPackage ../tools/backup/burp { };
-
-  buku = callPackage ../applications/misc/buku { };
-
-  byzanz = callPackage ../applications/video/byzanz { };
-
-  anydesk = callPackage ../applications/networking/remote/anydesk { };
-
   anystyle-cli = callPackage ../tools/misc/anystyle-cli { };
 
-  atool = callPackage ../tools/archivers/atool { };
-
-  bash_unit = callPackage ../tools/misc/bash_unit { };
-
-  boltbrowser = callPackage ../tools/misc/boltbrowser { };
-
   bzip2 = callPackage ../tools/compression/bzip2 { };
 
   bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { };
@@ -6103,44 +2917,18 @@ with pkgs;
     stdenv = clangStdenv;
   };
 
-  cabextract = callPackage ../tools/archivers/cabextract { };
-
-  cadaver = callPackage ../tools/networking/cadaver { };
-
   davix = callPackage ../tools/networking/davix {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   davix-copy = davix.override { enableThirdPartyCopy = true; };
 
-  cantoolz = callPackage ../tools/networking/cantoolz { };
-
-  can-utils = callPackage ../os-specific/linux/can-utils { };
-
-  cannelloni = callPackage ../os-specific/linux/cannelloni { };
-
-  caudec = callPackage ../applications/audio/caudec { };
-
-  ccd2iso = callPackage ../tools/cd-dvd/ccd2iso { };
-
-  ccrypt = callPackage ../tools/security/ccrypt { };
-
-  ccze = callPackage ../tools/misc/ccze { };
-
-  cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { };
-
   cdist = python3Packages.callPackage ../tools/admin/cdist { };
 
-  cdimgtools = callPackage ../tools/cd-dvd/cdimgtools { };
-
-  cdpr = callPackage ../tools/networking/cdpr { };
-
   cdrdao = callPackage ../tools/cd-dvd/cdrdao {
     inherit (darwin.apple_sdk.frameworks) CoreServices IOKit;
   };
 
-  cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
-
   cdrtools = callPackage ../tools/cd-dvd/cdrtools {
     stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_14.stdenv else stdenv;
     inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
@@ -6148,18 +2936,6 @@ with pkgs;
 
   cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { };
 
-  cider = callPackage ../applications/audio/cider { };
-
-  iat = callPackage ../tools/cd-dvd/iat { };
-
-  isolyzer = callPackage ../tools/cd-dvd/isolyzer { };
-
-  isomd5sum = callPackage ../tools/cd-dvd/isomd5sum { };
-
-  mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { };
-
-  nrg2iso = callPackage ../tools/cd-dvd/nrg2iso { };
-
   libceph = ceph.lib;
   inherit (callPackages ../tools/filesystems/ceph {
     lua = lua5_4; # Ceph currently requires >= 5.3
@@ -6175,39 +2951,6 @@ with pkgs;
     ceph-client;
   ceph-dev = ceph;
 
-  cfdg = callPackage ../tools/graphics/cfdg { };
-
-  cglm = callPackage ../development/libraries/cglm { };
-
-  chain-bench = callPackage ../tools/security/chain-bench { };
-
-  chainsaw = callPackage ../tools/security/chainsaw { };
-
-  checkinstall = callPackage ../tools/package-management/checkinstall { };
-
-  checkmake = callPackage ../development/tools/checkmake { };
-
-  cherrybomb = callPackage ../tools/security/cherrybomb { };
-
-  chit = callPackage ../development/tools/chit { };
-
-  chkrootkit = callPackage ../tools/security/chkrootkit { };
-
-  chunkfs = callPackage ../tools/filesystems/chunkfs { };
-
-  chunksync = callPackage ../tools/backup/chunksync { };
-
-  cicero-tui = callPackage ../tools/misc/cicero-tui { };
-
-  cilium-cli = callPackage ../applications/networking/cluster/cilium { };
-
-  cjdns = callPackage ../tools/networking/cjdns { };
-  cjdns-tools = callPackage ../tools/admin/cjdns-tools { };
-
-  cjson = callPackage ../development/libraries/cjson { };
-
-  cksfv = callPackage ../tools/networking/cksfv { };
-
   clementine = libsForQt5.callPackage ../applications/audio/clementine {
     gst_plugins =
       with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ];
@@ -6216,14 +2959,8 @@ with pkgs;
 
   mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { };
 
-  ciopfs = callPackage ../tools/filesystems/ciopfs { };
-
-  circleci-cli = callPackage ../development/tools/misc/circleci-cli { };
-
   circus = with python310Packages; toPythonApplication circus;
 
-  cirrusgo = callPackage ../tools/security/cirrusgo { };
-
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })
     citrix_workspace_23_09_0
     citrix_workspace_23_11_0
@@ -6232,34 +2969,10 @@ with pkgs;
   ;
   citrix_workspace = citrix_workspace_24_05_0;
 
-  clima = callPackage ../tools/text/clima { };
-
-  cmigemo = callPackage ../tools/text/cmigemo { };
-
-  cmospwd = callPackage ../tools/security/cmospwd { };
-
   cmst = libsForQt5.callPackage ../tools/networking/cmst { };
 
-  cmt = callPackage ../applications/audio/cmt { };
-
-  crlfsuite = callPackage ../tools/security/crlfsuite { };
-
-  crlfuzz = callPackage ../tools/security/crlfuzz { };
-
-  hedgedoc = callPackage ../servers/web-apps/hedgedoc { };
-
-  colord = callPackage ../tools/misc/colord { };
-
-  colord-gtk = callPackage ../tools/misc/colord-gtk { };
-
   colord-gtk4 = colord-gtk.override { withGtk4 = true; };
 
-  colordiff = callPackage ../tools/text/colordiff { };
-
-  connect = callPackage ../tools/networking/connect { };
-
-  conspy = callPackage ../os-specific/linux/conspy { };
-
   connmanFull = connman.override {
     # TODO: Why is this in `connmanFull` and not the default build? See TODO in
     # nixos/modules/services/networking/connman.nix (near the assertions)
@@ -6293,85 +3006,31 @@ with pkgs;
     enableWispr = false;
   };
 
-  convertlit = callPackage ../tools/text/convertlit { };
-
   collectd = callPackage ../tools/system/collectd {
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
   collectd-data = callPackage ../tools/system/collectd/data.nix { };
 
-  colormake = callPackage ../development/tools/build-managers/colormake { };
-
-  cpuminer = callPackage ../tools/misc/cpuminer { };
-
-  crabz = callPackage ../tools/compression/crabz { };
-
-  ethash = callPackage ../development/libraries/ethash { };
-
-  cuetools = callPackage ../tools/cd-dvd/cuetools { };
-
-  u3-tool = callPackage ../tools/filesystems/u3-tool { };
-
-  unifdef = callPackage ../development/tools/misc/unifdef { };
-
   unify = with python3Packages; toPythonApplication unify;
 
-  unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { };
-
-  unparam = callPackage ../tools/misc/unparam { };
-
   inherit (nodePackages) uppy-companion;
 
   usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
   usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { };
 
-  usbsdmux = callPackage ../development/tools/misc/usbsdmux { };
-
-  usbview = callPackage ../tools/misc/usbview { };
-
-  usbimager = callPackage ../tools/misc/usbimager { };
-
-  uwuify = callPackage ../tools/misc/uwuify { };
-
-  anthy = callPackage ../tools/inputmethods/anthy { };
-
-  evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { };
-
-  evsieve = callPackage ../tools/inputmethods/evsieve { };
-
-  eyedropper = callPackage ../applications/graphics/eyedropper { };
-
   persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { };
 
-  evscript = callPackage ../tools/inputmethods/evscript { };
-
-  keyd = callPackage ../tools/inputmethods/keyd { };
-
-  keymapper = callPackage ../tools/inputmethods/keymapper { };
-
   twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui {
     inherit (darwin.apple_sdk_11_0.frameworks) Security CoreServices SystemConfiguration;
   };
 
-  gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { };
-
-  kime = callPackage ../tools/inputmethods/kime { };
-
-  libpinyin = callPackage ../development/libraries/libpinyin { };
-
   inherit (import ../development/libraries/libsbsms pkgs)
     libsbsms
     libsbsms_2_0_2
     libsbsms_2_3_0
   ;
 
-  libskk = callPackage ../development/libraries/libskk { };
-
-  m17-cxx-demod = callPackage ../applications/radio/m17-cxx-demod { };
-
-  m17n_db = callPackage ../tools/inputmethods/m17n-db { };
-
   m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
 
   libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { };
@@ -6385,17 +3044,8 @@ with pkgs;
     ui = true;
   };
 
-  netevent = callPackage ../tools/inputmethods/netevent { };
-
-  netplan = callPackage ../tools/admin/netplan { };
-
-  skktools = callPackage ../tools/inputmethods/skk/skktools { };
   skkDictionaries = callPackages ../tools/inputmethods/skk/skk-dicts { };
 
-  libkkc-data = callPackage ../data/misc/libkkc-data { };
-
-  libkkc = callPackage ../tools/inputmethods/libkkc { };
-
   ibus = callPackage ../tools/inputmethods/ibus { };
 
   ibus-engines = recurseIntoAttrs {
@@ -6444,26 +3094,16 @@ with pkgs;
 
   ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { };
 
-  ibus-theme-tools = callPackage ../tools/misc/ibus-theme-tools { };
-
   interception-tools = callPackage ../tools/inputmethods/interception-tools { };
   interception-tools-plugins = recurseIntoAttrs {
     caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { };
     dual-function-keys = callPackage ../tools/inputmethods/interception-tools/dual-function-keys.nix { };
   };
 
-  age = callPackage ../tools/security/age { };
-
   age-plugin-ledger = callPackage ../tools/security/age-plugin-ledger {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  age-plugin-tpm = callPackage ../tools/security/age-plugin-tpm { };
-
-  artim-dark = callPackage ../data/themes/artim-dark { };
-
-  bbin = callPackage ../development/tools/bbin { };
-
   blacken-docs = with python3Packages; toPythonApplication blacken-docs;
 
   bore = callPackage ../tools/networking/bore {
@@ -6471,20 +3111,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
   };
 
-  brotli = callPackage ../tools/compression/brotli { };
-
-  biodiff = callPackage ../development/tools/biodiff { };
-
-  biosdevname = callPackage ../tools/networking/biosdevname { };
-
   bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { };
 
-  boa = callPackage ../development/web/boa { };
-
-  bombardier = callPackage ../tools/networking/bombardier { };
-
-  caeml = callPackage ../applications/networking/mailreaders/caeml { };
-
   calyx-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn {
     provider = "calyx";
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
@@ -6492,36 +3120,16 @@ with pkgs;
 
   cask-server = libsForQt5.callPackage ../applications/misc/cask-server { };
 
-  cc2538-bsl = callPackage ../tools/misc/cc2538-bsl { };
-
   code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; };
   code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; };
   code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; };
 
-  certstrap = callPackage ../tools/security/certstrap { };
-
   cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert;
 
-  cfssl = callPackage ../tools/security/cfssl { };
-
-  cfs-zen-tweaks = callPackage ../os-specific/linux/cfs-zen-tweaks { };
-
   chafa = callPackage ../tools/misc/chafa {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  changetower = callPackage ../tools/networking/changetower { };
-
-  chatblade = callPackage ../applications/misc/chatblade { };
-
-  checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
-
-  checkmate = callPackage ../development/tools/checkmate { };
-
-  circup = callPackage ../development/tools/circup { };
-
-  civetweb = callPackage ../development/libraries/civetweb { };
-
   ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { };
 
   clamav = callPackage ../tools/security/clamav {
@@ -6529,16 +3137,6 @@ with pkgs;
     inherit (darwin.apple_sdk_11_0.frameworks) Foundation;
   };
 
-  client-ip-echo = callPackage ../servers/misc/client-ip-echo { };
-
-  cloc = callPackage ../tools/misc/cloc { };
-
-  clolcat = callPackage ../tools/misc/clolcat { };
-
-  cloud-utils = callPackage ../tools/misc/cloud-utils { };
-
-  cloudlist = callPackage ../tools/security/cloudlist { };
-
   cmdpack = callPackages ../tools/misc/cmdpack { };
 
   cobalt = callPackage ../applications/misc/cobalt {
@@ -6557,34 +3155,12 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  codeberg-pages = callPackage ../development/tools/continuous-integration/codeberg-pages { };
-
-  codebraid = callPackage ../tools/misc/codebraid { };
-
-  codemov = callPackage ../tools/misc/codemov { };
-
-  codevis = callPackage ../tools/misc/codevis { };
-
   compass = callPackage ../development/tools/compass { };
 
   cone = callPackage ../development/compilers/cone {
     llvmPackages = llvmPackages_13;
   };
 
-  conda = callPackage ../tools/package-management/conda { };
-
-  conduktor = callPackage ../applications/misc/conduktor { };
-
-  console-bridge = callPackage ../development/libraries/console-bridge { };
-
-  convbin = callPackage ../tools/misc/convbin { };
-
-  convimg = callPackage ../tools/misc/convimg { };
-
-  convfont = callPackage ../tools/misc/convfont { };
-
-  cpcfs = callPackage ../tools/filesystems/cpcfs { };
-
   coreutils =  callPackage ../tools/misc/coreutils { };
 
   # The coreutils above are built with dependencies from
@@ -6593,32 +3169,10 @@ with pkgs;
   coreutils-full = callPackage ../tools/misc/coreutils { minimal = false; };
   coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; };
 
-  corkscrew = callPackage ../tools/networking/corkscrew { };
-
-  cowpatty = callPackage ../tools/security/cowpatty { };
-
-  cpio = callPackage ../tools/archivers/cpio { };
-
-  cpufetch = callPackage ../tools/misc/cpufetch { };
-
-  crackxls = callPackage ../tools/security/crackxls { };
-
-  crd2pulumi = callPackage ../development/tools/crd2pulumi { };
-
   create-cycle-app = nodePackages.create-cycle-app;
 
-  createrepo_c = callPackage ../tools/package-management/createrepo_c { };
-
-  cromfs = callPackage ../tools/archivers/cromfs { };
-
   cron = isc-cron;
 
-  ctlptl = callPackage ../development/tools/ctlptl { };
-
-  dumpnar = callPackage ../tools/archivers/dumpnar { };
-
-  snooze = callPackage ../tools/system/snooze { };
-
   cudaPackages_10_0 = callPackage ./cuda-packages.nix { cudaVersion = "10.0"; };
   cudaPackages_10_1 = callPackage ./cuda-packages.nix { cudaVersion = "10.1"; };
   cudaPackages_10_2 = callPackage ./cuda-packages.nix { cudaVersion = "10.2"; };
@@ -6648,8 +3202,6 @@ with pkgs;
   cudatoolkit = cudaPackages.cudatoolkit;
   cudatoolkit_11 = cudaPackages_11.cudatoolkit;
 
-  curie = callPackage ../data/fonts/curie { };
-
   curlFull = curl.override {
     ldapSupport = true;
     gsaslSupport = true;
@@ -6671,109 +3223,28 @@ with pkgs;
     brotliSupport = true;
   });
 
-  curlMinimal = callPackage ../tools/networking/curl { };
-
   curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; };
 
   curl-impersonate = darwin.apple_sdk_11_0.callPackage ../tools/networking/curl-impersonate { };
   curl-impersonate-ff = curl-impersonate.curl-impersonate-ff;
   curl-impersonate-chrome = curl-impersonate.curl-impersonate-chrome;
 
-  curlie = callPackage ../tools/networking/curlie { };
-
-  trurl = callPackage ../tools/networking/trurl { };
-
-  curv = callPackage ../applications/graphics/curv { };
-
-  cunit = callPackage ../tools/misc/cunit { };
-  bcunit = callPackage ../tools/misc/bcunit { };
-
-  curlftpfs = callPackage ../tools/filesystems/curlftpfs { };
-
-  tcp-cutter = callPackage ../tools/networking/tcp-cutter { };
-
-  cwebbin = callPackage ../development/tools/misc/cwebbin { };
-
   cve-bin-tool = python3Packages.callPackage ../tools/security/cve-bin-tool { };
 
-  cvs-fast-export = callPackage ../applications/version-management/cvs-fast-export { };
-
-  dadadodo = callPackage ../tools/text/dadadodo { };
-
-  daemon = callPackage ../tools/system/daemon { };
-
-  daemonize = callPackage ../tools/system/daemonize { };
-
   danger-gitlab = callPackage ../applications/version-management/danger-gitlab { };
 
-  daq = callPackage ../applications/networking/ids/daq { };
-
   dar = callPackage ../tools/backup/dar {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation;
   };
 
-  darkhttpd = callPackage ../servers/http/darkhttpd { };
-
-  darkstat = callPackage ../tools/networking/darkstat { };
-
-  dav1d = callPackage ../development/libraries/dav1d { };
-
-  davfs2 = callPackage ../tools/filesystems/davfs2 { };
-
-  dbench = callPackage ../development/tools/misc/dbench { };
-
-  dclxvi = callPackage ../development/libraries/dclxvi { };
-
   dconf2nix = callPackage ../development/tools/haskell/dconf2nix { };
 
-  dcraw = callPackage ../tools/graphics/dcraw { };
-
-  dcs = callPackage ../tools/text/dcs { };
-
-  dcfldd = callPackage ../tools/system/dcfldd { };
-
-  debian-devscripts = callPackage ../tools/misc/debian-devscripts { };
-
-  debian-goodies = callPackage ../applications/misc/debian-goodies { };
-
-  debootstrap = callPackage ../tools/misc/debootstrap { };
-
-  debugedit = callPackage ../development/tools/misc/debugedit { };
-
-  decode-spam-headers = callPackage ../tools/networking/decode-spam-headers { };
-
-  deer = callPackage ../shells/zsh/zsh-deer { };
-
-  deqp-runner = callPackage ../tools/graphics/deqp-runner { };
-
-  detox = callPackage ../tools/misc/detox { };
-
   devilspie2 = callPackage ../applications/misc/devilspie2 {
     gtk = gtk3;
   };
 
-  dex = callPackage ../tools/X11/dex { };
-
-  ddccontrol = callPackage ../tools/misc/ddccontrol { };
-
-  ddccontrol-db = callPackage ../data/misc/ddccontrol-db { };
-
   ddcui = libsForQt5.callPackage ../applications/misc/ddcui { };
 
-  ddcutil = callPackage ../tools/misc/ddcutil { };
-
-  ddclient = callPackage ../tools/networking/ddclient { };
-
-  dd_rescue = callPackage ../tools/system/dd_rescue { };
-
-  ddh = callPackage ../tools/system/ddh { };
-
-  ddrescue = callPackage ../tools/system/ddrescue { };
-
-  ddrescueview = callPackage ../tools/system/ddrescueview { };
-
-  ddrutility = callPackage ../tools/system/ddrutility { };
-
   inherit (callPackages ../applications/networking/p2p/deluge { })
     deluge-gtk
     deluged
@@ -6781,58 +3252,8 @@ with pkgs;
 
   deluge-2_x = deluge;
 
-  der-ascii = callPackage ../tools/security/der-ascii { };
-
-  desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { };
-
-  dfc  = callPackage ../tools/system/dfc { };
-
-  dfrs  = callPackage ../tools/system/dfrs { };
-
-  diskrsync = callPackage ../tools/backup/diskrsync { };
-
-  djbdns = callPackage ../tools/networking/djbdns { };
-
-  dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { };
-
-  dnscontrol = callPackage ../applications/networking/dnscontrol { };
-
-  dnsenum = callPackage ../tools/security/dnsenum { };
-
-  dnsmasq = callPackage ../tools/networking/dnsmasq { };
-
-  dnsmon-go = callPackage ../tools/networking/dnsmon-go { };
-
-  dnsmonster = callPackage ../tools/networking/dnsmonster { };
-
-  dnspeep = callPackage ../tools/security/dnspeep { };
-
-  dnsproxy = callPackage ../tools/networking/dnsproxy { };
-
-  dnsperf = callPackage ../tools/networking/dnsperf { };
-
-  dnsrecon = callPackage ../tools/security/dnsrecon { };
-
-  dnstop = callPackage ../tools/networking/dnstop { };
-
   dnsviz = python3Packages.callPackage ../tools/networking/dnsviz { };
 
-  dnsx = callPackage ../tools/security/dnsx { };
-
-  dhcpdump = callPackage ../tools/networking/dhcpdump { };
-
-  dhcpcd = callPackage ../tools/networking/dhcpcd { };
-
-  dhcping = callPackage ../tools/networking/dhcping { };
-
-  dotacat = callPackage ../tools/misc/dotacat { };
-
-  di = callPackage ../tools/system/di { };
-
-  diction = callPackage ../tools/text/diction { };
-
-  diffoci = callPackage ../tools/misc/diffoci { };
-
   diffoscope = callPackage ../tools/misc/diffoscope {
     jdk = jdk8;
   };
@@ -6845,38 +3266,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  diffsitter = callPackage ../tools/text/diffsitter { };
-
-  diffstat = callPackage ../tools/text/diffstat { };
-
-  difftastic = callPackage ../tools/text/difftastic { };
-
   diffutils = callPackage ../tools/text/diffutils { };
 
-  dirdiff = callPackage ../tools/text/dirdiff { };
-
-  dwdiff = callPackage ../applications/misc/dwdiff { };
-
-  picoscope = callPackage ../applications/science/electronics/picoscope { };
-
-  picotts = callPackage ../tools/audio/picotts { };
-
-  wgetpaste = callPackage ../tools/text/wgetpaste { };
-
-  dismap = callPackage ../tools/security/dismap { };
-
-  dismember = callPackage ../tools/security/dismember { };
-
-  dirvish  = callPackage ../tools/backup/dirvish { };
-
-  dleyna-connector-dbus = callPackage ../development/libraries/dleyna-connector-dbus { };
-
-  dleyna-core = callPackage ../development/libraries/dleyna-core { };
-
-  dleyna-renderer = callPackage ../development/libraries/dleyna-renderer { };
-
-  dleyna-server = callPackage ../development/libraries/dleyna-server { };
-
   dmd = callPackage ../by-name/dm/dmd/package.nix ({
     inherit (darwin.apple_sdk.frameworks) Foundation;
   } // lib.optionalAttrs stdenv.hostPlatform.isLinux {
@@ -6884,46 +3275,16 @@ with pkgs;
     stdenv = gcc11Stdenv;
   });
 
-  dmg2img = callPackage ../tools/misc/dmg2img { };
-
-  docbook2odf = callPackage ../tools/typesetting/docbook2odf { };
-
-  doas = callPackage ../tools/security/doas { };
-
-  doas-sudo-shim = callPackage ../tools/security/doas-sudo-shim { };
-
-  docbook2x = callPackage ../tools/typesetting/docbook2x { };
-
-  docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { };
-
-  dockbarx = callPackage ../applications/misc/dockbarx { };
-
-  dog = callPackage ../tools/system/dog { };
-
   dogdns = callPackage ../tools/networking/dogdns {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  dool = callPackage ../tools/system/dool { };
-
-  dosfstools = callPackage ../tools/filesystems/dosfstools { };
-
   dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
 
   dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
 
-  domoticz = callPackage ../servers/domoticz { };
-
-  dorkscout = callPackage ../tools/security/dorkscout { };
-
   sl1-to-photon = python3Packages.callPackage ../applications/misc/sl1-to-photon { };
 
-  drive = callPackage ../applications/networking/drive { };
-
-  driftnet = callPackage ../tools/networking/driftnet { };
-
-  driftctl = callPackage ../applications/networking/cluster/driftctl { };
-
   drill = callPackage ../tools/networking/drill {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -6933,29 +3294,11 @@ with pkgs;
     enableUnfree = false;
   };
 
-  drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { };
-
-  drone-runner-exec = callPackage ../development/tools/continuous-integration/drone-runner-exec { };
-
-  drone-runner-docker = callPackage ../development/tools/continuous-integration/drone-runner-docker { };
-
-  drone-runner-ssh = callPackage ../development/tools/continuous-integration/drone-runner-ssh { };
-
-  dropbear = callPackage ../tools/networking/dropbear { };
-
   dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { };
 
-  dtach = callPackage ../tools/misc/dtach { };
-
-  dtc = callPackage ../development/compilers/dtc { };
-
-  dt-schema = callPackage ../development/tools/dt-schema { };
-
   inherit (import ../build-support/dlang/dub-support.nix { inherit callPackage; })
     buildDubPackage dub-to-nix;
 
-  duc = callPackage ../tools/misc/duc { };
-
   duff = callPackage ../tools/filesystems/duff {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
@@ -6964,26 +3307,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  dumpasn1 = callPackage ../tools/security/dumpasn1 { };
-
-  dumptorrent = callPackage ../tools/misc/dumptorrent { };
-
-  duo-unix = callPackage ../tools/security/duo-unix { };
-
-  dupe-krill = callPackage ../tools/filesystems/dupe-krill { };
-
-  duplicity = callPackage ../tools/backup/duplicity { };
-
-  duply = callPackage ../tools/backup/duply { };
-
-  dvd-vr = callPackage ../tools/cd-dvd/dvd-vr { };
-
-  dvdisaster = callPackage ../tools/cd-dvd/dvdisaster { };
-
-  dvdplusrwtools = callPackage ../tools/cd-dvd/dvd+rw-tools { };
-
-  dvgrab = callPackage ../tools/video/dvgrab { };
-
   dvtm = callPackage ../tools/misc/dvtm {
     # if you prefer a custom config, write the config.h in dvtm.config.h
     # and enable
@@ -6992,64 +3315,22 @@ with pkgs;
 
   dvtm-unstable = callPackage ../tools/misc/dvtm/unstable.nix { };
 
-  erofs-utils = callPackage ../tools/filesystems/erofs-utils { };
-
-  e2tools = callPackage ../tools/filesystems/e2tools { };
-
-  e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { };
-
-  easyrsa = callPackage ../tools/networking/easyrsa { };
-
-  easysnap = callPackage ../tools/backup/easysnap { };
-
-  ebook_tools = callPackage ../tools/text/ebook-tools { };
-
   ecryptfs = callPackage ../tools/security/ecryptfs { };
 
   ecryptfs-helper = callPackage ../tools/security/ecryptfs/helper.nix { };
 
-  edgetpu-compiler = callPackage ../development/libraries/science/robotics/edgetpu-compiler { };
-
-  edid-decode = callPackage ../tools/misc/edid-decode { };
-
-  edid-generator = callPackage ../tools/misc/edid-generator { };
-
-  edir = callPackage ../tools/misc/edir { };
-
-  editres = callPackage ../tools/graphics/editres { };
-
-  edk2-uefi-shell = callPackage ../tools/misc/edk2-uefi-shell { };
-
-  edl = callPackage ../development/embedded/edl { };
-
-  edlib = callPackage ../development/libraries/science/biology/edlib { };
-
-  eff = callPackage ../development/interpreters/eff { };
-
   eid-mw = callPackage ../tools/security/eid-mw {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
   engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { };
 
-  epub2txt2 = callPackage ../tools/text/epub2txt2 { };
-
-  epubcheck = callPackage ../tools/text/epubcheck { };
-
-  evil-winrm = callPackage ../tools/security/evil-winrm { };
-
-  evtx = callPackage ../tools/security/evtx { };
-
-  kics = callPackage ../tools/admin/kics { };
-
   kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { };
 
   lychee = callPackage ../tools/networking/lychee {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  mcrcon = callPackage ../tools/networking/mcrcon { };
-
   mozwire = callPackage ../tools/networking/mozwire {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
@@ -7058,30 +3339,16 @@ with pkgs;
     inherit (pkgs.darwin.apple_sdk.libs) utmp;
   };
 
-  rar2fs = callPackage ../tools/filesystems/rar2fs { };
-
   rocmPackages = rocmPackages_6;
   rocmPackages_5 = recurseIntoAttrs (callPackage ../development/rocm-modules/5 { });
   rocmPackages_6 = recurseIntoAttrs (callPackage ../development/rocm-modules/6 { });
 
-  rune = callPackage ../development/interpreters/rune { };
-
-  s9fes = callPackage ../development/interpreters/s9fes { };
-
-  s-tar = callPackage ../tools/archivers/s-tar { };
-
   solo2-cli = callPackage ../tools/security/solo2-cli {
     inherit (darwin.apple_sdk.frameworks) PCSC IOKit CoreFoundation AppKit;
   };
 
-  sonota = callPackage ../tools/misc/sonota { };
-
   sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { };
 
-  stratisd = callPackage ../tools/filesystems/stratisd { };
-
-  stratis-cli = callPackage ../tools/filesystems/stratis-cli { };
-
   strawberry-qt5 = libsForQt5.callPackage ../applications/audio/strawberry { };
 
   strawberry-qt6 = qt6Packages.callPackage ../applications/audio/strawberry { };
@@ -7098,22 +3365,10 @@ with pkgs;
 
   teamocil = callPackage ../tools/misc/teamocil { };
 
-  the-way = callPackage ../development/tools/the-way { };
-
-  timeline = callPackage ../applications/office/timeline { };
-
   tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; };
 
   tracy-x11 = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; };
 
-  trivy = callPackage ../tools/admin/trivy { };
-
-  trompeloeil = callPackage ../development/libraries/trompeloeil { };
-
-  updog = callPackage ../tools/networking/updog { };
-
-  uudeview = callPackage ../tools/misc/uudeview { };
-
   uusi = haskell.lib.compose.justStaticExecutables haskellPackages.uusi;
 
   uutils-coreutils = callPackage ../tools/misc/uutils-coreutils {
@@ -7123,18 +3378,8 @@ with pkgs;
 
   uutils-coreutils-noprefix = uutils-coreutils.override { prefix = null; };
 
-  volctl = callPackage ../tools/audio/volctl { };
-
   vorta = qt6Packages.callPackage ../applications/backup/vorta { };
 
-  vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { };
-
-  vt-cli = callPackage ../tools/security/vt-cli { };
-
-  wakeonlan = callPackage ../tools/networking/wakeonlan { };
-
-  wayback = callPackage ../tools/misc/wayback { };
-
   worker-build = callPackage ../development/tools/worker-build {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -7143,54 +3388,20 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
   };
 
-  snowflake = callPackage ../tools/networking/snowflake { };
-
-  wsl-open = callPackage ../tools/misc/wsl-open { };
-
-  wsl-vpnkit = callPackage ../tools/networking/wsl-vpnkit { };
-
   xkcdpass = with python3Packages; toPythonApplication xkcdpass;
 
-  xjobs = callPackage ../tools/misc/xjobs { };
-
-  xob = callPackage ../tools/X11/xob { };
-
-  z-lua = callPackage ../tools/misc/z-lua { };
-
-  zabbixctl = callPackage ../tools/misc/zabbixctl { };
-
   zee = callPackage ../applications/editors/zee {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   zeek = darwin.apple_sdk_11_0.callPackage ../applications/networking/ids/zeek { };
 
-  zeekscript = callPackage ../tools/security/zeekscript { };
-
   zonemaster-cli = perlPackages.ZonemasterCLI;
 
-  zotero-translation-server = callPackage ../tools/misc/zotero-translation-server { };
-
-  zoxide = callPackage ../tools/misc/zoxide { };
-
-  zzuf = callPackage ../tools/security/zzuf { };
-
   ### DEVELOPMENT / EMSCRIPTEN
 
   buildEmscriptenPackage = callPackage ../development/em-modules/generic { };
 
-  carp = callPackage ../development/compilers/carp { };
-
-  cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { };
-
-  choose = callPackage ../tools/text/choose { };
-
-  d2 = callPackage ../tools/text/d2 { };
-
-  ddev = callPackage ../applications/virtualization/ddev { };
-
-  easeprobe = callPackage ../tools/misc/easeprobe { };
-
   emscripten = callPackage ../development/compilers/emscripten {
     llvmPackages = llvmPackages_19;
   };
@@ -7199,12 +3410,6 @@ with pkgs;
 
   emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; };
 
-  efivar = callPackage ../tools/system/efivar { };
-
-  eget = callPackage ../tools/misc/eget { };
-
-  evemu = callPackage ../tools/system/evemu { };
-
   # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
   # When updating make sure to update all plugins or they will break!
   elk7Version = "7.17.16";
@@ -7224,116 +3429,28 @@ with pkgs;
 
   emborg = python3Packages.callPackage ../development/python-modules/emborg { };
 
-  emblem = callPackage ../applications/graphics/emblem { };
-
-  emem = callPackage ../applications/misc/emem { };
-
-  empty = callPackage ../tools/misc/empty { };
-
   emulsion = callPackage ../applications/graphics/emulsion {
     inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices Foundation OpenGL;
   };
 
-  emulsion-palette = callPackage ../applications/graphics/emulsion-palette { };
-
-  emv = callPackage ../tools/misc/emv { };
-
-  enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { };
-
-  enc = callPackage ../tools/security/enc { };
-
-  endlessh = callPackage ../servers/endlessh { };
-
-  ericw-tools = callPackage ../applications/misc/ericw-tools { };
-
-  cryfs = callPackage ../tools/filesystems/cryfs { };
-
   encfs = callPackage ../tools/filesystems/encfs {
     tinyxml2 = tinyxml-2;
   };
 
-  enscript = callPackage ../tools/text/enscript { };
-
-  ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { };
-
-  entr = callPackage ../tools/misc/entr { };
-
   envchain = callPackage ../tools/misc/envchain { inherit (darwin.apple_sdk.frameworks) Security; };
 
-  eot_utilities = callPackage ../tools/misc/eot-utilities { };
-
-  eplot = callPackage ../tools/graphics/eplot { };
-
-  epstool = callPackage ../tools/graphics/epstool { };
-
-  escrotum = callPackage ../tools/graphics/escrotum { };
-
-  esshader = callPackage ../tools/graphics/esshader { };
-
   ethercalc = callPackage ../servers/web-apps/ethercalc { };
 
-  ethtool = callPackage ../tools/misc/ethtool { };
-
-  ets = callPackage ../tools/misc/ets { };
-
-  ettercap = callPackage ../applications/networking/sniffers/ettercap { };
-
-  evcc = callPackage ../servers/home-automation/evcc { };
-
-  eventstat = callPackage ../os-specific/linux/eventstat { };
-
-  evtest = callPackage ../applications/misc/evtest { };
-
   evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { };
 
-  eva = callPackage ../tools/misc/eva { };
-
-  exactaudiocopy = callPackage ../applications/audio/exact-audio-copy { };
-
-  exempi = callPackage ../development/libraries/exempi { };
-
   executor = with python3Packages; toPythonApplication executor;
 
-  exif = callPackage ../tools/graphics/exif { };
-
-  exifprobe = callPackage ../tools/graphics/exifprobe { };
-
-  exiftags = callPackage ../tools/graphics/exiftags { };
-
   exiftool = perlPackages.ImageExifTool;
 
-  ext4magic = callPackage ../tools/filesystems/ext4magic { };
-
-  extract_url = callPackage ../applications/misc/extract_url { };
-
-  extundelete = callPackage ../tools/filesystems/extundelete { };
-
   expect = tclPackages.expect;
 
-  expected-lite = callPackage ../development/libraries/expected-lite { };
-
-  exportarr = callPackage ../servers/monitoring/prometheus/exportarr { };
-
-  expliot = callPackage ../tools/security/expliot { };
-
   Fabric = with python3Packages; toPythonApplication fabric;
 
-  fakeroot = callPackage ../tools/system/fakeroot { };
-
-  fakeroute = callPackage ../tools/networking/fakeroute { };
-
-  fakechroot = callPackage ../tools/system/fakechroot { };
-
-  fancy-motd = callPackage ../tools/system/fancy-motd { };
-
-  fastpbkdf2 = callPackage ../development/libraries/fastpbkdf2 { };
-
-  fanficfare = callPackage ../tools/text/fanficfare { };
-
-  fastd = callPackage ../tools/networking/fastd { };
-
-  fatsort = callPackage ../tools/filesystems/fatsort { };
-
   chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { };
 
   fcitx5 = callPackage ../tools/inputmethods/fcitx5 { };
@@ -7362,22 +3479,8 @@ with pkgs;
 
   fcitx5-table-other = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-other.nix { };
 
-  fcppt = callPackage ../development/libraries/fcppt { };
-
-  fcrackzip = callPackage ../tools/security/fcrackzip { };
-
-  fcron = callPackage ../tools/system/fcron { };
-
-  fdm = callPackage ../tools/networking/fdm { };
-
-  fdtools = callPackage ../tools/misc/fdtools { };
-
   featherpad = qt5.callPackage ../applications/editors/featherpad { };
 
-  fend = callPackage ../tools/misc/fend { };
-
-  ferm = callPackage ../tools/networking/ferm { };
-
   feroxbuster = callPackage ../tools/security/feroxbuster {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
@@ -7386,13 +3489,9 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security AppKit;
   };
 
-  fgallery = callPackage ../tools/graphics/fgallery { };
-
   flannel = callPackage ../tools/networking/flannel { };
   cni-plugin-flannel = callPackage ../tools/networking/flannel/plugin.nix { };
 
-  flashbench = callPackage ../os-specific/linux/flashbench { };
-
   flatpak-builder = callPackage ../development/tools/flatpak-builder {
     binutils = binutils-unwrapped;
   };
@@ -7401,32 +3500,12 @@ with pkgs;
     icu = icu63;
   };
 
-  fluent-reader = callPackage ../applications/networking/feedreaders/fluent-reader { };
-
-  flux = callPackage ../development/compilers/flux { };
-
-  fierce = callPackage ../tools/security/fierce { };
-
-  figlet = callPackage ../tools/misc/figlet { };
-
   file = callPackage ../tools/misc/file {
     inherit (windows) libgnurx;
   };
 
-  filegive = callPackage ../tools/networking/filegive { };
-
-  filet = callPackage ../applications/misc/filet { };
-
-  findex = callPackage ../applications/misc/findex { };
-
-  findomain = callPackage ../tools/networking/findomain { };
-
   findutils = callPackage ../tools/misc/findutils { };
 
-  findup = callPackage ../tools/misc/findup { };
-
-  fingerprintx = callPackage ../tools/security/fingerprintx { };
-
   bsd-fingerd = bsd-finger.override {
     buildProduct = "daemon";
   };
@@ -7435,30 +3514,12 @@ with pkgs;
 
   firehol = callPackage ../applications/networking/firehol { };
 
-  fio = callPackage ../tools/system/fio { };
-
-  flamerobin = callPackage ../applications/misc/flamerobin { };
-
-  flashrom = callPackage ../tools/misc/flashrom { };
-
-  flexoptix-app = callPackage ../tools/misc/flexoptix-app { };
-
-  flpsed = callPackage ../applications/editors/flpsed { };
-
   fluentd = callPackage ../tools/misc/fluentd { };
 
-  flvstreamer = callPackage ../tools/networking/flvstreamer { };
-
-  frr = callPackage ../servers/frr { };
-
   gemstash = callPackage ../development/tools/gemstash { };
 
   hmetis = pkgsi686Linux.callPackage ../applications/science/math/hmetis { };
 
-  libbsd = callPackage ../development/libraries/libbsd { };
-
-  libbladeRF = callPackage ../development/libraries/libbladeRF { };
-
   libbtbb = callPackage ../development/libraries/libbtbb {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -7469,46 +3530,8 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { };
-
-  faraday-agent-dispatcher = callPackage ../tools/security/faraday-agent-dispatcher { };
-
-  faraday-cli = callPackage ../tools/security/faraday-cli { };
-
   fastlane = callPackage ../tools/admin/fastlane { };
 
-  fatresize = callPackage ../tools/filesystems/fatresize { };
-
-  fdk_aac = callPackage ../development/libraries/fdk-aac { };
-
-  fdk-aac-encoder = callPackage ../applications/audio/fdkaac { };
-
-  fead = callPackage ../applications/misc/fead { };
-
-  feedgnuplot = callPackage ../tools/graphics/feedgnuplot { };
-
-  fermyon-spin = callPackage ../development/tools/fermyon-spin { };
-
-  fbcat = callPackage ../tools/misc/fbcat { };
-
-  fbjni = callPackage ../development/libraries/fbjni { };
-
-  fbv = callPackage ../tools/graphics/fbv { };
-
-  fbvnc = callPackage ../tools/admin/fbvnc { };
-
-  fim = callPackage ../tools/graphics/fim { };
-
-  flamegraph = callPackage ../development/tools/flamegraph { };
-
-  flawfinder = callPackage ../development/tools/flawfinder { };
-
-  flintlock = callPackage ../applications/virtualization/flintlock { };
-
-  flips = callPackage ../tools/compression/flips { };
-
-  flowblade = callPackage ../applications/video/flowblade { };
-
   fontforge = lowPrio (callPackage ../tools/misc/fontforge {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
     python = python3;
@@ -7524,78 +3547,34 @@ with pkgs;
 
   fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix { };
 
-  foremost = callPackage ../tools/system/foremost { };
-
-  forktty = callPackage ../os-specific/linux/forktty { };
-
-  fortran-fpm = callPackage ../tools/package-management/fortran-fpm { };
-
-  fortune = callPackage ../tools/misc/fortune { };
-
   fox = callPackage ../development/libraries/fox {};
 
   fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  fpart = callPackage ../tools/misc/fpart { };
-
-  fpattern = callPackage ../development/libraries/fpattern { };
-
-  fping = callPackage ../tools/networking/fping { };
-
   fpm = callPackage ../tools/package-management/fpm { };
 
   ferdium = callPackage ../applications/networking/instant-messengers/ferdium {
     mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
   };
 
-  fq = callPackage ../development/tools/fq { };
-
   franz = callPackage ../applications/networking/instant-messengers/franz {
     mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
   };
 
-  freac = callPackage ../applications/audio/freac { };
-
-  freebind = callPackage ../tools/networking/freebind { };
-
-  freeipmi = callPackage ../tools/system/freeipmi { };
-
-  freetalk = callPackage ../applications/networking/instant-messengers/freetalk { };
-
-  freetds = callPackage ../development/libraries/freetds { };
-
-  freetube = callPackage ../applications/video/freetube { };
-
-  freeze = callPackage ../tools/security/freeze { };
-
   freqtweak = callPackage ../applications/audio/freqtweak {
     wxGTK = wxGTK32;
   };
 
-  frescobaldi = callPackage ../misc/frescobaldi { };
-
   freshfetch = callPackage ../tools/misc/freshfetch {
     inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation DiskArbitration Foundation IOKit;
   };
 
-  frigate = callPackage ../applications/video/frigate { };
-
   frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { };
 
-  ftop = callPackage ../os-specific/linux/ftop { };
-
-  ftxui = callPackage ../development/libraries/ftxui { };
-
-  fsarchiver = callPackage ../tools/archivers/fsarchiver { };
-
   fstl = qt5.callPackage ../applications/graphics/fstl { };
 
-  fswebcam = callPackage ../os-specific/linux/fswebcam { };
-
-  fuseiso = callPackage ../tools/filesystems/fuseiso { };
-
   fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { });
 
   inherit (fdbPackages)
@@ -7604,48 +3583,18 @@ with pkgs;
 
   foundationdb = foundationdb71;
 
-  fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { };
-
-  fuse-archive = callPackage ../tools/filesystems/fuse-archive { };
-
   fuse-ext2 = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/fuse-ext2 { };
 
-  fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs { };
-
-  fusee-interfacee-tk = callPackage ../applications/misc/fusee-interfacee-tk { };
-
-  fusee-launcher = callPackage ../development/tools/fusee-launcher { };
-
-  fusee-nano = callPackage ../development/tools/fusee-nano { };
-
-  fverb = callPackage ../applications/audio/fverb { };
-
   fwknop = callPackage ../tools/security/fwknop {
     texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8.
   };
 
-  elastic = callPackage ../applications/misc/elastic { };
-
-  exfat = callPackage ../tools/filesystems/exfat { };
-
-  exfatprogs = callPackage ../tools/filesystems/exfatprogs { };
-
-  dos2unix = callPackage ../tools/text/dos2unix { };
-
-  uni2ascii = callPackage ../tools/text/uni2ascii { };
-
   uniscribe = callPackage ../tools/text/uniscribe { };
 
-  fornalder = callPackage ../applications/version-management/fornalder { };
-
-  galen = callPackage ../development/tools/galen { };
-
   gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { };
 
   gandi-cli = python3Packages.callPackage ../tools/networking/gandi-cli { };
 
-  gandom-fonts = callPackage ../data/fonts/gandom-fonts { };
-
   gaphor = python3Packages.callPackage ../tools/misc/gaphor { };
 
   inherit (callPackages ../tools/filesystems/garage {
@@ -7656,10 +3605,6 @@ with pkgs;
       garage_0_8_7 garage_0_9_4
       garage_1_0_1 garage_1_x;
 
-  garmintools = callPackage ../development/libraries/garmintools { };
-
-  gau = callPackage ../tools/security/gau { };
-
   gauge-unwrapped = callPackage ../development/tools/gauge { };
   gauge = callPackage ../development/tools/gauge/wrapper.nix { };
   gaugePlugins = recurseIntoAttrs (callPackage ../development/tools/gauge/plugins {});
@@ -7677,152 +3622,48 @@ with pkgs;
 
   gawkInteractive = gawk.override { interactive = true; };
 
-  gatk = callPackage ../applications/science/biology/gatk {} ;
-
   gbdfed = callPackage ../tools/misc/gbdfed {
     gtk = gtk2-x11;
   };
 
-  gcfflasher = callPackage ../applications/misc/gcfflasher { };
-
-  gdmap = callPackage ../tools/system/gdmap { };
-
-  gef = callPackage ../development/tools/misc/gef { };
-
-  gelasio = callPackage ../data/fonts/gelasio { };
-
-  gemget = callPackage ../tools/networking/gemget { };
-
-  gen-oath-safe = callPackage ../tools/security/gen-oath-safe { };
-
-  genext2fs = callPackage ../tools/filesystems/genext2fs { };
-
-  gengetopt = callPackage ../development/tools/misc/gengetopt { };
-
-  genimage = callPackage ../tools/filesystems/genimage { };
-
-  genmap = callPackage ../applications/science/biology/genmap { };
-
-  geonkick = callPackage ../applications/audio/geonkick { };
-
-  geteltorito = callPackage ../tools/misc/geteltorito { };
-
-  getopt = callPackage ../tools/misc/getopt { };
-
-  getoptions = callPackage ../tools/misc/getoptions { };
-
-  gexiv2 = callPackage ../development/libraries/gexiv2 { };
-
   gftp = callPackage ../applications/networking/ftp/gftp {
     gtk = gtk2;
   };
 
-  gfs2-utils = callPackage ../tools/filesystems/gfs2-utils { };
-
-  gfbgraph = callPackage ../development/libraries/gfbgraph { };
-
-  ggobi = callPackage ../tools/graphics/ggobi { };
-
   ggshield = callPackage ../tools/security/ggshield {
     python3 = python311;
   };
 
-  ghost = callPackage ../tools/security/ghost { };
-
-  ghostunnel = callPackage ../tools/networking/ghostunnel { };
-
-  ghz = callPackage ../tools/networking/ghz { };
-
-  gi-crystal = callPackage ../development/tools/gi-crystal { };
-
   gibberish-detector = with python3Packages; toPythonApplication gibberish-detector;
 
-  gibo = callPackage ../tools/misc/gibo { };
-
   gifski = callPackage ../tools/graphics/gifski {
     ffmpeg = ffmpeg_6;
   };
 
-  github-backup = callPackage ../tools/misc/github-backup { };
-
-  gitkraken = callPackage ../applications/version-management/gitkraken { };
-
   gitlab = callPackage ../applications/version-management/gitlab { };
   gitlab-ee = callPackage ../applications/version-management/gitlab {
     gitlabEnterprise = true;
   };
 
-  gitlab-clippy = callPackage ../development/tools/rust/gitlab-clippy { };
-
-  gitlab-container-registry = callPackage ../applications/version-management/gitlab/gitlab-container-registry { };
-
-  gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { };
-
-  gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };
-
   gitlab-triage = callPackage ../applications/version-management/gitlab-triage { };
 
   gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { };
 
-  gitlab-elasticsearch-indexer = callPackage ../applications/version-management/gitlab/gitlab-elasticsearch-indexer { };
-
-  gitleaks = callPackage ../tools/security/gitleaks { };
-
-  gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
-
   gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { };
 
-  git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
-
-  gokart = callPackage ../development/tools/gokart { };
-
-  gl2ps = callPackage ../development/libraries/gl2ps { };
-
-  glusterfs = callPackage ../tools/filesystems/glusterfs { };
-
-  glmark2 = callPackage ../tools/graphics/glmark2 { };
-
   glogg = libsForQt5.callPackage ../tools/text/glogg { };
 
   gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect {
     inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;
   };
 
-  gnirehtet = callPackage ../tools/networking/gnirehtet { };
-
-  gnome-builder = callPackage ../applications/editors/gnome-builder { };
-
-  gnome-desktop = callPackage ../development/libraries/gnome-desktop { };
-
   gnome-decoder = callPackage ../applications/graphics/gnome-decoder {
      inherit (gst_all_1) gstreamer gst-plugins-base;
      gst-plugins-bad = gst_all_1.gst-plugins-bad.override { enableZbar = true; };
   };
 
-  gnome-epub-thumbnailer = callPackage ../applications/misc/gnome-epub-thumbnailer { };
-
-  gnome-extension-manager = callPackage ../applications/misc/gnome-extension-manager { };
-
-  gnome-frog = callPackage ../applications/misc/gnome-frog { };
-
-  gnome-keysign = callPackage ../tools/security/gnome-keysign { };
-
-  gnome-secrets = callPackage ../applications/misc/gnome-secrets { };
-
-  gnome-solanum = callPackage ../applications/misc/gnome-solanum { };
-
   gnome-panel-with-modules = callPackage ../by-name/gn/gnome-panel/wrapper.nix { };
 
-  gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { };
-
-  gnome-photos = callPackage ../applications/graphics/gnome-photos { };
-
-  gnome-randr = callPackage ../tools/wayland/gnome-randr { };
-
-  gnuapl = callPackage ../development/interpreters/gnu-apl { };
-
-  gnu-shepherd = callPackage ../misc/gnu-shepherd { };
-
   dapl = callPackage ../development/interpreters/dzaima-apl {
     buildNativeImage = false;
     stdenv = stdenvNoCC;
@@ -7835,18 +3676,12 @@ with pkgs;
 
   gnucap-full = gnucap.withPlugins(p: [ p.verilog ]);
 
-  gnu-cim = callPackage ../development/compilers/gnu-cim { };
-
-  gnuclad = callPackage ../applications/graphics/gnuclad { };
-
   gnufdisk = callPackage ../tools/system/fdisk {
     guile = guile_1_8;
   };
 
   gnugrep = callPackage ../tools/text/gnugrep { };
 
-  gnulib = callPackage ../development/tools/gnulib { };
-
   gnupatch = callPackage ../tools/text/gnupatch { };
 
   gnupg1orig = callPackage ../tools/security/gnupg/1.nix { };
@@ -7863,8 +3698,6 @@ with pkgs;
   };
   gnupg = gnupg24;
 
-  gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { };
-
   gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
@@ -7874,16 +3707,10 @@ with pkgs;
   # must have AquaTerm installed separately
   gnuplot_aquaterm = gnuplot.override { aquaterm = true; };
 
-  gnu-pw-mgr = callPackage ../tools/security/gnu-pw-mgr { };
-
   gnused = callPackage ../tools/text/gnused { };
 
   gnutar = callPackage ../tools/archivers/gnutar { };
 
-  goaccess = callPackage ../tools/misc/goaccess { };
-
-  gocryptfs = callPackage ../tools/filesystems/gocryptfs { };
-
   godot3 = callPackage ../development/tools/godot/3 { };
 
   godot3-export-templates = callPackage ../development/tools/godot/3/export-templates.nix { };
@@ -7904,24 +3731,12 @@ with pkgs;
 
   godot3-mono-server = callPackage ../development/tools/godot/3/mono/server.nix { };
 
-  goeland = callPackage ../applications/networking/feedreaders/goeland { };
-
-  go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { };
-
-  goofys = callPackage ../tools/filesystems/goofys { };
-
-  go-sct = callPackage ../tools/X11/go-sct { };
-
   goattracker = callPackage ../applications/audio/goattracker { };
 
   goattracker-stereo = callPackage ../applications/audio/goattracker {
     isStereo = true;
   };
 
-  google-app-engine-go-sdk = callPackage ../development/tools/google-app-engine-go-sdk { };
-
-  google-authenticator = callPackage ../os-specific/linux/google-authenticator { };
-
   google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk {
     python = python3;
   };
@@ -7930,47 +3745,15 @@ with pkgs;
     with-gce = true;
   };
 
-  google-cloud-bigtable-tool = callPackage ../tools/misc/google-cloud-bigtable-tool { };
-
-  google-cloud-sql-proxy = callPackage ../tools/misc/google-cloud-sql-proxy { };
-
-  google-fonts = callPackage ../data/fonts/google-fonts { };
-
-  google-clasp = callPackage ../development/tools/google-clasp { };
-
   google-compute-engine = with python3.pkgs; toPythonApplication google-compute-engine;
 
-  google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { };
-
-  google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { };
-
-  google-java-format = callPackage ../development/tools/google-java-format { };
-
-  google-guest-agent = callPackage ../tools/virtualization/google-guest-agent { };
-
-  google-guest-configs = callPackage ../tools/virtualization/google-guest-configs { };
-
   gdown = with python3Packages; toPythonApplication gdown;
 
-  gopro = callPackage ../tools/video/gopro { };
-
-  goreplay = callPackage ../tools/networking/goreplay { };
-
-  gost = callPackage ../tools/networking/gost { };
-
-  gource = callPackage ../applications/version-management/gource { };
-
-  govc = callPackage ../tools/virtualization/govc { };
-
   goverlay = callPackage ../tools/graphics/goverlay {
     inherit (qt5) wrapQtAppsHook;
     inherit (plasma5Packages) breeze-qt5;
   };
 
-  gpart = callPackage ../tools/filesystems/gpart { };
-
-  gparted = callPackage ../tools/misc/gparted { };
-
   gpt4all-cuda = gpt4all.override {
     cudaSupport = true;
   };
@@ -7981,30 +3764,12 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  gptman = callPackage ../tools/system/gptman { };
-
-  ldmtool = callPackage ../tools/misc/ldmtool { };
-
-  gphotos-sync = callPackage ../tools/backup/gphotos-sync { };
-
-  gpodder = callPackage ../applications/audio/gpodder { };
-
-  gpp = callPackage ../development/tools/gpp { };
-
   gpredict = callPackage ../applications/science/astronomy/gpredict {
     hamlib = hamlib_4;
   };
 
   gprof2dot = with python3Packages; toPythonApplication gprof2dot;
 
-  gprojector = callPackage ../applications/science/astronomy/gprojector { };
-
-  gptfdisk = callPackage ../tools/system/gptfdisk { };
-
-  gql = callPackage ../applications/version-management/gql { };
-
-  gradience = callPackage ../applications/misc/gradience { };
-
   grails = callPackage ../development/web/grails { jdk = null; };
 
   graylog-5_1 = callPackage ../tools/misc/graylog/5.1.nix { };
@@ -8026,50 +3791,14 @@ with pkgs;
     withXorg = false;
   };
 
-  grass-sass = callPackage ../tools/misc/grass-sass { };
-
-  gridtracker = callPackage ../applications/radio/gridtracker { };
-
-  grig = callPackage ../applications/radio/grig { };
-
-  grin = callPackage ../tools/text/grin { };
-
-  gyb = callPackage ../tools/backup/gyb { };
-
-  halftone = callPackage ../applications/graphics/halftone { };
-
-  harminv = callPackage ../development/libraries/science/chemistry/harminv { };
-
   igrep = callPackage ../tools/text/igrep {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  ripgrep = callPackage ../tools/text/ripgrep { };
-
   ripgrep-all = callPackage ../tools/text/ripgrep-all {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  grive2 = callPackage ../tools/filesystems/grive2 { };
-
-  groff = callPackage ../tools/text/groff { };
-
-  gron = callPackage ../development/tools/gron { };
-
-  groonga = callPackage ../servers/search/groonga { };
-
-  grpcurl = callPackage ../tools/networking/grpcurl { };
-
-  grpc_cli = callPackage ../tools/networking/grpc_cli { };
-
-  grpc-gateway = callPackage ../development/tools/grpc-gateway { };
-
-  grpcui = callPackage ../tools/networking/grpcui { };
-
-  grpc-tools = callPackage ../development/tools/misc/grpc-tools { };
-
-  grpc-client-cli = callPackage ../development/tools/misc/grpc-client-cli { };
-
   grub2 = callPackage ../tools/misc/grub/default.nix { };
 
   grub2_efi = grub2.override {
@@ -8084,8 +3813,6 @@ with pkgs;
     xenSupport = true;
   };
 
-  grub2_pvgrub_image = callPackage ../tools/misc/grub/pvgrub_image { };
-
   grub4dos = callPackage ../tools/misc/grub4dos {
     stdenv = stdenv_32bit;
   };
@@ -8095,14 +3822,6 @@ with pkgs;
   gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa;
 
   gx = callPackage ../tools/package-management/gx { };
-  gx-go = callPackage ../tools/package-management/gx/go { };
-
-  efitools = callPackage ../tools/security/efitools { };
-
-  sbsigntool = callPackage ../tools/security/sbsigntool { };
-
-  gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
-
   gsmlib = callPackage ../development/libraries/gsmlib
     { autoreconfHook = buildPackages.autoreconfHook269; };
 
@@ -8112,142 +3831,44 @@ with pkgs;
 
   gssdp-tools = callPackage ../development/libraries/gssdp/tools.nix { };
 
-  gt5 = callPackage ../tools/system/gt5 { };
-
-  gtest = callPackage ../development/libraries/gtest { };
-
-  gbenchmark = callPackage ../development/libraries/gbenchmark { };
-
-  gkraken = callPackage ../tools/system/gkraken { };
-
-  gtkdatabox = callPackage ../development/libraries/gtkdatabox { };
-
-  gtdialog = callPackage ../development/libraries/gtdialog { };
-
   gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; };
 
-  gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
-
-  gtkradiant = callPackage ../applications/misc/gtkradiant { };
-
-  gtk-frdp = callPackage ../development/libraries/gtk-frdp { };
-
-  gtk-vnc = callPackage ../tools/admin/gtk-vnc { };
-
   gup = callPackage ../development/tools/build-managers/gup { };
 
   gupnp = callPackage ../development/libraries/gupnp { };
 
   gupnp_1_6 = callPackage ../development/libraries/gupnp/1.6.nix { };
 
-  gupnp-av = callPackage ../development/libraries/gupnp-av { };
-
-  gupnp-dlna = callPackage ../development/libraries/gupnp-dlna { };
-
-  gupnp-igd = callPackage ../development/libraries/gupnp-igd { };
-
-  gupnp-tools = callPackage ../tools/networking/gupnp-tools { };
-
   gvm-tools = with python3.pkgs; toPythonApplication gvm-tools;
 
-  gvpe = callPackage ../tools/networking/gvpe { };
-
-  gvolicon = callPackage ../tools/audio/gvolicon { };
-
-  gvproxy = callPackage ../tools/networking/gvproxy { };
-
   gyroflow = qt6Packages.callPackage ../applications/video/gyroflow { };
 
   gzip = callPackage ../tools/compression/gzip { };
 
-  gzrt = callPackage ../tools/compression/gzrt { };
-
-  httplab = callPackage ../tools/networking/httplab { };
-
-  lucky-cli = callPackage ../development/web/lucky-cli { };
-
-  mac-fdisk = callPackage ../tools/system/mac-fdisk { };
-
-  partclone = callPackage ../tools/backup/partclone { };
-
-  partimage = callPackage ../tools/backup/partimage { };
-
   pdisk = callPackage ../tools/system/pdisk {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
   };
 
-  pgf_graphics = callPackage ../tools/graphics/pgf { };
-
-  pgbackrest = callPackage ../tools/backup/pgbackrest { };
-
-  pgformatter = callPackage ../development/tools/pgformatter { };
-
-  pgloader = callPackage ../development/tools/pgloader { };
-
-  pgtop = callPackage ../development/tools/pgtop { };
-
-  pigz = callPackage ../tools/compression/pigz { };
-
-  pixz = callPackage ../tools/compression/pixz { };
-
-  plog = callPackage ../development/libraries/plog {};
-
   plplot = callPackage ../development/libraries/plplot {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  pxattr = callPackage ../tools/archivers/pxattr { };
-
-  pxz = callPackage ../tools/compression/pxz { };
-
   haguichi = callPackage ../tools/networking/haguichi { };
 
-  hans = callPackage ../tools/networking/hans { };
-
-  haproxy = callPackage ../tools/networking/haproxy { };
-
-  hackertyper = callPackage ../tools/misc/hackertyper { };
-
-  hackneyed = callPackage ../data/icons/hackneyed { };
-
-  haveged = callPackage ../tools/security/haveged { };
-
-  habitat = callPackage ../applications/networking/cluster/habitat { };
-
-  hashcash = callPackage ../tools/security/hashcash { };
-
   hashcat = callPackage ../tools/security/hashcat {
     inherit (darwin.apple_sdk.frameworks) Foundation IOKit Metal OpenCL;
   };
 
-  hashcat-utils = callPackage ../tools/security/hashcat-utils { };
-
-  hashrat = callPackage ../tools/security/hashrat { };
-
-  hash_extender = callPackage ../tools/security/hash_extender { };
-
-  hash-identifier = callPackage ../tools/security/hash-identifier { };
-
-  hash-slinger = callPackage ../tools/security/hash-slinger { };
-
   haskell-language-server = callPackage ../development/tools/haskell/haskell-language-server/withWrapper.nix { };
 
   hassil = with python3Packages; toPythonApplication hassil;
 
-  hasmail = callPackage ../applications/networking/mailreaders/hasmail { };
-
   haste-client = callPackage ../tools/misc/haste-client { };
 
-  haste-server = callPackage ../servers/haste-server { };
-
   hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer {
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
 
-  half = callPackage ../development/libraries/half { };
-
-  halibut = callPackage ../tools/typesetting/halibut { };
-
   halide = callPackage ../development/compilers/halide {
     llvmPackages = llvmPackages_18;
   };
@@ -8256,30 +3877,6 @@ with pkgs;
 
   ham = pkgs.perlPackages.ham;
 
-  hamsket = callPackage ../applications/networking/instant-messengers/hamsket { };
-
-  hardinfo = callPackage ../tools/system/hardinfo { };
-
-  hayagriva = callPackage ../tools/typesetting/hayagriva { };
-
-  hcl2json = callPackage ../applications/misc/hcl2json { };
-
-  hcledit = callPackage ../tools/text/hcledit { };
-
-  hcxtools = callPackage ../tools/security/hcxtools { };
-
-  hcxdumptool = callPackage ../tools/security/hcxdumptool { };
-
-  hdapsd = callPackage ../os-specific/linux/hdapsd { };
-
-  hdaps-gl = callPackage ../tools/misc/hdaps-gl { };
-
-  hddfancontrol = callPackage ../tools/system/hddfancontrol { };
-
-  hddtemp = callPackage ../tools/misc/hddtemp { };
-
-  hdf4 = callPackage ../tools/misc/hdf4 { };
-
   hdf5 = callPackage ../tools/misc/hdf5 {
     fortranSupport = false;
     fortran = gfortran;
@@ -8298,16 +3895,8 @@ with pkgs;
 
   hdf5-threadsafe = hdf5.override { threadsafe = true; };
 
-  hdf5-blosc = callPackage ../development/libraries/hdf5-blosc { };
-
-  hdfview = callPackage ../tools/misc/hdfview { };
-
-  hecate = callPackage ../applications/editors/hecate { };
-
   heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack { };
 
-  heatshrink = callPackage ../tools/compression/heatshrink { };
-
   heimdall = libsForQt5.callPackage ../tools/misc/heimdall { };
 
   heimdall-gui = heimdall.override { enableGUI = true; };
@@ -8316,37 +3905,10 @@ with pkgs;
     buildGoModule = buildGo123Module;
   };
 
-  health = callPackage ../applications/misc/health { };
-
-  healthchecks = callPackage ../servers/web-apps/healthchecks { };
-
-  heisenbridge = callPackage ../servers/heisenbridge { };
-
-  helio-workstation = callPackage ../applications/audio/helio-workstation { };
-
-  hevea = callPackage ../tools/typesetting/hevea { };
-
-  hex = callPackage ../tools/misc/hex { };
-
-  hexd = callPackage ../tools/misc/hexd { };
-  pixd = callPackage ../tools/misc/pixd { };
-
-  hexgui = callPackage ../games/hexgui { };
-
-  hey = callPackage ../tools/networking/hey { };
-
-  heygpt = callPackage ../tools/llm/heygpt { };
-
-  hhpc = callPackage ../tools/misc/hhpc { };
-
   hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };
 
-  hivemind = callPackage ../applications/misc/hivemind { };
-
   hobbits = libsForQt5.callPackage ../tools/graphics/hobbits { };
 
-  hfsprogs = callPackage ../tools/filesystems/hfsprogs { };
-
   highlight = callPackage ../tools/text/highlight {
     lua = lua5;
   };
@@ -8355,30 +3917,16 @@ with pkgs;
 
   hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { };
 
-  holochain-launcher = callPackage ../applications/misc/holochain-launcher { };
-
   homesick = callPackage ../tools/misc/homesick { };
 
-  honcho = callPackage ../tools/system/honcho { };
-
-  horst = callPackage ../tools/networking/horst { };
-
   host = bind.host;
 
-  hostess = callPackage ../development/tools/hostess { };
-
-  hostname-debian = callPackage ../tools/networking/hostname-debian { };
-
   hotdoc = python3Packages.callPackage ../development/tools/hotdoc { };
 
-  hotpatch = callPackage ../development/libraries/hotpatch { };
-
   hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { };
 
   hpccm = with python3Packages; toPythonApplication hpccm;
 
-  hping = callPackage ../tools/networking/hping { };
-
   hqplayer-desktop = libsForQt5.callPackage ../applications/audio/hqplayer-desktop { };
 
   html-proofer = callPackage ../tools/misc/html-proofer { };
@@ -8387,92 +3935,34 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  htpdate = callPackage ../tools/networking/htpdate { };
-
   http-prompt = callPackage ../tools/networking/http-prompt { };
 
-  httpdump = callPackage ../tools/security/httpdump { };
-
   httpie = with python3Packages; toPythonApplication httpie;
 
-  httplz = callPackage ../tools/networking/httplz { };
-
-  httpfs2 = callPackage ../tools/filesystems/httpfs { };
-
-  httprobe = callPackage ../tools/networking/httprobe { };
-
-  httpstat = callPackage ../tools/networking/httpstat { };
-
-  httptunnel = callPackage ../tools/networking/httptunnel { };
-
-  httpx = callPackage ../tools/security/httpx { };
-
   hue-plus = libsForQt5.callPackage ../applications/misc/hue-plus { };
 
-  hubicfuse = callPackage ../tools/filesystems/hubicfuse { };
-
   humanfriendly = with python3Packages; toPythonApplication humanfriendly;
 
   hw-probe = perlPackages.callPackage ../tools/system/hw-probe { };
 
-  hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { };
-
   hyphen = callPackage ../development/libraries/hyphen { };
 
   hyphenDicts = recurseIntoAttrs (callPackages ../development/libraries/hyphen/dictionaries.nix {});
 
-  i2c-tools = callPackage ../os-specific/linux/i2c-tools { };
-
-  i2pd = callPackage ../tools/networking/i2pd { };
-
   iannix = libsForQt5.callPackage ../applications/audio/iannix { };
 
   iaito = libsForQt5.callPackage ../tools/security/iaito { };
 
   jamulus = libsForQt5.callPackage ../applications/audio/jamulus { };
 
-  ultrablue-server = callPackage ../os-specific/linux/ultrablue-server { };
-
-  ibm-sw-tpm2 = callPackage ../tools/security/ibm-sw-tpm2 { };
-
-  ibniz = callPackage ../tools/graphics/ibniz { };
-
-  icebreaker = callPackage ../servers/icebreaker { };
-
-  icecast = callPackage ../servers/icecast { };
-
   icemon = libsForQt5.callPackage ../applications/networking/icemon { };
 
   icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak;
 
-  iceshelf = callPackage ../tools/backup/iceshelf { };
-
-  darkice = callPackage ../tools/audio/darkice { };
-
-  bc-decaf = callPackage ../development/libraries/bc-decaf { };
-
-  deckmaster = callPackage ../applications/misc/deckmaster { };
-
-  deco = callPackage ../applications/misc/deco { };
-
-  decoder = callPackage ../tools/security/decoder { };
-
-  icoutils = callPackage ../tools/graphics/icoutils { };
-
-  idutils = callPackage ../tools/misc/idutils { };
-
-  idle3tools = callPackage ../tools/system/idle3tools { };
-
-  iftop = callPackage ../tools/networking/iftop { };
-
   ifwifi = callPackage ../tools/networking/ifwifi {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  ifuse = callPackage ../tools/filesystems/ifuse { };
-  ideviceinstaller = callPackage ../tools/misc/ideviceinstaller { };
-  idevicerestore = callPackage ../tools/misc/idevicerestore { };
-
   inherit (callPackages ../tools/filesystems/irods rec {
     stdenv = llvmPackages_13.libcxxStdenv;
     libcxx = llvmPackages_13.libcxx;
@@ -8485,8 +3975,6 @@ with pkgs;
     irods
     irods-icommands;
 
-  igmpproxy = callPackage ../tools/networking/igmpproxy { };
-
   ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
     inherit (haskellPackages) ghcWithPackages;
 
@@ -8497,302 +3985,99 @@ with pkgs;
 
   iruby = callPackage ../applications/editors/jupyter-kernels/iruby { };
 
-  ike-scan = callPackage ../tools/security/ike-scan { };
-
   ilspycmd = callPackage ../development/tools/ilspycmd {
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  imapsync = callPackage ../tools/networking/imapsync { };
-
-  imgur-screenshot = callPackage ../tools/graphics/imgur-screenshot { };
-
-  imgurbash2 = callPackage ../tools/graphics/imgurbash2 { };
-
   in-formant = qt6Packages.callPackage ../applications/audio/in-formant { };
 
-  inadyn = callPackage ../tools/networking/inadyn { };
-
   incus-lts = callPackage ../by-name/in/incus/lts.nix { };
 
-  incron = callPackage ../tools/system/incron { };
-
   indexed-bzip2 = with python3Packages; toPythonApplication indexed-bzip2;
 
-  industrializer = callPackage ../applications/audio/industrializer { };
-
-  inetutils = callPackage ../tools/networking/inetutils { };
-
-  inferno = callPackage ../development/tools/inferno { };
-
   infisical = callPackage ../development/tools/infisical { };
 
   inform6 = darwin.apple_sdk_11_0.callPackage ../development/compilers/inform6 { };
 
-  inform7 = callPackage ../development/compilers/inform7 { };
-
-  infamousPlugins = callPackage ../applications/audio/infamousPlugins { };
-
   innernet = callPackage ../tools/networking/innernet {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  innoextract = callPackage ../tools/archivers/innoextract { };
-
   input-remapper = python3Packages.callPackage ../tools/inputmethods/input-remapper { };
 
-  inql = callPackage ../tools/security/inql { };
-
-  intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { };
-
-  intermodal = callPackage ../tools/misc/intermodal { };
-
   internetarchive = with python3Packages; toPythonApplication internetarchive;
 
   invidious = callPackage ../servers/invidious { };
 
-  invoice2data  = callPackage ../tools/text/invoice2data  { };
-
-  inxi = callPackage ../tools/system/inxi { };
-
-  iodine = callPackage ../tools/networking/iodine { };
-
-  ioc-scan = callPackage ../tools/security/ioc-scan { };
-
-  ioccheck = callPackage ../tools/security/ioccheck { };
-
   iocextract = with python3Packages; toPythonApplication iocextract;
 
   iocsearcher = with python3Packages; toPythonApplication iocsearcher;
 
-  ioping = callPackage ../tools/system/ioping { };
-
-  ior = callPackage ../tools/system/ior { };
-
-  ioztat = callPackage ../tools/filesystems/ioztat { };
-
-  ip2location = callPackage ../tools/networking/ip2location { };
-
-  ip2unix = callPackage ../tools/networking/ip2unix { };
-
-  ipad_charge = callPackage ../tools/misc/ipad_charge { };
-
   iperf2 = callPackage ../tools/networking/iperf/2.nix { };
   iperf3 = callPackage ../tools/networking/iperf/3.nix { };
   iperf = iperf3;
 
-  iperf3d = callPackage ../tools/networking/iperf3d { };
-
-  ipfetch = callPackage ../tools/networking/ipfetch { };
-
-  ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
-
-  ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { };
-
-  ipget = callPackage ../applications/networking/ipget { };
-
   i-pi = with python3Packages; toPythonApplication i-pi;
 
-  iptsd = callPackage ../applications/misc/iptsd { };
-
-  ipmitool = callPackage ../tools/system/ipmitool { };
-
-  ipmiutil = callPackage ../tools/system/ipmiutil { };
-
-  ipatool = callPackage ../applications/misc/ipatool { };
-
-  ipmicfg = callPackage ../applications/misc/ipmicfg { };
-
-  ipmiview = callPackage ../applications/misc/ipmiview { };
-
-  ipcalc = callPackage ../tools/networking/ipcalc { };
-
-  netmask = callPackage ../tools/networking/netmask { };
-
-  netifd = callPackage ../tools/networking/netifd { };
-
-  ipinfo = callPackage ../tools/networking/ipinfo { };
-
-  ipscan = callPackage ../tools/security/ipscan { };
   # ipscan is commonly known under the name angryipscanner
   angryipscanner = ipscan;
 
-  ipv6calc = callPackage ../tools/networking/ipv6calc { };
-
-  irker = callPackage ../servers/irker { };
-
-  iroh = callPackage ../applications/networking/iroh { };
-
-  ised = callPackage ../tools/misc/ised { };
-
   isl = isl_0_20;
   isl_0_17 = callPackage ../development/libraries/isl/0.17.1.nix { };
   isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { };
   isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { };
 
-  ispike = callPackage ../development/libraries/science/robotics/ispike { };
-
-  isrcsubmit = callPackage ../tools/audio/isrcsubmit { };
-
   isync = callPackage ../tools/networking/isync {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  itm-tools = callPackage ../development/tools/misc/itm-tools { };
-
-  ite-backlight = callPackage ../misc/ite-backlight { };
-
-  iwgtk = callPackage ../tools/networking/iwgtk { };
-
-  ix = callPackage ../tools/misc/ix { };
-
-  jaaa = callPackage ../applications/audio/jaaa { };
-
   jackett = callPackage ../servers/jackett { };
 
-  jade = callPackage ../tools/text/sgml/jade { };
-
-  jadx = callPackage ../tools/security/jadx { };
-
   jamesdsp = qt6Packages.callPackage ../applications/audio/jamesdsp { };
   jamesdsp-pulse = qt6Packages.callPackage ../applications/audio/jamesdsp {
     usePipewire = false;
     usePulseaudio = true;
   };
 
-  jaq = callPackage ../development/tools/jaq { };
-
-  jasmin-compiler = callPackage ../development/compilers/jasmin-compiler { };
-
   jazzy = callPackage ../development/tools/jazzy { };
 
   jc = with python3Packages; toPythonApplication jc;
 
-  jd-diff-patch = callPackage ../development/tools/jd-diff-patch { };
-
-  jdiskreport = callPackage ../tools/misc/jdiskreport { };
-
   jekyll = callPackage ../applications/misc/jekyll { };
 
   jello = with python3Packages; toPythonApplication jello;
 
-  jen = callPackage ../tools/text/jen { };
-
-  jet = callPackage ../development/tools/jet { };
-
-  jf = callPackage ../development/tools/jf { };
-
-  jfmt = callPackage ../development/tools/jfmt { };
-
-  jfsutils = callPackage ../tools/filesystems/jfsutils { };
-
-  jhead = callPackage ../tools/graphics/jhead { };
-
-  jid = callPackage ../development/tools/jid { };
-
   jing = res.jing-trang;
   jing-trang = callPackage ../tools/text/xml/jing-trang {
     jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
 
-  jirafeau = callPackage ../servers/web-apps/jirafeau { };
-
-  jitterentropy = callPackage ../development/libraries/jitterentropy { };
-
   jl = haskellPackages.jl;
 
   jless = callPackage ../development/tools/jless {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  jmespath = callPackage ../development/tools/jmespath { };
-
   juicefs = callPackage ../tools/filesystems/juicefs {
     buildGoModule = buildGo122Module;
   };
 
-  juicity = callPackage ../tools/networking/juicity { };
-
-  jmtpfs = callPackage ../tools/filesystems/jmtpfs { };
-
-  jnettop = callPackage ../tools/networking/jnettop { };
-
-  jsvc = callPackage ../tools/system/jsvc { };
-
-  junkie = callPackage ../tools/networking/junkie { };
-
-  go-jira = callPackage ../applications/misc/go-jira { };
-
   jogl = callPackage ../by-name/jo/jogl/package.nix {
     stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK stdenv "11.0" else stdenv;
   };
 
-  john = callPackage ../tools/security/john { };
-
-  joomscan = callPackage ../tools/security/joomscan { };
-
   joplin = nodePackages.joplin;
 
-  joplin-desktop = callPackage ../applications/misc/joplin-desktop { };
-
-  jot = callPackage ../applications/misc/jot { };
-
-  jotdown = callPackage ../tools/text/jotdown { };
-
-  journaldriver = callPackage ../tools/misc/journaldriver { };
-
-  jp = callPackage ../development/tools/jp { };
-
-  jp2a = callPackage ../applications/misc/jp2a { };
-
-  jpeg-archive = callPackage ../applications/graphics/jpeg-archive { };
-
-  jpegexiforient = callPackage ../tools/graphics/jpegexiforient { };
-
-  jpeginfo = callPackage ../applications/graphics/jpeginfo { };
-
-  jpegoptim = callPackage ../applications/graphics/jpegoptim { };
-
-  jpegrescan = callPackage ../applications/graphics/jpegrescan { };
-
   jpylyzer = with python3Packages; toPythonApplication jpylyzer;
 
-  jiq = callPackage ../development/tools/misc/jiq { };
-
-  jql = callPackage ../development/tools/jql { };
-
-  jqp = callPackage ../development/tools/jqp { };
-
-  jo = callPackage ../development/tools/jo { };
-
-  jrnl = callPackage ../applications/misc/jrnl { };
-
   jsbeautifier = with python3Packages; toPythonApplication jsbeautifier;
 
-  jscoverage = callPackage ../development/tools/misc/jscoverage { };
-
-  jsduck = callPackage ../development/tools/jsduck { };
-
-  jsluice = callPackage ../tools/security/jsluice { };
-
   json-schema-for-humans = with python3Packages; toPythonApplication json-schema-for-humans;
 
-  jsonfmt = callPackage ../development/tools/misc/jsonfmt { };
-
   jsonwatch = callPackage ../tools/misc/jsonwatch {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  jsubfinder = callPackage ../tools/security/jsubfinder { };
-
-  jtag-remote-server = callPackage ../development/embedded/jtag-remote-server { };
-
-  jtc = callPackage ../development/tools/jtc { };
-
-  jumpapp = callPackage ../tools/X11/jumpapp { };
-
-  jugglinglab = callPackage ../tools/misc/jugglinglab { };
-
   jupyter = callPackage ../applications/editors/jupyter { };
 
   jupyter-all = jupyter.override {
@@ -8807,18 +4092,6 @@ with pkgs;
 
   jupyter-kernel = callPackage ../applications/editors/jupyter/kernel.nix { };
 
-  justify = callPackage ../tools/text/justify { };
-
-  jwhois = callPackage ../tools/networking/jwhois { };
-
-  k2pdfopt = callPackage ../applications/misc/k2pdfopt { };
-
-  kazam = callPackage ../applications/video/kazam { };
-
-  kalibrate-rtl = callPackage ../applications/radio/kalibrate-rtl { };
-
-  kalibrate-hackrf = callPackage ../applications/radio/kalibrate-hackrf { };
-
   wrapKakoune = kakoune: attrs: callPackage ../applications/editors/kakoune/wrapper.nix (attrs // { inherit kakoune; });
   kakounePlugins = recurseIntoAttrs (callPackage ../applications/editors/kakoune/plugins { });
 
@@ -8836,12 +4109,6 @@ with pkgs;
 
   kakoune-cr = callPackage ../tools/misc/kakoune-cr { crystal = crystal_1_2; };
 
-  kaniko = callPackage ../applications/networking/cluster/kaniko { };
-
-  katana = callPackage ../tools/security/katana { };
-
-  kbdd = callPackage ../applications/window-managers/kbdd { };
-
   kbs2 = callPackage ../tools/security/kbs2 {
     inherit (darwin.apple_sdk.frameworks) AppKit SystemConfiguration;
   };
@@ -8850,26 +4117,10 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  kdoctor = callPackage ../development/tools/kdoctor { };
-
-  kdigger = callPackage ../tools/security/kdigger { };
-
   kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { };
 
-  keepalived = callPackage ../tools/networking/keepalived { };
-
-  keepwn = callPackage ../tools/security/keepwn { };
-
-  kestrel = callPackage ../tools/security/kestrel { };
-
-  kexec-tools = callPackage ../os-specific/linux/kexec-tools { };
-
   keepkey-agent = with python3Packages; toPythonApplication keepkey-agent;
 
-  keepmenu = callPackage ../applications/misc/keepmenu { };
-
-  kent = callPackage ../applications/science/biology/kent { };
-
   keybase = darwin.apple_sdk_11_0.callPackage ../tools/security/keybase {
     # Reasoning for the inherited apple_sdk.frameworks:
     # 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox
@@ -8883,10 +4134,6 @@ with pkgs;
 
   keybase-gui = callPackage ../tools/security/keybase/gui.nix { };
 
-  keychain = callPackage ../tools/misc/keychain { };
-
-  keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
-
   keyscope = callPackage ../tools/security/keyscope {
     inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit Security;
   };
@@ -8895,36 +4142,10 @@ with pkgs;
     jdk = jdk11;
   };
 
-  kibi = callPackage ../applications/editors/kibi { };
-
   kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { };
 
-  kismet = callPackage ../applications/networking/sniffers/kismet { };
-
-  kiterunner = callPackage ../tools/security/kiterunner { };
-
-  klick = callPackage ../applications/audio/klick { };
-
-  klystrack = callPackage ../applications/audio/klystrack { };
-
-  knit = callPackage ../development/tools/build-managers/knit { };
-
-  knockpy = callPackage ../tools/security/knockpy { };
-
-  knowsmore = callPackage ../tools/security/knowsmore { };
-
-  kool = callPackage ../development/tools/misc/kool { };
-
-  kore = callPackage ../development/web/kore { };
-
-  krakenx = callPackage ../tools/system/krakenx { };
-
-  kpcli = callPackage ../tools/security/kpcli { };
-
   kphotoalbum = libsForQt5.callPackage ../applications/graphics/kphotoalbum { };
 
-  kratos = callPackage ../applications/misc/kratos { };
-
   krename = libsForQt5.callPackage ../applications/misc/krename { };
 
   krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { };
@@ -8937,20 +4158,8 @@ with pkgs;
 
   kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };
 
-  krop = callPackage ../applications/graphics/krop { };
-
   kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
 
-  kube-router = callPackage ../applications/networking/cluster/kube-router { };
-
-  kubedock = callPackage ../development/tools/kubedock { };
-
-  kubepug = callPackage ../development/tools/kubepug { };
-
-  kubeshark = callPackage ../applications/networking/cluster/kubeshark { };
-
-  kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { };
-
   kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { };
   kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { };
   kubo-migrator = callPackage ../applications/networking/kubo-migrator { };
@@ -8963,20 +4172,6 @@ with pkgs;
 
   kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { };
 
-  kytea = callPackage ../tools/text/kytea { };
-
-  kyverno = callPackage ../applications/networking/cluster/kyverno { };
-
-  k6 = callPackage ../development/tools/k6 { };
-
-  l2md = callPackage ../tools/text/l2md { };
-
-  lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { };
-
-  lalrpop = callPackage ../development/tools/lalrpop { };
-
-  last-resort = callPackage ../data/fonts/last-resort { };
-
   ligo =
     let ocaml_p = ocaml-ng.ocamlPackages_4_14.overrideScope (self: super: {
       zarith = super.zarith.override { version = "1.13"; };
@@ -8988,22 +4183,8 @@ with pkgs;
     ocamlPackages = ocaml_p;
   };
 
-  lego = callPackage ../tools/admin/lego { };
-
   leocad = libsForQt5.callPackage ../applications/graphics/leocad { };
 
-  lha = callPackage ../tools/archivers/lha { };
-
-  lhasa = callPackage ../tools/compression/lhasa { };
-
-  libcsptr = callPackage ../development/libraries/libcsptr { };
-
-  libgovirt = callPackage ../applications/virtualization/libgovirt { };
-
-  libscrypt = callPackage ../development/libraries/libscrypt { };
-
-  libcloudproviders = callPackage ../development/libraries/libcloudproviders { };
-
   libcoap = callPackage ../applications/networking/libcoap {
     autoconf = buildPackages.autoconf269;
   };
@@ -9013,49 +4194,21 @@ with pkgs;
     gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3;
   };
 
-  libshumate = callPackage ../development/libraries/libshumate { };
-
-  libsmartcols = callPackage ../development/libraries/libsmartcols { };
-
-  libsmi = callPackage ../development/libraries/libsmi { };
-
-  libgen-cli = callPackage ../tools/misc/libgen-cli { };
-
-  libpff = callPackage ../tools/misc/libpff {};
-
-  licensor = callPackage ../tools/misc/licensor { };
-
-  lesspipe = callPackage ../tools/misc/lesspipe { };
-
   liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
     ffmpeg = ffmpeg_6-full;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  linuxwave = callPackage ../tools/audio/linuxwave { };
-
-  lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };
-
   lldpd = callPackage ../tools/networking/lldpd {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
   llm = with python3Packages; toPythonApplication llm;
 
-  lnav = callPackage ../tools/misc/lnav { };
-
-  lnch = callPackage ../tools/misc/lnch { };
-
   lnx = callPackage ../servers/search/lnx {
     inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
   };
 
-  loadlibrary = callPackage ../tools/misc/loadlibrary { };
-
-  loc = callPackage ../development/misc/loc { };
-
-  lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
-
   loganalyzer = libsForQt5.callPackage ../development/tools/loganalyzer { };
 
   logstash7 = callPackage ../tools/misc/logstash/7.x.nix {
@@ -9073,26 +4226,12 @@ with pkgs;
 
   lolcat = callPackage ../tools/misc/lolcat { };
 
-  lottieconverter = callPackage ../tools/misc/lottieconverter { };
-
   loudgain = callPackage ../tools/audio/loudgain/default.nix { };
 
-  lpcnetfreedv = callPackage ../development/libraries/lpcnetfreedv { };
-
-  lsdvd = callPackage ../tools/cd-dvd/lsdvd { };
-
   lsyncd = callPackage ../applications/networking/sync/lsyncd {
     lua = lua5_2_compat;
   };
 
-  lttoolbox = callPackage ../applications/misc/lttoolbox { };
-
-  ltwheelconf = callPackage ../applications/misc/ltwheelconf { };
-
-  lvmsync = callPackage ../tools/backup/lvmsync { };
-
-  kapp = callPackage ../tools/networking/kapp { };
-
   kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { };
 
   kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { };
@@ -9106,29 +4245,13 @@ with pkgs;
 
   mailcatcher = callPackage ../development/web/mailcatcher { };
 
-  makebootfat = callPackage ../tools/misc/makebootfat { };
-
-  mani = callPackage ../development/tools/mani { };
-
-  manifest-tool = callPackage ../development/tools/manifest-tool { };
-
-  mask = callPackage ../development/tools/mask { };
-
   maskromtool = qt6Packages.callPackage ../tools/graphics/maskromtool { };
 
-  mastotool = callPackage ../tools/misc/mastotool { };
-
-  mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { };
-
-  matrix-conduit = callPackage ../servers/matrix-conduit { };
-
   matrix-synapse = callPackage ../servers/matrix-synapse/wrapper.nix { };
   matrix-synapse-unwrapped = callPackage ../servers/matrix-synapse/default.nix { };
   matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins;
   matrix-synapse-tools = recurseIntoAttrs matrix-synapse-unwrapped.tools;
 
-  matrix-appservice-irc = callPackage ../servers/matrix-synapse/matrix-appservice-irc { };
-
   matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {
     matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3;
     nodejs = nodejs_18;
@@ -9136,60 +4259,34 @@ with pkgs;
 
   matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { };
 
-  matrix-corporal = callPackage ../servers/matrix-corporal { };
-
-  matrix-hookshot = callPackage ../servers/matrix-synapse/matrix-hookshot { };
-
   maubot = with python3Packages; toPythonApplication maubot;
 
-  mautrix-discord = callPackage ../servers/mautrix-discord { };
-
-  mautrix-facebook = callPackage ../servers/mautrix-facebook { };
-
-  mautrix-googlechat = callPackage ../servers/mautrix-googlechat { };
-
   mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { });
 
   mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
 
-  mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { };
-
   m2r = with python3Packages; toPythonApplication m2r;
 
   md2gemini = with python3.pkgs; toPythonApplication md2gemini;
 
   md2pdf = with python3Packages; toPythonApplication md2pdf;
 
-  mdbook-emojicodes = callPackage ../tools/text/mdbook-emojicodes { };
-
   mdbook-epub = callPackage ../tools/text/mdbook-epub {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  mdbook-cmdrun = callPackage ../tools/text/mdbook-cmdrun { };
-
-  mdbook-pagetoc = callPackage ../tools/text/mdbook-pagetoc { };
-
   mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  mdbook-i18n-helpers = callPackage ../tools/text/mdbook-i18n-helpers { };
-
   mdbook-katex = callPackage ../tools/text/mdbook-katex {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  mdbook-kroki-preprocessor = callPackage ../tools/text/mdbook-kroki-preprocessor { };
-
   mdbook-linkcheck = callPackage ../tools/text/mdbook-linkcheck {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  mdbook-open-on-gh = callPackage ../tools/text/mdbook-open-on-gh { };
-
-  mdbook-man = callPackage ../tools/text/mdbook-man { };
-
   mdbook-mermaid = callPackage ../tools/text/mdbook-mermaid {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -9227,90 +4324,26 @@ with pkgs;
     inherit (darwin.apple_sdk_11_0.frameworks) Security SystemConfiguration;
   };
 
-  memtester = callPackage ../tools/system/memtester { };
-
-  mesa-demos = callPackage ../tools/graphics/mesa-demos { };
-
   mhonarc = perlPackages.MHonArc;
 
-  minica = callPackage ../tools/security/minica { };
-
-  minidlna = callPackage ../tools/networking/minidlna { };
-
-  miniplayer = callPackage ../applications/audio/miniplayer { };
-
-  minipro = callPackage ../tools/misc/minipro { };
-
-  minisign = callPackage ../tools/security/minisign { };
-
-  ministat = callPackage ../tools/misc/ministat { };
-
-  minizign = callPackage ../tools/security/minizign { };
-
-  mitm6 = callPackage ../tools/security/mitm6 { };
-
-  mjolnir = callPackage ../servers/mjolnir { };
-
-  mmutils = callPackage ../tools/X11/mmutils { };
-
-  mmv = callPackage ../tools/misc/mmv { };
-
-  mmv-go = callPackage ../tools/misc/mmv-go { };
-
-  mob = callPackage ../applications/misc/mob { };
-
-  most = callPackage ../tools/misc/most { };
-
-  motion = callPackage ../applications/video/motion { };
-
-  mozphab = callPackage ../applications/misc/mozphab { };
-
-  mtail = callPackage ../servers/monitoring/mtail { };
-
   mujmap = callPackage ../applications/networking/mujmap {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  multitail = callPackage ../tools/misc/multitail { };
-
-  mvebu64boot = callPackage ../tools/misc/mvebu64boot { };
-
   mx-puppet-discord = callPackage ../servers/mx-puppet-discord { };
 
-  mx-takeover = callPackage ../tools/security/mx-takeover { };
-
-  mxt-app = callPackage ../misc/mxt-app { };
-
-  naabu = callPackage ../tools/security/naabu { };
-
   nagstamon = callPackage ../tools/misc/nagstamon {
     pythonPackages = python3Packages;
   };
 
   nanoemoji = with python3Packages; toPythonApplication nanoemoji;
 
-  nagelfar = callPackage ../development/tools/nagelfar { };
-
-  nats-top = callPackage ../tools/system/nats-top { };
-
-  natscli = callPackage ../tools/system/natscli { };
-
-  nsc = callPackage ../tools/system/nsc { };
-
-  nbench = callPackage ../tools/misc/nbench { };
-
   nbtscanner = callPackage ../tools/security/nbtscanner {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  nbutools = callPackage ../tools/security/nbutools { };
-
-  ncrack = callPackage ../tools/security/ncrack { };
-
   netexec = python3Packages.callPackage ../tools/security/netexec { };
 
-  nerdctl = callPackage ../applications/networking/cluster/nerdctl { };
-
   netdata = callPackage ../tools/system/netdata {
     protobuf = protobuf_21;
   };
@@ -9322,16 +4355,6 @@ with pkgs;
   netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf { });
   netsurf-browser = netsurf.browser;
 
-  netperf = callPackage ../applications/networking/netperf { };
-
-  netsniff-ng = callPackage ../tools/networking/netsniff-ng { };
-
-  networkminer = callPackage ../tools/security/networkminer { };
-
-  nixpacks = callPackage ../applications/virtualization/nixpacks { };
-
-  nkeys = callPackage ../tools/system/nkeys { };
-
   nyxt = callPackage ../applications/networking/browsers/nyxt {
     sbcl = sbcl_2_4_6;
     inherit (gst_all_1)
@@ -9343,16 +4366,8 @@ with pkgs;
       gst-plugins-ugly;
   };
 
-  nfpm = callPackage ../tools/package-management/nfpm { };
-
-  nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { };
-
-  ninka = callPackage ../development/tools/misc/ninka { };
-
   nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
 
-  nodenv = callPackage ../development/tools/nodenv { };
-
   nodejs = hiPrio nodejs_20;
   nodejs-slim = nodejs-slim_20;
   corepack = hiPrio corepack_20;
@@ -9393,125 +4408,27 @@ with pkgs;
 
   node2nix = nodePackages.node2nix;
 
-  notesnook = callPackage ../applications/misc/notesnook { };
-
-  oddjob = callPackage ../os-specific/linux/oddjob { };
-
-  openipmi = callPackage ../tools/system/openipmi { };
-
-  ox = callPackage ../applications/editors/ox { };
-
   oxigraph = callPackage ../servers/oxigraph {
     inherit (darwin.apple_sdk.frameworks) IOKit Security;
   };
 
-  file-rename = callPackage ../tools/filesystems/file-rename { };
-
   kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd { };
 
-  kea = callPackage ../tools/networking/kea { };
-
-  keama = callPackage ../tools/networking/keama { };
-
   ktailctl = kdePackages.callPackage ../applications/networking/ktailctl {};
 
-  ispell = callPackage ../tools/text/ispell { };
-
-  iodash = callPackage ../development/libraries/iodash { };
-
-  jbofihe = callPackage ../tools/text/jbofihe { };
-
-  jbrowse = callPackage ../applications/science/biology/jbrowse { };
-
-  jumanpp = callPackage ../tools/text/jumanpp { };
-
-  jump = callPackage ../tools/system/jump { };
-
-  latex2html = callPackage ../tools/misc/latex2html { };
-
-  lazycli = callPackage ../tools/misc/lazycli { };
-
-  lavat = callPackage ../tools/misc/lavat { };
-
-  lcdf-typetools = callPackage ../tools/misc/lcdf-typetools { };
-
-  lcsync = callPackage ../applications/networking/sync/lcsync { };
-
   ldapdomaindump = with python3Packages; toPythonApplication ldapdomaindump;
 
-  ldapmonitor = callPackage ../tools/security/ldapmonitor { };
-
-  ldapnomnom = callPackage ../tools/security/ldapnomnom { };
-
-  ldapvi = callPackage ../tools/misc/ldapvi { };
-
-  ldeep = callPackage ../tools/security/ldeep { };
-
-  ldns = callPackage ../development/libraries/ldns { };
-
   leanblueprint = with python3Packages; toPythonApplication leanblueprint;
 
-  leanify = callPackage ../tools/misc/leanify { };
-
-  leatherman = callPackage ../development/libraries/leatherman { };
-
-  lact = callPackage ../tools/system/lact { };
-
-  ledit = callPackage ../tools/misc/ledit { };
-
-  ledmon = callPackage ../tools/system/ledmon { };
-
-  leela = callPackage ../tools/graphics/leela { };
-
-  lemmeknow = callPackage ../tools/misc/lemmeknow { };
-
-  lemmy-help = callPackage ../tools/misc/lemmy-help { };
-
-  lerpn = callPackage ../tools/misc/lerpn { };
-
   lethe = callPackage ../tools/security/lethe {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  lftp = callPackage ../tools/networking/lftp { };
-
-  libck = callPackage ../development/libraries/libck { };
-
-  libcork = callPackage ../development/libraries/libcork { };
-
-  libcmis = callPackage ../development/libraries/libcmis { };
-
-  libee = callPackage ../development/libraries/libee { };
-
-  libepc = callPackage ../development/libraries/libepc { };
-
-  liberfa = callPackage ../development/libraries/liberfa { };
-
-  libestr = callPackage ../development/libraries/libestr { };
-
-  libevdev = callPackage ../development/libraries/libevdev { };
-
-  liberio = callPackage ../development/libraries/liberio { };
-
-  libevdevplus = callPackage ../development/libraries/libevdevplus { };
-
-  libfann = callPackage ../development/libraries/libfann { };
-
-  libfsm = callPackage ../development/libraries/libfsm { };
-
-  libgaminggear = callPackage ../development/libraries/libgaminggear { };
-
   libhandy = callPackage ../development/libraries/libhandy { };
 
   # Needed for apps that still depend on the unstable verison of the library (not libhandy-1)
   libhandy_0 = callPackage ../development/libraries/libhandy/0.x.nix { };
 
-  libgmpris = callPackage ../development/libraries/libgmpris { };
-
-  libgumath = callPackage ../development/libraries/libgumath { };
-
-  libinsane = callPackage ../development/libraries/libinsane { };
-
   libint = callPackage ../development/libraries/libint { };
   libintPsi4 = callPackage ../development/libraries/libint {
     enableFortran = false;
@@ -9536,117 +4453,23 @@ with pkgs;
     eri3PureSh = false;
   };
 
-  libipfix = callPackage ../development/libraries/libipfix { };
-
   libirc = libsForQt5.callPackage ../development/libraries/libirc { };
 
-  libircclient = callPackage ../development/libraries/libircclient { };
-
-  libiscsi = callPackage ../development/libraries/libiscsi { };
-
-  libisds = callPackage ../development/libraries/libisds { };
-
-  libite = callPackage ../development/libraries/libite { };
-
-  liblangtag = callPackage ../development/libraries/liblangtag { };
-
-  liblouis = callPackage ../development/libraries/liblouis { };
-
-  liboauth = callPackage ../development/libraries/liboauth { };
-
-  libr3 = callPackage ../development/libraries/libr3 { };
-
-  libraspberrypi = callPackage ../development/libraries/libraspberrypi { };
-
-  libsidplayfp = callPackage ../development/libraries/libsidplayfp { };
-
-  libspf2 = callPackage ../development/libraries/libspf2 { };
-
-  libsrs2 = callPackage ../development/libraries/libsrs2 { };
-
-  libtermkey = callPackage ../development/libraries/libtermkey { };
-
-  libtelnet = callPackage ../development/libraries/libtelnet { };
-
-  libtirpc = callPackage ../development/libraries/ti-rpc { };
-
-  libtickit = callPackage ../development/libraries/libtickit { };
-
-  libtins = callPackage ../development/libraries/libtins { };
-
-  libtree = callPackage ../development/tools/misc/libtree { };
-
-  libshout = callPackage ../development/libraries/libshout { };
-
-  libqb = callPackage ../development/libraries/libqb { };
-
-  libqmi = callPackage ../development/libraries/libqmi { };
-
-  libqrtr-glib = callPackage ../development/libraries/libqrtr-glib { };
-
-  libmbim = callPackage ../development/libraries/libmbim { };
-
   libmongocrypt = darwin.apple_sdk_11_0.callPackage ../development/libraries/libmongocrypt { };
 
-  libmesode = callPackage ../development/libraries/libmesode { };
-
-  libmsym = callPackage ../development/libraries/science/chemistry/libmsym { };
-
-  libnabo = callPackage ../development/libraries/libnabo { };
-
-  libngspice = callPackage ../development/libraries/libngspice { };
-
-  libnixxml = callPackage ../development/libraries/libnixxml { };
-
-  libplctag = callPackage ../development/libraries/libplctag { };
-
-  libpointmatcher = callPackage ../development/libraries/libpointmatcher { };
-
-  libportal = callPackage ../development/libraries/libportal { };
   libportal-gtk3 = libportal.override { variant = "gtk3"; };
   libportal-gtk4 = libportal.override { variant = "gtk4"; };
   libportal-qt5 = libportal.override { variant = "qt5"; };
   libportal-qt6 = libportal.override { variant = "qt6"; };
 
-  libmicrodns = callPackage ../development/libraries/libmicrodns { };
-
-  libnids = callPackage ../tools/networking/libnids { };
-
   jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent {
     libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { };
   };
 
-  libmpack = callPackage ../development/libraries/libmpack { };
-
-  libiberty = callPackage ../development/libraries/libiberty { };
-
-  libucl = callPackage ../development/libraries/libucl { };
-
-  libxc = callPackage ../development/libraries/libxc { };
-
-  libxcomp = callPackage ../development/libraries/libxcomp { };
-
-  libxl = callPackage ../development/libraries/libxl { };
-
-  libx86emu = callPackage ../development/libraries/libx86emu { };
-
-  libzim = callPackage ../development/libraries/libzim { };
-
-
-  libzmf = callPackage ../development/libraries/libzmf { };
-
-  librespeed-cli = callPackage ../tools/misc/librespeed-cli { };
-
-  libreswan = callPackage ../tools/networking/libreswan { };
-
   librest = callPackage ../development/libraries/librest { };
 
   librest_1_0 = callPackage ../development/libraries/librest/1.0.nix { };
 
-  libwebsockets = callPackage ../development/libraries/libwebsockets { };
-
-  libyafaray = callPackage ../tools/graphics/libyafaray { };
-
   licensee = callPackage ../tools/package-management/licensee { };
 
   lidarr = callPackage ../servers/lidarr { };
@@ -9662,106 +4485,18 @@ with pkgs;
   limesuite
   limesuiteWithGui;
 
-  limesurvey = callPackage ../servers/limesurvey { };
-
-  linux-exploit-suggester = callPackage ../tools/security/linux-exploit-suggester { };
-
   linux-gpib = callPackage ../applications/science/electronics/linux-gpib/user.nix { };
 
-  linuxquota = callPackage ../tools/misc/linuxquota { };
-
-  lipl = callPackage ../tools/misc/lipl { };
-
   liquidctl = with python3Packages; toPythonApplication liquidctl;
 
-  lmp = callPackage ../tools/security/lmp { };
-
-  localproxy = callPackage ../applications/networking/localproxy { };
-
   localstack = with python3Packages; toPythonApplication localstack;
 
-  localtime = callPackage ../tools/system/localtime { };
-
-  log4j-detect = callPackage ../tools/security/log4j-detect { };
-
-  log4j-scan = callPackage ../tools/security/log4j-scan { };
-
-  log4j-sniffer = callPackage ../tools/security/log4j-sniffer { };
-
-  log4j-vuln-scanner = callPackage ../tools/security/log4j-vuln-scanner { };
-
-  log4jcheck = callPackage ../tools/security/log4jcheck { };
-
-  log4shell-detector = callPackage ../tools/security/log4shell-detector { };
-
-  logcheck = callPackage ../tools/system/logcheck { };
-
-  logmap = callPackage ../tools/security/logmap { };
-
-  logmein-hamachi = callPackage ../tools/networking/logmein-hamachi { };
-
-  logkeys = callPackage ../tools/security/logkeys { };
-
-  logrotate = callPackage ../tools/system/logrotate { };
-
-  logstalgia = callPackage ../tools/graphics/logstalgia { };
-
-  lokalise2-cli = callPackage ../tools/misc/lokalise2-cli { };
-
-  loki = callPackage ../development/libraries/loki { };
-
-  longview = callPackage ../servers/monitoring/longview { };
-
-  lorien = callPackage ../applications/graphics/lorien { };
-
-  lout = callPackage ../tools/typesetting/lout { };
-
-  lr = callPackage ../tools/system/lr { };
-
-  lrzip = callPackage ../tools/compression/lrzip { };
-
-  lsb-release = callPackage ../os-specific/linux/lsb-release { };
-
-  lunatic = callPackage ../development/interpreters/lunatic { };
-
-  lux = callPackage ../tools/video/lux { };
-
-  lv = callPackage ../tools/text/lv { };
-
-  lwc = callPackage ../tools/misc/lwc { };
-
-  lxd-image-server = callPackage ../tools/virtualization/lxd-image-server { };
-
-  lzfse = callPackage ../tools/compression/lzfse { };
-
-  lzham = callPackage ../tools/compression/lzham { };
-
-  lzip = callPackage ../tools/compression/lzip { };
-
-  lziprecover = callPackage ../tools/compression/lziprecover { };
-
   xz = callPackage ../tools/compression/xz { };
 
-  lz4 = callPackage ../tools/compression/lz4 { };
-
-  lzbench = callPackage ../tools/compression/lzbench { };
-
-  lzop = callPackage ../tools/compression/lzop { };
-
   lzwolf = callPackage ../games/lzwolf { SDL2_mixer = SDL2_mixer_2_0; };
 
-  macchanger = callPackage ../os-specific/linux/macchanger { };
-
-  macchina = callPackage ../tools/misc/macchina { };
-
   madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang;
 
-  maeparser = callPackage ../development/libraries/maeparser { };
-
-  mailcheck = callPackage ../applications/networking/mailreaders/mailcheck { };
-
-  maildrop = callPackage ../tools/networking/maildrop { };
-
   mailnag = callPackage ../applications/networking/mailreaders/mailnag {
     availablePlugins = {
       # More are listed here: https://github.com/pulb/mailnag/#desktop-integration
@@ -9772,14 +4507,10 @@ with pkgs;
   mailnagWithPlugins = mailnag.withPlugins(
     builtins.attrValues mailnag.availablePlugins
   );
-  bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { };
-
   mailpit = callPackage ../servers/mail/mailpit {
     libtool = if stdenv.hostPlatform.isDarwin then cctools else libtool;
   };
 
-  mailsend = callPackage ../tools/networking/mailsend { };
-
   mailutils = callPackage ../tools/networking/mailutils {
     sasl = gsasl;
   };
@@ -9787,24 +4518,10 @@ with pkgs;
   matrix-sdk-crypto-nodejs = callPackage ../development/libraries/matrix-sdk-crypto-nodejs { };
   matrix-sdk-crypto-nodejs-0_1_0-beta_3 = callPackage ../development/libraries/matrix-sdk-crypto-nodejs/beta3.nix { };
 
-  email = callPackage ../tools/networking/email { };
-
-  maim = callPackage ../tools/graphics/maim { };
-
-  mairix = callPackage ../tools/text/mairix { };
-
   makemkv = libsForQt5.callPackage ../applications/video/makemkv { };
 
-  makerpm = callPackage ../development/tools/makerpm { };
-
-  makefile2graph = callPackage ../development/tools/analysis/makefile2graph { };
-
   man = man-db;
 
-  man-db = callPackage ../tools/misc/man-db { };
-
-  mandoc = callPackage ../tools/misc/mandoc { };
-
   mangohud = callPackage ../tools/graphics/mangohud {
     libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
     mangohud32 = pkgsi686Linux.mangohud;
@@ -9813,12 +4530,6 @@ with pkgs;
 
   marimo = with python3Packages; toPythonApplication marimo;
 
-  marktext = callPackage ../applications/misc/marktext { };
-
-  mars-mips = callPackage ../development/tools/mars-mips { };
-
-  mb2md = callPackage ../tools/text/mb2md { };
-
   mecab =
     let
       mecab-nodic = callPackage ../tools/text/mecab/nodic.nix { };
@@ -9829,138 +4540,32 @@ with pkgs;
       };
     };
 
-  mediawiki = callPackage ../servers/web-apps/mediawiki { };
-
-  mediawriter = callPackage ../tools/system/mediawriter { };
-
-  memtier-benchmark = callPackage ../tools/networking/memtier-benchmark { };
-
-  memtest86-efi = callPackage ../tools/misc/memtest86-efi { };
-
-  memtest86plus = callPackage ../tools/misc/memtest86+ { };
-
   mbutil = python310Packages.callPackage ../applications/misc/mbutil { };
 
-  mcabber = callPackage ../applications/networking/instant-messengers/mcabber { };
-
-  mcron = callPackage ../tools/system/mcron { };
-
   mcstatus = with python3Packages; toPythonApplication mcstatus;
 
-  mdbtools = callPackage ../tools/misc/mdbtools { };
-
-  mdk = callPackage ../development/tools/mdk { };
-
-  mdk4 = callPackage ../tools/networking/mdk4 { };
-
-  mdp = callPackage ../applications/misc/mdp { };
-
-  megacli = callPackage ../tools/misc/megacli { };
-
-  memo = callPackage ../applications/misc/memo { };
-
-  mencal = callPackage ../applications/misc/mencal { } ;
-
-  metamorphose2 = callPackage ../applications/misc/metamorphose2 { };
-
-  metar = callPackage ../applications/misc/metar { };
-
-  mfcuk = callPackage ../tools/security/mfcuk { };
-
-  mfoc = callPackage ../tools/security/mfoc { };
-
-  microbin = callPackage ../servers/microbin { };
-
-  microplane = callPackage ../tools/misc/microplane { };
-
-  microserver = callPackage ../servers/microserver { };
-
-  midisheetmusic = callPackage ../applications/audio/midisheetmusic { };
-
-  mimeo = callPackage ../tools/misc/mimeo { };
-
-  mimetic = callPackage ../development/libraries/mimetic { };
-
-  minio-client = callPackage ../tools/networking/minio-client { };
-
-  minio-certgen = callPackage ../tools/security/minio-certgen { };
-
-  minissdpd = callPackage ../tools/networking/minissdpd { };
-
-  miniupnpc = callPackage ../tools/networking/miniupnpc { };
-
   miniupnpd = callPackage ../tools/networking/miniupnpd { };
 
   miniupnpd-nftables = callPackage ../tools/networking/miniupnpd { firewall = "nftables"; };
 
-  miniball = callPackage ../development/libraries/miniball { };
-
   minijail = callPackage ../tools/system/minijail { };
 
   minijail-tools = python3.pkgs.callPackage ../tools/system/minijail/tools.nix { };
 
-  minilibx = callPackage ../development/libraries/minilibx { };
-
-  minixml = callPackage ../development/libraries/minixml { };
-
   mir-qualia = callPackage ../tools/text/mir-qualia {
     pythonPackages = python3Packages;
   };
 
-  mirakurun = callPackage ../applications/video/mirakurun { };
-
-  miredo = callPackage ../tools/networking/miredo { };
-
-  mirrorbits = callPackage ../servers/mirrorbits { };
-
   mitmproxy = with python3Packages; toPythonApplication mitmproxy;
 
-  mitmproxy2swagger = callPackage ../tools/security/mitmproxy2swagger { };
-
-  mjpegtools = callPackage ../tools/video/mjpegtools { };
-
   mjpegtoolsFull = mjpegtools.override {
     withMinimal = false;
   };
 
-  mkclean = callPackage ../applications/video/mkclean { };
-
-  mkcue = callPackage ../tools/cd-dvd/mkcue { };
-
-  mkp224o = callPackage ../tools/security/mkp224o { };
-
   mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { });
 
-  mkrand = callPackage ../tools/security/mkrand { };
-
-  mktemp = callPackage ../tools/security/mktemp { };
-
-  mktorrent = callPackage ../tools/misc/mktorrent { };
-
-  mloader = callPackage ../tools/misc/mloader { };
-
-  mmake = callPackage ../tools/misc/mmake { };
-
-  mmixware = callPackage ../development/tools/mmixware { };
-
-  modemmanager = callPackage ../tools/networking/modemmanager { };
-
-  modem-manager-gui = callPackage ../applications/networking/modem-manager-gui { };
-
-  modsecurity_standalone = callPackage ../tools/security/modsecurity { };
-
-  modsecurity-crs = callPackage ../tools/security/modsecurity-crs { };
-
   molecule = with python3Packages; toPythonApplication molecule;
 
-  molly-guard = callPackage ../os-specific/linux/molly-guard { };
-
-  molotov = callPackage ../applications/video/molotov { };
-
-  monit = callPackage ../tools/system/monit { };
-
-  monocraft = callPackage ../data/fonts/monocraft { };
-
   monolith = callPackage ../tools/backup/monolith {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
@@ -9969,70 +4574,24 @@ with pkgs;
     docbook-xsl = docbook_xsl;
   };
 
-  mole = callPackage ../tools/networking/mole { };
-
   morgen = callPackage ../applications/office/morgen {
     electron = electron_32;
   };
 
-  mosh = callPackage ../tools/networking/mosh { };
-
-  motrix = callPackage ../tools/networking/motrix { };
-
-  mount-zip = callPackage ../tools/filesystems/mount-zip { };
-
-  mpage = callPackage ../tools/text/mpage { };
-
-  mprime = callPackage ../tools/misc/mprime { };
-
-  mpw = callPackage ../tools/security/mpw { };
-
-  mqtt_cpp = callPackage ../development/libraries/mqtt_cpp { };
-
-  mr = callPackage ../applications/version-management/mr { };
-
-  mrsh = callPackage ../shells/mrsh { };
-
-  mrtg = callPackage ../tools/misc/mrtg { };
-
-  mscgen = callPackage ../tools/graphics/mscgen { };
-
-  msfpc = callPackage ../tools/security/msfpc { };
-
-  melt = callPackage ../tools/security/melt { };
-
-  metabigor = callPackage ../tools/security/metabigor { };
-
   metasploit = callPackage ../tools/security/metasploit { };
 
   mhost = callPackage ../applications/networking/mhost {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  ms-sys = callPackage ../tools/misc/ms-sys { };
-
   mtools = callPackage ../tools/filesystems/mtools { };
 
   mtr = callPackage ../tools/networking/mtr { };
 
-  mtr-exporter = callPackage ../tools/networking/mtr-exporter { };
-
   mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; };
 
-  mtx = callPackage ../tools/backup/mtx { };
-
-  mt-st = callPackage ../tools/backup/mt-st { };
-
-  mubeng = callPackage ../tools/networking/mubeng { };
-
-  muffet = callPackage ../tools/networking/muffet { };
-
   multipass = qt6Packages.callPackage ../tools/virtualization/multipass { };
 
-  multitime = callPackage ../tools/misc/multitime { };
-
-  sta = callPackage ../tools/misc/sta { };
-
   multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in {
     multitrandata = callPackage ../tools/text/multitran/data { };
 
@@ -10047,160 +4606,43 @@ with pkgs;
     mtutils = callPackage ../tools/text/multitran/mtutils { };
   });
 
-  munge = callPackage ../tools/security/munge { };
-
-  mutagen = callPackage ../tools/misc/mutagen { };
-
-  mutagen-compose = callPackage ../tools/misc/mutagen-compose { };
-
-  mycli = callPackage ../tools/admin/mycli { };
-
-  mycrypto = callPackage ../applications/blockchains/mycrypto { };
-
-  mydumper = callPackage ../tools/backup/mydumper { };
-
-  mylvmbackup = callPackage ../tools/backup/mylvmbackup { };
-
-  mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { };
-
-  mysqltuner = callPackage ../tools/misc/mysqltuner { };
-
   mytetra = libsForQt5.callPackage ../applications/office/mytetra { };
 
-  nabi = callPackage ../tools/inputmethods/nabi { };
-
-  nahid-fonts = callPackage ../data/fonts/nahid-fonts { };
-
-  namazu = callPackage ../tools/text/namazu { };
-
-  nasty = callPackage ../tools/security/nasty { };
-
-  nat-traverse = callPackage ../tools/networking/nat-traverse { };
-
-  navi = callPackage ../applications/misc/navi { };
-
   navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; };
 
-  nbd = callPackage ../tools/networking/nbd { };
-  xnbd = callPackage ../tools/networking/xnbd { };
-
-  ndjbdns = callPackage ../tools/networking/ndjbdns { };
-
-  ndppd = callPackage ../applications/networking/ndppd { };
-
-  nearcore = callPackage ../applications/blockchains/nearcore { };
-
-  nebula = callPackage ../tools/networking/nebula { };
-
-  nemiver = callPackage ../development/tools/nemiver { };
-
-  neo-cowsay = callPackage ../tools/misc/neo-cowsay { };
-
-  neofetch = callPackage ../tools/misc/neofetch { };
-
-  nerdfix = callPackage ../tools/text/nerdfix { };
-
   nerdfonts = callPackage ../data/fonts/nerdfonts { };
 
-  netatalk = callPackage ../tools/filesystems/netatalk { };
-
-  netavark = callPackage ../tools/networking/netavark { };
-
-  netcdf = callPackage ../development/libraries/netcdf { };
-
   netcdf-mpi = netcdf.override {
     hdf5 = hdf5-mpi.override { usev110Api = true; };
   };
 
-  netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { };
-
   netcdffortran = callPackage ../development/libraries/netcdf-fortran {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices SystemConfiguration;
   };
 
-  networking-ts-cxx = callPackage ../development/libraries/networking-ts-cxx { };
-
-  nco = callPackage ../development/libraries/nco { };
-
-  ncftp = callPackage ../tools/networking/ncftp { };
-
-  ncgopher = callPackage ../applications/networking/ncgopher { };
-
-  ncompress = callPackage ../tools/compression/ncompress { };
-
-  ndisc6 = callPackage ../tools/networking/ndisc6 { };
-
-  netassert = callPackage ../tools/networking/netassert { };
-
-  netboot = callPackage ../tools/networking/netboot { };
-
-  netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { };
-
   inherit (callPackage ../servers/web-apps/netbox { }) netbox_3_7;
 
   # Not in aliases because it wouldn't get picked up by callPackage
   netbox = netbox_4_1;
 
-  netbox2netshot = callPackage ../tools/admin/netbox2netshot { };
-
   netcat = libressl.nc.overrideAttrs (old: {
     meta = old.meta // {
       mainProgram = "nc";
     };
   });
 
-  netcat-gnu = callPackage ../tools/networking/netcat { };
-
-  netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { };
-
-  netdiscover = callPackage ../tools/networking/netdiscover { };
-
-  nethogs = callPackage ../tools/networking/nethogs { };
-
-  nethoscope = callPackage ../tools/networking/nethoscope { };
-
-  netkittftp = callPackage ../tools/networking/netkit/tftp { };
-
   netlify-cli = callPackage ../development/web/netlify-cli { };
 
-  netlistsvg = callPackage ../applications/science/logic/netlistsvg { };
-
   netpbm = callPackage ../tools/graphics/netpbm { };
 
-  netrw = callPackage ../tools/networking/netrw { };
-
-  netselect = callPackage ../tools/networking/netselect { };
-
   networkmanager = callPackage ../tools/networking/networkmanager { };
 
-  networkmanager-iodine = callPackage ../tools/networking/networkmanager/iodine { };
-
-  networkmanager-openvpn = callPackage ../tools/networking/networkmanager/openvpn { };
-
-  networkmanager-l2tp = callPackage ../tools/networking/networkmanager/l2tp { };
-
-  networkmanager-vpnc = callPackage ../tools/networking/networkmanager/vpnc { };
-
-  networkmanager-openconnect = callPackage ../tools/networking/networkmanager/openconnect { };
-
-  networkmanager-fortisslvpn = callPackage ../tools/networking/networkmanager/fortisslvpn { };
-
-  networkmanager_strongswan = callPackage ../tools/networking/networkmanager/strongswan { };
-
-  networkmanager-sstp = callPackage ../tools/networking/networkmanager/sstp { };
-
-  networkmanagerapplet = callPackage ../tools/networking/networkmanager/applet { };
-
   libnma = callPackage ../tools/networking/networkmanager/libnma { };
 
   libnma-gtk4 = libnma.override { withGtk4 = true; };
 
-  networkmanager_dmenu = callPackage ../tools/networking/networkmanager/dmenu  { };
-
   nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { };
 
-  grocy = callPackage ../servers/grocy { };
-
   inherit (callPackages ../servers/nextcloud {})
     nextcloud28 nextcloud29 nextcloud30;
 
@@ -10221,18 +4663,6 @@ with pkgs;
 
   nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { };
 
-  ndstool = callPackage ../tools/archivers/ndstool { };
-
-  nfs-ganesha = callPackage ../servers/nfs-ganesha { };
-
-  nflz = callPackage ../misc/nflz { };
-
-  ngrep = callPackage ../tools/networking/ngrep { };
-
-  nifi = callPackage ../servers/web-apps/nifi { };
-
-  noip = callPackage ../tools/networking/noip { };
-
   inherit (callPackages ../applications/networking/cluster/nomad { })
     nomad
     nomad_1_4
@@ -10243,28 +4673,8 @@ with pkgs;
     nomad_1_9
     ;
 
-  nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { };
-
-  nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { };
-
-  nova = callPackage ../applications/networking/cluster/nova { };
-
-  nomino = callPackage ../tools/misc/nomino { };
-
-  nb = callPackage ../tools/misc/nb { };
-
-  kb = callPackage ../tools/misc/kb { };
-
-  notable = callPackage ../applications/misc/notable { };
-
-  npm-check = callPackage ../development/tools/npm-check { };
-
   nth = with python3Packages; toPythonApplication name-that-hash;
 
-  ntlmrecon = callPackage ../tools/security/ntlmrecon { };
-
-  numberstation = callPackage ../applications/misc/numberstation { };
-
   nvchecker = with python3Packages; toPythonApplication (
     nvchecker.overridePythonAttrs (oldAttrs: {
       propagatedBuildInputs = oldAttrs.propagatedBuildInputs
@@ -10275,16 +4685,10 @@ with pkgs;
   nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;
 
 
-  miller = callPackage ../tools/text/miller { };
-
-  milu = callPackage ../applications/misc/milu { };
-
   mkgmap = callPackage ../applications/misc/mkgmap { };
 
   mkgmap-splitter = callPackage ../applications/misc/mkgmap/splitter { };
 
-  mtm = callPackage ../tools/misc/mtm { };
-
   op-geth = callPackage ../applications/blockchains/optimism/geth.nix {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) IOKit;
@@ -10292,8 +4696,6 @@ with pkgs;
 
   optimism = callPackage ../applications/blockchains/optimism { };
 
-  pa_applet = callPackage ../tools/audio/pa-applet { };
-
   pandoc-acro = python3Packages.callPackage ../tools/misc/pandoc-acro { };
 
   pandoc-imagine = python3Packages.callPackage ../tools/misc/pandoc-imagine { };
@@ -10302,8 +4704,6 @@ with pkgs;
 
   pandoc-drawio-filter = python3Packages.callPackage ../tools/misc/pandoc-drawio-filter { };
 
-  pandoc-katex = callPackage ../tools/misc/pandoc-katex { };
-
   pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { };
 
   # pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality
@@ -10312,90 +4712,22 @@ with pkgs;
   pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { };
   pandoc-tablenos = python3Packages.callPackage ../tools/misc/pandoc-tablenos { };
 
-  panicparse = callPackage ../tools/misc/panicparse {};
-
-  panoply = callPackage ../tools/misc/panoply { };
-
-  patray = callPackage ../tools/audio/patray { };
-
-  pathvector = callPackage ../tools/networking/pathvector { };
-
-  pasystray = callPackage ../tools/audio/pasystray { };
-
-  pcmsolver = callPackage ../development/libraries/pcmsolver { };
-
   pegasus-frontend = libsForQt5.callPackage ../games/pegasus-frontend {};
 
   pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { };
 
-  pffft = callPackage ../development/libraries/pffft { };
-
-  phash = callPackage ../development/libraries/phash { };
-
-  pnmixer = callPackage ../tools/audio/pnmixer { };
-
-  present-cli = callPackage ../tools/misc/present-cli { };
-
-  pulsemixer = callPackage ../tools/audio/pulsemixer { };
-
-  pwsafe = callPackage ../applications/misc/pwsafe { };
-
-  pw-viz = callPackage ../applications/misc/pw-viz { };
-
-  napi-rs-cli = callPackage ../development/tools/napi-rs-cli { };
-
-  neil = callPackage ../development/tools/neil { };
-
-  niff = callPackage ../tools/package-management/niff { };
-
   nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { };
 
-  nilfs-utils = callPackage ../tools/filesystems/nilfs-utils { };
-
-  nitrogen = callPackage ../tools/X11/nitrogen { };
-
-  smart-wallpaper = callPackage ../tools/X11/smart-wallpaper { };
-
-  nms = callPackage ../tools/misc/nms { };
-
-  nomachine-client = callPackage ../tools/admin/nomachine-client { };
-
-  notify-desktop = callPackage ../tools/misc/notify-desktop { };
-
-  nkf = callPackage ../tools/text/nkf { };
-
   nlopt = callPackage ../development/libraries/nlopt { octave = null; };
 
-  npapi_sdk = callPackage ../development/libraries/npapi-sdk { };
-
-  npth = callPackage ../development/libraries/npth { };
-
-  nmap-formatter = callPackage ../tools/security/nmap-formatter { };
-
-  noise-repellent = callPackage ../applications/audio/noise-repellent { };
-
-  noisetorch = callPackage ../applications/audio/noisetorch { };
-
   notation = callPackage ../by-name/no/notation/package.nix {
     buildGoModule = buildGo123Module;
   };
 
-  notify-osd = callPackage ../applications/misc/notify-osd { };
-
-  notes-up = callPackage ../applications/office/notes-up { };
-
-  notify-osd-customizable = callPackage ../applications/misc/notify-osd-customizable { };
-
-  nox = callPackage ../tools/package-management/nox { };
-
-  nq = callPackage ../tools/system/nq { };
-
   nsjail = callPackage ../tools/security/nsjail {
     protobuf = protobuf_21;
   };
 
-  nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd { };
-
   ntfs3g = callPackage ../tools/filesystems/ntfs-3g {
     inherit (darwin.apple_sdk.frameworks) DiskArbitration;
   };
@@ -10407,100 +4739,28 @@ with pkgs;
 
   ntfy-sh = callPackage ../tools/misc/ntfy-sh { };
 
-  ntirpc = callPackage ../development/libraries/ntirpc { };
-
-  ntopng = callPackage ../tools/networking/ntopng { };
-
-  ntp = callPackage ../tools/networking/ntp { };
-
-  numdiff = callPackage ../tools/text/numdiff { };
-
-  numlockx = callPackage ../tools/X11/numlockx { };
-
-  nurl = callPackage ../tools/misc/nurl { };
-
-  nttcp = callPackage ../tools/networking/nttcp { };
-
-  ntttcp = callPackage ../tools/networking/ntttcp { };
-
-  nuttcp = callPackage ../tools/networking/nuttcp { };
-
-  nssmdns = callPackage ../tools/networking/nss-mdns { };
-
   nvfancontrol = callPackage ../tools/misc/nvfancontrol {
     libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
   };
 
-  nvimpager = callPackage ../tools/misc/nvimpager { };
-
   nwdiag = with python3Packages; toPythonApplication nwdiag;
 
   nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { };
 
-  nxpmicro-mfgtools = callPackage ../development/tools/misc/nxpmicro-mfgtools { };
-
-  nyancat = callPackage ../tools/misc/nyancat { };
-
-  nylon = callPackage ../tools/networking/nylon { };
-
-  oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
-
-  oatpp = callPackage ../development/libraries/oatpp { };
-
-  obex_data_server = callPackage ../tools/bluetooth/obex-data-server { };
-
-  obexd = callPackage ../tools/bluetooth/obexd { };
-
-  obfs4 = callPackage ../tools/networking/obfs4 { };
-
-  ocproxy = callPackage ../tools/networking/ocproxy { };
-
-  ocserv = callPackage ../tools/networking/ocserv { };
-
   octofetch = callPackage ../tools/misc/octofetch {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  oha = callPackage ../tools/networking/oha { };
-
   onetun = callPackage ../tools/networking/onetun {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  opencorsairlink = callPackage ../tools/misc/opencorsairlink { };
-
-  openfpgaloader = callPackage ../development/embedded/fpga/openfpgaloader { };
-
-  openfortivpn = callPackage ../tools/networking/openfortivpn { };
-
   openobserve = darwin.apple_sdk_11_0.callPackage ../servers/monitoring/openobserve {
     apple_sdk = darwin.apple_sdk_11_0;
   };
 
-  obexfs = callPackage ../tools/bluetooth/obexfs { };
-
-  obexftp = callPackage ../tools/bluetooth/obexftp { };
-
-  objconv = callPackage ../development/tools/misc/objconv { };
-
-  odpic = callPackage ../development/libraries/odpic { };
-
-  odt2txt = callPackage ../tools/text/odt2txt { };
-
-  odyssey = callPackage ../tools/misc/odyssey { };
-
-  offensive-azure = callPackage ../tools/security/offensive-azure { };
-
-  offlineimap = callPackage ../tools/networking/offlineimap { };
-
-  offzip = callPackage ../tools/compression/offzip { };
-
   ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { };
 
-  ogdf = callPackage ../development/libraries/ogdf { };
-
-  oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };
-
   ola = callPackage ../applications/misc/ola {
     protobuf = protobuf_21;
   };
@@ -10513,55 +4773,29 @@ with pkgs;
 
   ome_zarr = with python3Packages; toPythonApplication ome-zarr;
 
-  omping = callPackage ../applications/networking/omping { };
-
   onefetch = callPackage ../tools/misc/onefetch {
     inherit (darwin) libresolv;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
 
-  onioncircuits = callPackage ../tools/security/onioncircuits { };
-
-  onlykey-agent = callPackage ../tools/security/onlykey-agent { };
-
-  onlykey-cli = callPackage ../tools/security/onlykey-cli { };
-
   onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; };
 
-  ooniprobe-cli = callPackage ../tools/networking/ooniprobe-cli { };
-
   openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { jre = pkgs.jre_headless; };
 
   openboard = libsForQt5.callPackage ../applications/graphics/openboard { };
 
-  opencc = callPackage ../tools/text/opencc { };
-
-  opencryptoki = callPackage ../tools/security/opencryptoki { };
-
-  opendbx = callPackage ../development/libraries/opendbx { };
-
   opendht = callPackage ../development/libraries/opendht  {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  opendkim = callPackage ../development/libraries/opendkim { };
-
-  openfec = callPackage ../development/libraries/openfec { };
-
   ophcrack-cli = ophcrack.override { enableGui = false; };
 
   ophis = python3Packages.callPackage ../development/compilers/ophis { };
 
-  open-ecard = callPackage ../tools/security/open-ecard { };
-
   open-interpreter = with python3Packages; toPythonApplication open-interpreter;
 
-  openjade = callPackage ../tools/text/sgml/openjade { };
-
   openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { };
 
-  openimagedenoise = callPackage ../development/libraries/openimagedenoise { };
-
   openmvg = callPackage ../applications/science/misc/openmvg {
     inherit (llvmPackages) openmp;
   };
@@ -10570,17 +4804,11 @@ with pkgs;
     inherit (llvmPackages) openmp;
   };
 
-  openntpd = callPackage ../tools/networking/openntpd { };
-
   openntpd_nixos = openntpd.override {
     privsepUser = "ntp";
     privsepPath = "/var/empty";
   };
 
-  openobex = callPackage ../tools/bluetooth/openobex { };
-
-  openresolv = callPackage ../tools/networking/openresolv { };
-
   openrefine = callPackage ../applications/science/misc/openrefine { jdk = jdk17; };
 
   openrgb = libsForQt5.callPackage ../applications/misc/openrgb { };
@@ -10594,24 +4822,12 @@ with pkgs;
 
   openrgb-plugin-hardwaresync = libsForQt5.callPackage ../applications/misc/openrgb-plugins/hardwaresync { };
 
-  opensbi = callPackage ../misc/opensbi { };
-
   opensc = callPackage ../tools/security/opensc {
     inherit (darwin.apple_sdk.frameworks) Carbon PCSC;
   };
 
-  openseachest = callPackage ../tools/system/openseachest { };
-
-  opensm = callPackage ../tools/networking/opensm { };
-
-  tinyssh = callPackage ../tools/networking/tinyssh { };
-
-  tinystatus = callPackage ../tools/networking/tinystatus { };
-
   toastify = darwin.apple_sdk_11_0.callPackage ../tools/misc/toastify {};
 
-  tuc = callPackage ../tools/text/tuc { };
-
   opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {});
 
   openssh = opensshPackages.openssh.override {
@@ -10641,18 +4857,8 @@ with pkgs;
 
   sshd-openpgp-auth = callPackage ../by-name/ss/ssh-openpgp-auth/daemon.nix { };
 
-  opensp = callPackage ../tools/text/sgml/opensp { };
-
-  opentofu = callPackage ../applications/networking/cluster/opentofu { };
-
   opentrack = libsForQt5.callPackage ../applications/misc/opentrack { };
 
-  opentracker = callPackage ../applications/networking/p2p/opentracker { };
-
-  alttpr-opentracker = callPackage ../tools/games/opentracker { };
-
-  opentsdb = callPackage ../tools/misc/opentsdb { };
-
   openvpn = callPackage ../tools/networking/openvpn {};
 
   openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
@@ -10663,22 +4869,6 @@ with pkgs;
 
   namespaced-openvpn = python3Packages.callPackage ../tools/networking/namespaced-openvpn { };
 
-  oq = callPackage ../development/tools/oq { };
-
-  out-of-tree = callPackage ../development/tools/out-of-tree { };
-
-  oppai-ng = callPackage ../tools/misc/oppai-ng { };
-
-  operator-sdk = callPackage ../development/tools/operator-sdk { };
-
-  oscclip = callPackage ../tools/misc/oscclip { };
-
-  oui = callPackage ../tools/networking/oui { };
-
-  owncast = callPackage ../servers/owncast { };
-
-  owntracks-recorder = callPackage ../servers/owntracks-recorder { };
-
   update-dotdee = with python3Packages; toPythonApplication update-dotdee;
 
   update-nix-fetchgit = haskell.lib.compose.justStaticExecutables haskellPackages.update-nix-fetchgit;
@@ -10687,10 +4877,6 @@ with pkgs;
 
   update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { };
 
-  opae = callPackage ../development/libraries/opae { };
-
-  open-pdf-sign = callPackage ../tools/misc/open-pdf-sign { };
-
   opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { };
   opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { };
 
@@ -10700,12 +4886,6 @@ with pkgs;
 
   optifine = optifinePackages.optifine-latest;
 
-  optipng = callPackage ../tools/graphics/optipng { };
-
-  olsrd = callPackage ../tools/networking/olsrd { };
-
-  oonf-olsrd2 = callPackage ../tools/networking/oonf-olsrd2 { };
-
   opl3bankeditor = libsForQt5.callPackage ../tools/audio/opl3bankeditor { };
   opn2bankeditor = libsForQt5.callPackage ../tools/audio/opl3bankeditor/opn2bankeditor.nix { };
 
@@ -10713,14 +4893,6 @@ with pkgs;
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  org-stats = callPackage ../tools/misc/org-stats { };
-
-  orz = callPackage ../tools/compression/orz { };
-
-  os-prober = callPackage ../tools/misc/os-prober { };
-
-  oshka = callPackage ../development/tools/oshka { };
-
   osl = libsForQt5.callPackage ../development/compilers/osl {
     boost = boost179;
     libclang = llvmPackages_15.libclang;
@@ -10729,48 +4901,16 @@ with pkgs;
     openexr = openexr_3;
   };
 
-  osqp = callPackage ../development/libraries/science/math/osqp { };
-
   ossec-agent = callPackage ../tools/security/ossec/agent.nix { };
 
   ossec-server = callPackage ../tools/security/ossec/server.nix { };
 
-  osslsigncode = callPackage ../development/tools/osslsigncode { };
-
-  ostree = callPackage ../tools/misc/ostree { };
-
-  ostree-rs-ext = callPackage ../tools/misc/ostree-rs-ext { };
-
-  otel-cli = callPackage ../tools/misc/otel-cli { };
-
-  otfcc = callPackage ../tools/misc/otfcc { };
-
-  otpclient = callPackage ../applications/misc/otpclient { };
-
-  otpw = callPackage ../os-specific/linux/otpw { };
-
-  ovftool = callPackage ../tools/virtualization/ovftool { };
-
-  overmind = callPackage ../applications/misc/overmind { };
-
-  oxker = callPackage ../applications/misc/oxker { };
-
-  oxlint = callPackage ../development/tools/oxlint { };
-
   ovito = qt6Packages.callPackage ../applications/graphics/ovito {
     inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration;
   };
 
-  oxefmsynth = callPackage ../applications/audio/oxefmsynth { };
-
   oxidized = callPackage ../tools/admin/oxidized { };
 
-  oxipng = callPackage ../tools/graphics/oxipng { };
-
-  payload_dumper = callPackage ../tools/archivers/payload_dumper { };
-
-  payload-dumper-go = callPackage ../tools/archivers/payload-dumper-go { };
-
   p4c = callPackage ../development/compilers/p4c {
     protobuf = protobuf_21;
   };
@@ -10780,56 +4920,22 @@ with pkgs;
 
   packagekit = callPackage ../tools/package-management/packagekit { };
 
-  packetdrill = callPackage ../tools/networking/packetdrill { };
-
-  pacman = callPackage ../tools/package-management/pacman { };
-
-  paco = callPackage ../development/compilers/paco { };
-
   padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { };
 
-  padbuster = callPackage ../tools/security/padbuster { };
-
-  page = callPackage ../tools/misc/page { };
-
   pageedit = libsForQt5.callPackage ../applications/office/PageEdit {
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
 
   pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };
 
-  paging-calculator  = callPackage ../development/tools/paging-calculator { };
-
-  pagmo2 = callPackage ../development/libraries/pagmo2 { };
-
-  paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { };
-
   pakcs = callPackage ../development/compilers/pakcs { };
 
-  pal = callPackage ../tools/misc/pal { };
-
-  pandoc = callPackage ../development/tools/pandoc { };
-
-  pandoc-lua-filters = callPackage ../tools/misc/pandoc-lua-filters { };
-
-  pamtester = callPackage ../tools/security/pamtester { };
-
-  paperless-ngx = callPackage ../applications/office/paperless-ngx { };
-
   paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };
 
-  papeer = callPackage ../tools/text/papeer { };
-
-  papertrail = callPackage ../tools/text/papertrail { };
-
-  par2cmdline = callPackage ../tools/networking/par2cmdline { };
-
   parallel = callPackage ../tools/misc/parallel { };
 
   parallel-full = callPackage ../tools/misc/parallel/wrapper.nix { };
 
-  parastoo-fonts = callPackage ../data/fonts/parastoo-fonts { };
-
   parcellite = callPackage ../tools/misc/parcellite {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
@@ -10844,71 +4950,25 @@ with pkgs;
 
   patchutils_0_4_2 = callPackage ../tools/text/patchutils/0.4.2.nix { };
 
-  parted = callPackage ../tools/misc/parted { };
-
-  passh = callPackage ../tools/networking/passh { };
-
-  paulstretch = callPackage ../applications/audio/paulstretch { };
-
-  pazi = callPackage ../tools/misc/pazi { };
-
-  peep = callPackage ../tools/misc/peep { };
-
-  pell = callPackage ../applications/misc/pell { };
-
-  perccli = callPackage ../tools/misc/perccli { };
-
-  perceptualdiff = callPackage ../tools/graphics/perceptualdiff { };
-
   inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_4 percona-server;
   inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_4 percona-xtrabackup;
 
-  pick = callPackage ../tools/misc/pick { };
-
-  pipe-rename = callPackage ../tools/misc/pipe-rename { };
-
   pipecontrol = libsForQt5.callPackage ../applications/audio/pipecontrol { };
 
-  pipectl = callPackage ../tools/misc/pipectl { };
-
-  pitivi = callPackage ../applications/video/pitivi { };
-
-  prism = callPackage ../applications/video/prism { };
-
-  pulumi = callPackage ../tools/admin/pulumi { };
-
   pulumiPackages = recurseIntoAttrs (
     callPackage ../tools/admin/pulumi-packages { }
   );
 
   pulumi-bin = callPackage ../tools/admin/pulumi-bin { };
 
-  p0f = callPackage ../tools/security/p0f { };
-
-  pngloss = callPackage ../tools/graphics/pngloss { };
-
-  pngout = callPackage ../tools/graphics/pngout { };
-
   patch = gnupatch;
 
-  patchage = callPackage ../applications/audio/patchage { };
-
   patchance = python3Packages.callPackage ../applications/audio/patchance { };
 
-  patatt = callPackage ../development/tools/patatt { };
-
-  pcapfix = callPackage ../tools/networking/pcapfix { };
-
-  pbzip2 = callPackage ../tools/compression/pbzip2 { };
-
-  pcimem = callPackage ../os-specific/linux/pcimem { };
-
   pciutils = callPackage ../tools/system/pciutils {
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  otpauth = callPackage ../tools/security/otpauth { };
-
   pcsclite = callPackage ../tools/security/pcsclite {
     inherit (darwin.apple_sdk.frameworks) Foundation IOKit;
   };
@@ -10918,66 +4978,16 @@ with pkgs;
     polkitSupport = true;
   };
 
-  pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { };
-
-  pcsc-safenet = callPackage ../tools/security/pcsc-safenet { };
-
-  pcsc-scm-scl011 = callPackage ../tools/security/pcsc-scm-scl011 { };
-
   pcsc-tools = callPackage ../tools/security/pcsc-tools {
     inherit (pkgs.darwin.apple_sdk.frameworks) PCSC;
   };
 
-  ifdnfc = callPackage ../tools/security/ifdnfc { };
-
   pdd = python3Packages.callPackage ../tools/misc/pdd { };
 
-  pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { };
-
-  pdfcrack = callPackage ../tools/security/pdfcrack { };
-
   pdfposter = callPackage ../applications/misc/pdfposter { };
 
-  pdfsandwich = callPackage ../tools/typesetting/pdfsandwich { };
-
-  pdftag = callPackage ../tools/graphics/pdftag { };
-
-  pdf2svg = callPackage ../tools/graphics/pdf2svg { };
-
-  pdftoipe = callPackage ../tools/graphics/pdftoipe { };
-
   pdfminer = with python3Packages; toPythonApplication pdfminer-six;
 
-  pdf-quench = callPackage ../applications/misc/pdf-quench { };
-
-  briss = callPackage ../tools/graphics/briss { };
-
-  brickd = callPackage ../servers/brickd { };
-
-  bully = callPackage ../tools/networking/bully { };
-
-  pcapc = callPackage ../tools/networking/pcapc { };
-
-  pdm = callPackage ../tools/package-management/pdm { };
-
-  pdnsd = callPackage ../tools/networking/pdnsd { };
-
-  peco = callPackage ../tools/text/peco { };
-
-  percollate = callPackage ../tools/text/percollate { };
-
-  pg_activity = callPackage ../development/tools/database/pg_activity { };
-
-  pg_checksums = callPackage ../development/tools/database/pg_checksums { };
-
-  pg_flame = callPackage ../tools/misc/pg_flame { };
-
-  pg_top = callPackage ../tools/misc/pg_top { };
-
-  pgcenter = callPackage ../tools/misc/pgcenter { };
-
-  pgmetrics = callPackage ../tools/misc/pgmetrics { };
-
   pgsync = callPackage ../development/tools/database/pgsync { };
 
   pdsh = callPackage ../tools/networking/pdsh {
@@ -10985,25 +4995,12 @@ with pkgs;
     ssh = openssh;
   };
 
-  pfetch = callPackage ../tools/misc/pfetch { };
-
-  pfetch-rs = callPackage ../tools/misc/pfetch-rs { };
-
   pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { };
 
   phoc = callPackage ../applications/misc/phoc {
     wlroots = wlroots_0_17;
   };
 
-  phockup = callPackage ../applications/misc/phockup { };
-
-  phodav = callPackage ../tools/networking/phodav { };
-
-  photon-rss = callPackage ../applications/networking/feedreaders/photon { };
-
-  pim6sd = callPackage ../servers/pim6sd { };
-
-  piper-phonemize = callPackage ../development/libraries/piper-phonemize { };
   piper-train = callPackage ../tools/audio/piper/train.nix { };
   piper-tts = callPackage ../tools/audio/piper { };
 
@@ -11011,8 +5008,6 @@ with pkgs;
 
   phosh-mobile-settings = callPackage ../applications/window-managers/phosh/phosh-mobile-settings.nix { };
 
-  piknik = callPackage ../tools/networking/piknik { };
-
   inherit (callPackages ../tools/security/pinentry { })
     pinentry-curses
     pinentry-emacs
@@ -11026,40 +5021,20 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  pinentry-bemenu = callPackage ../tools/security/pinentry-bemenu { };
-
-  pinentry-rofi = callPackage ../tools/security/pinentry-rofi { };
-
-  pingtcp = callPackage ../tools/networking/pingtcp { };
-
   pingu = callPackage ../tools/networking/pingu {
     buildGoModule = buildGo122Module;
   };
 
   pinnwand = callPackage ../servers/pinnwand { };
 
-  pinsel = callPackage ../tools/misc/pinsel { };
-
   piping-server-rust = callPackage ../servers/piping-server-rust {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
 
-  pirate-get = callPackage ../tools/networking/pirate-get { };
-
-  pipr = callPackage ../applications/misc/pipr { };
-
-  pipreqs = callPackage ../tools/misc/pipreqs { };
-
-  pius = callPackage ../tools/security/pius { };
-
-  pixiewps = callPackage ../tools/networking/pixiewps { };
-
   pinyin-tool = callPackage ../tools/text/pinyin-tool {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  pk2cmd = callPackage ../tools/misc/pk2cmd { };
-
   plan9port = darwin.apple_sdk_11_0.callPackage ../tools/system/plan9port {
     inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit Metal QuartzCore;
     inherit (darwin) DarwinTools;
@@ -11069,19 +5044,11 @@ with pkgs;
   platformio = if stdenv.hostPlatform.isLinux then platformioPackages.platformio-chrootenv else platformioPackages.platformio-core;
   platformio-core = platformioPackages.platformio-core;
 
-  platinum-searcher = callPackage ../tools/text/platinum-searcher { };
-
   playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { };
 
   playwright-driver = (callPackage ../development/web/playwright/driver.nix { }).playwright-core;
   playwright-test = (callPackage ../development/web/playwright/driver.nix { }).playwright-test;
 
-  please = callPackage ../tools/security/please { };
-
-  plecost = callPackage ../tools/security/plecost { };
-
-  plujain-ramp = callPackage ../applications/audio/plujain-ramp { };
-
   inherit (callPackage ../servers/plik { })
     plik plikd;
 
@@ -11089,10 +5056,6 @@ with pkgs;
 
   plexRaw = callPackage ../servers/plex/raw.nix { };
 
-  psitransfer = callPackage ../servers/psitransfer { };
-
-  tab = callPackage ../tools/text/tab { };
-
   tabview = with python3Packages; toPythonApplication tabview;
 
   tautulli = python3Packages.callPackage ../servers/tautulli { };
@@ -11106,38 +5069,10 @@ with pkgs;
     python = null;
   };
 
-  ploticus = callPackage ../tools/graphics/ploticus { };
-
-  plotinus = callPackage ../tools/misc/plotinus { };
-
-  plots = callPackage ../applications/misc/plots { };
-
-  plotutils = callPackage ../tools/graphics/plotutils { };
-
-  plowshare = callPackage ../tools/misc/plowshare { };
-
-  pmenu = callPackage ../tools/X11/pmenu { };
-
-  pngcheck = callPackage ../tools/graphics/pngcheck { };
-
-  pngcrush = callPackage ../tools/graphics/pngcrush { };
-
-  pngnq = callPackage ../tools/graphics/pngnq { };
-
-  pngoptimizer = callPackage ../tools/graphics/pngoptimizer { };
-
-  pngtoico = callPackage ../tools/graphics/pngtoico { };
-
   pngpaste = callPackage ../os-specific/darwin/pngpaste {
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
   };
 
-  pngtools = callPackage ../tools/graphics/pngtools { };
-
-  pngpp = callPackage ../development/libraries/png++ { };
-
-  pngquant = callPackage ../tools/graphics/pngquant { };
-
   inherit (callPackage ../development/tools/pnpm { })
     pnpm_8 pnpm_9;
   pnpm = pnpm_9;
@@ -11148,22 +5083,12 @@ with pkgs;
     inherit (llvmPackages_14) stdenv;
   };
 
-  podiff = callPackage ../tools/text/podiff { };
-
-  pocketbase = callPackage ../servers/pocketbase { };
-
-  podman = callPackage ../applications/virtualization/podman { };
-
   podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose { };
 
   podman-desktop = callPackage ../applications/virtualization/podman-desktop {
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  pods = callPackage ../applications/virtualization/pods { };
-
-  pod2mdoc = callPackage ../tools/misc/pod2mdoc { };
-
   poedit = callPackage ../tools/text/poedit {
     wxGTK32 = wxGTK32.override { withWebKit = true; };
   };
@@ -11172,60 +5097,12 @@ with pkgs;
 
   polaris-web = callPackage ../servers/polaris/web.nix { };
 
-  polipo = callPackage ../servers/polipo { };
-
-  poly2tri-c = callPackage ../development/libraries/poly2tri-c { };
-
-  polypane = callPackage ../applications/networking/browsers/polypane { };
-
-  pomsky = callPackage ../tools/text/pomsky { };
-
-  ponysay = callPackage ../tools/misc/ponysay { };
-
-  popfile = callPackage ../tools/text/popfile { };
-
-  porsmo = callPackage ../applications/misc/porsmo { };
-
-  pantum-driver = callPackage ../misc/drivers/pantum-driver { };
-
-  posteid-seed-extractor = callPackage ../tools/security/posteid-seed-extractor { };
-
-  postscript-lexmark = callPackage ../misc/drivers/postscript-lexmark { };
-
   povray = callPackage ../tools/graphics/povray {
     # https://github.com/POV-Ray/povray/issues/460
     # https://github.com/NixOS/nixpkgs/issues/311017
     stdenv = gcc12Stdenv;
   };
 
-  ppl = callPackage ../development/libraries/ppl { };
-
-  pplite = callPackage ../development/libraries/pplite { };
-
-  ppp = callPackage ../tools/networking/ppp { };
-
-  pptp = callPackage ../tools/networking/pptp { };
-
-  pptpd = callPackage ../tools/networking/pptpd { };
-
-  pre-commit = callPackage ../tools/misc/pre-commit { };
-
-  pre-commit-hook-ensure-sops = callPackage ../tools/misc/pre-commit-hook-ensure-sops { };
-
-  pretender = callPackage ../tools/security/pretender { };
-
-  pretty-simple = callPackage ../development/tools/pretty-simple { };
-
-  prettyping = callPackage ../tools/networking/prettyping { };
-
-  pritunl-ssh = callPackage ../tools/networking/pritunl-ssh { };
-
-  profile-cleaner = callPackage ../tools/misc/profile-cleaner { };
-
-  profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { };
-
-  projectable = callPackage ../applications/file-managers/projectable { };
-
   projectlibre = callPackage ../applications/misc/projectlibre {
     jre = jre8;
     jdk = jdk8;
@@ -11233,103 +5110,27 @@ with pkgs;
 
   projectm = libsForQt5.callPackage ../applications/audio/projectm { };
 
-  proot = callPackage ../tools/system/proot { };
-
-  prototypejs = callPackage ../development/libraries/prototypejs { };
-
   proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix {
     inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit;
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
 
-  proxychains = callPackage ../tools/networking/proxychains { };
-
-  proxychains-ng = callPackage ../tools/networking/proxychains-ng { };
-
-  proxify = callPackage ../tools/networking/proxify { };
-
-  proxysql = callPackage ../servers/sql/proxysql { };
-
-  prs = callPackage ../tools/security/prs { };
-
-  psw = callPackage ../tools/misc/psw { };
-
   pws = callPackage ../tools/misc/pws { };
 
-  cntlm = callPackage ../tools/networking/cntlm { };
-
-  cnping = callPackage ../tools/networking/cnping { };
-
-  past-time = callPackage ../tools/misc/past-time { };
-
-  pastebinit = callPackage ../tools/misc/pastebinit { };
-
-  pmacct = callPackage ../tools/networking/pmacct { };
-
-  pmix = callPackage ../development/libraries/pmix { };
-
-  polygraph = callPackage ../tools/networking/polygraph { };
-
-  pr-tracker = callPackage ../servers/pr-tracker { };
-
-  progress = callPackage ../tools/misc/progress { };
-
-  ps3-disc-dumper = callPackage ../tools/games/ps3-disc-dumper { };
-
-  ps3iso-utils = callPackage ../tools/games/ps3iso-utils { };
-
-  ps3netsrv = callPackage ../servers/ps3netsrv { };
-
-  pscircle = callPackage ../os-specific/linux/pscircle { };
-
-  psitop = callPackage ../applications/system/psitop { };
-
-  psmisc = callPackage ../os-specific/linux/psmisc { };
-
-  pssh = callPackage ../tools/networking/pssh { };
-
-  pspg = callPackage ../tools/misc/pspg { };
-
-  pstoedit = callPackage ../tools/graphics/pstoedit { };
-
-  psutils = callPackage ../tools/typesetting/psutils { };
-
-  psudohash = callPackage ../tools/security/psudohash { };
-
-  pubs = callPackage ../tools/misc/pubs { };
-
-  pulldown-cmark = callPackage ../tools/typesetting/pulldown-cmark { };
-
-  pulumictl = callPackage ../development/tools/pulumictl { };
-
-  pure-prompt = callPackage ../shells/zsh/pure-prompt { };
-
-  pwgen = callPackage ../tools/security/pwgen { };
-
-  pwgen-secure = callPackage ../tools/security/pwgen-secure { };
-
-  pwnat = callPackage ../tools/networking/pwnat { };
-
   pwninit = callPackage ../development/tools/misc/pwninit {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;
 
-  pydf = callPackage ../applications/misc/pydf { };
-
   pyinfra = with python3Packages; toPythonApplication pyinfra;
 
   pylint = with python3Packages; toPythonApplication pylint;
 
-  pympress = callPackage ../applications/office/pympress { };
-
   pyocd = with python3Packages; toPythonApplication pyocd;
 
   pypass = with python3Packages; toPythonApplication pypass;
 
-  ticktick = callPackage ../applications/office/ticktick { };
-
   py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy {
     # https://github.com/benfred/py-spy/issues/633
     python3 = python311;
@@ -11337,37 +5138,17 @@ with pkgs;
 
   pydeps = with python3Packages; toPythonApplication pydeps;
 
-  pysentation = callPackage ../applications/misc/pysentation { };
-
-  python-launcher = callPackage ../development/tools/misc/python-launcher { };
-
-  pytrainer = callPackage ../applications/misc/pytrainer { };
-
   pywal = with python3Packages; toPythonApplication pywal;
 
-  pystring = callPackage ../development/libraries/pystring { };
-
   raysession = python3Packages.callPackage ../applications/audio/raysession {};
 
-  rbw = callPackage ../tools/security/rbw { };
-
   remarshal = with python3Packages; toPythonApplication remarshal;
 
-  rehex = callPackage ../applications/editors/rehex { };
-
-  rio = callPackage ../applications/terminal-emulators/rio { };
-
-  rig = callPackage ../tools/misc/rig { };
-
-  ripdrag = callPackage ../tools/misc/ripdrag { };
-
   riseup-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn {
     provider = "riseup";
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
 
-  rnm = callPackage ../tools/filesystems/rnm { };
-
   rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
 
   rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix {
@@ -11384,17 +5165,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreMIDI CoreAudio CoreServices;
   };
 
-  openmpi = callPackage ../development/libraries/openmpi { };
-
-  ouch = callPackage ../tools/compression/ouch { };
-
   mpi = openmpi; # this attribute should used to build MPI applications
-  mpiCheckPhaseHook = callPackage ../build-support/setup-hooks/mpi-check-hook { };
-
-  ucc = callPackage ../development/libraries/ucc { };
-
-  ucx = callPackage ../development/libraries/ucx { };
-
   openmodelica = recurseIntoAttrs (callPackage ../applications/science/misc/openmodelica {});
 
   prowlarr = callPackage ../servers/prowlarr { };
@@ -11411,62 +5182,34 @@ with pkgs;
 
   quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { };
 
-  q-text-as-data = callPackage ../tools/misc/q-text-as-data { };
-
-  qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { };
-
   qalculate-qt = qt6Packages.callPackage ../applications/science/math/qalculate-qt { };
 
   qastools = libsForQt5.callPackage ../tools/audio/qastools { };
 
   qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ;
 
-  qhull = callPackage ../development/libraries/qhull { };
-
   qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { };
 
   qjoypad = libsForQt5.callPackage ../tools/misc/qjoypad { };
 
-  qmk = callPackage ../tools/misc/qmk { };
-
-  qmk_hid = callPackage ../tools/misc/qmk_hid { };
-
   qmarkdowntextedit = libsForQt5.callPackage  ../development/libraries/qmarkdowntextedit { };
 
   qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { };
 
-  qovery-cli = callPackage ../tools/admin/qovery-cli { };
-
   qownnotes = qt6Packages.callPackage ../applications/office/qownnotes {
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
 
-  qpdf = callPackage ../development/libraries/qpdf { };
-
-  qprint = callPackage ../tools/text/qprint { };
-
-  qrscan = callPackage ../tools/misc/qrscan { };
-
   qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
 
   qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { };
 
-  quadrafuzz = callPackage ../applications/audio/quadrafuzz { };
-
-  quickfix = callPackage ../development/libraries/quickfix { };
-
-  quickserve = callPackage ../tools/networking/quickserve { };
-
   quictls = callPackage ../development/libraries/quictls { };
 
-  quicktun = callPackage ../tools/networking/quicktun { };
-
   quickwit = callPackage ../servers/search/quickwit {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  quilt = callPackage ../development/tools/quilt { };
-
   quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota;
 
   qvge = libsForQt5.callPackage ../applications/graphics/qvge { };
@@ -11475,322 +5218,98 @@ with pkgs;
 
   wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { };
 
-  wiggle = callPackage ../development/tools/wiggle { };
-
-  radamsa = callPackage ../tools/security/radamsa { };
-
   radarr = callPackage ../servers/radarr { };
 
   radeon-profile = libsForQt5.callPackage ../tools/misc/radeon-profile { };
 
-  radsecproxy = callPackage ../tools/networking/radsecproxy { };
-
-  radvd = callPackage ../tools/networking/radvd { };
-
-  rain = callPackage ../development/tools/rain { };
-
   rainbowstream = with python3.pkgs; toPythonApplication rainbowstream;
 
-  rambox = callPackage ../applications/networking/instant-messengers/rambox { };
-
-  ramfetch = callPackage ../tools/misc/ramfetch { };
-
   rapidgzip = with python3Packages; toPythonApplication rapidgzip;
 
   rar = callPackage ../tools/archivers/rar { };
 
-  rarcrack = callPackage ../tools/security/rarcrack { };
-
-  rare-regex = callPackage ../tools/text/rare-regex { };
-
-  ratman = callPackage ../tools/networking/ratman { };
-
   ratarmount = with python3Packages; toPythonApplication ratarmount;
 
-  ratools = callPackage ../tools/networking/ratools { };
-
-  ratt = callPackage ../applications/misc/ratt { };
-
-  rc-9front = callPackage ../shells/rc-9front { };
-
-  rcon = callPackage ../tools/networking/rcon { };
-
-  rconc = callPackage ../tools/networking/rconc { };
-
-  rdap = callPackage ../tools/networking/rdap { };
-
   rdbtools = callPackage ../development/tools/rdbtools { python = python3; };
 
-  rdma-core = callPackage ../os-specific/linux/rdma-core { };
-
-  rdrview = callPackage ../tools/networking/rdrview { };
-
-  real_time_config_quick_scan = callPackage ../applications/audio/real_time_config_quick_scan { };
-
-  realesrgan-ncnn-vulkan = callPackage ../tools/graphics/realesrgan-ncnn-vulkan { };
-
-  react-native-debugger = callPackage ../development/tools/react-native-debugger { };
-
-  read-edid = callPackage ../os-specific/linux/read-edid { };
-
-  readstat = callPackage ../applications/science/math/readstat { };
-
-  redir = callPackage ../tools/networking/redir { };
-
-  redpanda-client = callPackage ../servers/redpanda { };
-
-  redsocks = callPackage ../tools/networking/redsocks { };
-
-  rep = callPackage ../development/tools/rep { };
-
-  repseek = callPackage ../applications/science/biology/repseek { };
-
-  reredirect = callPackage ../tools/misc/reredirect { };
-
   retext = qt6Packages.callPackage ../applications/editors/retext { };
 
-  rewrk = callPackage ../tools/networking/rewrk { };
-
   inherit (callPackage ../tools/security/rekor { })
     rekor-cli
     rekor-server;
 
-  rhai-doc = callPackage ../development/tools/misc/rhai-doc { };
-
-  rich-cli = callPackage ../misc/rich-cli { };
-
-  richgo = callPackage ../development/tools/richgo {  };
-
-  risor = callPackage ../development/interpreters/risor { };
-
-  rlci = callPackage ../development/interpreters/rlci { };
-
   rst2pdf = with python3Packages; toPythonApplication rst2pdf;
 
   rstcheck = with python3Packages; toPythonApplication rstcheck;
 
-  rstfmt = callPackage ../development/tools/rstfmt { };
-
-  rt = callPackage ../servers/rt { };
-
-  rtmpdump = callPackage ../tools/video/rtmpdump { };
   rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
 
-  rtptools = callPackage ../tools/networking/rtptools { };
-
-  rtss = callPackage ../development/tools/misc/rtss { };
-
-  re-isearch = callPackage ../applications/search/re-isearch { };
-
-  reason-shell = callPackage ../applications/science/misc/reason-shell { };
-
-  reaverwps = callPackage ../tools/networking/reaver-wps { };
-
-  reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x { };
-
-  rx = callPackage ../applications/graphics/rx { };
-
   qt-box-editor = libsForQt5.callPackage ../applications/misc/qt-box-editor { };
 
-  readability-cli = callPackage ../tools/text/readability-cli { };
-
   recoll = libsForQt5.callPackage ../applications/search/recoll { };
 
   recoll-nox = recoll.override { withGui = false; };
 
-  redoc-cli = callPackage ../development/tools/redoc-cli { };
-
-  reflex = callPackage ../development/tools/reflex { };
-
-  reiser4progs = callPackage ../tools/filesystems/reiser4progs { };
-
-  reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { };
-
-  relic = callPackage ../development/tools/relic { };
-
   remmina = darwin.apple_sdk_11_0.callPackage ../applications/networking/remote/remmina { };
 
-  rename = callPackage ../tools/misc/rename { };
-
-  renameutils = callPackage ../tools/misc/renameutils { };
-
-  repgrep = callPackage ../tools/text/repgrep { };
-
-  replace = callPackage ../tools/text/replace { };
-
-  resvg = callPackage ../tools/graphics/resvg { };
-
   reckon = callPackage ../tools/text/reckon { };
 
-  recoverjpeg = callPackage ../tools/misc/recoverjpeg { };
-
-  reftools = callPackage ../development/tools/reftools { };
-
-  redwax-tool = callPackage ../tools/security/redwax-tool { };
-
-  regpg = callPackage ../tools/security/regpg { };
-
-  remote-touchpad = callPackage ../tools/inputmethods/remote-touchpad { };
-
   remote-exec = python3Packages.callPackage ../tools/misc/remote-exec { };
 
-  reposurgeon = callPackage ../applications/version-management/reposurgeon { };
-
   reptor = with python3.pkgs; toPythonApplication reptor;
 
-  reptyr = callPackage ../os-specific/linux/reptyr { };
-
   rescuetime = libsForQt5.callPackage ../applications/misc/rescuetime { };
 
   inherit (callPackage ../development/misc/resholve { })
     resholve;
 
-  restool = callPackage ../os-specific/linux/restool { };
-
   reuse = with python3.pkgs; toPythonApplication reuse;
 
-  reveal-md = callPackage ../tools/text/reveal-md { };
-
-  rewritefs = callPackage ../os-specific/linux/rewritefs { };
-
-  rdiff-backup = callPackage ../tools/backup/rdiff-backup { };
-
-  rdfind = callPackage ../tools/filesystems/rdfind { };
-
-  rhash = callPackage ../tools/security/rhash { };
-
-  rhoas = callPackage ../tools/admin/rhoas { };
-
-  riemann_c_client = callPackage ../tools/misc/riemann-c-client { };
   riemann-tools = callPackage ../tools/misc/riemann-tools { };
 
-  ripmime = callPackage ../tools/networking/ripmime { };
-
-  rkflashtool = callPackage ../tools/misc/rkflashtool { };
-
-  rkvm = callPackage ../tools/misc/rkvm { };
-
-  rkrlv2 = callPackage ../applications/audio/rkrlv2 { };
-
   rmlint = callPackage ../tools/misc/rmlint {
     inherit (python3Packages) sphinx;
   };
 
-  rmw = callPackage ../tools/misc/rmw { };
-
-  rng-tools = callPackage ../tools/security/rng-tools { };
-
-  rnnoise = callPackage ../development/libraries/rnnoise { };
-
   # Use `apple_sdk_11_0` because `apple_sdk.libs` does not provide `simd`
   rnnoise-plugin = darwin.apple_sdk_11_0.callPackage ../development/libraries/rnnoise-plugin {
     inherit (darwin.apple_sdk_11_0.frameworks) WebKit MetalKit CoreAudioKit;
     inherit (darwin.apple_sdk_11_0.libs) simd;
   };
 
-  rnp = callPackage ../tools/security/rnp { };
-
-  rnr = callPackage ../tools/text/rnr { };
-
-  rnv = callPackage ../tools/text/xml/rnv { };
-
-  roam-research = callPackage ../applications/office/roam-research { };
-
-  rosie = callPackage ../tools/text/rosie { };
-
-  rounded-mgenplus = callPackage ../data/fonts/rounded-mgenplus { };
-
-  roundup = callPackage ../tools/misc/roundup { };
-
-  routino = callPackage ../tools/misc/routino { };
-
-  rq = callPackage ../development/tools/rq { };
-
-  rsnapshot = callPackage ../tools/backup/rsnapshot { };
-
-  rlwrap = callPackage ../tools/misc/rlwrap { };
-
-  rmtrash = callPackage ../tools/misc/rmtrash { };
-
-  roc-toolkit = callPackage ../development/libraries/audio/roc-toolkit { };
-
   rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { };
 
   rosenpass = callPackage ../tools/networking/rosenpass  { };
 
   rosenpass-tools = callPackage ../tools/networking/rosenpass/tools.nix  { };
 
-  rot8 = callPackage ../tools/misc/rot8 { };
-
-  rowhammer-test = callPackage ../tools/system/rowhammer-test { };
-
-  rpPPPoE = callPackage ../tools/networking/rp-pppoe { };
-
   rpm = callPackage ../tools/package-management/rpm {
     python = python3;
     lua = lua5_4;
   };
 
-  rpm-ostree = callPackage ../tools/misc/rpm-ostree { };
-
-  rpm2targz = callPackage ../tools/archivers/rpm2targz { };
-
-  rpmextract = callPackage ../tools/archivers/rpmextract { };
-
-  rscw = callPackage ../applications/radio/rscw { };
-
-  rset = callPackage ../tools/admin/rset { };
-
-  rshijack = callPackage ../tools/networking/rshijack { };
-
-  rshim-user-space = callPackage ../tools/misc/rshim-user-space { };
-
   rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { };
 
-  rslint = callPackage ../development/tools/rslint { };
-
-  rss-bridge-cli = callPackage ../applications/misc/rss-bridge-cli { };
-
   rss2email = callPackage ../applications/networking/feedreaders/rss2email {
     pythonPackages = python3Packages;
   };
 
-  feed2imap-go = callPackage ../applications/networking/feedreaders/feed2imap-go { };
-
-  rsstail = callPackage ../applications/networking/feedreaders/rsstail { };
-
-  rtz = callPackage ../tools/misc/rtz { };
-
-  rubber = callPackage ../tools/typesetting/rubber { };
-
   rubocop = rubyPackages.rubocop;
 
   ruby-lsp = rubyPackages.ruby-lsp;
 
-  runningx = callPackage ../tools/X11/runningx { };
-
-  rund = callPackage ../development/tools/rund { };
-
-  runzip = callPackage ../tools/archivers/runzip { };
-
   ruplacer = callPackage ../tools/text/ruplacer {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  rust-code-analysis = callPackage ../development/tools/rust-code-analysis { };
-
   rust-motd = callPackage ../tools/misc/rust-motd {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  rust-petname = callPackage ../tools/text/rust-petname { };
-
   rustcat = callPackage ../tools/networking/rustcat {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  rustfilt = callPackage ../development/tools/rust/rustfilt { };
-
   rustscan = callPackage ../tools/security/rustscan {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -11799,28 +5318,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  rustypaste = callPackage ../servers/rustypaste { };
-
-  rustypaste-cli = callPackage ../tools/misc/rustypaste-cli { };
-
-  rustywind = callPackage ../development/tools/misc/rustywind { };
-
-  rw = callPackage ../tools/misc/rw { };
-
-  rwc = callPackage ../tools/system/rwc { };
-
-  rwedid = callPackage ../tools/video/rwedid { };
-
-  rxp = callPackage ../tools/text/xml/rxp { };
-
-  rzip = callPackage ../tools/compression/rzip { };
-
-  s-tui = callPackage ../tools/system/s-tui { };
-
-  s3backer = callPackage ../tools/filesystems/s3backer { };
-
-  s3bro = callPackage ../tools/admin/s3bro { };
-
   s3fs = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/s3fs { };
 
   s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { };
@@ -11831,319 +5328,72 @@ with pkgs;
 
   s3-credentials = with python3Packages; toPythonApplication s3-credentials;
 
-  s4cmd = callPackage ../tools/networking/s4cmd { };
-
-  s5 = callPackage ../tools/security/s5 { };
-
-  s5cmd = callPackage ../tools/networking/s5cmd { };
-
-  sacad = callPackage ../tools/misc/sacad { };
-
-  sad = callPackage ../tools/text/sad { };
-
-  safecopy = callPackage ../tools/system/safecopy { };
-
-  sacd = callPackage ../tools/cd-dvd/sacd { };
-
-  safe = callPackage ../tools/security/safe { };
-
   safety-cli = with python3.pkgs; toPythonApplication safety;
 
-  safe-rm = callPackage ../tools/system/safe-rm { };
-
-  safecloset = callPackage ../applications/misc/safecloset { };
-
-  safeeyes = callPackage ../applications/misc/safeeyes { };
-
-  sagoin = callPackage ../tools/misc/sagoin { };
-
-  sahel-fonts = callPackage ../data/fonts/sahel-fonts { };
-
-  saldl = callPackage ../tools/networking/saldl { };
-
-  salt = callPackage ../tools/admin/salt { };
-
-  samim-fonts = callPackage ../data/fonts/samim-fonts { };
-
   saml2aws = callPackage ../tools/security/saml2aws {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  sammler = callPackage ../tools/security/sammler { };
-
-  samplicator = callPackage ../tools/networking/samplicator { };
-
-  sanctity = callPackage ../tools/misc/sanctity { };
-
   sasview = libsForQt5.callPackage ../applications/science/misc/sasview { };
 
-  sbs = callPackage ../tools/X11/sbs { };
-
-  schemes = callPackage ../applications/misc/schemes { };
-
-  scanbd = callPackage ../tools/graphics/scanbd { };
-
-  scdl = callPackage ../tools/misc/scdl { };
-
-  scorecard = callPackage ../tools/security/scorecard { };
-
-  scream = callPackage ../applications/audio/scream { };
-
   screen = callPackage ../tools/misc/screen {
     inherit (darwin.apple_sdk.libs) utmp;
   };
 
-  screen-message = callPackage ../tools/X11/screen-message { };
-
-  screenkey = callPackage ../applications/video/screenkey { };
-
-  scrub = callPackage ../tools/misc/scrub { };
-
   scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { };
 
-  scraper = callPackage ../tools/text/scraper { };
-
-  scriptaculous = callPackage ../development/libraries/scriptaculous { };
-
-  script-directory = callPackage ../tools/misc/script-directory { };
-
-  scrot = callPackage ../tools/graphics/scrot { };
-
-  scrypt = callPackage ../tools/security/scrypt { };
-
   sd = callPackage ../tools/text/sd {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  sd-switch = callPackage ../os-specific/linux/sd-switch { };
-
-  sdate = callPackage ../tools/misc/sdate { };
-
-  sdat2img = callPackage ../tools/filesystems/sdat2img { };
-
-  sdcv = callPackage ../applications/misc/sdcv { };
-
-  sdl-jstest = callPackage ../tools/misc/sdl-jstest { };
-
-  senpai = callPackage ../applications/networking/irc/senpai { };
-
-  skim = callPackage ../tools/misc/skim { };
-
-  seashells = callPackage ../applications/misc/seashells { };
-
-  seaweedfs = callPackage ../applications/networking/seaweedfs { };
-
-  sec = callPackage ../tools/admin/sec { };
-
-  seccure = callPackage ../tools/security/seccure { };
-
-  secp256k1 = callPackage ../tools/security/secp256k1 { };
-
   securefs = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/securefs { };
 
-  seehecht = callPackage ../tools/text/seehecht { };
-
   segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; };
 
   selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { };
 
-  semantic-release = callPackage ../development/tools/semantic-release { };
-
   semgrep = python3.pkgs.toPythonApplication python3.pkgs.semgrep;
   inherit (semgrep.passthru) semgrep-core;
 
-  setroot = callPackage  ../tools/X11/setroot { };
-
-  setserial = callPackage ../tools/system/setserial { };
-
   seqdiag = with python3Packages; toPythonApplication seqdiag;
 
-  sequoia-sqv = callPackage ../tools/security/sequoia-sqv { };
-
-  sequoia-sqop = callPackage ../tools/security/sequoia-sqop { };
-
-  sequoia-chameleon-gnupg = callPackage ../tools/security/sequoia-chameleon-gnupg { };
-
-  sewer = callPackage ../tools/admin/sewer { };
-
-  sexpp = callPackage ../development/libraries/sexpp { };
-
-  sfeed = callPackage ../tools/misc/sfeed { };
-
-  sftpman = callPackage ../tools/filesystems/sftpman { };
-
-  sftpgo = callPackage ../servers/sftpgo { };
-
-  screenfetch = callPackage ../tools/misc/screenfetch { };
-
-  sg3_utils = callPackage ../tools/system/sg3_utils { };
-
-  sha1collisiondetection = callPackage ../tools/security/sha1collisiondetection { };
-
-  shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { };
-
-  shadered = callPackage ../development/tools/shadered { };
-
-  go-shadowsocks2 = callPackage ../tools/networking/go-shadowsocks2 { };
-
-  shabnam-fonts = callPackage ../data/fonts/shabnam-fonts { };
-
   shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust {
     inherit (darwin.apple_sdk.frameworks) Security CoreServices;
   };
 
-  shadowsocks-v2ray-plugin = callPackage ../tools/networking/shadowsocks-v2ray-plugin { };
-
-  sharutils = callPackage ../tools/archivers/sharutils { };
-
-  shell2http = callPackage ../servers/misc/shell2http { };
-
-  shelldap = callPackage ../tools/misc/shelldap { };
-
   shellify = haskellPackages.shellify.bin;
 
-  shellspec = callPackage ../tools/misc/shellspec { };
-
-  schema2ldif = callPackage ../tools/text/schema2ldif { };
-
-  schemacrawler = callPackage ../development/tools/schemacrawler { };
-
   sharedown = callPackage ../tools/misc/sharedown { };
 
-  shen-sbcl = callPackage ../development/interpreters/shen-sbcl { };
-
-  shen-sources = callPackage ../development/interpreters/shen-sources { };
-
   shiv = with python3Packages; toPythonApplication shiv;
 
-  shim-unsigned = callPackage ../tools/misc/shim { };
-
-  shocco = callPackage ../tools/text/shocco { };
-
-  shopify-themekit = callPackage ../development/web/shopify-themekit { };
-
-  shorewall = callPackage ../tools/networking/shorewall { };
-
-  shotwell = callPackage ../applications/graphics/shotwell { };
-
-  shrikhand = callPackage ../data/fonts/shrikhand { };
-
-  shunit2 = callPackage ../tools/misc/shunit2 { };
-
-  sic = callPackage ../applications/networking/irc/sic { };
-
-  siege = callPackage ../tools/networking/siege { };
-
-  sieve-connect = callPackage ../applications/networking/sieve-connect { };
-
-  sigal = callPackage ../applications/misc/sigal { };
-
   sigil = libsForQt5.callPackage ../applications/editors/sigil { };
 
-  signald = callPackage ../applications/networking/instant-messengers/signald { };
-
-  signaldctl = callPackage ../applications/networking/instant-messengers/signaldctl { };
-
-  signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { };
-
   inherit (callPackage ../applications/networking/instant-messengers/signal-desktop {}) signal-desktop signal-desktop-beta;
 
   slither-analyzer = with python3Packages; toPythonApplication slither-analyzer;
 
-  sigma-cli = callPackage ../tools/security/sigma-cli { };
-
-  signify = callPackage ../tools/security/signify { };
-
   # aka., pgp-tools
-  signing-party = callPackage ../tools/security/signing-party { };
-
-  sigtop = callPackage ../tools/backup/sigtop { };
-
-  silc_client = callPackage ../applications/networking/instant-messengers/silc-client { };
-
-  silc_server = callPackage ../servers/silc-server { };
-
-  silenthound = callPackage ../tools/security/silenthound { };
-
-  silice = callPackage ../development/compilers/silice { };
-
-  silver-searcher = callPackage ../tools/text/silver-searcher { };
-
-  simple-mtpfs = callPackage ../tools/filesystems/simple-mtpfs { };
-
-  simpleproxy = callPackage ../tools/networking/simpleproxy { };
-
   simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { };
 
-  sipexer = callPackage ../tools/networking/sipexer { };
-
-  sipsak = callPackage ../tools/networking/sipsak { };
-
-  sipvicious = callPackage ../tools/security/sipvicious { };
-
-  siril = callPackage ../applications/science/astronomy/siril { };
-
   sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { };
 
-  sixpair = callPackage ../tools/misc/sixpair { };
-
-  skippy-xd = callPackage ../tools/X11/skippy-xd { };
-
   sks = callPackage ../servers/sks {
     ocamlPackages = ocaml-ng.ocamlPackages_4_12;
   };
 
-  skydns = callPackage ../servers/skydns { };
-
-  sing-box = callPackage ../tools/networking/sing-box { };
-
-  sing-geosite = callPackage ../data/misc/sing-geosite { };
-
-  sing-geoip = callPackage ../data/misc/sing-geoip { };
-
-  sipcalc = callPackage ../tools/networking/sipcalc { };
-
-  skytemple = callPackage ../applications/misc/skytemple { };
-
-  sleuthkit = callPackage ../tools/system/sleuthkit { };
-
-  slides = callPackage ../applications/misc/slides { };
-
-  slippy = callPackage ../applications/misc/slippy { };
-
-  slirp4netns = callPackage ../tools/networking/slirp4netns { };
-
   slowlorust = callPackage ../tools/networking/slowlorust {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  slsa-verifier = callPackage ../tools/security/slsa-verifier { };
-
-  slsnif = callPackage ../tools/misc/slsnif { };
-
   slstatus = callPackage ../applications/misc/slstatus {
     conf = config.slstatus.conf or null;
   };
 
-  smartdns = callPackage ../tools/networking/smartdns { };
-
   smartmontools = callPackage ../tools/system/smartmontools {
     inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices;
   };
 
-  smarty3 = callPackage ../development/libraries/smarty3 { };
-  smarty3-i18n = callPackage ../development/libraries/smarty3-i18n { };
-
-  smbnetfs = callPackage ../tools/filesystems/smbnetfs { };
-
-  smenu = callPackage ../tools/misc/smenu { };
-
-  boost-sml = callPackage ../development/libraries/boost-ext/boost-sml { };
-
-  smu = callPackage ../tools/text/smu { };
-
-  smug = callPackage ../tools/misc/smug { };
-
   smpq = callPackage ../by-name/sm/smpq/package.nix {
     stormlib = stormlib.overrideAttrs (old: {
       version = "9.22";
@@ -12156,88 +5406,39 @@ with pkgs;
     });
   };
 
-  snabb = callPackage ../tools/networking/snabb { };
-
-  snallygaster = callPackage ../tools/security/snallygaster { };
-
   snapcast = darwin.apple_sdk_11_0.callPackage ../applications/audio/snapcast {
     inherit (darwin.apple_sdk_11_0.frameworks) IOKit AudioToolbox;
     pulseaudioSupport = config.pulseaudio or stdenv.hostPlatform.isLinux;
   };
 
-  snapdragon-profiler = callPackage ../tools/graphics/snapdragon-profiler { };
-
-  snet = callPackage ../tools/networking/snet { };
-
-  snmpcheck = callPackage ../tools/networking/snmpcheck { };
-
-  snobol4 = callPackage ../development/interpreters/snobol4 { };
-
-  snort = callPackage ../applications/networking/ids/snort { };
-
   soapui = callPackage ../applications/networking/soapui {
     jdk = jdk11;
   };
 
-  sockdump = callPackage ../tools/networking/sockdump { };
-
   specup = haskellPackages.specup.bin;
 
   spglib = callPackage ../development/libraries/spglib {
     inherit (llvmPackages) openmp;
   };
 
-  spicy = callPackage ../development/tools/spicy { };
-
-  spire = callPackage ../tools/security/spire { };
   # to match naming of other package repositories
   spire-agent = spire.agent;
   spire-server = spire.server;
 
   spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { };
 
-  sqlboiler = callPackage ../development/tools/sqlboiler { };
-
-  sshed = callPackage ../tools/networking/sshed { };
-
-  sshguard = callPackage ../tools/security/sshguard { };
-
-  sshping = callPackage ../tools/networking/sshping { };
-
-  ssh-chat = callPackage ../applications/networking/instant-messengers/ssh-chat { };
-
-  ssh-to-age = callPackage ../tools/security/ssh-to-age { };
-
-  ssh-to-pgp = callPackage ../tools/security/ssh-to-pgp { };
-
   suricata = callPackage ../applications/networking/ids/suricata {
     python = python3;
     libbpf = libbpf_0;
   };
 
-  sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { };
-
   softhsm = callPackage ../tools/security/softhsm {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  snapshot = callPackage ../applications/graphics/snapshot { };
-
-  solvespace = callPackage ../applications/graphics/solvespace { };
-
-  sonata = callPackage ../applications/audio/sonata { };
-
-  sony-headphones-client = callPackage ../applications/audio/sony-headphones-client { };
-
-  soundconverter = callPackage ../applications/audio/soundconverter { };
-
   soundkonverter = libsForQt5.soundkonverter;
 
-  sozu = callPackage ../servers/sozu { };
-
-  spacer = callPackage ../tools/misc/spacer { };
-
   sparrow-unwrapped = callPackage ../applications/blockchains/sparrow {
     openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix {};
     openjdk = jdk23.override { enableJavaFX = true; };
@@ -12245,255 +5446,70 @@ with pkgs;
 
   sparrow = callPackage ../applications/blockchains/sparrow/fhsenv.nix { };
 
-  sparsehash = callPackage ../development/libraries/sparsehash { };
-
-  spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { };
-
-  spiped = callPackage ../tools/networking/spiped { };
-
-  sqlite3-to-mysql = callPackage ../tools/misc/sqlite3-to-mysql { };
-
-  sqls = callPackage ../applications/misc/sqls { };
-
-  stdman = callPackage ../data/documentation/stdman { };
-
-  stderred = callPackage ../tools/misc/stderred { };
-
   steck = callPackage ../servers/pinnwand/steck.nix { };
 
-  stenc = callPackage ../tools/backup/stenc { };
-
   stm32loader = with python3Packages; toPythonApplication stm32loader;
 
   stremio = qt5.callPackage ../applications/video/stremio { };
 
-  sunwait = callPackage ../applications/misc/sunwait { };
-
-  surface-control = callPackage ../applications/misc/surface-control { };
-
-  syntex = callPackage ../tools/graphics/syntex { };
-
-  synapse-admin = callPackage ../tools/admin/synapse-admin { };
-
-  sl = callPackage ../tools/misc/sl { };
-
-  socat = callPackage ../tools/networking/socat { };
-
-  sockperf = callPackage ../tools/networking/sockperf { };
-
-  softnet = callPackage ../tools/networking/softnet { };
-
-  solaar = callPackage ../applications/misc/solaar { };
-
   solanum = callPackage ../servers/irc/solanum {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
   solc-select = with python3Packages; toPythonApplication solc-select;
 
-  sourceHighlight = callPackage ../tools/text/source-highlight { };
-
-  somebar = callPackage ../applications/misc/somebar { };
-
-  speech-denoiser = callPackage ../applications/audio/speech-denoiser { };
-
   splot = haskell.lib.compose.justStaticExecutables haskellPackages.splot;
 
-  spotdl = callPackage ../tools/audio/spotdl { };
-
-  squashfsTools = callPackage ../tools/filesystems/squashfs { };
-
   squashfs-tools-ng = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/squashfs-tools-ng { };
 
-  squashfuse = callPackage ../tools/filesystems/squashfuse { };
-
-  srt-live-server = callPackage ../applications/video/srt-live-server { };
-
-  srt-to-vtt-cl = callPackage ../tools/cd-dvd/srt-to-vtt-cl { };
-
-  srtrelay = callPackage ../applications/video/srtrelay { };
-
-  srsran = callPackage ../applications/radio/srsran {  };
-
   sourcehut = callPackage ../applications/version-management/sourcehut { };
 
-  sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { };
   sshfs = sshfs-fuse; # added 2017-08-14
 
-  sshlatex = callPackage ../tools/typesetting/sshlatex { };
-
-  sshuttle = callPackage ../tools/security/sshuttle { };
-
   inherit (callPackages ../tools/misc/sshx { })
     sshx
     sshx-server;
 
-  ssldump = callPackage ../tools/networking/ssldump { };
-
-  sslsplit = callPackage ../tools/networking/sslsplit { };
-
-  sstp = callPackage ../tools/networking/sstp { };
-
   strip-nondeterminism = perlPackages.strip-nondeterminism;
 
-  subberthehut = callPackage ../tools/misc/subberthehut { };
-
-  subedit = callPackage ../tools/text/subedit { };
-
   subsurface = libsForQt5.callPackage ../applications/misc/subsurface { };
 
-  sudo = callPackage ../tools/security/sudo { };
-
-  sudo-rs = callPackage ../tools/security/sudo-rs { };
-
-  suidChroot = callPackage ../tools/system/suid-chroot { };
-
-  sundtek = callPackage ../misc/drivers/sundtek { };
-
-  sunxi-tools = callPackage ../development/tools/sunxi-tools { };
-
   sumorobot-manager = python3Packages.callPackage ../applications/science/robotics/sumorobot-manager { };
 
-  supertag = callPackage ../tools/filesystems/supertag { };
-
-  svgbob = callPackage ../tools/graphics/svgbob { };
-
-  svgcleaner = callPackage ../tools/graphics/svgcleaner { };
-
-  svu = callPackage ../tools/misc/svu { };
-
-  ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { };
-
-  ssdeep = callPackage ../tools/security/ssdeep { };
-
-  ssh-ident = callPackage ../tools/networking/ssh-ident { };
-
-  sshpass = callPackage ../tools/networking/sshpass { };
-
   sslscan = callPackage ../tools/security/sslscan {
     openssl = openssl.override { withZlib = true; };
   };
 
-  sslmate = callPackage ../development/tools/sslmate { };
-
-  sslmate-agent = callPackage ../development/tools/sslmate-agent { };
-
-  sshocker = callPackage ../tools/security/sshocker { };
-
-  sshoogr = callPackage ../tools/networking/sshoogr { };
-
-  ssocr = callPackage ../applications/misc/ssocr { };
-
-  sss-cli = callPackage ../tools/security/sss-cli { };
-
-  ssss = callPackage ../tools/security/ssss { };
-
-  stabber = callPackage ../misc/stabber { };
-
   stacer = libsForQt5.callPackage ../tools/system/stacer { };
 
-  starcharts = callPackage ../servers/misc/starcharts { };
-
   staticjinja = with python3.pkgs; toPythonApplication staticjinja;
 
-  stress = callPackage ../tools/system/stress { };
-
-  stress-ng = callPackage ../tools/system/stress-ng { };
-
-  stressapptest = callPackage ../tools/system/stressapptest { };
-
   stoken = callPackage ../tools/security/stoken (config.stoken or {});
 
-  storeBackup = callPackage ../tools/backup/store-backup { };
-
-  stow = callPackage ../tools/misc/stow { };
-  xstow = callPackage ../tools/misc/xstow { };
-
-  stun = callPackage ../tools/networking/stun { };
-
-  stunnel = callPackage ../tools/networking/stunnel { };
-
-  stuntman = callPackage ../tools/networking/stuntman { };
-
   stutter = haskell.lib.compose.justStaticExecutables haskellPackages.stutter;
 
-  strongswan    = callPackage ../tools/networking/strongswan { };
   strongswanTNC = strongswan.override { enableTNC = true; };
   strongswanNM  = strongswan.override { enableNetworkManager = true; };
 
-  stylish = callPackage ../applications/misc/stylish { };
-
   stylish-haskell = haskell.lib.compose.justStaticExecutables haskellPackages.stylish-haskell;
 
   su = shadow.su;
 
-  subjs = callPackage ../tools/security/subjs { };
-
-  subsonic = callPackage ../servers/misc/subsonic { };
-
-  subfinder = callPackage ../tools/networking/subfinder { };
-
   subzerod = with python3Packages; toPythonApplication subzerod;
 
   suckit = callPackage ../tools/networking/suckit {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  surfraw = callPackage ../tools/networking/surfraw { };
-
-  swagger-cli = callPackage ../tools/networking/swagger-cli { };
-
-  swagger-codegen = callPackage ../tools/networking/swagger-codegen { };
-
-  swagger-codegen3 = callPackage ../tools/networking/swagger-codegen3 { };
-
-  swaggerhole = callPackage ../tools/security/swaggerhole { };
-
-  swapview = callPackage ../os-specific/linux/swapview { };
-
-  swc = callPackage ../development/tools/swc { };
-
-  swtpm = callPackage ../tools/security/swtpm { };
-
-  svnfs = callPackage ../tools/filesystems/svnfs { };
-
-  svtplay-dl = callPackage ../tools/misc/svtplay-dl { };
-
-  sycl-info = callPackage ../development/libraries/sycl-info { };
-
-  symengine = callPackage ../development/libraries/symengine { };
-
-  synaesthesia = callPackage ../applications/audio/synaesthesia { };
-
-  sysbench = callPackage ../development/tools/misc/sysbench { };
-
-  systemc = callPackage ../applications/science/electronics/systemc { };
-
   system-config-printer = callPackage ../tools/misc/system-config-printer {
     autoreconfHook = buildPackages.autoreconfHook269;
     libxml2 = libxml2Python;
   };
 
-  systembus-notify = callPackage ../applications/misc/systembus-notify { };
-
-  stricat = callPackage ../tools/security/stricat { };
-
-  stone-phaser = callPackage ../applications/audio/stone-phaser { };
-
-  systrayhelper = callPackage ../tools/misc/systrayhelper { };
-
   privoxy = callPackage ../tools/networking/privoxy {
     w3m = w3m-batch;
   };
 
-  swaks = callPackage ../tools/networking/swaks { };
-
-  swiftbar = callPackage ../os-specific/darwin/swiftbar { };
-
-  swiften = callPackage ../development/libraries/swiften { };
-
-  squeekboard = callPackage ../applications/accessibility/squeekboard { };
-
   systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { };
 
   t = callPackage ../tools/misc/t { };
@@ -12504,78 +5520,20 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  tagtime = callPackage ../applications/misc/tagtime { };
-
-  tailer = callPackage ../tools/misc/tailer { };
-
   tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { };
 
-  tango = callPackage ../applications/misc/tango { };
-
-  tangram = callPackage ../applications/networking/instant-messengers/tangram { };
-
-  t1utils = callPackage ../tools/misc/t1utils { };
-
-  talkfilters = callPackage ../misc/talkfilters { };
-
-  znapzend = callPackage ../tools/backup/znapzend { };
-
-  tar2ext4 = callPackage ../tools/filesystems/tar2ext4 { };
-
-  targetcli = callPackage ../os-specific/linux/targetcli { };
-
-  target-isns = callPackage ../os-specific/linux/target-isns { };
-
-  tarsnap = callPackage ../tools/backup/tarsnap { };
-
-  tarsnapper = callPackage ../tools/backup/tarsnapper { };
-
-  tarantool = callPackage ../servers/tarantool { };
-
-  tarssh = callPackage ../servers/tarssh { };
-
   tartube = callPackage ../applications/video/tartube { };
 
   tartube-yt-dlp = callPackage ../applications/video/tartube {
     youtube-dl = yt-dlp;
   };
 
-  tayga = callPackage ../tools/networking/tayga { };
-
-  tcb = callPackage ../tools/security/tcb { };
-
-  tcpcrypt = callPackage ../tools/security/tcpcrypt { };
-
-  tcptraceroute = callPackage ../tools/networking/tcptraceroute { };
-
-  tboot = callPackage ../tools/security/tboot { };
-
-  tagutil = callPackage ../applications/audio/tagutil { };
-
-  tcpdump = callPackage ../tools/networking/tcpdump { };
-
-  tcpflow = callPackage ../tools/networking/tcpflow { };
-
-  tcpkali = callPackage ../applications/networking/tcpkali { };
-
   tcpreplay = callPackage ../tools/networking/tcpreplay {
     inherit (darwin.apple_sdk.frameworks) Carbon CoreServices;
   };
 
-  tdns-cli = callPackage ../tools/networking/tdns-cli { };
-
-  tea = callPackage ../tools/misc/tea { };
-
-  teavpn2 = callPackage ../tools/networking/teavpn2 { };
-
-  ted = callPackage ../tools/typesetting/ted { };
-
   teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };
 
-  teehee = callPackage ../applications/editors/teehee { };
-
-  teip = callPackage ../tools/text/teip { };
-
   inherit (callPackages ../servers/teleport {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
     buildGoModule = buildGo122Module;
@@ -12585,24 +5543,10 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  telepresence2 = callPackage ../tools/networking/telepresence2 { };
-
-  teler = callPackage ../tools/security/teler { };
-
-  termcolor = callPackage ../development/libraries/termcolor { };
-
   termscp = callPackage ../tools/networking/termscp {
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation Security;
   };
 
-  termius = callPackage ../applications/networking/termius { };
-
-  termplay = callPackage ../tools/misc/termplay { };
-
-  tetrd = callPackage ../applications/networking/tetrd { };
-
-  tewisay = callPackage ../tools/misc/tewisay { };
-
   texmacs = libsForQt5.callPackage ../applications/editors/texmacs {
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
     extraFonts = true;
@@ -12616,18 +5560,6 @@ with pkgs;
 
   texworks = qt6Packages.callPackage ../applications/editors/texworks { };
 
-  tf2pulumi = callPackage ../development/tools/tf2pulumi { };
-
-  thc-hydra = callPackage ../tools/security/thc-hydra { };
-
-  thc-ipv6 = callPackage ../tools/security/thc-ipv6 { };
-
-  thedesk = callPackage ../applications/misc/thedesk { };
-
-  theharvester = callPackage ../tools/security/theharvester { };
-
-  thelounge = callPackage ../applications/networking/irc/thelounge { };
-
   theLoungePlugins = let
     pkgs = lib.filterAttrs (name: _: lib.hasPrefix "thelounge-" name) nodePackages;
     getPackagesWithPrefix = prefix: lib.mapAttrs' (name: pkg: lib.nameValuePair (lib.removePrefix ("thelounge-" + prefix + "-") name) pkg)
@@ -12638,148 +5570,40 @@ with pkgs;
     themes = lib.recurseIntoAttrs (getPackagesWithPrefix "theme");
   };
 
-  theme-sh = callPackage ../tools/misc/theme-sh { };
-
-  thiefmd = callPackage ../applications/editors/thiefmd { };
-
-  thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools {  };
-
   thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { };
 
-  threatest = callPackage ../tools/security/threatest {  };
-
-  threema-desktop = callPackage ../applications/networking/instant-messengers/threema-desktop { };
-
-  tidy-viewer = callPackage ../tools/text/tidy-viewer { };
-
   tiled = libsForQt5.callPackage ../applications/editors/tiled { };
 
-  tiledb = callPackage ../development/libraries/tiledb { };
-
-  timemachine = callPackage ../applications/audio/timemachine { };
-
-  timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { };
-
-  timelens = callPackage ../applications/video/timelens { };
-
   timetrap = callPackage ../applications/office/timetrap { };
 
-  timetagger = callPackage ../servers/timetagger { };
-
-  timetagger_cli = callPackage ../tools/misc/timetagger_cli { };
-
-  timezonemap = callPackage ../development/libraries/timezonemap { };
-
-  tzupdate = callPackage ../applications/misc/tzupdate { };
-
   tinc = callPackage ../tools/networking/tinc { };
 
-  tie = callPackage ../development/tools/misc/tie { };
-
-  tidb = callPackage ../servers/tidb { };
-
   tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };
 
   tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
 
-  tinycbor = callPackage ../development/libraries/tinycbor { };
-
-  tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { };
-
-  tinyobjloader = callPackage ../development/libraries/tinyobjloader { };
-
-  tinyprog = callPackage ../development/embedded/fpga/tinyprog { };
-
-  tinyproxy = callPackage ../tools/networking/tinyproxy { };
-
-  time-decode = callPackage ../tools/misc/time-decode { };
-
-  timer = callPackage ../tools/misc/timer { };
-
-  tiv = callPackage ../applications/misc/tiv { };
-
-  tkman = callPackage ../tools/misc/tkman { };
-
-  tldr = callPackage ../tools/misc/tldr { };
-
   tldr-hs = haskellPackages.tldr;
 
-  tlsclient = callPackage ../tools/admin/tlsclient { };
-
-  tlsx = callPackage ../tools/security/tlsx { };
-
-  tmate = callPackage ../tools/misc/tmate { };
-
-  tmate-ssh-server = callPackage ../servers/tmate-ssh-server { };
-
-  tml = callPackage ../tools/text/tml { };
-
-  tmpwatch = callPackage ../tools/misc/tmpwatch  { };
-
-  tmpmail = callPackage ../applications/networking/tmpmail { };
-
-  tmux = callPackage ../tools/misc/tmux { };
-
-  tmuxp = callPackage ../tools/misc/tmuxp { };
-
-  tmuxinator = callPackage ../tools/misc/tmuxinator { };
-
-  tmux-mem-cpu-load = callPackage ../tools/misc/tmux-mem-cpu-load { };
-
   tmux-sessionizer = callPackage ../tools/misc/tmux-sessionizer {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { };
-
   tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins {
     pkgs = pkgs.__splicedPackages;
   });
 
-  tncattach = callPackage ../applications/radio/tncattach { };
-
-  to-html = callPackage ../tools/text/to-html { };
-
-  toilet = callPackage ../tools/misc/toilet { };
-
   tokei = callPackage ../development/tools/misc/tokei {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  tokio-console = callPackage ../development/tools/tokio-console { };
-
-  toml2json = callPackage ../development/tools/toml2json { };
-
-  toml2nix = callPackage ../development/tools/toml2nix { };
-
-  topfew = callPackage ../tools/text/topfew { };
-
-  topfew-rs = callPackage ../tools/text/topfew-rs { };
-
   topgrade = callPackage ../tools/misc/topgrade {
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
   };
 
-  topiary = callPackage ../development/tools/misc/topiary { };
-
-  todo = callPackage ../tools/misc/todo { };
-
-  toolbox = callPackage ../applications/virtualization/toolbox { };
-
   tor = callPackage ../tools/security/tor { };
 
-  touchegg = callPackage ../tools/inputmethods/touchegg { };
-
-  torrent7z = callPackage ../tools/archivers/torrent7z { };
-
   torsocks = callPackage ../tools/security/tor/torsocks.nix { };
 
-  toss = callPackage ../tools/networking/toss { };
-
-  tox-node = callPackage ../tools/networking/tox-node { };
-
-  toxvpn = callPackage ../tools/networking/toxvpn { };
-
   toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox { };
 
   trackma = callPackage ../tools/misc/trackma { };
@@ -12790,24 +5614,8 @@ with pkgs;
 
   trackma-qt = trackma.override { withQT = true; };
 
-  tran = callPackage ../tools/networking/tran { };
-
   tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { };
 
-  tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { };
-
-  tpm-tools = callPackage ../tools/security/tpm-tools { };
-
-  tpm-luks = callPackage ../tools/security/tpm-luks { };
-
-  tpm2-abrmd = callPackage ../tools/security/tpm2-abrmd { };
-
-  tpm2-pkcs11 = callPackage ../misc/tpm2-pkcs11 { };
-
-  tpm2-tools = callPackage ../tools/security/tpm2-tools { };
-
-  trezor-udev-rules = callPackage ../os-specific/linux/trezor-udev-rules { };
-
   trezorctl = with python3Packages; toPythonApplication trezor;
 
   trezord = callPackage ../servers/trezord {
@@ -12816,110 +5624,38 @@ with pkgs;
 
   trezor-agent = with python3Packages; toPythonApplication trezor-agent;
 
-  trezor-suite = callPackage ../applications/blockchains/trezor-suite { };
-
   trunk-ng = callPackage ../by-name/tr/trunk-ng/package.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
   };
 
-  tthsum = callPackage ../applications/misc/tthsum { };
-
-  ttdl = callPackage ../applications/misc/ttdl { };
-
   ttp = with python3.pkgs; toPythonApplication ttp;
 
   trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
 
   kernelshark = qt6Packages.callPackage ../os-specific/linux/trace-cmd/kernelshark.nix { };
 
-  traceroute = callPackage ../tools/networking/traceroute { };
-
-  tracebox = callPackage ../tools/networking/tracebox { };
-
   tracee = callPackage ../tools/security/tracee {
     clang = clang_14;
   };
 
-  tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { };
-
-  tracefilesim = callPackage ../development/tools/analysis/garcosim/tracefilesim { };
-
-  transifex-cli = callPackage ../applications/misc/transifex-cli { };
-
-  translatelocally = callPackage ../applications/misc/translatelocally { };
-
   translatelocally-models = recurseIntoAttrs (callPackages ../misc/translatelocally-models { });
 
-  translate-shell = callPackage ../applications/misc/translate-shell { };
-
   translatepy = with python3.pkgs; toPythonApplication translatepy;
 
-  trash-cli = callPackage ../tools/misc/trash-cli { };
-
-  trashy = callPackage ../tools/misc/trashy { };
-
-  trdl-client = callPackage ../tools/misc/trdl-client { };
-
   trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { };
 
-  trickle = callPackage ../tools/networking/trickle { };
-
-  node-manta = callPackage ../tools/admin/manta { };
-
-  triton = callPackage ../tools/admin/triton { };
-
-  triggerhappy = callPackage ../tools/inputmethods/triggerhappy { };
-
   inherit (callPackage ../applications/office/trilium {})
     trilium-desktop
     trilium-server
     ;
 
-  trippy = callPackage ../tools/networking/trippy { };
-
-  trousers = callPackage ../tools/security/trousers { };
-
-  trueseeing = callPackage ../tools/security/trueseeing { };
-
-  trx = callPackage ../tools/audio/trx { };
-
-  tryton = callPackage ../applications/office/tryton { };
-
   trytond = with python3Packages; toPythonApplication trytond;
 
-  tun2socks = callPackage ../tools/networking/tun2socks { };
-
-  tuntox = callPackage ../tools/networking/tuntox { };
-
-  tunwg = callPackage ../tools/networking/tunwg { };
-
-  ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
-
   ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
   ttfautohint-nox = ttfautohint.override { enableGUI = false; };
 
-  tty-clock = callPackage ../tools/misc/tty-clock { };
-
-  tty-share = callPackage ../applications/misc/tty-share { };
-
-  ttyplot = callPackage ../tools/misc/ttyplot { };
-
-  ttygif = callPackage ../tools/misc/ttygif { };
-
-  ttylog = callPackage ../tools/misc/ttylog { };
-
-  ipbt = callPackage ../tools/misc/ipbt { };
-
-  tuckr = callPackage ../applications/misc/tuckr { };
-
-  tuhi = callPackage ../applications/misc/tuhi { };
-
-  tui-journal = callPackage ../applications/misc/tui-journal { };
-
-  tuir = callPackage ../applications/misc/tuir { };
-
   tuifeed = callPackage ../applications/networking/feedreaders/tuifeed {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -12928,243 +5664,45 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  tuptime = callPackage ../tools/system/tuptime { };
-
-  turses = callPackage ../applications/networking/instant-messengers/turses { };
-
-  tutanota-desktop = callPackage ../applications/networking/mailreaders/tutanota-desktop { };
-
-  tv = callPackage ../tools/text/tv { };
-
-  tvm = callPackage ../development/compilers/tvm { };
-
-  ttfb = callPackage ../development/tools/ttfb { };
-
   twilight = callPackage ../tools/graphics/twilight {
     libX11 = xorg.libX11;
   };
 
   twitch-chat-downloader = python3Packages.callPackage ../applications/misc/twitch-chat-downloader { };
 
-  twitterBootstrap = callPackage ../development/web/twitter-bootstrap { };
-
-  twspace-crawler = callPackage ../tools/misc/twspace-crawler { };
-
-  twspace-dl = callPackage ../tools/misc/twspace-dl { };
-
   twtxt = python3Packages.callPackage ../applications/networking/twtxt { };
 
   twurl = callPackage ../tools/misc/twurl { };
 
-  txt2man = callPackage ../tools/misc/txt2man { };
-
-  txt2tags = callPackage ../tools/text/txt2tags { };
-
-  txtw = callPackage ../tools/misc/txtw { };
-
-  tydra = callPackage ../tools/misc/tydra { };
-
   typesense = callPackage ../servers/search/typesense { };
 
-  tz = callPackage ../tools/misc/tz { };
-
-  u9fs = callPackage ../servers/u9fs { };
-
-  ua = callPackage ../tools/networking/ua { };
-
-  uair = callPackage ../tools/misc/uair { };
-
   ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { };
 
-  ubi_reader = callPackage ../tools/filesystems/ubi_reader { };
-
   ubpm = libsForQt5.callPackage ../applications/misc/ubpm { };
 
-  ubertooth = callPackage ../applications/radio/ubertooth { };
-
-  ucarp = callPackage ../servers/ucarp { };
-
-  ucl = callPackage ../development/libraries/ucl { };
-
-  ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { };
-
-  udftools = callPackage ../tools/filesystems/udftools { };
-
-  udp2raw = callPackage ../tools/networking/udp2raw { };
-
-  udpreplay = callPackage ../tools/networking/udpreplay { };
-
-  udpt = callPackage ../servers/udpt { };
-
-  udptunnel = callPackage ../tools/networking/udptunnel { };
-
-  udpx = callPackage ../tools/security/udpx { };
-
-  uftrace = callPackage ../development/tools/uftrace { };
-
   uftraceFull = uftrace.override {
     withLuaJIT = true;
     withPython = true;
   };
 
-  uftpd = callPackage ../servers/ftp/uftpd {};
-
-  uget = callPackage ../tools/networking/uget { };
-
-  uget-integrator = callPackage ../tools/networking/uget-integrator { };
-
-  ugrep = callPackage ../tools/text/ugrep { };
-
-  ugs = callPackage ../tools/misc/ugs { };
-
-  uhk-agent = callPackage ../os-specific/linux/uhk-agent { };
-
-  uhk-udev-rules = callPackage ../os-specific/linux/uhk-udev-rules { };
-
-  uif2iso = callPackage ../tools/cd-dvd/uif2iso { };
-
-  uivonim = callPackage ../applications/editors/uivonim { };
-
-  ulid = callPackage ../tools/misc/ulid { };
-
-  umlet = callPackage ../tools/misc/umlet { };
-
   unetbootin = libsForQt5.callPackage ../tools/cd-dvd/unetbootin { };
 
-  unfs3 = callPackage ../servers/unfs3 { };
-
-  unfurl = callPackage ../tools/text/unfurl { };
-
-  unixbench = callPackage ../development/tools/misc/unixbench { };
-
-  unoconv = callPackage ../tools/text/unoconv { };
-
-  unrtf = callPackage ../tools/text/unrtf { };
-
   unrpa = with python3Packages; toPythonApplication unrpa;
 
-  untex = callPackage ../tools/text/untex { };
-
-  untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { };
-
-  unzrip = callPackage ../tools/compression/unzrip { };
-
-  up = callPackage ../tools/misc/up { };
-
-  upterm = callPackage ../tools/misc/upterm { };
-
-  upx = callPackage ../tools/compression/upx { };
-
-  uq = callPackage ../misc/uq { };
-
-  uqmi = callPackage ../tools/networking/uqmi { };
-
-  urdfdom = callPackage ../development/libraries/urdfdom { };
-
-  urdfdom-headers = callPackage ../development/libraries/urdfdom-headers { };
-
-  urlencode = callPackage ../tools/misc/urlencode {};
-
-  uriparser = callPackage ../development/libraries/uriparser { };
-
-  urlscan = callPackage ../applications/misc/urlscan { };
-
-  url-parser = callPackage ../tools/misc/url-parser { };
-
-  urn-timer = callPackage ../tools/misc/urn-timer { };
-
-  ursadb = callPackage ../servers/ursadb { };
-
-  usbmuxd = callPackage ../tools/misc/usbmuxd { };
-
-  usbmuxd2 = callPackage ../tools/misc/usbmuxd2 { };
-
   usort = with python3Packages; toPythonApplication usort;
 
-  ustreamer = callPackage ../applications/video/ustreamer { };
-
-  usync = callPackage ../applications/misc/usync { };
-
-  uwc = callPackage ../tools/text/uwc { };
-
-  uwsgi = callPackage ../servers/uwsgi { };
-
-  uwufetch = callPackage ../tools/misc/uwufetch { };
-
-  v2ray = callPackage ../tools/networking/v2ray { };
-
-  v2raya = callPackage ../tools/networking/v2raya { };
-
-  v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { };
-
-  v2ray-geoip = callPackage ../data/misc/v2ray-geoip { };
-
   vacuum = libsForQt5.callPackage ../applications/networking/instant-messengers/vacuum {};
 
-  validator-nu = callPackage ../tools/text/validator-nu { };
-
   vampire = callPackage ../applications/science/logic/vampire { };
 
-  vdmfec = callPackage ../applications/backup/vdmfec { };
-
-  vk-bootstrap = callPackage ../development/libraries/vk-bootstrap { };
-
-  vk-cli = callPackage ../applications/networking/instant-messengers/vk-cli { };
-
-  vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger { };
-
-  volatility3 = callPackage ../tools/security/volatility3 { };
-
-  vbetool = callPackage ../tools/system/vbetool { };
-
-  vcsi = callPackage ../tools/video/vcsi { };
-
-  vde2 = callPackage ../tools/networking/vde2 { };
-
-  vboot_reference = callPackage ../tools/system/vboot_reference { };
-
-  vcftools = callPackage ../applications/science/biology/vcftools { };
-
   vcmi = libsForQt5.callPackage ../games/vcmi { };
 
-  vcsh = callPackage ../applications/version-management/vcsh { };
-
-  vcs_query = callPackage ../tools/misc/vcs_query { };
-
-  vcstool = callPackage ../development/tools/vcstool { };
-
-  vectorscan = callPackage ../development/libraries/vectorscan { };
-
-  verco = callPackage ../applications/version-management/verco { };
-
-  verilator = callPackage ../applications/science/electronics/verilator { };
-
-  versus = callPackage ../applications/networking/versus { };
-
-  vexctl = callPackage ../tools/security/vexctl { };
-
-  vgrep = callPackage ../tools/text/vgrep { };
-
-  vhd2vl = callPackage ../applications/science/electronics/vhd2vl { };
-
-  vhdl-ls = callPackage ../development/tools/language-servers/vhdl-ls { };
-
   video2midi = callPackage ../tools/audio/video2midi {
     pythonPackages = python3Packages;
   };
 
-  via = callPackage ../tools/misc/via { };
-
-  vial = callPackage ../tools/misc/vial { };
-
-  viking = callPackage ../applications/misc/viking { };
-
   vikunja = callPackage ../by-name/vi/vikunja/package.nix { pnpm = pnpm_9; };
 
-  vim-vint = callPackage ../development/tools/vim-vint { };
-
-  vimer = callPackage ../tools/misc/vimer { };
-
   vimpager = callPackage ../tools/misc/vimpager { };
   vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { };
 
@@ -13172,40 +5710,10 @@ with pkgs;
 
   visidata = python3Packages.callPackage ../applications/misc/visidata { };
 
-  vit = callPackage ../applications/misc/vit { };
-
-  viu = callPackage ../tools/graphics/viu { };
-
-  vix = callPackage ../tools/misc/vix { };
-
   vkbasalt = callPackage ../tools/graphics/vkbasalt {
     vkbasalt32 = pkgsi686Linux.vkbasalt;
   };
 
-  vkbasalt-cli = callPackage ../tools/graphics/vkbasalt-cli { };
-
-  vkmark = callPackage ../tools/graphics/vkmark { };
-
-  vncrec = callPackage ../tools/video/vncrec { };
-
-  vo-amrwbenc = callPackage ../development/libraries/vo-amrwbenc { };
-
-  vo-aacenc = callPackage ../development/libraries/vo-aacenc { };
-
-  vobcopy = callPackage ../tools/cd-dvd/vobcopy { };
-
-  vobsub2srt = callPackage ../tools/cd-dvd/vobsub2srt { };
-
-  void = callPackage ../tools/misc/void { };
-
-  volume_key = callPackage ../development/libraries/volume-key { };
-
-  vorbisgain = callPackage ../tools/misc/vorbisgain { };
-
-  vpnc = callPackage ../tools/networking/vpnc { };
-
-  vpnc-scripts = callPackage ../tools/networking/vpnc-scripts { };
-
   vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { };
 
   vpWithSixel = vp.override {
@@ -13214,16 +5722,10 @@ with pkgs;
     SDL = SDL_sixel;
   };
 
-  vtm = callPackage ../tools/misc/vtm { };
-
-  witness = callPackage ../tools/security/witness { };
-
   openconnectPackages = callPackage ../tools/networking/openconnect { };
 
   inherit (openconnectPackages) openconnect openconnect_openssl;
 
-  ding-libs = callPackage ../tools/misc/ding-libs { };
-
   sssd = callPackage ../os-specific/linux/sssd {
     inherit (perlPackages) Po4a;
     # python312Packages.python-ldap is broken
@@ -13235,186 +5737,71 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
   };
 
-  sentry-native = callPackage ../development/libraries/sentry-native { };
-
-  twilio-cli = callPackage ../development/tools/twilio-cli { };
-
   waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp {
     inherit (darwin.apple_sdk.frameworks) OpenCL;
   };
 
-  wambo = callPackage ../development/tools/wambo { };
-
-  weather = callPackage ../applications/misc/weather { };
-
-  wego = callPackage ../applications/misc/wego { };
-
-  wander = callPackage ../tools/admin/wander { };
-
   watchexec = callPackage ../tools/misc/watchexec {
     inherit (darwin.apple_sdk.frameworks) Cocoa AppKit;
   };
 
-  watchlog = callPackage ../tools/misc/watchlog { };
-
   watchman = darwin.apple_sdk_11_0.callPackage ../development/tools/watchman {
     inherit (darwin.apple_sdk_11_0.frameworks) CoreServices;
   };
 
-  wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse { };
-
-  wbox = callPackage ../tools/networking/wbox { };
-
   webassemblyjs-cli = nodePackages."@webassemblyjs/cli-1.11.1";
   webassemblyjs-repl = nodePackages."@webassemblyjs/repl-1.11.1";
   wasm-strip = nodePackages."@webassemblyjs/wasm-strip";
   wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen-1.11.1";
   wast-refmt = nodePackages."@webassemblyjs/wast-refmt-1.11.1";
 
-  wasm-tools = callPackage ../tools/misc/wasm-tools { };
-
   wasmedge = callPackage ../development/tools/wasmedge {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else llvmPackages.stdenv;
     inherit (darwin.apple_sdk_11_0.frameworks) Foundation;
   };
 
-  wasmi = callPackage ../development/tools/wasmi { };
-
-  wasmserve = callPackage ../development/tools/wasmserve {};
-
-  welkin = callPackage ../tools/graphics/welkin { };
-
-  wemux = callPackage ../tools/misc/wemux { };
-
-  wf-recorder = callPackage ../applications/video/wf-recorder { };
-
-  whatip = callPackage ../tools/networking/whatip { };
-
-  whatsapp-chat-exporter = callPackage ../tools/misc/whatsapp-chat-exporter { };
-
   whatweb = callPackage ../tools/security/whatweb { };
 
-  whipper = callPackage ../applications/audio/whipper { };
-
-  whitebophir = callPackage ../servers/web-apps/whitebophir { };
-
-  whois = callPackage ../tools/networking/whois { };
-
-  wimboot = callPackage ../tools/misc/wimboot { };
-
-  wire = callPackage ../development/tools/wire { };
-
   wireguard-tools = callPackage ../tools/networking/wireguard-tools { };
 
   wireguard-vanity-address = callPackage ../tools/networking/wireguard-vanity-address {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  wiringpi = callPackage ../os-specific/linux/wiringpi { };
-
-  wg-friendly-peer-names = callPackage ../tools/networking/wg-friendly-peer-names { };
-
   wg-netmanager = callPackage ../tools/networking/wg-netmanager {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  wgautomesh = callPackage ../tools/networking/wgautomesh { };
-
-  woff2 = callPackage ../development/web/woff2 { };
-
   woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { };
 
   woodpecker-cli = callPackage ../development/tools/continuous-integration/woodpecker/cli.nix { };
 
-  woodpecker-plugin-git = callPackage ../development/tools/continuous-integration/woodpecker-plugin-git { };
-
   woodpecker-server = callPackage ../development/tools/continuous-integration/woodpecker/server.nix { };
 
-  woof = callPackage ../tools/misc/woof { };
-
-  wootility = callPackage ../tools/misc/wootility { };
-
-  wormhole-william = callPackage ../tools/networking/wormhole-william { };
-
   wpscan = callPackage ../tools/security/wpscan { };
 
-  write-good = callPackage ../tools/text/write-good { };
-
-  wsmancli = callPackage ../tools/system/wsmancli { };
-
-  wolfebin = callPackage ../tools/networking/wolfebin { };
-
-  wthrr = callPackage ../applications/misc/wthrr { };
-
-  xautoclick = callPackage ../applications/misc/xautoclick { };
-
-  xl2tpd = callPackage ../tools/networking/xl2tpd { };
-
-  xe = callPackage ../tools/system/xe { };
-
-  xray = callPackage ../tools/networking/xray { };
-
-  xteve = callPackage ../servers/xteve { };
-
-  termbook = callPackage ../tools/text/termbook { };
-
   testdisk = libsForQt5.callPackage ../tools/system/testdisk { };
 
   testdisk-qt = testdisk.override { enableQt = true; };
 
-  textql = callPackage ../development/tools/textql { };
-
-  html2text = callPackage ../tools/text/html2text { };
-
-  html-tidy = callPackage ../tools/text/html-tidy { };
-
-  html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { };
-
   htmldoc = callPackage ../tools/typesetting/htmldoc {
     inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation;
   };
 
-  htmltest = callPackage ../development/tools/htmltest { };
-
   td = callPackage ../tools/misc/td { };
 
-  tdfgo = callPackage ../tools/misc/tdfgo { };
-
-  tftp-hpa = callPackage ../tools/networking/tftp-hpa { };
-
-  tigervnc = callPackage ../tools/admin/tigervnc { };
-
-  time = callPackage ../tools/misc/time { };
-
   tweet-hs = haskell.lib.compose.justStaticExecutables haskellPackages.tweet-hs;
 
-  tweeny = callPackage ../development/libraries/tweeny { };
-
   tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { };
 
-  tm = callPackage ../tools/system/tm { };
-
-  tradcpp = callPackage ../development/tools/tradcpp { };
-
-  traitor = callPackage ../tools/security/traitor { };
-
-  tre = callPackage ../development/libraries/tre { };
-
   tremor-rs = darwin.apple_sdk_11_0.callPackage ../tools/misc/tremor-rs {
     inherit (darwin.apple_sdk_11_0.frameworks) Security;
   };
 
   tremor-language-server = callPackage ../tools/misc/tremor-rs/ls.nix { };
 
-  truecrack = callPackage ../tools/security/truecrack { };
   truecrack-cuda = truecrack.override { cudaSupport = true; };
 
-  ts = callPackage ../tools/system/ts { };
-
-  ttmkfdir = callPackage ../tools/misc/ttmkfdir { };
-
-  ttwatch = callPackage ../tools/misc/ttwatch { };
-
   turbovnc = callPackage ../tools/admin/turbovnc {
     # fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ];
     libjpeg_turbo = libjpeg_turbo.override { enableJava = true; };
@@ -13422,20 +5809,10 @@ with pkgs;
 
   ufmt = with python3Packages; toPythonApplication ufmt;
 
-  uftp = callPackage ../servers/uftp { };
-
-  uhttpmock = callPackage ../development/libraries/uhttpmock { };
-
   uim = callPackage ../tools/inputmethods/uim {
     autoconf = buildPackages.autoconf269;
   };
 
-  uhub = callPackage ../servers/uhub { };
-
-  unclutter = callPackage ../tools/misc/unclutter { };
-
-  unclutter-xfixes = callPackage ../tools/misc/unclutter-xfixes { };
-
   unbound-with-systemd = unbound.override {
     withSystemd = true;
   };
@@ -13456,64 +5833,16 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  unittest-cpp = callPackage ../development/libraries/unittest-cpp { };
-
-  unnaturalscrollwheels = callPackage ../tools/inputmethods/unnaturalscrollwheels { };
-
   unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { };
 
-  uptime-kuma = callPackage ../servers/monitoring/uptime-kuma { };
-
-  vul = callPackage ../applications/misc/vul { };
-
   vuls = callPackage ../by-name/vu/vuls/package.nix {
     buildGoModule = buildGo123Module;
   };
 
-  xarchiver = callPackage ../tools/archivers/xarchiver { };
-
-  xbanish = callPackage ../tools/X11/xbanish { };
-
-  xbrightness = callPackage ../tools/X11/xbrightness { };
-
-  xdg-launch = callPackage ../applications/misc/xdg-launch { };
-
   xdp-tools = callPackage ../tools/networking/xdp-tools {
     llvmPackages = llvmPackages_14;
   };
 
-  xkbvalidate = callPackage ../tools/X11/xkbvalidate { };
-
-  xkeysnail = callPackage ../tools/X11/xkeysnail { };
-
-  xfstests = callPackage ../tools/misc/xfstests { };
-
-  xprompt = callPackage ../tools/X11/xprompt { };
-
-  xprintidle = callPackage ../tools/X11/xprintidle { };
-
-  xprintidle-ng = callPackage ../tools/X11/xprintidle-ng { };
-
-  xssstate = callPackage ../tools/X11/xssstate { };
-
-  xscast = callPackage ../applications/video/xscast { };
-
-  xsettingsd = callPackage ../tools/X11/xsettingsd { };
-
-  xsensors = callPackage ../os-specific/linux/xsensors { };
-
-  xspim = callPackage ../development/tools/misc/xspim { };
-
-  xcrawl3r = callPackage ../tools/security/xcrawl3r { };
-
-  xcruiser = callPackage ../applications/misc/xcruiser { };
-
-  xwallpaper = callPackage ../tools/X11/xwallpaper { };
-
-  gxkb = callPackage ../applications/misc/gxkb { };
-
-  xxkb = callPackage ../applications/misc/xxkb { };
-
   ugarit = callPackage ../tools/backup/ugarit {
     inherit (chickenPackages_4) eggDerivation fetchegg;
   };
@@ -13522,35 +5851,13 @@ with pkgs;
     inherit (chickenPackages_4) eggDerivation fetchegg;
   };
 
-  ulogd = callPackage ../os-specific/linux/ulogd { };
-
   unar = callPackage ../tools/archivers/unar {
     inherit (darwin.apple_sdk.frameworks) Foundation AppKit;
     stdenv = clangStdenv;
   };
 
-  unp = callPackage ../tools/archivers/unp { };
-
-  unshield = callPackage ../tools/archivers/unshield { };
-
-  unzip = callPackage ../tools/archivers/unzip { };
-
   unzipNLS = lowPrio (unzip.override { enableNLS = true; });
 
-  undmg = callPackage ../tools/archivers/undmg { };
-
-  uptimed = callPackage ../tools/system/uptimed { };
-
-  upwork = callPackage ../applications/misc/upwork { };
-
-  urlhunter = callPackage ../tools/security/urlhunter { };
-
-  urlwatch = callPackage ../tools/networking/urlwatch { };
-
-  vals = callPackage ../tools/security/vals { };
-
-  valum = callPackage ../development/web/valum { };
-
   inherit (callPackages ../servers/varnish { })
     varnish60 varnish75;
   inherit (callPackages ../servers/varnish/packages.nix { })
@@ -13559,22 +5866,12 @@ with pkgs;
   varnishPackages = varnish75Packages;
   varnish = varnishPackages.varnish;
 
-  hitch = callPackage ../servers/hitch { };
-
-  veryfasttree = callPackage ../applications/science/biology/veryfasttree { };
-
   viceroy = callPackage ../development/tools/viceroy {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  vlan = callPackage ../tools/networking/vlan { };
-
-  vmtouch = callPackage ../tools/misc/vmtouch { };
-
   vncdo = with python3Packages; toPythonApplication vncdo;
 
-  volumeicon = callPackage ../tools/audio/volumeicon { };
-
   # An alias to work around the splicing incidents
   # Related:
   # https://github.com/NixOS/nixpkgs/issues/204303
@@ -13582,42 +5879,12 @@ with pkgs;
   # https://github.com/NixOS/nixpkgs/issues/227327
   wafHook = waf.hook;
 
-  waf-tester = callPackage ../tools/security/waf-tester { };
-
   wagyu = callPackage ../tools/misc/wagyu {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  wakelan = callPackage ../tools/networking/wakelan { };
-
-  wavemon = callPackage ../tools/networking/wavemon { };
-
-  wdfs = callPackage ../tools/filesystems/wdfs { };
-
   web-eid-app = libsForQt5.callPackage ../tools/security/web-eid-app { };
 
-  wdiff = callPackage ../tools/text/wdiff { };
-
-  wdisplays = callPackage ../tools/graphics/wdisplays { };
-
-  weaviate = callPackage ../servers/search/weaviate { };
-
-  webalizer = callPackage ../tools/networking/webalizer { };
-
-  webmesh = callPackage ../servers/webmesh { };
-
-  wget = callPackage ../tools/networking/wget { };
-
-  wget2 = callPackage ../tools/networking/wget2 { };
-
-  wg-bond = callPackage ../applications/networking/wg-bond { };
-
-  wgcf = callPackage ../applications/networking/wgcf { };
-
-  which = callPackage ../tools/system/which { };
-
-  whsniff = callPackage ../applications/networking/sniffers/whsniff { };
-
   wio = callPackage ../by-name/wi/wio/package.nix {
     wlroots = wlroots_0_17;
   };
@@ -13627,58 +5894,16 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth;
   };
 
-  wipefreespace = callPackage ../tools/filesystems/wipefreespace { };
-
-  woeusb = callPackage ../tools/misc/woeusb { };
-
-  woeusb-ng = callPackage ../tools/misc/woeusb-ng { };
-
-  chase = callPackage ../tools/system/chase { };
-
-  wimlib = callPackage ../tools/archivers/wimlib { };
-
-  wipe = callPackage ../tools/security/wipe { };
-
   wireguard-go = callPackage ../tools/networking/wireguard-go {
     buildGoModule = buildGo122Module;
   };
 
-  wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { };
-
-  wml = callPackage ../development/web/wml { };
-
-  wol = callPackage ../tools/networking/wol { };
-
-  wolf-shaper = callPackage ../applications/audio/wolf-shaper { };
-
-  wpgtk = callPackage ../tools/X11/wpgtk { };
-
-  wrap = callPackage ../tools/text/wrap { };
-
   wring = nodePackages.wring;
 
-  wrk = callPackage ../tools/networking/wrk { };
-
-  wrk2 = callPackage ../tools/networking/wrk2 { };
-
-  wsysmon = callPackage ../tools/system/wsysmon { };
-
-  wuzz = callPackage ../tools/networking/wuzz { };
-
-  wv = callPackage ../tools/misc/wv { };
-
-  wv2 = callPackage ../tools/misc/wv2 { };
-
-  wvkbd = callPackage ../applications/accessibility/wvkbd { };
-
   wyrd = callPackage ../tools/misc/wyrd {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
   };
 
-  x86info = callPackage ../os-specific/linux/x86info { };
-
-  x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { };
-
   xbursttools = callPackage ../tools/misc/xburst-tools {
     # It needs a cross compiler for mipsel to build the firmware it will
     # load into the Ben Nanonote
@@ -13686,10 +5911,6 @@ with pkgs;
     autoconf = buildPackages.autoconf269;
   };
 
-  clipnotify = callPackage ../tools/misc/clipnotify { };
-
-  clipboard-jh = callPackage ../tools/misc/clipboard-jh { };
-
   clipbuzz = callPackage ../tools/misc/clipbuzz {
     zig = buildPackages.zig_0_12;
   };
@@ -13698,61 +5919,24 @@ with pkgs;
   # It is also needed to reduce the amount of unnecessary stuff in the Darwin bootstrap.
   xarMinimal = callPackage ../by-name/xa/xar/package.nix { e2fsprogs = null; };
 
-  xclip = callPackage ../tools/misc/xclip { };
-
-  xcur2png = callPackage ../tools/graphics/xcur2png { };
-
-  xcwd = callPackage ../tools/X11/xcwd { };
-
-  xtitle = callPackage ../tools/misc/xtitle { };
-
   xdelta = callPackage ../tools/compression/xdelta { };
   xdeltaUnstable = callPackage ../tools/compression/xdelta/unstable.nix { };
 
   xdot = with python3Packages; toPythonApplication xdot;
 
-  xdummy = callPackage ../tools/misc/xdummy { };
-
-  xdg-ninja = callPackage ../tools/misc/xdg-ninja { };
-
-  xdxf2slob = callPackage ../tools/misc/xdxf2slob { };
-
-  xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { };
-
   xflux = callPackage ../tools/misc/xflux { };
   xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { };
 
-  xfsdump = callPackage ../tools/filesystems/xfsdump { };
-
-  xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
   libxfs = xfsprogs.dev;
 
-  xml2 = callPackage ../tools/text/xml/xml2 { };
-
-  xmlformat = callPackage ../tools/text/xml/xmlformat { };
-
-  xmlroff = callPackage ../tools/typesetting/xmlroff { };
-
-  xmloscopy = callPackage ../tools/text/xml/xmloscopy { };
-
-  xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { };
-
   xmlto = callPackage ../tools/typesetting/xmlto {
     w3m = w3m-batch;
   };
 
-  xiccd = callPackage ../tools/misc/xiccd { };
-
   xidlehook = callPackage ../tools/X11/xidlehook {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  xq-xml = callPackage ../tools/text/xml/xq { };
-
-  xsecurelock = callPackage ../tools/X11/xsecurelock { };
-
-  xsel = callPackage ../tools/misc/xsel { };
-
   xsv = callPackage ../tools/text/xsv {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -13763,28 +5947,12 @@ with pkgs;
 
   xorriso = libisoburn;
 
-  xurls = callPackage ../tools/text/xurls { };
-
-  xxv = callPackage ../tools/misc/xxv { };
-
   xvfb-run = callPackage ../tools/misc/xvfb-run {
     inherit (texFunctions) fontsConf;
   };
 
-  xvkbd = callPackage ../tools/X11/xvkbd { };
-
-  xwinmosaic = callPackage ../tools/X11/xwinmosaic { };
-
-  xwinwrap = callPackage ../tools/X11/xwinwrap { };
-
-  yajsv = callPackage ../tools/misc/yajsv { };
-
-  yallback = callPackage ../development/tools/analysis/yallback { };
-
   yapf = with python3Packages; toPythonApplication yapf;
 
-  yarn = callPackage ../development/tools/yarn  { };
-
   yarn-berry = callPackage ../development/tools/yarn-berry { };
 
   yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { pkgs = pkgs.__splicedPackages; };
@@ -13795,44 +5963,14 @@ with pkgs;
     mkYarnModules
     fixup_yarn_lock;
 
-  yarr = callPackage ../applications/networking/feedreaders/yarr { };
-
-  yascreen = callPackage ../development/libraries/yascreen { };
-
-  yasr = callPackage ../applications/audio/yasr { };
-
-  yank = callPackage ../tools/misc/yank { };
-
   yamlfix = with python3Packages; toPythonApplication yamlfix;
 
-  yamlfmt = callPackage ../development/tools/yamlfmt { };
-
   yamllint = with python3Packages; toPythonApplication yamllint;
 
-  yamlpath = callPackage ../development/tools/yamlpath { };
-
-  yaml-merge = callPackage ../tools/text/yaml-merge { };
-
-  yeshup = callPackage ../tools/system/yeshup { };
-
-  ytfzf = callPackage ../tools/misc/ytfzf { };
-
   yaydl = callPackage ../tools/video/yaydl {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  yx = callPackage ../tools/text/yx { };
-
-  zarchive = callPackage ../tools/archivers/zarchive { };
-
-  zprint = callPackage ../development/tools/zprint { };
-
-  yle-dl = callPackage ../tools/misc/yle-dl { };
-
-  you-get = callPackage ../tools/misc/you-get { };
-
-  zasm = callPackage ../development/compilers/zasm { };
-
   zbackup = callPackage ../tools/backup/zbackup {
     protobuf = protobuf_21;
   };
@@ -13841,12 +5979,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  zbctl = callPackage ../tools/admin/zbctl { };
-
-  zdelta = callPackage ../tools/compression/zdelta { };
-
-  zed = callPackage ../development/tools/zed { };
-
   zenith = callPackage ../tools/system/zenith {
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
@@ -13858,140 +5990,20 @@ with pkgs;
     nvidiaSupport = true;
   };
 
-  zerofree = callPackage ../tools/filesystems/zerofree { };
-
-  zet = callPackage ../tools/text/zet { };
-
-  zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { };
-
-  zfsbackup = callPackage ../tools/backup/zfsbackup { };
-
-  zfstools = callPackage ../tools/filesystems/zfstools { };
-
-  zfsnap = callPackage ../tools/backup/zfsnap { };
-
-  zpool-auto-expand-partitions = callPackage ../tools/filesystems/zpool-auto-expand-partitions { };
-
-  zinnia = callPackage ../tools/inputmethods/zinnia { };
-  tegaki-zinnia-japanese = callPackage ../tools/inputmethods/tegaki-zinnia-japanese { };
-
-  zim-tools = callPackage ../tools/text/zim-tools { };
-
-  zimfw = callPackage ../shells/zsh/zimfw { };
-
-  zld = callPackage ../development/tools/zld { };
-
-  par = callPackage ../tools/text/par { };
-
-  zip = callPackage ../tools/archivers/zip { };
-
-  zkfuse = callPackage ../tools/filesystems/zkfuse { };
-
   zpaq = callPackage ../tools/archivers/zpaq { };
   zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { };
 
-  zplug = callPackage ../shells/zsh/zplug { };
-
-  zps = callPackage ../tools/system/zps { };
-
-  zi = callPackage ../shells/zsh/zi { };
-
-  zinit = callPackage ../shells/zsh/zinit {} ;
-
   zint = qt6Packages.callPackage ../development/libraries/zint { };
 
-  zs-apc-spdu-ctl = callPackage ../tools/networking/zs-apc-spdu-ctl { };
-
-  zs-wait4host = callPackage ../tools/networking/zs-wait4host { };
-
-  zstxtns-utils = callPackage ../tools/text/zstxtns-utils { };
-
-  zsh-abbr = callPackage ../shells/zsh/zsh-abbr { };
-
-  zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { };
-
-  zsh-autopair = callPackage ../shells/zsh/zsh-autopair { };
-
-  zsh-bd = callPackage ../shells/zsh/zsh-bd { };
-
-  zsh-better-npm-completion = callPackage ../shells/zsh/zsh-better-npm-completion { };
-
-  zsh-clipboard = callPackage ../shells/zsh/zsh-clipboard { };
-
-  zsh-defer = callPackage ../shells/zsh/zsh-defer { };
-
-  zsh-edit = callPackage ../shells/zsh/zsh-edit { };
-
-  zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
-
-  zsh-history = callPackage ../shells/zsh/zsh-history { };
-
-  zsh-history-search-multi-word = callPackage ../shells/zsh/zsh-history-search-multi-word { };
-
-  zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { };
-
-  zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { };
-
-  zsh-nix-shell = callPackage ../shells/zsh/zsh-nix-shell { };
-
-  zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { };
-
-  zsh-system-clipboard = callPackage ../shells/zsh/zsh-system-clipboard { };
-
-  zsh-f-sy-h = callPackage ../shells/zsh/zsh-f-sy-h { };
-
-  zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { };
-
-  zsh-forgit = callPackage ../shells/zsh/zsh-forgit { };
-
-  zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { };
-
-  zsh-autocomplete = callPackage ../shells/zsh/zsh-autocomplete { };
-
-  zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { };
-
-  zsh-powerlevel10k = callPackage ../shells/zsh/zsh-powerlevel10k { };
-
-  zsh-powerlevel9k = callPackage ../shells/zsh/zsh-powerlevel9k { };
-
-  zsh-command-time = callPackage ../shells/zsh/zsh-command-time { };
-
-  zsh-fzf-history-search = callPackage ../shells/zsh/zsh-fzf-history-search { };
-
-  zsh-vi-mode = callPackage ../shells/zsh/zsh-vi-mode { };
-
-  zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { };
-
-  zsh-z = callPackage ../shells/zsh/zsh-z { };
-
-  zssh = callPackage ../tools/networking/zssh { };
-
   zstd = callPackage ../tools/compression/zstd {
     cmake = buildPackages.cmakeMinimal;
   };
 
-  zsv = callPackage ../development/tools/zsv { };
-
-  zxing = callPackage ../tools/graphics/zxing { };
-
-  zkar = callPackage ../tools/security/zkar { };
-
-  zlint = callPackage ../tools/security/zlint { };
-
-  zmap = callPackage ../tools/security/zmap { };
-
-  zmusic = callPackage ../development/libraries/zmusic { };
-
-  zpool-iostat-viz = callPackage ../tools/filesystems/zpool-iostat-viz { };
-
-
   ### SHELLS
 
   runtimeShell = "${runtimeShellPackage}${runtimeShellPackage.shellPath}";
   runtimeShellPackage = bash;
 
-  agdsn-zsh-config = callPackage ../shells/zsh/agdsn-zsh-config { };
-
   bash = lowPrio (callPackage ../shells/bash/5.nix { });
   # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed
   bashInteractive = callPackage ../shells/bash/5.nix {
@@ -14004,68 +6016,18 @@ with pkgs;
     forFHSEnv = true;
   };
 
-  bash-completion = callPackage ../shells/bash/bash-completion { };
-
-  gradle-completion = callPackage ../shells/zsh/gradle-completion { };
-
-  nix-bash-completions = callPackage ../shells/bash/nix-bash-completions { };
-
-  yarn-bash-completion = callPackage ../shells/bash/yarn-completion { };
-
-  blesh = callPackage ../shells/bash/blesh { };
-
-  undistract-me = callPackage ../shells/bash/undistract-me { };
-
   carapace = callPackage ../shells/carapace {
     buildGoModule = buildGo123Module;
   };
 
-  dash = callPackage ../shells/dash { };
-
-  dasht = callPackage ../tools/misc/dasht { };
-
-  dashing = callPackage ../tools/misc/dashing { };
-
-  es = callPackage ../shells/es { };
-
   fish = callPackage ../shells/fish { };
 
   wrapFish = callPackage ../shells/fish/wrapper.nix { };
 
   fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { });
 
-  fzf-git-sh = callPackage ../shells/fzf-git-sh { };
-
-  hishtory = callPackage ../shells/hishtory { };
-
-  ion = callPackage ../shells/ion { };
-
-  ksh = callPackage ../shells/ksh { };
-
-  liquidprompt = callPackage ../shells/liquidprompt { };
-
-  murex = callPackage ../shells/murex { };
-
-  oh = callPackage ../shells/oh { };
-
-  oksh = callPackage ../shells/oksh { };
-
-  scponly = callPackage ../shells/scponly { };
-
-  rush = callPackage ../shells/rush { };
-
   zsh = callPackage ../shells/zsh { };
 
-  nix-zsh-completions = callPackage ../shells/zsh/nix-zsh-completions { };
-
-  zsh-completions = callPackage ../shells/zsh/zsh-completions { };
-
-  zsh-prezto = callPackage ../shells/zsh/zsh-prezto { };
-
-  yash = callPackage ../shells/yash { };
-
-  grml-zsh-config = callPackage ../shells/zsh/grml-zsh-config { };
-
   powerline = with python3Packages; toPythonApplication powerline;
 
   ### DEVELOPMENT / COMPILERS
@@ -14108,40 +6070,18 @@ with pkgs;
 
   alan_2 = callPackage ../development/compilers/alan/2.nix { };
 
-  alarm-clock-applet = callPackage ../tools/misc/alarm-clock-applet { };
-
-  ante = callPackage ../development/compilers/ante { };
-
   armips = callPackage ../development/compilers/armips {
     stdenv = gcc10Stdenv;
   };
 
-  arachne-pnr = callPackage ../development/compilers/arachne-pnr { };
-
-  asciigraph = callPackage ../tools/text/asciigraph { };
-
   autocorrect = callPackage ../tools/text/autocorrect {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  aspectj = callPackage ../development/compilers/aspectj { };
-
-  ats = callPackage ../development/compilers/ats { };
-
-  ats-acc = callPackage ../development/tools/ats-acc { };
-
-  august = callPackage ../development/compilers/august { };
-
-  avra = callPackage ../development/compilers/avra { };
-
   ballerina = callPackage ../development/compilers/ballerina {
     openjdk = openjdk17_headless;
   };
 
-  bfc = callPackage ../development/compilers/bfc { };
-
-  bigloo = callPackage ../development/compilers/bigloo { };
-
   binaryen = callPackage ../development/compilers/binaryen {
     nodejs = nodejs-slim;
     inherit (python3Packages) filecheck;
@@ -14151,18 +6091,10 @@ with pkgs;
     gmp-static = gmp.override { withStatic = true; };
   };
 
-  bun = callPackage ../development/web/bun { };
-
-  cakelisp = callPackage ../development/compilers/cakelisp { };
-
-  ciao = callPackage ../development/compilers/ciao { };
-
   codon = callPackage ../development/compilers/codon {
     inherit (llvmPackages_14) lld stdenv;
   };
 
-  colm = callPackage ../development/compilers/colm { };
-
   colmap = libsForQt5.callPackage ../applications/science/misc/colmap { inherit (config) cudaSupport; };
   colmapWithCuda = colmap.override { cudaSupport = true; };
 
@@ -14182,18 +6114,6 @@ with pkgs;
     stdenv = gccStdenv;
   };
 
-  chez = callPackage ../development/compilers/chez { };
-
-  chez-racket = callPackage ../development/compilers/chez-racket { };
-
-  chez-srfi = callPackage ../development/chez-modules/chez-srfi { };
-
-  chez-mit = callPackage ../development/chez-modules/chez-mit { };
-
-  chez-scmutils = callPackage ../development/chez-modules/chez-scmutils { };
-
-  chez-matchable = callPackage ../development/chez-modules/chez-matchable { };
-
   libclang = llvmPackages.libclang;
   clang-manpages = llvmPackages.clang-manpages;
 
@@ -14221,21 +6141,12 @@ with pkgs;
   clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv;
   libcxxStdenv = if stdenv.hostPlatform.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv;
 
-  clean = callPackage ../development/compilers/clean { };
-
-  closurecompiler = callPackage ../development/compilers/closure { };
-
-  cmdstan = callPackage ../development/compilers/cmdstan { };
-
-  coffeescript = callPackage ../development/compilers/coffeescript { };
-
   comby = callPackage ../development/tools/comby {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
   inherit (coqPackages) compcert;
 
-  computecpp-unwrapped = callPackage ../development/compilers/computecpp { };
   computecpp = wrapCCWith rec {
     cc = computecpp-unwrapped;
     extraPackages = [
@@ -14254,8 +6165,6 @@ with pkgs;
     '';
   };
 
-  copper = callPackage ../development/compilers/copper { };
-
   corretto11 = javaPackages.compiler.corretto11;
   corretto17 = javaPackages.compiler.corretto17;
   corretto21 = javaPackages.compiler.corretto21;
@@ -14274,45 +6183,25 @@ with pkgs;
     crystal_1_14
     crystal;
 
-  crystal2nix = callPackage ../development/compilers/crystal2nix { };
-
   crystalline = callPackage ../development/tools/language-servers/crystalline {
     llvmPackages = crystal.llvmPackages;
   };
 
-  icr = callPackage ../development/tools/icr { };
-
   scry = callPackage ../development/tools/scry { crystal = crystal_1_2; };
 
-  dasm = callPackage ../development/compilers/dasm { };
-
-  dbmate = callPackage ../development/tools/database/dbmate { };
-
-  dbmonster = callPackage ../tools/security/dbmonster { };
-
   devpi-client = python3Packages.callPackage ../development/tools/devpi-client { };
 
   devpi-server = python3Packages.callPackage ../development/tools/devpi-server { };
 
-  dictu = callPackage ../development/compilers/dictu { };
-
-  eli = callPackage ../development/compilers/eli { };
-
-  erg = callPackage ../development/compilers/erg { };
-
   elm2nix = haskell.lib.compose.justStaticExecutables haskellPackages.elm2nix;
 
   elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { });
 
-  apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { };
-
   fasm = pkgsi686Linux.callPackage ../development/compilers/fasm {
     inherit (stdenv.hostPlatform) isx86_64;
   };
   fasm-bin = callPackage ../development/compilers/fasm/bin.nix { };
 
-  fasmg = callPackage ../development/compilers/fasmg { };
-
   fbc = if stdenv.hostPlatform.isDarwin then
     callPackage ../development/compilers/fbc/mac-bin.nix { }
   else
@@ -14320,12 +6209,6 @@ with pkgs;
 
   filecheck = with python3Packages; toPythonApplication filecheck;
 
-  firrtl = callPackage ../development/compilers/firrtl { };
-
-  flasm = callPackage ../development/compilers/flasm { };
-
-  fluidd = callPackage ../applications/misc/fluidd { };
-
   flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { });
   flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; });
   flutterPackages = flutterPackages-bin;
@@ -14339,12 +6222,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security;
   };
 
-  fnlfmt = callPackage ../development/tools/fnlfmt { };
-
   fpc = callPackage ../development/compilers/fpc { };
 
-  g203-led = callPackage ../tools/misc/g203-led { };
-
   gambit = callPackage ../development/compilers/gambit { };
   gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { };
   gambit-support = callPackage ../development/compilers/gambit/gambit-support.nix { };
@@ -14354,8 +6233,6 @@ with pkgs;
   gerbilPackages-unstable = pkgs.gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries
   glow-lang = pkgs.gerbilPackages-unstable.glow-lang;
 
-  gbforth = callPackage ../development/compilers/gbforth { };
-
   default-gcc-version = 13;
   gcc = pkgs.${"gcc${toString default-gcc-version}"};
   gccFun = callPackage ../development/compilers/gcc;
@@ -14657,14 +6534,6 @@ with pkgs;
     inherit (llvmPackages_15) llvm;
   };
 
-  gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 { };
-  gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 { };
-  gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 { };
-  gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 { };
-  gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 { };
-  gcc-arm-embedded-11 = callPackage ../development/compilers/gcc-arm-embedded/11 { };
-  gcc-arm-embedded-12 = callPackage ../development/compilers/gcc-arm-embedded/12 { };
-  gcc-arm-embedded-13 = callPackage ../development/compilers/gcc-arm-embedded/13 { };
   gcc-arm-embedded = gcc-arm-embedded-12;
 
   # It would be better to match the default gcc so that there are no linking errors
@@ -14678,17 +6547,11 @@ with pkgs;
     profiledCompiler = false;
   });
 
-  gforth = callPackage ../development/compilers/gforth { };
-
   gleam = callPackage ../development/compilers/gleam {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
     erlang = erlang_27;
   };
 
-  gmqcc = callPackage ../development/compilers/gmqcc { };
-
-  gtk-server = callPackage ../development/interpreters/gtk-server { };
-
   # Haskell and GHC
 
   haskell = callPackage ./haskell-packages.nix { };
@@ -14744,8 +6607,6 @@ with pkgs;
 
   purescript = callPackage ../development/compilers/purescript/purescript { };
 
-  psc-package = callPackage ../development/compilers/purescript/psc-package { };
-
   purescript-psa = nodePackages.purescript-psa;
 
   purenix = haskell.lib.compose.justStaticExecutables haskellPackages.purenix;
@@ -14758,15 +6619,9 @@ with pkgs;
 
   coreboot-toolchain = recurseIntoAttrs (callPackage ../development/tools/misc/coreboot-toolchain { });
 
-  remarkable-toolchain = callPackage ../development/tools/misc/remarkable/remarkable-toolchain { };
-
-  remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { };
-
   spicedb     = callPackage ../servers/spicedb { };
   spicedb-zed = callPackage ../servers/spicedb/zed.nix { };
 
-  tacacsplus = callPackage ../servers/tacacsplus { };
-
   tamarin-prover =
     (haskellPackages.callPackage ../applications/science/logic/tamarin-prover {
       # NOTE: do not use the haskell packages 'graphviz' and 'maude'
@@ -14786,14 +6641,10 @@ with pkgs;
   haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { });
   inherit (haxePackages) hxcpp;
 
-  hop = callPackage ../development/compilers/hop { };
-
   falcon = callPackage ../development/interpreters/falcon {
     stdenv = gcc10Stdenv;
   };
 
-  fsharp = callPackage ../development/compilers/fsharp { };
-
   fstar = callPackage ../development/compilers/fstar {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
     z3 = z3_4_8_5;
@@ -14801,24 +6652,6 @@ with pkgs;
 
   dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
 
-  glslang = callPackage ../development/compilers/glslang { };
-
-  gnostic = callPackage ../development/compilers/gnostic { };
-
-  go-junit-report = callPackage ../development/tools/go-junit-report { };
-
-  gocover-cobertura = callPackage ../development/tools/gocover-cobertura { };
-
-  goblob = callPackage ../tools/security/goblob { };
-
-  gogetdoc = callPackage ../development/tools/gogetdoc { };
-
-  gox = callPackage ../development/tools/gox { };
-
-  goxlr-utility = callPackage ../tools/audio/goxlr-utility {};
-
-  gprolog = callPackage ../development/compilers/gprolog { };
-
   gwe = callPackage ../tools/misc/gwe {
     nvidia_x11 = linuxPackages.nvidia_x11;
   };
@@ -14846,8 +6679,6 @@ with pkgs;
 
   instawow = callPackage ../games/instawow/default.nix { };
 
-  intel-graphics-compiler = callPackage ../development/compilers/intel-graphics-compiler { };
-
   irony-server = callPackage ../development/tools/irony-server {
     # The repository of irony to use -- must match the version of the employed emacs
     # package.  Wishing we could merge it into one irony package, to avoid this issue,
@@ -14860,10 +6691,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  holo-build = callPackage ../tools/package-management/holo-build { };
-
-  hugs = callPackage ../development/interpreters/hugs { };
-
   openjfx17 = openjfx;
   openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; };
   openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; };
@@ -14930,18 +6757,6 @@ with pkgs;
     python3 = python311;
   };
 
-  lingua-franca = callPackage ../development/compilers/lingua-franca { };
-
-  openspin = callPackage ../development/compilers/openspin { };
-
-  jasmin = callPackage ../development/compilers/jasmin { };
-
-  java-service-wrapper = callPackage ../tools/system/java-service-wrapper { };
-
-  jna = callPackage ../development/java-modules/jna { };
-
-  juniper = callPackage ../development/compilers/juniper { };
-
   inherit (callPackage ../development/compilers/julia { })
     julia_19-bin
     julia_110-bin
@@ -14960,30 +6775,6 @@ with pkgs;
 
   kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { };
 
-  kingstvis = callPackage ../applications/science/electronics/kingstvis { };
-
-  knightos-genkfs = callPackage ../development/tools/knightos/genkfs { };
-
-  regenkfs = callPackage ../development/tools/knightos/regenkfs { };
-
-  knightos-kcc = callPackage ../development/tools/knightos/kcc { };
-
-  knightos-kimg = callPackage ../development/tools/knightos/kimg { };
-
-  knightos-kpack = callPackage ../development/tools/knightos/kpack { };
-
-  knightos-mkrom = callPackage ../development/tools/knightos/mkrom { };
-
-  remkrom = callPackage ../development/tools/knightos/remkrom { };
-
-  knightos-patchrom = callPackage ../development/tools/knightos/patchrom { };
-
-  knightos-mktiupgrade = callPackage ../development/tools/knightos/mktiupgrade { };
-
-  knightos-scas = callPackage ../development/tools/knightos/scas { };
-
-  knightos-z80e = callPackage ../development/tools/knightos/z80e { };
-
   koka = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../development/compilers/koka { });
 
   kotlin = callPackage ../development/compilers/kotlin { };
@@ -15000,10 +6791,6 @@ with pkgs;
 
   lessc = nodePackages.less;
 
-  liquibase = callPackage ../development/tools/database/liquibase { };
-
-  lizardfs = callPackage ../tools/filesystems/lizardfs { };
-
   lobster = callPackage ../development/compilers/lobster {
     inherit (darwin.apple_sdk.frameworks)
       CoreFoundation Cocoa AudioToolbox OpenGL Foundation ForceFeedback;
@@ -15102,22 +6889,12 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
 
-  lunarml = callPackage ../development/compilers/lunarml { };
-
-  manticore = callPackage ../development/compilers/manticore { };
-
   mercury = callPackage ../development/compilers/mercury {
     jdk_headless = openjdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
 
-  microscheme = callPackage ../development/compilers/microscheme { };
-
-  minimacy = callPackage ../development/compilers/minimacy { };
-
   mint = callPackage ../development/compilers/mint { crystal = crystal_1_9; };
 
-  mitama-cpp-result = callPackage ../development/libraries/mitama-cpp-result { };
-
   mitscheme = callPackage ../development/compilers/mit-scheme {
     texinfo = texinfo6;
   };
@@ -15126,10 +6903,6 @@ with pkgs;
     enableX11 = true;
   };
 
-  miranda = callPackage ../development/compilers/miranda { };
-
-  mlkit = callPackage ../development/compilers/mlkit {};
-
   inherit (callPackage ../development/compilers/mlton {})
     mlton20130715
     mlton20180207Binary
@@ -15156,14 +6929,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
-
-  roslyn = callPackage ../development/compilers/roslyn { };
-
-  msbuild = callPackage ../development/tools/build-managers/msbuild { };
-
-  mosml = callPackage ../development/compilers/mosml { };
-
   mozart2 = callPackage ../development/compilers/mozart {
     emacs = emacs-nox;
     jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@@ -15171,8 +6936,6 @@ with pkgs;
 
   mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
 
-  muonlang = callPackage ../development/compilers/muonlang { };
-
   nim = nim2;
   nim1 = nim-1_0;
   nim2 = nim-2_2;
@@ -15183,23 +6946,11 @@ with pkgs;
   buildNimPackage = callPackage ../build-support/build-nim-package.nix { };
   nimOverrides = callPackage ./nim-overrides.nix { };
 
-  neko = callPackage ../development/compilers/neko { };
-
   nextpnrWithGui = libsForQt5.callPackage ../by-name/ne/nextpnr/package.nix {
     enableGui = true;
     inherit (darwin.apple_sdk.frameworks) OpenGL;
   };
 
-  acme = callPackage ../development/compilers/acme { };
-
-  nasm = callPackage ../development/compilers/nasm { };
-
-  nasmfmt = callPackage ../development/tools/nasmfmt { };
-
-  nqc = callPackage ../development/compilers/nqc { };
-
-  nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };
-
   obliv-c = callPackage ../development/compilers/obliv-c {
     stdenv = gcc10Stdenv;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
@@ -15223,63 +6974,35 @@ with pkgs;
 
   inherit (ocamlPackages) odig;
 
-  orc = callPackage ../development/compilers/orc { };
-
-  orocos-kdl = callPackage ../development/libraries/orocos-kdl { };
-
   ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml.nix { };
 
-  ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
-
-  ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { };
-
-  ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { };
-
-  opaline = callPackage ../development/tools/ocaml/opaline { };
-
   opam = callPackage ../development/tools/ocaml/opam {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
   opam-installer = callPackage ../development/tools/ocaml/opam/installer.nix { };
 
-  opam2json = callPackage ../development/tools/ocaml/opam2json { };
-
   wrapWatcom = callPackage ../development/compilers/open-watcom/wrapper.nix { };
   open-watcom-v2-unwrapped = callPackage ../development/compilers/open-watcom/v2.nix { };
   open-watcom-v2 = wrapWatcom open-watcom-v2-unwrapped { };
   open-watcom-bin-unwrapped = callPackage ../development/compilers/open-watcom/bin.nix { };
   open-watcom-bin = wrapWatcom open-watcom-bin-unwrapped { };
 
-  passerine = callPackage ../development/compilers/passerine { };
-
-  picat = callPackage ../development/compilers/picat { };
-
   ponyc = callPackage ../development/compilers/ponyc {
     # Upstream pony no longer supports GCC
     stdenv = llvmPackages.stdenv;
   };
 
-  blaze = callPackage ../development/libraries/blaze { };
-
   pony-corral = callPackage ../development/compilers/ponyc/pony-corral.nix { };
 
-  prqlc = callPackage ../development/tools/database/prqlc { };
-
-  qbe = callPackage ../development/compilers/qbe { };
-
   replibyte = callPackage ../development/tools/database/replibyte {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  rgbds = callPackage ../development/compilers/rgbds { };
-
   rml = callPackage ../development/compilers/rml {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  rgxg = callPackage ../tools/text/rgxg { };
-
   rtags = callPackage ../development/tools/rtags {
     inherit (darwin) apple_sdk;
   };
@@ -15331,16 +7054,9 @@ with pkgs;
 
   defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { };
 
-  cargo-about = callPackage ../development/tools/rust/cargo-about { };
-  cargo-all-features = callPackage ../development/tools/rust/cargo-all-features { };
-  cargo-apk = callPackage ../development/tools/rust/cargo-apk { };
   cargo-audit = callPackage ../development/tools/rust/cargo-audit {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
-  cargo-benchcmp = callPackage ../development/tools/rust/cargo-benchcmp { };
-  cargo-binstall = callPackage ../development/tools/rust/cargo-binstall { };
-  cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { };
-  cargo-bitbake = callPackage ../development/tools/rust/cargo-bitbake { };
   cargo-c = callPackage ../development/tools/rust/cargo-c {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
@@ -15353,31 +7069,15 @@ with pkgs;
       inherit rustc cargo;
     };
   };
-  cargo-component = callPackage ../development/tools/rust/cargo-component { };
-  cargo-cranky = callPackage ../development/tools/rust/cargo-cranky { };
-  cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { };
   cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation;
   };
   cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-deb = callPackage ../development/tools/rust/cargo-deb { };
-  cargo-docset = callPackage ../development/tools/rust/cargo-docset { };
-  cargo-duplicates = callPackage ../development/tools/rust/cargo-duplicates { };
   cargo-edit = callPackage ../development/tools/rust/cargo-edit {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-leptos = callPackage ../development/tools/rust/cargo-leptos { };
-  cargo-kcov = callPackage ../development/tools/rust/cargo-kcov { };
-  cargo-guppy = callPackage ../development/tools/rust/cargo-guppy { };
-  cargo-hack = callPackage ../development/tools/rust/cargo-hack { };
-  cargo-license = callPackage ../development/tools/rust/cargo-license { };
-  cargo-llvm-cov = callPackage ../development/tools/rust/cargo-llvm-cov { };
-  cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { };
-  cargo-local-registry = callPackage ../development/tools/rust/cargo-local-registry { };
-  cargo-lock = callPackage ../development/tools/rust/cargo-lock { };
-  cargo-machete = callPackage ../development/tools/rust/cargo-machete { };
   cargo-outdated = callPackage ../development/tools/rust/cargo-outdated {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration;
   };
@@ -15392,174 +7092,85 @@ with pkgs;
   buildPgrxExtension = callPackage ../development/tools/rust/cargo-pgrx/buildPgrxExtension.nix {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-release = callPackage ../development/tools/rust/cargo-release { };
-  cargo-rr = callPackage ../development/tools/rust/cargo-rr { };
   cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-update = callPackage ../development/tools/rust/cargo-update { };
-
   cargo-asm = callPackage ../development/tools/rust/cargo-asm {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
   cargo-bazel = callPackage ../development/tools/rust/cargo-bazel {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-binutils = callPackage ../development/tools/rust/cargo-binutils { };
-  cargo-bolero = callPackage ../development/tools/rust/cargo-bolero { };
-  cargo-bundle = callPackage ../development/tools/rust/cargo-bundle { };
-  cargo-bundle-licenses = callPackage ../development/tools/rust/cargo-bundle-licenses { };
   cargo-cache = callPackage ../development/tools/rust/cargo-cache {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-careful = callPackage ../development/tools/rust/cargo-careful { };
-  cargo-chef = callPackage ../development/tools/rust/cargo-chef { };
   cargo-crev = callPackage ../development/tools/rust/cargo-crev {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation;
   };
-  cargo-cross = callPackage ../development/tools/rust/cargo-cross { };
-  cargo-deny = callPackage ../development/tools/rust/cargo-deny { };
-  cargo-depgraph = callPackage ../development/tools/rust/cargo-depgraph { };
-  cargo-dephell = callPackage ../development/tools/rust/cargo-dephell { };
-  cargo-diet = callPackage ../development/tools/rust/cargo-diet { };
-  cargo-dist = callPackage ../development/tools/rust/cargo-dist { };
-  cargo-espmonitor = callPackage ../development/tools/rust/cargo-espmonitor { };
-  cargo-feature = callPackage ../development/tools/rust/cargo-feature { };
   cargo-fund = callPackage ../development/tools/rust/cargo-fund {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
-
   cargo-hf2 = callPackage ../development/tools/rust/cargo-hf2 {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
-  cargo-info = callPackage ../development/tools/rust/cargo-info { };
   cargo-inspect = callPackage ../development/tools/rust/cargo-inspect {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-insta = callPackage ../development/tools/rust/cargo-insta { };
   cargo-lambda = callPackage ../development/tools/rust/cargo-lambda {
     zig = buildPackages.zig_0_12;
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
-  cargo-limit = callPackage ../development/tools/rust/cargo-limit { };
-  cargo-mommy = callPackage ../development/tools/rust/cargo-mommy { };
   cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-mutants = callPackage ../development/tools/rust/cargo-mutants { };
-
   cargo-ndk = callPackage ../development/tools/rust/cargo-ndk {
     inherit (darwin.apple_sdk.frameworks) CoreGraphics Foundation;
   };
 
-  cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { };
-  cargo-play = callPackage ../development/tools/rust/cargo-play { };
   cargo-rdme = callPackage ../by-name/ca/cargo-rdme/package.nix {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-readme = callPackage ../development/tools/rust/cargo-readme { };
-  cargo-run-bin = callPackage ../development/tools/rust/cargo-run-bin {};
-  cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks { };
-
-  cargo-show-asm = callPackage ../development/tools/rust/cargo-show-asm { };
-  cargo-shuttle = callPackage ../development/tools/rust/cargo-shuttle { };
-
-  cargo-sort = callPackage ../development/tools/rust/cargo-sort { };
   cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
-  cargo-supply-chain = callPackage ../development/tools/rust/cargo-supply-chain { };
-  cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { };
-  cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme { };
-  cargo-tally = callPackage ../development/tools/rust/cargo-tally { };
-  cargo-temp = callPackage ../development/tools/rust/cargo-temp { };
-  cargo-toml-lint = callPackage ../development/tools/rust/cargo-toml-lint { };
   cargo-udeps = callPackage ../development/tools/rust/cargo-udeps {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
   };
-  cargo-ui = callPackage ../development/tools/rust/cargo-ui { };
-  cargo-unused-features = callPackage ../development/tools/rust/cargo-unused-features { };
-
-  cargo-mobile2 = callPackage ../development/tools/rust/cargo-mobile2 { };
-
-  cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { };
   cargo-vet = callPackage ../development/tools/rust/cargo-vet {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
   cargo-watch = callPackage ../development/tools/rust/cargo-watch {
     inherit (darwin.apple_sdk.frameworks) Foundation Cocoa;
   };
-  cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { };
-  cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { };
-  cargo-xbuild = callPackage ../development/tools/rust/cargo-xbuild { };
-  cargo-generate = callPackage ../development/tools/rust/cargo-generate { };
-  cargo-bootimage = callPackage ../development/tools/rust/bootimage { };
-
   cargo-whatfeatures = callPackage ../development/tools/rust/cargo-whatfeatures {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { };
-
   cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild {
     zig = buildPackages.zig_0_12;
   };
 
-  cauwugo = callPackage ../development/tools/rust/cauwugo { };
-
-  critcmp = callPackage ../development/tools/rust/critcmp { };
-
-  devspace = callPackage ../development/tools/misc/devspace { };
-
-  djlint = callPackage ../development/tools/djlint { };
-
-  leptosfmt = callPackage ../development/tools/rust/leptosfmt { };
-
-  panamax = callPackage ../development/tools/rust/panamax { };
-
-  ograc = callPackage ../development/tools/rust/ograc { };
-
   opensmalltalk-vm = callPackage ../development/compilers/opensmalltalk-vm { };
 
   opensycl = darwin.apple_sdk_11_0.callPackage ../development/compilers/opensycl { };
   opensyclWithRocm = opensycl.override { rocmSupport = true; };
 
-  pest-ide-tools = callPackage ../development/tools/misc/pest-ide-tools { };
-
-  ravedude = callPackage ../development/tools/rust/ravedude { };
-
-  ra-multiplex = callPackage ../development/tools/rust/ra-multiplex {};
-
-  rhack = callPackage ../development/tools/rust/rhack { };
-  roogle = callPackage ../development/tools/rust/roogle { };
   rustfmt = rustPackages.rustfmt;
   rust-analyzer-unwrapped = callPackage ../development/tools/rust/rust-analyzer {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
   rust-analyzer = callPackage ../development/tools/rust/rust-analyzer/wrapper.nix { };
-  rust-audit-info = callPackage ../development/tools/rust/rust-audit-info { };
   rust-bindgen-unwrapped = callPackage ../development/tools/rust/bindgen/unwrapped.nix { };
   rust-bindgen = callPackage ../development/tools/rust/bindgen { };
   rust-cbindgen = callPackage ../development/tools/rust/cbindgen {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  rust-script = callPackage ../development/tools/rust/rust-script { };
   rustup = callPackage ../development/tools/rust/rustup {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
   rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  rusty-man = callPackage ../development/tools/rust/rusty-man { };
-  rustycli = callPackage ../development/tools/rust/rustycli { };
-  specr-transpile = callPackage ../development/tools/rust/specr-transpile { };
-  typeshare = callPackage ../development/tools/rust/typeshare { };
-
-  sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme { };
-
-  roswell = callPackage ../development/tools/roswell { };
-
   scala_2_10 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.10"; jre = jdk8; };
   scala_2_11 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.11"; jre = jdk8; };
   scala_2_12 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.12"; };
@@ -15574,40 +7185,12 @@ with pkgs;
   scalafix = callPackage ../development/tools/scalafix {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
-  scalafmt = callPackage ../development/tools/scalafmt { };
-
-  scryer-prolog = callPackage ../development/compilers/scryer-prolog { };
-
-  seren = callPackage ../applications/networking/instant-messengers/seren { };
-
-  serialdv = callPackage ../development/libraries/serialdv {  };
-
-  serpent = callPackage ../development/compilers/serpent { };
-
-  shmig = callPackage ../development/tools/database/shmig { };
-
-  sleek = callPackage ../development/tools/database/sleek { };
-
-  smlfmt = callPackage ../development/tools/smlfmt { };
-
   # smlnjBootstrap should be redundant, now that smlnj works on Darwin natively
   smlnjBootstrap = callPackage ../development/compilers/smlnj/bootstrap.nix { };
   smlnj = callPackage ../development/compilers/smlnj {
     inherit (darwin) Libsystem;
   };
 
-  smlpkg = callPackage ../tools/package-management/smlpkg { };
-
-  solc = callPackage ../development/compilers/solc { };
-
-  souffle = callPackage ../development/compilers/souffle { };
-
-  spasm-ng = callPackage ../development/compilers/spasm-ng { };
-
-  spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { };
-
-  sqlfluff = callPackage ../development/tools/database/sqlfluff { };
-
   sqlx-cli = callPackage ../development/tools/rust/sqlx-cli {
     inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security;
   };
@@ -15624,12 +7207,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  stalin = callPackage ../development/compilers/stalin { };
-
-  metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { };
-
-  svd2rust = callPackage ../development/tools/rust/svd2rust { };
-
   swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { });
   inherit (swiftPackages) swift swiftpm sourcekit-lsp swift-format swiftpm2nix;
 
@@ -15663,28 +7240,12 @@ with pkgs;
     llvmPackages = llvmPackages_18;
   };
 
-  tinyscheme = callPackage ../development/interpreters/tinyscheme { };
-
-  tbox = callPackage ../development/libraries/tbox { };
-
-  typescript = callPackage ../development/compilers/typescript { };
-
   ubports-click = python3Packages.callPackage ../development/tools/click { };
 
-  uasm = callPackage ../development/compilers/uasm { };
-
-  urn = callPackage ../development/compilers/urn { };
-
   urweb = callPackage ../development/compilers/urweb {
     icu = icu67;
   };
 
-  urbackup-client = callPackage ../applications/backup/urbackup-client { };
-
-  vlang = callPackage ../development/compilers/vlang { };
-
-  vala-lint = callPackage ../development/tools/vala-lint { };
-
   vcard = python3Packages.toPythonApplication python3Packages.vcard;
 
   inherit (callPackage ../development/compilers/vala { })
@@ -15693,12 +7254,6 @@ with pkgs;
 
   vyper = with python3Packages; toPythonApplication vyper;
 
-  wazero = callPackage ../development/interpreters/wazero { };
-
-  wcc = callPackage ../development/compilers/wcc { };
-
-  wla-dx = callPackage ../development/compilers/wla-dx { };
-
   wrapCCWith =
     { cc
     , # This should be the only bintools runtime dep with this sort of logic. The
@@ -15752,25 +7307,13 @@ with pkgs;
     inherit bintools libc;
   } // extraArgs; in self);
 
-  yaml-language-server = callPackage  ../development/tools/language-servers/yaml-language-server { };
-
   # prolog
-  yap = callPackage ../development/compilers/yap { };
-
-  yasm = callPackage ../development/compilers/yasm { };
-
   yosys = callPackage ../development/compilers/yosys { };
   yosys-bluespec = callPackage ../development/compilers/yosys/plugins/bluespec.nix { };
   yosys-ghdl = callPackage ../development/compilers/yosys/plugins/ghdl.nix { };
   yosys-synlig = callPackage ../development/compilers/yosys/plugins/synlig.nix { };
   yosys-symbiflow = callPackage ../development/compilers/yosys/plugins/symbiflow.nix { };
 
-  z88dk = callPackage ../development/compilers/z88dk { };
-
-  zulip = callPackage ../applications/networking/instant-messengers/zulip { };
-
-  zulip-term = callPackage ../applications/networking/instant-messengers/zulip-term { };
-
   zulu8 = callPackage ../development/compilers/zulu/8.nix { };
   zulu11 = callPackage ../development/compilers/zulu/11.nix { };
   zulu17 = callPackage ../development/compilers/zulu/17.nix { };
@@ -15783,10 +7326,6 @@ with pkgs;
   acl2 = callPackage ../development/interpreters/acl2 { };
   acl2-minimal = callPackage ../development/interpreters/acl2 { certifyBooks = false; };
 
-  angelscript = callPackage ../development/interpreters/angelscript { };
-
-  anko = callPackage ../development/interpreters/anko { };
-
   babashka-unwrapped = callPackage ../development/interpreters/babashka { };
   babashka = callPackage ../development/interpreters/babashka/wrapped.nix { };
 
@@ -15861,16 +7400,6 @@ with pkgs;
     jdk = graalvm-ce;
   };
 
-  chibi = callPackage ../development/interpreters/chibi { };
-
-  ceptre = callPackage ../development/interpreters/ceptre { };
-
-  cg3 = callPackage ../development/interpreters/cg3 { };
-
-  cling = callPackage ../development/interpreters/cling { };
-
-  clips = callPackage ../development/interpreters/clips { };
-
   cliscord = callPackage ../misc/cliscord {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -15908,8 +7437,6 @@ with pkgs;
 
   dhallPackages = recurseIntoAttrs (callPackage ./dhall-packages.nix { });
 
-  duktape = callPackage ../development/interpreters/duktape { };
-
   duckscript = callPackage ../development/tools/rust/duckscript {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
@@ -15948,10 +7475,6 @@ with pkgs;
 
   erlang_language_platform = callPackage ../by-name/er/erlang-language-platform/package.nix { };
 
-  expr = callPackage ../development/interpreters/expr { };
-
-  genemichaels = callPackage ../development/tools/rust/genemichaels { };
-
   gnudatalanguage = callPackage ../development/interpreters/gnudatalanguage {
     inherit (llvmPackages) openmp;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
@@ -15959,18 +7482,10 @@ with pkgs;
     mpi = mpich;
   };
 
-  gpython = callPackage ../development/interpreters/gpython { };
-
   graphql-client = callPackage ../development/tools/graphql-client {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  graphqlmap = callPackage ../tools/security/graphqlmap { };
-
-  graphqurl = callPackage ../tools/networking/graphqurl { };
-
-  groovy = callPackage ../development/interpreters/groovy { };
-
   inherit (callPackages ../applications/networking/cluster/hadoop {})
     hadoop_3_4
     hadoop_3_3
@@ -15978,47 +7493,22 @@ with pkgs;
   hadoop3 = hadoop_3_4;
   hadoop = hadoop3;
 
-  hashlink = callPackage ../development/interpreters/hashlink { };
-
-  io = callPackage ../development/interpreters/io { };
-
-  ivy = callPackage ../development/interpreters/ivy { };
-
   jacinda = haskell.lib.compose.justStaticExecutables haskellPackages.jacinda;
 
   janet = callPackage ../development/interpreters/janet { };
 
   jpm = callPackage ../development/interpreters/janet/jpm.nix { };
 
-  jelly = callPackage ../development/interpreters/jelly { };
-
-  jimtcl = callPackage ../development/interpreters/jimtcl { };
-
-  jmeter = callPackage ../applications/networking/jmeter { };
-
-  joker = callPackage ../development/interpreters/joker { };
-
   davmail = callPackage ../applications/networking/davmail {
     zulu = zulu11;
   };
 
-  kamilalisp = callPackage ../development/interpreters/kamilalisp { };
-
-  kanif = callPackage ../applications/networking/cluster/kanif { };
-
-  kona = callPackage ../development/interpreters/kona { };
-
-  lambda-lisp = callPackage ../development/interpreters/lambda-lisp { };
   lambda-lisp-blc = lambda-lisp;
 
   love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };
   love_11 = callPackage ../development/interpreters/love/11.nix { };
   love = love_11;
 
-  wabt = callPackage ../development/tools/wabt { };
-
-  zuo = callPackage ../development/interpreters/zuo { };
-
   ### LUA interpreters
   emiluaPlugins = recurseIntoAttrs
     (callPackage ./emilua-plugins.nix {}
@@ -16049,10 +7539,6 @@ with pkgs;
     pluginupdate = ../../maintainers/scripts/pluginupdate-py;
   };
 
-  luau = callPackage ../development/interpreters/luau { };
-
-  lune = callPackage ../development/interpreters/lune { };
-
   toluapp = callPackage ../development/tools/toluapp {
     lua = lua5_1; # doesn't work with any other :(
   };
@@ -16066,24 +7552,6 @@ with pkgs;
 
   ### End of CuboCore
 
-  maude = callPackage ../development/interpreters/maude { };
-
-  me_cleaner = callPackage ../tools/misc/me_cleaner { };
-
-  metamath = callPackage ../development/interpreters/metamath { };
-
-  minder = callPackage ../applications/misc/minder { };
-
-  mujs = callPackage ../development/interpreters/mujs { };
-
-  nelua = callPackage ../development/interpreters/nelua { };
-
-  nextflow = callPackage ../development/interpreters/nextflow { };
-
-  ngn-k = callPackage ../development/interpreters/ngn-k { };
-
-  oak = callPackage ../development/interpreters/oak { };
-
   obb = callPackage ../development/interpreters/clojure/obb.nix { };
 
   octave = callPackage ../development/interpreters/octave { };
@@ -16096,9 +7564,6 @@ with pkgs;
 
   octavePackages = recurseIntoAttrs octave.pkgs;
 
-  pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
-
-
   # PHP interpreters, packages and extensions.
   #
   # Set default PHP interpreter, extensions and packages
@@ -16146,10 +7611,6 @@ with pkgs;
   php81Extensions = recurseIntoAttrs php81.extensions;
   php81Packages = recurseIntoAttrs php81.packages;
 
-  picoc = callPackage ../development/interpreters/picoc { };
-
-  picolisp = callPackage ../development/interpreters/picolisp { };
-
   polyml = callPackage ../development/compilers/polyml { };
   polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
   polyml57 = callPackage ../development/compilers/polyml/5.7.nix { };
@@ -16243,39 +7704,19 @@ with pkgs;
   pypy39Packages = pypy39.pkgs;
   pypy310Packages = pypy310.pkgs;
 
-  py3c = callPackage ../development/libraries/py3c { };
-
   pythonManylinuxPackages = callPackage ./../development/interpreters/python/manylinux { };
 
   pythonCondaPackages = callPackage ./../development/interpreters/python/conda { };
 
-  update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { };
-
   # Should eventually be moved inside Python interpreters.
   python-setup-hook = buildPackages.callPackage ../development/interpreters/python/setup-hook.nix { };
 
   pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {});
 
-  check-jsonschema = callPackage ../development/tools/check-jsonschema { };
-
-  pypi-mirror = callPackage ../development/tools/pypi-mirror { };
-
   svg2tikz = with python3.pkgs; toPythonApplication svg2tikz;
 
-  svg2pdf = callPackage ../tools/graphics/svg2pdf { };
-
-  pew = callPackage ../development/tools/pew { };
-
-  poetry = callPackage ../tools/package-management/poetry { };
-
   poetryPlugins = recurseIntoAttrs poetry.plugins;
 
-  poetry2conda = callPackage ../tools/package-management/poetry2conda { };
-
-  pip-audit = callPackage ../development/tools/pip-audit { };
-
-  pipenv = callPackage ../development/tools/pipenv { };
-
   pipx = with python3.pkgs; toPythonApplication pipx;
 
   pipewire = callPackage ../development/libraries/pipewire {
@@ -16288,8 +7729,6 @@ with pkgs;
 
   wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { };
 
-  pw-volume = callPackage ../tools/audio/pw-volume { };
-
   racket = callPackage ../development/interpreters/racket {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation;
   };
@@ -16305,14 +7744,6 @@ with pkgs;
   nqp = callPackage  ../development/interpreters/rakudo/nqp.nix { };
   zef = callPackage ../development/interpreters/rakudo/zef.nix { };
 
-  rascal = callPackage ../development/interpreters/rascal { };
-
-  red = callPackage ../development/interpreters/red { };
-
-  regexploit = callPackage ../tools/security/regexploit { };
-
-  regextester = callPackage ../applications/misc/regextester { };
-
   inherit (ocamlPackages) reason;
 
   buildRubyGem = callPackage ../development/ruby-modules/gem {
@@ -16322,19 +7753,14 @@ with pkgs;
     inherit (darwin) DarwinTools autoSignDarwinBinariesHook;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
-  bundler = callPackage ../development/ruby-modules/bundler { };
   bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
   bundlerApp = callPackage ../development/ruby-modules/bundler-app { };
   bundlerUpdateScript = callPackage ../development/ruby-modules/bundler-update-script { };
 
   bundler-audit = callPackage ../tools/security/bundler-audit { };
 
-  sol2 = callPackage ../development/libraries/sol2 { };
-
   solargraph = rubyPackages.solargraph;
 
-  rbenv = callPackage ../development/ruby-modules/rbenv { };
-
   rubyfmt = darwin.apple_sdk_11_0.callPackage ../development/tools/rubyfmt {
     inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
     inherit (darwin) libobjc;
@@ -16359,25 +7785,13 @@ with pkgs;
   rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems;
   rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems;
 
-  mruby = callPackage ../development/compilers/mruby { };
-
   samplebrain = libsForQt5.callPackage ../applications/audio/samplebrain { };
 
-  scsh = callPackage ../development/interpreters/scsh { };
-
-  scheme48 = callPackage ../development/interpreters/scheme48 { };
-
-  scheme-bytestructures = callPackage ../development/scheme-modules/scheme-bytestructures { };
-
-  smiley-sans = callPackage ../data/fonts/smiley-sans { };
-
   inherit (callPackages ../applications/networking/cluster/spark { })
     spark_3_5 spark_3_4;
   spark3 = spark_3_5;
   spark = spark3;
 
-  sparkleshare = callPackage ../applications/version-management/sparkleshare { };
-
   inherit
     ({
       spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix {
@@ -16399,8 +7813,6 @@ with pkgs;
     spidermonkey_128
     ;
 
-  starlark-rust = callPackage ../development/interpreters/starlark-rust { };
-
   supercollider = libsForQt5.callPackage ../development/interpreters/supercollider {
     fftw = fftwSinglePrec;
   };
@@ -16421,8 +7833,6 @@ with pkgs;
     plugins = with supercolliderPlugins; [ sc3-plugins ];
   };
 
-  taktuk = callPackage ../applications/networking/cluster/taktuk { };
-
   tcl = tcl-8_6;
   tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
   tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
@@ -16433,14 +7843,8 @@ with pkgs;
 
   tclreadline = tclPackages.tclreadline;
 
-  eltclsh = callPackage ../development/tools/eltclsh { };
-
   wasm = ocamlPackages.wasm;
 
-  wasm3 = callPackage ../development/interpreters/wasm3 { };
-
-  yaegi = callPackage ../development/interpreters/yaegi { };
-
   ### DEVELOPMENT / MISC
 
   inherit (callPackages ../development/misc/h3 { }) h3_3 h3_4;
@@ -16451,20 +7855,10 @@ with pkgs;
     stdenv = stdenvNoLibc;
   };
 
-  avr8burnomat = callPackage ../development/misc/avr8-burn-omat { };
-
-  cppreference-doc = callPackage ../development/misc/cppreference-doc { };
-
   sourceFromHead = callPackage ../build-support/source-from-head-fun.nix { };
 
   jruby = callPackage ../development/interpreters/jruby { };
 
-  jython = callPackage ../development/interpreters/jython { };
-
-  gImageReader = callPackage ../applications/misc/gImageReader { };
-
-  gimme-aws-creds = callPackage ../tools/admin/gimme-aws-creds { };
-
   guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
 
   # Needed for autogen
@@ -16484,8 +7878,6 @@ with pkgs;
     guile = guile_2_2;
   };
 
-  inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { };
-
   msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { };
 
   msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { };
@@ -16499,63 +7891,21 @@ with pkgs;
 
   or1k-newlib = callPackage ../development/misc/or1k/newlib.nix { };
 
-  rappel = callPackage ../development/misc/rappel { };
-
-  protege-distribution = callPackage ../development/web/protege-distribution { };
-
-  publii = callPackage ../development/web/publii {};
-
-  umr = callPackage ../development/misc/umr { };
-
-  refurb = callPackage ../development/tools/refurb { };
-
-  srandrd = callPackage ../tools/X11/srandrd { };
-
-  srecord = callPackage ../development/tools/misc/srecord { };
-
-  srelay = callPackage ../tools/networking/srelay { };
-
-  xidel = callPackage ../tools/text/xidel { };
-
-  asdf-vm = callPackage ../tools/misc/asdf-vm { };
-
   mise = callPackage ../by-name/mi/mise/package.nix {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
   ### DEVELOPMENT / TOOLS
 
-  abi-compliance-checker = callPackage ../development/tools/misc/abi-compliance-checker { };
-
-  abi-dumper = callPackage ../development/tools/misc/abi-dumper { };
-
-  abuild = callPackage ../development/tools/abuild { };
-
   actiona = libsForQt5.callPackage ../applications/misc/actiona { };
 
-  adreaper = callPackage ../tools/security/adreaper { };
-
-  aeron = callPackage ../servers/aeron { };
-
   inherit (callPackage ../development/tools/alloy { })
     alloy5
     alloy6
     alloy;
 
-  altair = callPackage ../development/tools/altair-graphql-client { };
-
-  ameba = callPackage ../development/tools/ameba { };
-
   anybadge = with python3Packages; toPythonApplication anybadge;
 
-  apgdiff = callPackage ../development/tools/database/apgdiff { };
-
-  apkg = callPackage ../tools/package-management/apkg { };
-
-  augeas = callPackage ../tools/system/augeas { };
-
-  autoadb = callPackage ../misc/autoadb { };
-
   ansible = ansible_2_17;
   ansible_2_17 = python3Packages.toPythonApplication python3Packages.ansible-core;
   ansible_2_16 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
@@ -16578,84 +7928,28 @@ with pkgs;
 
   ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { };
 
-  dbus-test-runner = callPackage ../development/tools/dbus-test-runner { };
-
-  doq = callPackage ../development/tools/misc/doq { };
-
-  espup = callPackage ../development/tools/espup { };
-
-  karma-runner = callPackage ../development/tools/karma-runner { };
-
-  teller = callPackage ../development/tools/teller { };
-
   yakut = python3Packages.callPackage ../development/tools/misc/yakut { };
 
   ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS
 
-  ansible-language-server = callPackage ../development/tools/language-servers/ansible-language-server { };
-
-  beancount-language-server = callPackage ../development/tools/language-servers/beancount-language-server { };
-
-  buf-language-server = callPackage ../development/tools/language-servers/buf-language-server { };
-
   ccls = callPackage ../development/tools/language-servers/ccls {
     llvmPackages = llvmPackages_14;
   };
 
-  docker-compose-language-service = callPackage ../development/tools/language-servers/docker-compose-language-service { };
-
-  dockerfile-language-server-nodejs = callPackage ../development/tools/language-servers/dockerfile-language-server-nodejs { };
-
-  dot-language-server = callPackage ../development/tools/language-servers/dot-language-server { };
-
-  emmet-ls = callPackage ../development/tools/language-servers/emmet-ls { };
-
-  emmet-language-server = callPackage ../development/tools/language-servers/emmet-language-server { };
-
   fortls = python3.pkgs.callPackage ../development/tools/language-servers/fortls { };
 
   fortran-language-server = python3.pkgs.callPackage ../development/tools/language-servers/fortran-language-server { };
 
-  glslls = callPackage ../development/tools/language-servers/glslls { };
-
-  helm-ls = callPackage ../development/tools/language-servers/helm-ls { };
-
-  javascript-typescript-langserver = callPackage ../development/tools/language-servers/javascript-typescript-langserver { };
-
-  jsonnet-language-server = callPackage ../development/tools/language-servers/jsonnet-language-server { };
-
-  kotlin-language-server = callPackage ../development/tools/language-servers/kotlin-language-server { };
-
   lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/language-servers/lua-language-server {
     inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation;
     inherit (darwin) ditto;
   };
 
-  metals = callPackage ../development/tools/language-servers/metals { };
-
-  millet = callPackage ../development/tools/language-servers/millet { };
-
-  neocmakelsp = callPackage ../development/tools/language-servers/neocmakelsp { };
-
   inherit (callPackages ../development/tools/language-servers/nixd {
     llvmPackages = llvmPackages_16;
     nix = nixVersions.nix_2_19;
   }) nixf nixt nixd;
 
-  openscad-lsp = callPackage ../development/tools/language-servers/openscad-lsp { };
-
-  perlnavigator = callPackage ../development/tools/language-servers/perlnavigator { };
-
-  postgres-lsp = callPackage ../development/tools/language-servers/postgres-lsp { };
-
-  rune-languageserver = callPackage ../development/tools/language-servers/rune-languageserver { };
-
-  svls = callPackage ../development/tools/language-servers/svls { };
-
-  vala-language-server = callPackage ../development/tools/language-servers/vala-language-server { };
-
-  vscode-langservers-extracted = callPackage ../development/tools/language-servers/vscode-langservers-extracted { };
-
   ansible-later = callPackage ../tools/admin/ansible/later.nix { };
 
   ansible-lint = callPackage ../tools/admin/ansible/lint.nix { };
@@ -16677,7 +7971,6 @@ with pkgs;
 
   antlr = antlr4;
 
-  apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
   ant = apacheAnt;
 
   inherit (callPackages ../servers/apache-kafka { })
@@ -16687,29 +7980,10 @@ with pkgs;
 
   apacheKafka = apacheKafka_3_8;
 
-  apng2gif = callPackage ../tools/graphics/apng2gif { };
-
-  gif2apng = callPackage ../tools/graphics/gif2apng { };
-
-  apngopt = callPackage ../tools/graphics/apngopt { };
-
-  kt = callPackage ../tools/misc/kt { };
-
-  arpa2cm = callPackage ../development/tools/build-managers/arpa2cm { };
-
-  arpa2common = callPackage ../development/libraries/arpa2common { };
-
   asn2quickder = python3Packages.callPackage ../development/tools/asn2quickder { };
 
-  astyle = callPackage ../development/tools/misc/astyle { };
   libastyle = astyle.override { asLibrary = true; };
 
-  automaticcomponenttoolkit = callPackage ../development/tools/misc/automaticcomponenttoolkit { };
-
-  aviator = callPackage ../development/tools/misc/aviator { };
-
-  awf = callPackage ../development/tools/misc/awf { };
-
   aws-adfs = with python3Packages; toPythonApplication aws-adfs;
 
   electron-source = callPackage ../development/tools/electron { };
@@ -16745,18 +8019,12 @@ with pkgs;
   electron-bin = electron_33-bin;
   electron-chromedriver = electron-chromedriver_33;
 
-  autobuild = callPackage ../development/tools/misc/autobuild { };
-
-  autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { };
-
   autoconf = callPackage ../development/tools/misc/autoconf { };
   autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
   autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { };
   autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { };
   autoconf271 = callPackage ../development/tools/misc/autoconf/2.71.nix { };
 
-  autocutsel = callPackage ../tools/X11/autocutsel{ };
-
   automake = automake116x;
 
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { };
@@ -16767,12 +8035,6 @@ with pkgs;
 
   automake117x = callPackage ../development/tools/misc/automake/automake-1.17.x.nix { };
 
-  avrdude = callPackage ../development/embedded/avrdude { };
-
-  b4 = callPackage ../development/tools/b4 { };
-
-  bam = callPackage ../development/tools/build-managers/bam { };
-
   bandit = with python3Packages; toPythonApplication bandit;
 
   bazel = bazel_6;
@@ -16811,29 +8073,16 @@ with pkgs;
     bazel_self = bazel_7;
   };
 
-  bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };
   buildifier = bazel-buildtools;
   buildozer = bazel-buildtools;
   unused_deps = bazel-buildtools;
 
-  bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { };
-
-  bazel-watcher = callPackage ../development/tools/bazel-watcher { };
-
-  bazel-gazelle = callPackage ../development/tools/bazel-gazelle { };
-
-  bazel-kazel = callPackage ../development/tools/bazel-kazel { };
-
-  bazelisk = callPackage ../development/tools/bazelisk { };
-
   rebazel = callPackage ../development/tools/rebazel {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
   buildBazelPackage = darwin.apple_sdk_11_0.callPackage ../build-support/build-bazel-package { };
 
-  bingrep = callPackage ../development/tools/analysis/bingrep { };
-
   binutils-unwrapped = callPackage ../development/tools/misc/binutils {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     # FHS sys dirs presumably only have stuff for the build platform
@@ -16913,28 +8162,16 @@ with pkgs;
     wrapGas = true;
   };
 
-  bison = callPackage ../development/tools/parsing/bison { };
-
-  bisoncpp = callPackage ../development/tools/parsing/bisonc++ { };
-
   black = with python3Packages; toPythonApplication black;
 
   blackfire = callPackage ../development/tools/misc/blackfire { };
 
   black-macchiato = with python3Packages; toPythonApplication black-macchiato;
 
-  blackmagic = callPackage ../development/embedded/blackmagic { };
-
-  bloomrpc = callPackage ../development/web/bloomrpc { };
-
-  bloop = callPackage ../development/tools/build-managers/bloop { };
-
   bossa = callPackage ../development/embedded/bossa { };
 
   bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { };
 
-  bob = callPackage ../development/tools/build-managers/bob { };
-
   buck = callPackage ../development/tools/build-managers/buck {
     python3 = python311;
   };
@@ -16952,9 +8189,6 @@ with pkgs;
     inherit (darwin) DarwinTools;
   };
 
-  libbpkg = callPackage ../development/libraries/libbpkg { };
-  libodb = callPackage ../development/libraries/libodb { };
-  libodb-sqlite = callPackage ../development/libraries/libodb-sqlite { };
   bdep = callPackage ../development/tools/build-managers/build2/bdep.nix { };
 
   bore-cli = callPackage ../tools/networking/bore-cli/default.nix {
@@ -16963,37 +8197,17 @@ with pkgs;
 
   bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { };
 
-  buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { };
-
-  buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { };
-
   buildkite-test-collector-rust  = callPackage ../development/tools/continuous-integration/buildkite-test-collector-rust {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  bump = callPackage ../development/tools/github/bump { };
-
   libbpf = callPackage ../os-specific/linux/libbpf { };
   libbpf_0 = callPackage ../os-specific/linux/libbpf/0.x.nix { };
 
   bundlewrap = with python3.pkgs; toPythonApplication bundlewrap;
 
-  bpftools = callPackage ../os-specific/linux/bpftools { };
-
-  bpm-tools = callPackage ../tools/audio/bpm-tools { };
-
   cadre = callPackage ../development/tools/cadre { };
 
-  carto = callPackage ../development/tools/carto { };
-
-  catnip = callPackage ../tools/audio/catnip { };
-
-  catnip-gtk4 = callPackage ../tools/audio/catnip-gtk4 { };
-
-  cbrowser = callPackage ../development/tools/misc/cbrowser { };
-
-  cc-tool = callPackage ../development/embedded/cc-tool { };
-
   # Wrapper that works as gcc or g++
   # It can be used by setting in nixpkgs config like this, for example:
   #    replaceStdenv = { pkgs }: pkgs.ccacheStdenv;
@@ -17034,78 +8248,26 @@ with pkgs;
       inherit stdenv;
     });
 
-  cccc = callPackage ../development/tools/analysis/cccc { };
-
-  cgdb = callPackage ../development/tools/misc/cgdb { };
-
-  cheat = callPackage ../applications/misc/cheat { };
-
   matter-compiler = callPackage ../development/compilers/matter-compiler { };
 
-  cfr = callPackage ../development/tools/java/cfr { };
-
-  cfripper = callPackage ../tools/security/cfripper { };
-
-  checkra1n = callPackage ../development/mobile/checkra1n { };
-
-  checkstyle = callPackage ../development/tools/analysis/checkstyle { };
-
   chromedriver = callPackage ../development/tools/selenium/chromedriver { };
 
-  chromium-xorg-conf = callPackage ../os-specific/linux/chromium-xorg-conf { };
-
-  chrpath = callPackage ../development/tools/misc/chrpath { };
-
   chruby = callPackage ../development/tools/misc/chruby { rubies = null; };
 
-  chruby-fish = callPackage ../development/tools/misc/chruby-fish { };
-
-  cl-launch = callPackage ../development/tools/misc/cl-launch { };
-
-  cloud-nuke = callPackage ../development/tools/cloud-nuke { };
-
   cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { };
 
-  cloudlog = callPackage ../applications/radio/cloudlog { };
-
-  cloudflare-warp = callPackage ../tools/networking/cloudflare-warp { };
-
-  cloudfoundry-cli = callPackage ../applications/networking/cluster/cloudfoundry-cli { };
-
-  coan = callPackage ../development/tools/analysis/coan { };
-
   coder = callPackage ../development/tools/coder { };
 
-  compile-daemon = callPackage ../development/tools/compile-daemon { };
-
-  complexity = callPackage ../development/tools/misc/complexity { };
-
-  complgen = callPackage ../development/tools/misc/complgen { };
-
-  conan = callPackage ../development/tools/build-managers/conan { };
-
   cookiecutter = with python3Packages; toPythonApplication cookiecutter;
 
-  cordova = callPackage ../development/mobile/cordova { };
-
-  corrosion = callPackage ../development/tools/build-managers/corrosion { };
-
   corundum = callPackage ../development/tools/corundum { };
 
-  confluencepot = callPackage ../servers/confluencepot { };
-
-  confluent-platform = callPackage ../servers/confluent-platform { };
-
   ctags = callPackage ../development/tools/misc/ctags { };
 
   ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix { };
 
-  ctodo = callPackage ../applications/misc/ctodo { };
-
   cubiomes-viewer = libsForQt5.callPackage ../applications/misc/cubiomes-viewer { };
 
-  ctmg = callPackage ../tools/security/ctmg { };
-
   # can't use override - it triggers infinite recursion
   cmakeMinimal = callPackage ../by-name/cm/cmake/package.nix {
     isMinimalBuild = true;
@@ -17132,39 +8294,21 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  cpptest = callPackage ../development/libraries/cpptest { };
-
-  cppi = callPackage ../development/tools/misc/cppi { };
-
-  cproto = callPackage ../development/tools/misc/cproto { };
-
-  cflow = callPackage ../development/tools/misc/cflow { };
-
-  cov-build = callPackage ../development/tools/analysis/cov-build { };
-
   credstash = with python3Packages; toPythonApplication credstash;
 
   creduce = callPackage ../development/tools/misc/creduce {
     inherit (llvmPackages_16) llvm libclang;
   };
 
-  cscope = callPackage ../development/tools/misc/cscope { };
-
-  csmith = callPackage ../development/tools/misc/csmith { };
-
   inherit (nodePackages) csslint;
 
   css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify;
 
-  cvehound = callPackage ../development/tools/analysis/cvehound { };
-
   cvise = python3Packages.callPackage ../development/tools/misc/cvise {
     # cvise keeps up with fresh llvm releases and supports wide version range
     inherit (llvmPackages_14) llvm libclang;
   };
 
-  cwltool = callPackage ../applications/science/misc/cwltool { };
-
   dbt = with python3Packages; toPythonApplication dbt-core;
 
   dprint = callPackage ../development/tools/dprint {
@@ -17191,36 +8335,6 @@ with pkgs;
     python = python3;
   };
 
-  libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };
-
-  sqlcl = callPackage ../development/tools/database/sqlcl { };
-
-  sigrok-firmware-fx2lafw = callPackage ../development/tools/sigrok-firmware-fx2lafw { };
-
-  datree = callPackage ../development/tools/datree { };
-
-  detekt = callPackage ../development/tools/detekt { };
-
-  dcadec = callPackage ../development/tools/dcadec { };
-
-  dejagnu = callPackage ../development/tools/misc/dejagnu { };
-
-  devd = callPackage ../development/tools/devd { };
-
-  devtodo = callPackage ../development/tools/devtodo { };
-
-  d-spy = callPackage ../development/tools/misc/d-spy { };
-
-  dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { };
-
-  dfu-util = callPackage ../development/tools/misc/dfu-util { };
-
-  ddd = callPackage ../development/tools/misc/ddd { };
-
-  lattice-diamond = callPackage ../development/embedded/fpga/lattice-diamond { };
-
-  direvent = callPackage ../development/tools/misc/direvent { };
-
   distcc = callPackage ../development/tools/misc/distcc {
     libiberty_static = libiberty.override { staticBuild = true; };
   };
@@ -17249,20 +8363,10 @@ with pkgs;
       binutils = binutils;
     };
 
-  dive = callPackage ../development/tools/dive { };
-
-  dioxus-cli = callPackage ../development/tools/rust/dioxus-cli { };
-
-  doclifter = callPackage ../development/tools/misc/doclifter { };
-
   docutils = with python3Packages; toPythonApplication docutils;
 
-  doctl = callPackage ../development/tools/doctl { };
-
   doit = with python3Packages; toPythonApplication doit;
 
-  dolt = callPackage ../servers/sql/dolt { };
-
   dot2tex = with python3.pkgs; toPythonApplication dot2tex;
 
   doxygen = darwin.apple_sdk_11_0.callPackage ../development/tools/documentation/doxygen {
@@ -17274,129 +8378,39 @@ with pkgs;
 
   drake = callPackage ../development/tools/build-managers/drake { };
 
-  drip = callPackage ../development/tools/drip { };
-
-  drm_info = callPackage ../development/tools/drm_info { };
-
   dura = callPackage ../development/tools/misc/dura {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  dwz = callPackage ../development/tools/misc/dwz { };
-
-  easypdkprog = callPackage ../development/embedded/easypdkprog { };
-
-  editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { };
-
-  editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { };
-
   edb = libsForQt5.callPackage ../development/tools/misc/edb { };
 
-  eggdbus = callPackage ../development/tools/misc/eggdbus { };
-
-  effitask = callPackage ../applications/misc/effitask { };
-
-  efm-langserver = callPackage ../development/tools/efm-langserver { };
-
-  egypt = callPackage ../development/tools/analysis/egypt { };
-
-  electron-fiddle = callPackage ../development/tools/electron-fiddle { };
-
   elf2uf2-rs = darwin.apple_sdk_11_0.callPackage ../development/embedded/elf2uf2-rs {
     inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation DiskArbitration Foundation;
   };
 
-  elfinfo = callPackage ../development/tools/misc/elfinfo { };
-
-  elfkickers = callPackage ../development/tools/misc/elfkickers { };
-
-  elfutils = callPackage ../development/tools/misc/elfutils { };
-
-  eliot-tree = callPackage ../development/tools/eliot-tree { };
-
-  emma = callPackage ../development/tools/analysis/emma { };
-
-  ent-go = callPackage ../development/tools/ent { };
-
-  epm = callPackage ../development/tools/misc/epm { };
-
-  eresi = callPackage ../development/tools/analysis/eresi { };
-
-  evmdis = callPackage ../development/tools/analysis/evmdis { };
-
-  explain = callPackage ../development/tools/explain { };
-
-  ezno = callPackage ../development/tools/misc/ezno { };
-
-  func = callPackage ../applications/networking/cluster/func { };
-
   license_finder = callPackage ../development/tools/license_finder { };
 
-  license-scanner = callPackage ../development/tools/license-scanner { };
-
   # NOTE: Override and set useIcon = false to use Awk instead of Icon.
-  noweb = callPackage ../development/tools/literate-programming/noweb { };
-
-  eztrace = callPackage ../development/tools/profiling/EZTrace { };
-
-  faas-cli = callPackage ../development/tools/faas-cli { };
-
-  fastddsgen = callPackage ../development/tools/fastddsgen { };
-
-  fastgron = callPackage ../development/tools/fastgron { };
-
-  fatcat = callPackage ../development/tools/fatcat { };
-
-  findbugs = callPackage ../development/tools/analysis/findbugs { };
-
-  findnewest = callPackage ../development/tools/misc/findnewest { };
-
-  flootty = callPackage ../development/tools/flootty { };
-
   fffuu = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { });
 
-  ffuf = callPackage ../tools/security/ffuf { };
-
   flow = callPackage ../development/tools/analysis/flow {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  fly = callPackage ../development/tools/continuous-integration/fly { };
-
-  fprettify = callPackage ../development/tools/fprettify { };
-
-  framac = callPackage ../development/tools/analysis/frama-c { };
-
-  frame = callPackage ../development/libraries/frame { };
-
-  framesh = callPackage ../applications/blockchains/framesh { };
-
-  frp = callPackage ../tools/networking/frp { };
-
-  fsatrace = callPackage ../development/tools/misc/fsatrace { };
-
   fswatch = callPackage ../development/tools/misc/fswatch {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  fsearch = callPackage ../tools/misc/fsearch { };
-
   fujprog = callPackage ../development/embedded/fpga/fujprog {
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  fundoc = callPackage ../development/tools/fundoc { };
-
-  funzzy = callPackage ../development/tools/misc/funzzy { };
-
   gede = libsForQt5.callPackage ../development/tools/misc/gede { };
 
   gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { };
 
-  pifpaf = callPackage ../development/tools/pifpaf { };
-
   pmd = callPackage ../development/tools/analysis/pmd {
     openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
@@ -17408,66 +8422,9 @@ with pkgs;
   flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
   flex = callPackage ../development/tools/parsing/flex { };
 
-  re-flex = callPackage ../development/tools/parsing/re-flex { };
-
-  flexibee = callPackage ../applications/office/flexibee { };
-
-  flexcpp = callPackage ../development/tools/parsing/flexc++ { };
-
-  gi-docgen = callPackage ../development/tools/documentation/gi-docgen { };
-
-  git2-cpp = callPackage ../development/libraries/git2-cpp { };
-
-  github-release = callPackage ../development/tools/github/github-release { };
-
-  global = callPackage ../development/tools/misc/global { };
-
-  gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils { };
-
-  gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing { };
-
-  gnome-tecla = callPackage ../applications/misc/gnome-tecla { };
-
-  gnome-usage = callPackage ../applications/misc/gnome-usage { };
-
-  gnome-inform7 = callPackage ../applications/editors/gnome-inform7 { };
-
-  gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { };
-
-  gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer { };
-
-  gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { };
-
-  gnome-video-effects = callPackage ../development/libraries/gnome-video-effects { };
-
-  gnum4 = callPackage ../development/tools/misc/gnum4 { };
   m4 = gnum4;
 
-  om4 = callPackage ../development/tools/misc/om4 { };
-
   gnumake = callPackage ../development/tools/build-managers/gnumake { };
-  gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { };
-
-  go-licenses = callPackage ../development/tools/misc/go-licenses  { };
-
-  gob2 = callPackage ../development/tools/misc/gob2 { };
-
-  gocd-agent = callPackage ../development/tools/continuous-integration/gocd-agent { };
-
-  gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { };
-
-  gopatch = callPackage ../development/tools/misc/gopatch { };
-
-  gotify-server = callPackage ../servers/gotify { };
-
-  gotty = callPackage ../servers/gotty { };
-
-  gputils = callPackage ../development/embedded/gputils { };
-
-  gpuvis = callPackage ../development/tools/misc/gpuvis { };
-
-  gqlint = callPackage ../development/tools/gqlint { };
-
   gradle-packages = import ../development/tools/build-managers/gradle {
     inherit jdk11 jdk17 jdk21;
   };
@@ -17486,24 +8443,8 @@ with pkgs;
   # 3.1 changed some parameters from int to size_t, leading to mismatches.
   gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { };
 
-  grail = callPackage ../development/libraries/grail { };
-
-  graphene = callPackage ../development/libraries/graphene { };
-
   griffe = with python3Packages; toPythonApplication griffe;
 
-  gtk-doc = callPackage ../development/tools/documentation/gtk-doc { };
-
-  gtkdialog = callPackage ../development/tools/misc/gtkdialog { };
-
-  crowdin-cli = callPackage ../tools/text/crowdin-cli { };
-
-  gtranslator = callPackage ../tools/text/gtranslator { };
-
-  gtree = callPackage ../tools/text/gtree { };
-
-  guff = callPackage ../tools/graphics/guff { };
-
   gwrap = g-wrap;
   g-wrap = callPackage ../by-name/g-/g-wrap/package.nix {
     guile = guile_2_2;
@@ -17514,68 +8455,22 @@ with pkgs;
     (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
     haskellPackages.hadolint;
 
-  halfempty = callPackage ../development/tools/halfempty { };
-
-  hcloud = callPackage ../development/tools/hcloud { };
-
-  help2man = callPackage ../development/tools/misc/help2man { };
-
-  heroku = callPackage ../development/tools/heroku { };
-
-  highlight-assertions = callPackage ../development/tools/misc/highlight-assertions { };
-
-  confluent-cli = callPackage ../development/tools/confluent-cli { };
-
-  html-minifier = callPackage ../development/tools/html-minifier { };
-
-  htmlhint = callPackage ../development/tools/htmlhint { };
-
-  htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { };
-
-  hyenae = callPackage ../tools/networking/hyenae { };
-
   iaca_2_1 = callPackage ../development/tools/iaca/2.1.nix { };
   iaca_3_0 = callPackage ../development/tools/iaca/3.0.nix { };
   iaca = iaca_3_0;
 
-  icestorm = callPackage ../development/embedded/fpga/icestorm { };
-
-  icmake = callPackage ../development/tools/build-managers/icmake { };
-
-  iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils { };
-
   ikos = callPackage ../development/tools/analysis/ikos {
     inherit (llvmPackages_14) stdenv clang llvm;
     tbb = tbb_2021_11;
   };
 
-  img = callPackage ../development/tools/img { };
-
   include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use {
     llvmPackages = llvmPackages_18;
   };
 
-  indent = callPackage ../development/tools/misc/indent { };
-
-  inotify-tools = callPackage ../development/tools/misc/inotify-tools { };
-
   inherit (callPackage ../applications/misc/inochi2d { })
     inochi-creator inochi-session;
 
-  intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { };
-
-  insomnia = callPackage ../development/web/insomnia { };
-
-  ihp-new = callPackage ../development/web/ihp-new { };
-
-  iozone = callPackage ../development/tools/misc/iozone { };
-
-  itstool = callPackage ../development/tools/misc/itstool { };
-
-  jacoco = callPackage ../development/tools/analysis/jacoco { };
-
-  jake = callPackage ../development/tools/jake { };
-
   javacc = callPackage ../development/tools/parsing/javacc {
     # Upstream doesn't support anything newer than Java 8.
     # https://github.com/javacc/javacc/blob/c708628423b71ce8bc3b70143fa5b6a2b7362b3a/README.md#building-javacc-from-source
@@ -17583,82 +8478,10 @@ with pkgs;
     jre = jre8;
   };
 
-  jbake = callPackage ../development/tools/jbake { };
-
-  jbang = callPackage ../development/tools/jbang { };
-
-  jikespg = callPackage ../development/tools/parsing/jikespg { };
-
-  jenkins = callPackage ../development/tools/continuous-integration/jenkins { };
-
   jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder;
 
-  jpexs = callPackage ../development/tools/jpexs { };
-
-  k0sctl = callPackage ../applications/networking/cluster/k0sctl { };
-
-  k2tf = callPackage ../development/tools/misc/k2tf { };
-
-  kafka-delta-ingest = callPackage ../development/tools/kafka-delta-ingest { };
-
-  kamid = callPackage ../servers/ftp/kamid { };
-
-  karate = callPackage ../development/tools/karate { };
-
-  kati = callPackage ../development/tools/build-managers/kati { };
-
-  kafkactl = callPackage ../development/tools/kafkactl { };
-
-  kcat = callPackage ../development/tools/kcat { };
-
   kcc = libsForQt5.callPackage ../applications/graphics/kcc { };
 
-  kcgi = callPackage ../development/web/kcgi { };
-
-  kcov = callPackage ../development/tools/analysis/kcov { };
-
-  kind = callPackage ../development/tools/kind { };
-
-  khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader {  };
-
-  ko = callPackage ../development/tools/ko { };
-
-  konstraint = callPackage ../development/tools/konstraint { };
-
-  krankerl = callPackage ../development/tools/krankerl { };
-
-  krew = callPackage ../development/tools/krew { };
-
-  kube-bench = callPackage ../tools/security/kube-bench { };
-
-  kube-hunter = callPackage ../tools/security/kube-hunter { };
-
-  kubeaudit = callPackage ../tools/security/kubeaudit { };
-
-  kubectx = callPackage ../development/tools/kubectx { };
-
-  kube-linter = callPackage ../development/tools/kube-linter { };
-
-  kube-prompt = callPackage ../development/tools/kube-prompt { };
-
-  kubeclarity = callPackage ../tools/security/kubeclarity { };
-
-  kubemq-community = callPackage ../servers/kubemq-community { };
-
-  kubeone = callPackage ../applications/networking/cluster/kubeone { };
-
-  kubeprompt = callPackage ../development/tools/kubeprompt { };
-
-  kubernetes-polaris = callPackage ../tools/security/kubernetes-polaris { };
-
-  kubescape = callPackage ../tools/security/kubescape { };
-
-  kubesec = callPackage ../tools/security/kubesec { };
-
-  kubespy = callPackage ../applications/networking/cluster/kubespy { };
-
-  kubeswitch = callPackage ../development/tools/kubeswitch { };
-
   kubie = callPackage ../development/tools/kubie {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -17671,26 +8494,12 @@ with pkgs;
 
   kustomize-sops = callPackage ../development/tools/kustomize/kustomize-sops.nix { };
 
-  ktlint = callPackage ../development/tools/ktlint { };
-
-  kythe = callPackage ../development/tools/kythe { };
-
-  laminar = callPackage ../development/tools/continuous-integration/laminar { };
-
-  lcov = callPackage ../development/tools/analysis/lcov { };
-
-  lemon = callPackage ../development/tools/parsing/lemon { };
-
   libtool = libtool_2;
 
   libtool_1_5 = callPackage ../development/tools/misc/libtool { };
 
   libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
 
-  libwhich = callPackage ../development/tools/misc/libwhich { };
-
-  libwtk-sdl2 = callPackage ../development/libraries/libwtk-sdl2 { };
-
   linuxkit = callPackage ../development/tools/misc/linuxkit {
     inherit (darwin.apple_sdk_11_0.frameworks) Cocoa Virtualization;
     inherit (darwin) sigtool;
@@ -17702,82 +8511,36 @@ with pkgs;
 
   lit = with python3Packages; toPythonApplication lit;
 
-  litecli = callPackage ../development/tools/database/litecli { };
-
-  litefs = callPackage ../development/tools/database/litefs { };
-
-  litestream = callPackage ../development/tools/database/litestream { };
-
-  ls-lint = callPackage ../development/tools/ls-lint { };
-
-  lsof = callPackage ../development/tools/misc/lsof { };
-
-  ltrace = callPackage ../development/tools/misc/ltrace { };
-
-  lttng-tools = callPackage ../development/tools/misc/lttng-tools { };
-
   lttng-ust = callPackage ../development/tools/misc/lttng-ust { };
 
   lttng-ust_2_12 = callPackage ../development/tools/misc/lttng-ust/2.12.nix { };
 
-  lttv = callPackage ../development/tools/misc/lttv { };
-
-  lurk = callPackage ../development/tools/lurk { };
-
-  maizzle = callPackage ../development/tools/maizzle { };
-
-  malt = callPackage ../development/tools/profiling/malt { };
-
   marksman = callPackage ../development/tools/marksman { };
 
   massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { };
 
-  mastodon-archive = callPackage ../tools/backup/mastodon-archive { };
-
-  math-preview = callPackage ../tools/text/math-review { };
-
   maven3 = maven;
   inherit (maven) buildMaven;
 
   mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { };
 
-  go-md2man = callPackage ../development/tools/misc/go-md2man { };
-
-  mage = callPackage ../development/tools/build-managers/mage { };
-
-  mbed-cli = callPackage ../development/tools/mbed-cli { };
-
   mdl = callPackage ../development/tools/misc/mdl { };
 
   meraki-cli = python3Packages.callPackage ../tools/admin/meraki-cli { };
 
-  mermerd = callPackage ../development/tools/database/mermerd { };
-
   python-matter-server = with python3Packages; toPythonApplication (
     python-matter-server.overridePythonAttrs (oldAttrs: {
       dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.server;
     })
   );
 
-  minify = callPackage ../development/web/minify { };
-
   minizinc = callPackage ../development/tools/minizinc { };
   minizincide = qt6Packages.callPackage ../development/tools/minizinc/ide.nix {
     inherit (darwin.apple_sdk_11_0.frameworks) Cocoa;
   };
 
-  mkcert = callPackage ../development/tools/misc/mkcert { };
-
   mkdocs = with python3Packages; toPythonApplication mkdocs;
 
-  mmtf-cpp = callPackage ../development/libraries/science/chemistry/mmtf-cpp { };
-
-  mockgen = callPackage ../development/tools/mockgen { };
-
-  mockoon = callPackage ../tools/networking/mockoon { };
-
-  modd = callPackage ../development/tools/modd { };
-
   mold = callPackage ../by-name/mo/mold/package.nix {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
     tbb = tbb_2021_11;
@@ -17795,60 +8558,30 @@ with pkgs;
 
   mopsa = ocamlPackages.mopsa.bin;
 
-  msgpack-tools = callPackage ../development/tools/msgpack-tools { };
-
-  msgpuck = callPackage ../development/libraries/msgpuck { };
-
-  msitools = callPackage ../development/tools/misc/msitools { };
-
   haskell-ci =
     # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
     (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
       haskellPackages.haskell-ci;
 
-  nailgun = callPackage ../development/tools/nailgun { };
-
-  nap = callPackage ../development/tools/nap { };
-
-  nex = callPackage ../development/tools/parsing/nex { };
-
   nimbo = with python3Packages; callPackage ../applications/misc/nimbo { };
 
-  gn = callPackage ../development/tools/build-managers/gn { };
-
   nixbang = callPackage ../development/tools/misc/nixbang {
     pythonPackages = python3Packages;
   };
 
-  nix-bisect = callPackage ../development/tools/misc/nix-bisect { };
-
-  nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { };
-
   nexusmods-app-unfree = nexusmods-app.override {
     pname = "nexusmods-app-unfree";
     _7zz = _7zz-rar;
   };
 
-  nmrpflash = callPackage ../development/embedded/nmrpflash { };
-
-  norminette = callPackage ../development/tools/norminette { };
-
   nwjs = callPackage ../development/tools/nwjs { };
 
   nwjs-sdk = callPackage ../development/tools/nwjs {
     sdk = true;
   };
 
-  nrf5-sdk = callPackage ../development/libraries/nrf5-sdk { };
-
   obelisk = callPackage ../development/tools/ocaml/obelisk { menhir = ocamlPackages.menhir; };
 
-  obuild = callPackage ../development/tools/ocaml/obuild { };
-
-  omake = callPackage ../development/tools/ocaml/omake { };
-
-  omniorb = callPackage ../development/tools/omniorb { };
-
   openai = with python3Packages; toPythonApplication openai;
 
   openai-whisper = with python3.pkgs; toPythonApplication openai-whisper;
@@ -17857,10 +8590,6 @@ with pkgs;
     inherit (darwin.apple_sdk_11_0.frameworks) Accelerate CoreGraphics CoreML CoreVideo MetalKit;
   };
 
-  opengrok = callPackage ../development/tools/misc/opengrok { };
-
-  openocd = callPackage ../development/embedded/openocd { };
-
   openocd-rp2040 = openocd.overrideAttrs (old: {
     pname = "openocd-rp2040";
     src = fetchFromGitHub {
@@ -17881,38 +8610,16 @@ with pkgs;
     libiberty_static = libiberty.override { staticBuild = true; };
   };
 
-  package-project-cmake = callPackage ../development/tools/package-project-cmake { };
-
   pactorio = callPackage ../development/tools/pactorio {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  panopticon = callPackage ../development/tools/analysis/panopticon { };
-
-  parinfer-rust = callPackage ../development/tools/parinfer-rust { };
-
-  parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };
-
   patchelf = callPackage ../development/tools/misc/patchelf { };
 
   patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { });
 
-  patsh = callPackage ../development/tools/misc/patsh { };
-
-  pax-rs = callPackage ../development/tools/pax-rs { };
-
-  perfect-hash = callPackage ../development/tools/misc/perfect-hash { };
-
-  peg = callPackage ../development/tools/parsing/peg { };
-
   pgcli = with pkgs.python3Packages; toPythonApplication pgcli;
 
-  picotool = callPackage ../development/tools/picotool { };
-
-  planus = callPackage ../development/tools/misc/planus { };
-
-  pmccabe = callPackage ../development/tools/misc/pmccabe { };
-
   pkgconf-unwrapped = libpkgconf;
 
   pkgconf = callPackage ../build-support/pkg-config-wrapper {
@@ -17920,7 +8627,6 @@ with pkgs;
     baseBinName = "pkgconf";
   };
 
-  pkg-config-unwrapped = callPackage ../development/tools/misc/pkg-config { };
   pkg-config = callPackage ../build-support/pkg-config-wrapper {
     pkg-config = pkg-config-unwrapped;
   };
@@ -17939,18 +8645,8 @@ with pkgs;
 
   inherit (nodePackages) postcss-cli;
 
-  postiats-utilities = callPackage ../development/tools/postiats-utilities { };
-
-  postman = callPackage ../development/web/postman { };
-
-  pprof = callPackage ../development/tools/profiling/pprof { };
-
-  pqrs = callPackage ../development/tools/pqrs { };
-
   pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree;
 
-  prelink = callPackage ../development/tools/misc/prelink { };
-
   premake3 = callPackage ../development/tools/misc/premake/3.nix { };
 
   premake4 = callPackage ../development/tools/misc/premake { };
@@ -17961,30 +8657,12 @@ with pkgs;
 
   premake = premake4;
 
-  process-compose = callPackage ../applications/misc/process-compose { };
-
-  process-viewer = callPackage ../applications/misc/process-viewer { };
-
   procodile = callPackage ../tools/system/procodile { };
 
-  protox = callPackage ../development/tools/misc/protox { };
-
-  proxmove = callPackage ../tools/admin/proxmove { };
-
   pry = callPackage ../development/tools/pry { };
 
-  pup = callPackage ../development/tools/pup { };
-
-  puppeteer-cli = callPackage ../tools/graphics/puppeteer-cli { };
-
-  pyrseas = callPackage ../development/tools/database/pyrseas { };
-
   pycritty = with python3Packages; toPythonApplication pycritty;
 
-  pylint-exit = callPackage ../development/tools/pylint-exit { };
-
-  qc = callPackage ../development/tools/qc { };
-
   qtcreator = qt6Packages.callPackage ../development/tools/qtcreator {
     inherit (linuxPackages) perf;
     stdenv = llvmPackages.stdenv;
@@ -17996,10 +8674,6 @@ with pkgs;
     lua = lua5;
   } // (config.radare or {}));
 
-  ran = callPackage ../servers/http/ran { };
-
-  retry = callPackage ../tools/system/retry { };
-
   rizin = pkgs.callPackage ../development/tools/analysis/rizin { };
 
   rizinPlugins = recurseIntoAttrs rizin.plugins;
@@ -18010,74 +8684,25 @@ with pkgs;
 
   ragel = ragelStable;
 
-  randoop = callPackage ../development/tools/analysis/randoop { };
-
   inherit (callPackages ../development/tools/parsing/ragel { }) ragelStable ragelDev;
 
-  hammer = callPackage ../development/tools/parsing/hammer { };
-
-  rcodesign = callPackage ../development/tools/rcodesign { };
-
-  rdocker = callPackage ../development/tools/rdocker { };
-
-  react-static = callPackage ../development/tools/react-static { };
-
   redis-dump = callPackage ../development/tools/redis-dump { };
 
-  redis-plus-plus = callPackage ../development/libraries/redis-plus-plus { };
-
-  redisinsight = callPackage ../development/tools/redisinsight { };
-
-  redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { };
-
-  redo-c = callPackage ../development/tools/build-managers/redo-c { };
-
-  redo-sh = callPackage ../development/tools/build-managers/redo-sh { };
-
-  regclient = callPackage ../development/tools/regclient { };
   inherit (regclient) regbot regctl regsync;
 
-  regex-cli = callPackage ../development/tools/misc/regex-cli { };
-
   reno = callPackage ../development/tools/reno {
     python3Packages = python311Packages;
   };
 
-  re2c = callPackage ../development/tools/parsing/re2c { };
-
-  remake = callPackage ../development/tools/build-managers/remake { };
-
   replace-secret = callPackage ../build-support/replace-secret/replace-secret.nix { };
 
-  replacement = callPackage ../development/tools/misc/replacement { };
-
   inherit (callPackage ../development/tools/replay-io { })
     replay-io replay-node-cli;
 
-  requestly = callPackage ../tools/networking/requestly { };
-
-  reshape = callPackage ../development/tools/reshape { } ;
-
-  retdec = callPackage ../development/tools/analysis/retdec { };
-
-  reviewdog = callPackage ../development/tools/misc/reviewdog { };
-
-  revive = callPackage ../development/tools/revive { };
-
-  riff = callPackage ../development/tools/misc/riff { };
-
-  rman = callPackage ../development/tools/misc/rman { };
-
   rnginline = with python3Packages; toPythonApplication rnginline;
 
-  rolespec = callPackage ../development/tools/misc/rolespec { };
-
   rr = callPackage ../development/tools/analysis/rr { };
 
-  rsass = callPackage ../development/tools/misc/rsass { };
-
-  rsonpath = callPackage ../development/tools/misc/rsonpath { };
-
   rufo = callPackage ../development/tools/rufo { };
 
   muonStandalone = muon.override {
@@ -18085,50 +8710,22 @@ with pkgs;
     buildDocs = false;
   };
 
-  saleae-logic = callPackage ../development/tools/misc/saleae-logic { };
-
-  saleae-logic-2 = callPackage ../development/tools/misc/saleae-logic-2 { };
-
-  samply = callPackage ../development/tools/misc/samply { };
-
   sauce-connect = callPackage ../development/tools/sauce-connect { };
 
-  sawjap = callPackage ../development/tools/java/sawjap { };
-
   sbomnix = python3.pkgs.callPackage ../tools/security/sbomnix { };
 
-  sd-local = callPackage ../development/tools/sd-local { };
-
   seer = libsForQt5.callPackage ../development/tools/misc/seer { };
 
-  selenium-server-standalone = callPackage ../development/tools/selenium/server { };
-
-  selendroid = callPackage ../development/tools/selenium/selendroid { };
-
-  sem = callPackage ../development/tools/sem { };
-
-  semver-tool = callPackage ../development/tools/misc/semver-tool { };
-
   semantik = libsForQt5.callPackage ../applications/office/semantik { };
 
-  sca2d = callPackage ../development/tools/sca2d {  };
-
-  mill = callPackage ../development/tools/build-managers/mill { };
-
   sbt = callPackage ../development/tools/build-managers/sbt { };
   sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { };
   simpleBuildTool = sbt;
 
-  sbt-extras = callPackage ../development/tools/build-managers/sbt-extras { };
-
   scala-cli = callPackage ../development/tools/build-managers/scala-cli { };
 
   scss-lint = callPackage ../development/tools/scss-lint { };
 
-  segger-ozone = callPackage ../development/tools/misc/segger-ozone { };
-
-  selene = callPackage ../development/tools/selene { };
-
   shadowenv = callPackage ../tools/misc/shadowenv {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -18138,8 +8735,6 @@ with pkgs;
     (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
     haskellPackages.shake;
 
-  shallot = callPackage ../tools/misc/shallot { };
-
   inherit (callPackage ../development/tools/build-managers/shards { })
     shards_0_17
     shards;
@@ -18154,34 +8749,12 @@ with pkgs;
   # pandoc takes long to build and documentation isn't needed for just running the cli
   shellcheck-minimal = haskell.lib.compose.justStaticExecutables shellcheck.unwrapped;
 
-  shellharden = callPackage ../development/tools/shellharden { };
-
-  scenebuilder = callPackage ../development/tools/scenebuilder { };
-
-  scenic-view = callPackage ../development/tools/scenic-view { };
-
-  shncpd = callPackage ../tools/networking/shncpd { };
-
-  sigrok-cli = callPackage ../development/tools/sigrok-cli { };
-
-  simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { };
-
-  slimerjs = callPackage ../development/tools/slimerjs { };
-
   slint-lsp = callPackage ../by-name/sl/slint-lsp/package.nix {
     inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
   };
 
-  sloccount = callPackage ../development/tools/misc/sloccount { };
-
   sloc = nodePackages.sloc;
 
-  smc = callPackage ../tools/misc/smc { };
-
-  snore = callPackage ../tools/misc/snore { };
-
-  snzip = callPackage ../tools/archivers/snzip { };
-
   snowman = qt5.callPackage ../development/tools/analysis/snowman { };
 
   sparse = callPackage ../development/tools/analysis/sparse {
@@ -18190,13 +8763,6 @@ with pkgs;
 
   speedtest-cli = with python3Packages; toPythonApplication speedtest-cli;
 
-  spicy-parser-generator = callPackage ../development/tools/parsing/spicy { };
-
-  spin = callPackage ../development/tools/analysis/spin { };
-
-  spirv-headers = callPackage ../development/libraries/spirv-headers { };
-  spirv-tools = callPackage ../development/tools/spirv-tools { };
-
   splint = callPackage ../development/tools/analysis/splint {
     flex = flex_2_5_35;
   };
@@ -18210,113 +8776,32 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  spooles = callPackage ../development/libraries/science/math/spooles { };
-
   spr = callPackage ../development/tools/spr {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  spruce = callPackage ../development/tools/misc/spruce { };
-
-  sqlboiler-crdb = callPackage ../development/tools/database/sqlboiler-crdb { };
-
-  sqlcheck = callPackage ../development/tools/database/sqlcheck { };
-
-  sqlcmd = callPackage ../development/tools/database/sqlcmd { };
-
   sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };
 
   sqlite-utils = with python3Packages; toPythonApplication sqlite-utils;
 
-  sqlite-web = callPackage ../development/tools/database/sqlite-web { };
-
   sqlmap = with python3Packages; toPythonApplication sqlmap;
 
-  sqlpage = callPackage ../servers/sqlpage { };
-
-  src-cli = callPackage ../development/tools/misc/src-cli { };
-
-  sselp = callPackage ../tools/X11/sselp{ };
-
-  statix = callPackage ../tools/nix/statix { };
-
-  stm32cubemx = callPackage ../development/embedded/stm32/stm32cubemx { };
-
-  stm32flash = callPackage ../development/embedded/stm32/stm32flash { };
-
-  stm8flash = callPackage ../development/embedded/stm8/stm8flash { };
-
-  strace = callPackage ../development/tools/misc/strace { };
-
-  strace-analyzer = callPackage ../development/tools/misc/strace-analyzer { };
-
-  stylua = callPackage ../development/tools/stylua { };
-
-  summon = callPackage ../development/tools/summon { };
-
-  supabase-cli = callPackage ../development/tools/supabase-cli { };
-
-  surge-cli = callPackage ../development/tools/surge-cli { };
-
-  svlint = callPackage ../development/tools/analysis/svlint { };
-
-  swarm = callPackage ../development/tools/analysis/swarm { };
-
-  swiftformat = callPackage ../development/tools/swiftformat { };
-
-  swiftshader = callPackage ../development/libraries/swiftshader { };
-
-  systemfd = callPackage ../development/tools/systemfd { };
-
-  c2ffi = callPackage ../development/tools/misc/c2ffi { };
-
   c0 = callPackage ../development/compilers/c0 {
     stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
   };
 
-  c3c = callPackage ../development/compilers/c3c { };
-
-  swfmill = callPackage ../tools/video/swfmill { };
-
   swftools = callPackage ../tools/video/swftools {
     stdenv = gccStdenv;
   };
 
-  szyszka = callPackage ../tools/misc/szyszka { };
-
-  taplo = callPackage ../development/tools/taplo { };
-
-  taoup = callPackage ../tools/misc/taoup { };
-
   tarmac = callPackage ../development/tools/tarmac {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  tcptrack = callPackage ../development/tools/misc/tcptrack { };
-
-  teensy-cmake-macros = callPackage ../development/embedded/teensy-cmake-macros { };
-
   teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; };
 
-  teensy-loader-cli = callPackage ../development/embedded/teensy-loader-cli { };
-
   tytools = libsForQt5.callPackage ../development/embedded/tytools { };
 
-  terracognita = callPackage ../development/tools/misc/terracognita { };
-
-  terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { };
-  terraform-ls = callPackage ../development/tools/misc/terraform-ls { };
-
-  terraformer = callPackage ../development/tools/misc/terraformer { };
-
-  terramate = callPackage ../development/tools/misc/terramate { };
-
-  terrascan = callPackage ../tools/security/terrascan { };
-
-  terser = callPackage ../development/tools/misc/terser { };
-
-  tesh = callPackage ../tools/text/tesh {};
-
   texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { };
   inherit (texinfoPackages)
     texinfo413
@@ -18329,26 +8814,14 @@ with pkgs;
   texinfo = texinfo7;
   texinfoInteractive = texinfo.override { interactive = true; };
 
-  texi2html = callPackage ../development/tools/misc/texi2html { };
-
-  texi2mdoc = callPackage ../tools/misc/texi2mdoc { };
-
   texlab = callPackage ../development/tools/misc/texlab {
     inherit (darwin.apple_sdk.frameworks) Security CoreServices;
   };
 
-  time-ghc-modules = callPackage ../development/tools/time-ghc-modules { };
-
   tflint-plugins = recurseIntoAttrs (
     callPackage ../development/tools/analysis/tflint-plugins { }
   );
 
-  tfsec = callPackage ../development/tools/analysis/tfsec { };
-
-  todoist = callPackage ../applications/misc/todoist { };
-
-  todoist-electron = callPackage ../applications/misc/todoist-electron { };
-
   travis = callPackage ../development/tools/misc/travis { };
 
   tree-sitter = makeOverridable (callPackage ../development/tools/parsing/tree-sitter) {
@@ -18357,56 +8830,22 @@ with pkgs;
 
   tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars;
 
-  trellis = callPackage ../development/embedded/fpga/trellis { };
-
-  ttags = callPackage ../development/tools/misc/ttags { };
-
-  ttyd = callPackage ../servers/ttyd { };
-
-  tweak = callPackage ../applications/editors/tweak { };
-
-  typical = callPackage ../development/tools/misc/typical { };
-
-  tyson = callPackage ../development/tools/misc/tyson { };
-
-  uddup = callPackage ../tools/security/uddup { };
-
-  udis86 = callPackage  ../development/tools/udis86 { };
-
   uhd = callPackage ../applications/radio/uhd { };
   uhdMinimal = uhd.override {
     enableUtils = false;
     enablePythonApi = false;
   };
 
-  uisp = callPackage ../development/embedded/uisp { };
-
-  wch-isp = callPackage ../development/embedded/wch-isp { };
-
-  uncrustify = callPackage ../development/tools/misc/uncrustify { };
-
-  unused = callPackage ../development/tools/misc/unused { };
-
-  vagrant = callPackage ../development/tools/vagrant { };
-
-  bashdb = callPackage ../development/tools/misc/bashdb { };
-
   gdb = callPackage ../development/tools/misc/gdb {
     guile = null;
   };
 
   gdbHostCpuOnly = gdb.override { hostCpuOnly = true; };
 
-  gf = callPackage ../development/tools/misc/gf { };
-
-  java-language-server = callPackage ../development/tools/java/java-language-server { };
-
   jprofiler = callPackage ../development/tools/java/jprofiler {
     jdk = jdk11;
   };
 
-  jhiccup = callPackage ../development/tools/java/jhiccup { };
-
   valgrind = callPackage ../development/tools/analysis/valgrind {
     inherit (buildPackages.darwin) xnu bootstrap_cmds;
   };
@@ -18418,44 +8857,20 @@ with pkgs;
 
   vcpkg-tool-unwrapped = callPackage ../by-name/vc/vcpkg-tool/package.nix { doWrap = false; };
 
-  visualvm = callPackage ../development/tools/java/visualvm { };
-
-  volta = callPackage ../development/tools/volta { };
-
-  vultr = callPackage ../development/tools/vultr { };
-
-  vultr-cli = callPackage ../development/tools/vultr-cli { };
-
-  vulnix = callPackage ../tools/security/vulnix { };
-
-  vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { };
-
   wails = callPackage ../development/tools/wails {
     stdenv = gccStdenv;
   };
 
-  wasmer-pack = callPackage ../development/tools/misc/wasmer-pack { };
-
-  whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { };
-
   whatstyle = callPackage ../development/tools/misc/whatstyle {
     inherit (llvmPackages) clang-unwrapped;
   };
 
   watson-ruby = callPackage ../development/tools/misc/watson-ruby { };
 
-  web-ext = callPackage ../development/tools/web-ext { };
-
-  webdis = callPackage ../development/tools/database/webdis { };
-
   xmake = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/xmake {
     inherit (darwin.apple_sdk_11_0.frameworks) CoreServices;
   };
 
-  xc3sprog = callPackage ../development/embedded/xc3sprog { };
-
-  xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { };
-
   xcode-install = callPackage ../development/tools/xcode-install { };
 
   xcbuild = callPackage ../by-name/xc/xcbuild/package.nix {
@@ -18476,63 +8891,29 @@ with pkgs;
 
   xcpretty = callPackage ../development/tools/xcpretty { };
 
-  xeus = callPackage ../development/libraries/xeus { };
-
-  xeus-zmq = callPackage ../development/libraries/xeus-zmq { };
-
-  xmlindent = callPackage ../development/web/xmlindent { };
-
-  xpwn = callPackage ../development/mobile/xpwn { };
-
   xxdiff = libsForQt5.callPackage ../development/tools/misc/xxdiff { };
 
   xxe-pe = callPackage ../applications/editors/xxe-pe { };
 
   xxdiff-tip = xxdiff;
 
-  xxgdb = callPackage ../development/tools/misc/xxgdb { };
-
-  yaml2json = callPackage ../development/tools/yaml2json { };
-
-  yams = callPackage ../applications/audio/yams { };
-
   ycmd = callPackage ../by-name/yc/ycmd/package.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
     python = python3;
   };
 
-  yo = callPackage ../development/tools/yo { };
-
-  yodl = callPackage ../development/tools/misc/yodl { };
-
   yourkit-java = callPackage ../by-name/yo/yourkit-java/package.nix {
     jre = jdk17;
   };
 
   yq = python3.pkgs.toPythonApplication python3.pkgs.yq;
 
-  yq-go = callPackage ../development/tools/yq-go { };
-
-  ytt = callPackage ../development/tools/ytt { };
-
-  grabserial = callPackage ../development/tools/grabserial { };
-
   mypy = with python3Packages; toPythonApplication mypy;
 
   mypy-protobuf = with python3Packages; toPythonApplication mypy-protobuf;
 
-  nsis = callPackage ../development/tools/nsis { };
-
-  tockloader = callPackage ../development/tools/misc/tockloader { };
-
-  zon2nix = callPackage ../tools/nix/zon2nix { };
-
-  ztags = callPackage ../development/tools/misc/ztags { };
-
   ### DEVELOPMENT / LIBRARIES
 
-  aalib = callPackage ../development/libraries/aalib { };
-
   abseil-cpp_202103 = callPackage ../development/libraries/abseil-cpp/202103.nix {
     # If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
     stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
@@ -18559,93 +8940,37 @@ with pkgs;
   };
   abseil-cpp = abseil-cpp_202407;
 
-  accountsservice = callPackage ../development/libraries/accountsservice { };
-
   acl = callPackage ../development/libraries/acl { };
 
-  acltoolkit = callPackage ../tools/security/acltoolkit { };
-
-  acsccid = callPackage ../tools/security/acsccid { };
-
-  adns = callPackage ../development/libraries/adns { };
-
-  adslib = callPackage ../development/libraries/adslib { };
-
-  aemu = callPackage ../development/libraries/aemu { };
-
-  afflib = callPackage ../development/libraries/afflib { };
-
-  aften = callPackage ../development/libraries/aften { };
-
-  alure = callPackage ../development/libraries/alure { };
-
-  alure2 = callPackage ../development/libraries/alure2 { };
-
   agg = callPackage ../development/libraries/agg {
     stdenv = gccStdenv;
   };
 
-  agkozak-zsh-prompt = callPackage ../shells/zsh/agkozak-zsh-prompt { };
-
-  alass = callPackage ../applications/video/alass { };
-
   allegro = allegro4;
   allegro4 = callPackage ../development/libraries/allegro { };
   allegro5 = callPackage ../development/libraries/allegro/5.nix { };
 
-  amf-headers = callPackage ../development/libraries/amf-headers { };
-
-  aml = callPackage ../development/libraries/aml { };
-
-  amrnb = callPackage ../development/libraries/amrnb { };
-
-  amrwb = callPackage ../development/libraries/amrwb { };
-
   ansi2html = with python3.pkgs; toPythonApplication ansi2html;
 
-  antic = callPackage ../development/libraries/antic { };
-
-  anttweakbar = callPackage ../development/libraries/AntTweakBar { };
-
   appstream = callPackage ../development/libraries/appstream { };
 
-  appstream-glib = callPackage ../development/libraries/appstream-glib { };
-
   apr = callPackage ../development/libraries/apr {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  aprutil = callPackage ../development/libraries/apr-util { };
-
-  aravis = callPackage ../development/libraries/aravis { };
-
-  arb = callPackage ../development/libraries/arb { };
-
-  argparse = callPackage ../development/libraries/argparse { };
-
   argparse-manpage = with python3Packages; toPythonApplication argparse-manpage;
 
-  argp-standalone = callPackage ../development/libraries/argp-standalone { };
-
   aribb25 = callPackage ../development/libraries/aribb25 {
     inherit (darwin.apple_sdk.frameworks) PCSC;
   };
 
-  armadillo = callPackage ../development/libraries/armadillo { };
-
   arrayfire = callPackage ../development/libraries/arrayfire {
     cudaPackages = cudaPackages_12;
   };
 
-  arsenal = callPackage ../tools/security/arsenal { };
-
-  assimp = callPackage ../development/libraries/assimp { };
-
   asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { };
   asio = callPackage ../development/libraries/asio { };
 
-  asmjit = callPackage ../development/libraries/asmjit { };
-
   aspell = callPackage ../development/libraries/aspell { };
 
   aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {});
@@ -18656,101 +8981,40 @@ with pkgs;
 
   attr = callPackage ../development/libraries/attr { };
 
-  at-spi2-core = callPackage ../development/libraries/at-spi2-core { };
-
   # Not moved to aliases while we decide if we should split the package again.
   at-spi2-atk = at-spi2-core;
 
   aqbanking = callPackage ../development/libraries/aqbanking { };
 
-  aubio = callPackage ../development/libraries/aubio { };
-
-  audiality2 = callPackage ../development/libraries/audiality2 { };
-
   audiofile = callPackage ../development/libraries/audiofile {
     inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices;
   };
 
-  aws-c-auth = callPackage ../development/libraries/aws-c-auth { };
-
   aws-c-cal = callPackage ../development/libraries/aws-c-cal {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  aws-c-common = callPackage ../development/libraries/aws-c-common { };
-
-  aws-c-compression = callPackage ../development/libraries/aws-c-compression { };
-
-  aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { };
-
-  aws-c-http = callPackage ../development/libraries/aws-c-http { };
-
   aws-c-io = callPackage ../development/libraries/aws-c-io {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  aws-c-mqtt = callPackage ../development/libraries/aws-c-mqtt { };
-
-  aws-c-s3 = callPackage ../development/libraries/aws-c-s3 { };
-
-  aws-c-sdkutils = callPackage ../development/libraries/aws-c-sdkutils { };
-
-  aws-checksums = callPackage ../development/libraries/aws-checksums { };
-
-  aws-crt-cpp = callPackage ../development/libraries/aws-crt-cpp { };
-
   aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp {
     inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox;
   };
 
-  ayatana-webmail = callPackage ../applications/networking/mailreaders/ayatana-webmail { };
-
-  azmq = callPackage ../development/libraries/azmq { };
-
-  babl = callPackage ../development/libraries/babl { };
-
   backlight-auto = callPackage ../by-name/ba/backlight-auto/package.nix {
     zig = buildPackages.zig_0_11;
   };
 
-  backward-cpp = callPackage ../development/libraries/backward-cpp { };
-
-  bamf = callPackage ../development/libraries/bamf { };
-
   inherit (callPackages ../development/libraries/bashup-events { }) bashup-events32 bashup-events44;
 
-  bcg729 = callPackage ../development/libraries/bcg729 { };
-
-  bctoolbox = callPackage ../development/libraries/bctoolbox { };
-
   bc-soci = callPackage ../development/libraries/soci/bc-soci.nix { };
 
-  bearssl = callPackage ../development/libraries/bearssl { };
-
-  beecrypt = callPackage ../development/libraries/beecrypt { };
-
-  belcard = callPackage ../development/libraries/belcard { };
-
-  belr = callPackage ../development/libraries/belr { };
-
-  bencode = callPackage ../development/libraries/bencode { };
-
-  bencodetools = callPackage ../development/libraries/bencodetools { };
-
-  belle-sip = callPackage ../development/libraries/belle-sip { };
-
-
-  bicpl = callPackage ../development/libraries/science/biology/bicpl { };
-
-  bicgl = callPackage ../development/libraries/science/biology/bicgl { };
-
   # TODO(@Ericson2314): Build bionic libc from source
   bionic = if stdenv.hostPlatform.useAndroidPrebuilt
     then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVersion}".libraries
     else callPackage ../os-specific/linux/bionic-prebuilt { };
 
-  boolstuff = callPackage ../development/libraries/boolstuff { };
-
   inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; })
     boost175
     boost177
@@ -18767,8 +9031,6 @@ with pkgs;
 
   boost = boost181;
 
-  bosh-cli = callPackage ../applications/networking/cluster/bosh-cli { };
-
   inherit (callPackages ../development/libraries/botan { })
     botan2
     botan3
@@ -18778,18 +9040,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL;
   };
 
-  boxfort = callPackage ../development/libraries/boxfort { };
-
-  brunsli = callPackage ../development/libraries/brunsli { };
-
-  buddy = callPackage ../development/libraries/buddy { };
-
-  buildkit-nix = callPackage ../applications/virtualization/buildkit-nix { };
-
-  bulletml = callPackage ../development/libraries/bulletml { };
-
-  bzrtp = callPackage ../development/libraries/bzrtp { };
-
   c-ares = callPackage ../development/libraries/c-ares { };
 
   c-aresMinimal = callPackage ../development/libraries/c-ares {
@@ -18801,8 +9051,6 @@ with pkgs;
 
   cachix = lib.getBin haskellPackages.cachix;
 
-  calcium = callPackage ../development/libraries/calcium { };
-
   cubeb = callPackage ../development/libraries/audio/cubeb {
     inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreServices;
   };
@@ -18817,33 +9065,11 @@ with pkgs;
 
   ormolu = lib.getBin (haskell.lib.compose.justStaticExecutables haskellPackages.ormolu);
 
-  capnproto = callPackage ../development/libraries/capnproto { };
-
-  capnproto-java = callPackage ../development/tools/capnproto-java { };
-
-  capnproto-rust = callPackage ../development/tools/capnproto-rust { };
-
-  captive-browser = callPackage ../applications/networking/browsers/captive-browser { };
-
   catboost = callPackage ../by-name/ca/catboost/package.nix {
     # https://github.com/catboost/catboost/issues/2540
     cudaPackages = cudaPackages_11;
   };
 
-  cddlib = callPackage ../development/libraries/cddlib { };
-
-  cdk-go = callPackage ../tools/security/cdk-go { };
-
-  cdo = callPackage ../development/libraries/cdo { };
-
-  cista = callPackage ../development/libraries/cista { };
-
-  cjose = callPackage ../development/libraries/cjose { };
-
-  scmccid = callPackage ../development/libraries/scmccid { };
-
-  ccrtp = callPackage ../development/libraries/ccrtp { };
-
   cctag = callPackage ../development/libraries/cctag {
     stdenv = clangStdenv;
     tbb = tbb_2021_11;
@@ -18859,8 +9085,6 @@ with pkgs;
   celt_0_7 = callPackage ../development/libraries/celt/0.7.nix { };
   celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix { };
 
-  cegui = callPackage ../development/libraries/cegui { };
-
   certbot = python3.pkgs.toPythonApplication python3.pkgs.certbot;
 
   certbot-full = certbot.withPlugins (cp: with cp; [
@@ -18871,106 +9095,36 @@ with pkgs;
     certbot-dns-route53
   ]);
 
-  caf = callPackage ../development/libraries/caf { };
-
   # CGAL 5 has API changes
   cgal_4 = callPackage ../development/libraries/CGAL/4.nix { };
   cgal_5 = callPackage ../development/libraries/CGAL { };
   cgal = cgal_5;
 
-  cgui = callPackage ../development/libraries/cgui { };
-
-  charls = callPackage ../development/libraries/charls { };
-
   check = callPackage ../development/libraries/check {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  chipmunk = callPackage ../development/libraries/chipmunk { };
-
-  chmlib = callPackage ../development/libraries/chmlib { };
-
-  chromaprint = callPackage ../development/libraries/chromaprint { };
-
-  cl = callPackage ../development/libraries/cl { };
-
-  clanlib = callPackage ../development/libraries/clanlib { };
-
-  clap = callPackage ../development/libraries/clap { };
-
-  classads = callPackage ../development/libraries/classads { };
-
-  clfft = callPackage ../development/libraries/clfft { };
-
-  clipp  = callPackage ../development/libraries/clipp { };
-
-  clipper = callPackage ../development/libraries/clipper { };
-
-  cln = callPackage ../development/libraries/cln { };
-
   clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
 
   clucene_core = clucene_core_2;
 
-  clutter = callPackage ../development/libraries/clutter { };
-
   clutter-gst = callPackage ../development/libraries/clutter-gst {
   };
 
-  clutter-gtk = callPackage ../development/libraries/clutter-gtk { };
-
-  cminpack = callPackage ../development/libraries/cminpack { };
-
-  cmocka = callPackage ../development/libraries/cmocka { };
-
-  cmrt = callPackage ../development/libraries/cmrt { };
-
   codecserver = callPackage ../applications/audio/codecserver {
     protobuf = protobuf_21;
   };
 
-  coercer = callPackage ../tools/security/coercer { };
-
   cogl = callPackage ../development/libraries/cogl {
     inherit (darwin.apple_sdk.frameworks) OpenGL;
   };
 
-  coin3d = callPackage ../development/libraries/coin3d { };
-
-  soxt = callPackage ../development/libraries/soxt { };
-
   coinlive = callPackage ../tools/misc/coinlive {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  cointop = callPackage ../applications/misc/cointop { };
-
-  coloquinte = callPackage ../development/libraries/science/electronics/coloquinte { };
-
-  cog = callPackage ../development/web/cog { };
-
   inherit (cosmopolitan) cosmocc;
 
-  python-cosmopolitan = callPackage ../development/interpreters/python-cosmopolitan { };
-
-  ctpp2 = callPackage ../development/libraries/ctpp2 { };
-
-  ctpl = callPackage ../development/libraries/ctpl { };
-
-  cppe = callPackage ../development/libraries/science/chemistry/cppe { };
-
-  cppdb = callPackage ../development/libraries/cppdb { };
-
-  cpp-utilities = callPackage ../development/libraries/cpp-utilities { };
-
-  cpp-hocon = callPackage ../development/libraries/cpp-hocon { };
-
-  cpp-ipfs-http-client = callPackage ../development/libraries/cpp-ipfs-http-client { };
-
-  cpp-netlib = callPackage ../development/libraries/cpp-netlib { };
-
-  cpp-jwt = callPackage ../development/libraries/cpp-jwt { };
-
   ctranslate2 = callPackage ../development/libraries/ctranslate2 rec {
     stdenv = if withCUDA then gcc11Stdenv else pkgs.stdenv;
     withCUDA = pkgs.config.cudaSupport;
@@ -18978,12 +9132,6 @@ with pkgs;
     cudaPackages = pkgs.cudaPackages;
   };
 
-  ubus = callPackage ../development/libraries/ubus { };
-
-  uci = callPackage ../development/libraries/uci { };
-
-  uclient = callPackage ../development/libraries/uclient { };
-
   ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; };
 
   ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; additional_buildInputs = [ openssl ]; };
@@ -18993,52 +9141,10 @@ with pkgs;
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
   };
 
-  uri = callPackage ../development/libraries/uri { };
-
-  cppcms = callPackage ../development/libraries/cppcms { };
-
-  cppcodec = callPackage ../development/libraries/cppcodec { };
-
-  cppunit = callPackage ../development/libraries/cppunit { };
-
-  cpputest = callPackage ../development/libraries/cpputest { };
-
-  cracklib = callPackage ../development/libraries/cracklib { };
-
-  cre2 = callPackage ../development/libraries/cre2 { };
-
-  croaring = callPackage ../development/libraries/croaring { };
-
-  crossguid = callPackage ../development/libraries/crossguid { };
-
-  cryptopp = callPackage ../development/libraries/crypto++ { };
-
-  cryptominisat = callPackage ../applications/science/logic/cryptominisat { };
-
-  csdr = callPackage ../applications/radio/csdr { };
-
-  ctypes_sh = callPackage ../development/libraries/ctypes_sh { };
-
-  curlpp = callPackage ../development/libraries/curlpp { };
-
-  cutee = callPackage ../development/libraries/cutee { };
-
-  cxxtools = callPackage ../development/libraries/cxxtools { };
-
-  cwiid = callPackage ../development/libraries/cwiid { };
-
-  cxx-prettyprint = callPackage ../development/libraries/cxx-prettyprint { };
-
-  cxxopts = callPackage ../development/libraries/cxxopts { };
-
   cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { };
 
   cypress = callPackage ../development/web/cypress { };
 
-  cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };
-
-  cyrus-sasl-xoauth2 = callPackage ../development/libraries/cyrus-sasl-xoauth2 { };
-
   # Make bdb5 the default as it is the last release under the custom
   # bsd-like license
   db = db5;
@@ -19050,13 +9156,7 @@ with pkgs;
   db60 = callPackage ../development/libraries/db/db-6.0.nix { };
   db62 = callPackage ../development/libraries/db/db-6.2.nix { };
 
-  dbxml = callPackage ../development/libraries/dbxml { };
-
   dbus = callPackage ../development/libraries/dbus { };
-  dbus_cplusplus  = callPackage ../development/libraries/dbus-cplusplus { };
-  dbus-glib       = callPackage ../development/libraries/dbus-glib { };
-  dbus_java       = callPackage ../development/libraries/java/dbus-java { };
-
   dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { };
   dbus-sharp-2_0 = callPackage ../development/libraries/dbus-sharp { };
 
@@ -19072,30 +9172,10 @@ with pkgs;
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  dhex = callPackage ../applications/editors/dhex { };
-
-  double-conversion = callPackage ../development/libraries/double-conversion { };
-
-  dclib = callPackage ../development/libraries/dclib { };
-
-  digiham = callPackage ../applications/radio/digiham { };
-
-  directfb = callPackage ../development/libraries/directfb { };
-
   discord-rpc = callPackage ../development/libraries/discord-rpc {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  discord-sh = callPackage ../tools/networking/discord-sh { };
-
-  dlib = callPackage ../development/libraries/dlib { };
-
-  doctest = callPackage ../development/libraries/doctest { };
-
-  docopt_cpp = callPackage ../development/libraries/docopt_cpp { };
-
-  dotconf = callPackage ../development/libraries/dotconf { };
-
   draco = callPackage ../development/libraries/draco {
     tinygltf = callPackage ../development/libraries/draco/tinygltf.nix { };
   };
@@ -19113,31 +9193,19 @@ with pkgs;
       vdpauinfo;
   };
 
-  drogon = callPackage ../development/libraries/drogon { };
-
-  dssi = callPackage ../development/libraries/dssi { };
-
   duckdb = callPackage ../development/libraries/duckdb { };
 
-  easyloggingpp = callPackage ../development/libraries/easyloggingpp { };
-
   eccodes = callPackage ../development/libraries/eccodes {
     pythonPackages = python3Packages;
     stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
   };
 
-  eclib = callPackage ../development/libraries/eclib { };
-
-  editline = callPackage ../development/libraries/editline { };
-
   edencommon = darwin.apple_sdk_11_0.callPackage ../development/libraries/edencommon { };
 
   eigen = callPackage ../development/libraries/eigen { };
 
   eigen2 = callPackage ../development/libraries/eigen/2.0.nix { };
 
-  eigenmath = callPackage ../applications/science/math/eigenmath { };
-
   vapoursynth = callPackage ../by-name/va/vapoursynth/package.nix {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
   };
@@ -19148,16 +9216,10 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
   };
 
-  eglexternalplatform = callPackage ../development/libraries/eglexternalplatform { };
-
-  egl-wayland = callPackage ../development/libraries/egl-wayland { };
-
   elastix = callPackage ../development/libraries/science/biology/elastix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  elfio = callPackage ../development/libraries/elfio { };
-
   # TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013
   emanote = haskellPackages.emanote;
 
@@ -19166,28 +9228,10 @@ with pkgs;
   };
   enchant = enchant2;
 
-  enet = callPackage ../development/libraries/enet { };
-
-  entt = callPackage ../development/libraries/entt { };
-
   libepoxy = callPackage ../development/libraries/libepoxy {
     inherit (darwin.apple_sdk.frameworks) Carbon OpenGL;
   };
 
-  libesmtp = callPackage ../development/libraries/libesmtp { };
-
-  exiv2 = callPackage ../development/libraries/exiv2 { };
-
-  expat = callPackage ../development/libraries/expat { };
-
-  exprtk = callPackage ../development/libraries/exprtk { };
-
-  eventlog = callPackage ../development/libraries/eventlog { };
-
-  faac = callPackage ../development/libraries/faac { };
-
-  faad2 = callPackage ../development/libraries/faad2 { };
-
   factor-lang-scope = callPackage ../development/compilers/factor-lang/scope.nix { };
   factor-lang = factor-lang-scope.interpreter;
 
@@ -19195,8 +9239,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) IOKit Carbon Cocoa AudioToolbox OpenGL System;
   };
 
-  farbfeld = callPackage ../development/libraries/farbfeld { };
-
   farstream = callPackage ../development/libraries/farstream {
     inherit (gst_all_1)
       gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
@@ -19208,16 +9250,6 @@ with pkgs;
 
   fb303 = darwin.apple_sdk_11_0.callPackage ../development/libraries/fb303 { };
 
-  fcl = callPackage ../development/libraries/fcl { };
-
-  ffcast = callPackage ../tools/X11/ffcast { };
-
-  fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { };
-
-  forge = callPackage ../development/libraries/forge { };
-
-  linbox = callPackage ../development/libraries/linbox { };
-
   inherit (callPackage ../development/libraries/ffmpeg { })
     ffmpeg_4
     ffmpeg_4-headless
@@ -19232,11 +9264,6 @@ with pkgs;
     ffmpeg-headless
     ffmpeg-full;
 
-  ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };
-
-  ffms = callPackage ../development/libraries/ffms { };
-
-  fftw = callPackage ../development/libraries/fftw { };
   fftwSinglePrec = fftw.override { precision = "single"; };
   fftwFloat = fftwSinglePrec; # the configure option is just an alias
   fftwLongDouble = fftw.override { precision = "long-double"; };
@@ -19247,16 +9274,8 @@ with pkgs;
   };
   fftwMpi = fftw.override { enableMpi = true; };
 
-  filter-audio = callPackage ../development/libraries/filter-audio { };
-
-  filtron = callPackage ../servers/filtron { };
-
   fizz = darwin.apple_sdk_11_0.callPackage ../development/libraries/fizz { };
 
-  flann = callPackage ../development/libraries/flann { };
-
-  flatcc = callPackage ../development/libraries/flatcc { };
-
   flint = callPackage ../development/libraries/flint { };
 
   flint3 = callPackage ../development/libraries/flint/3.nix { };
@@ -19284,8 +9303,6 @@ with pkgs;
   fltk = fltk13;
   fltk-minimal = fltk13-minimal;
 
-  flyway = callPackage ../development/tools/flyway { };
-
   inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9 fmt_10 fmt_11;
 
   fmt = fmt_10;
@@ -19307,26 +9324,14 @@ with pkgs;
     };
   };
 
-  freetts = callPackage ../development/libraries/freetts { };
-
   frog = res.languageMachines.frog;
 
-  fstrcmp = callPackage ../development/libraries/fstrcmp { };
-
-  fstrm = callPackage ../development/libraries/fstrm { };
-
-  cfitsio = callPackage ../development/libraries/science/astronomy/cfitsio { };
-
   fontconfig = callPackage ../development/libraries/fontconfig {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation;
   };
 
   folly = darwin.apple_sdk_11_0.callPackage ../development/libraries/folly { };
 
-  folks = callPackage ../development/libraries/folks { };
-
-  fortify-headers = callPackage ../development/libraries/fortify-headers { };
-
   makeFontsConf = callPackage ../development/libraries/fontconfig/make-fonts-conf.nix { };
 
   makeFontsCache = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:
@@ -19334,76 +9339,34 @@ with pkgs;
       inherit fontconfig fontDirectories;
     };
 
-  f2c = callPackage ../development/tools/f2c { };
-
-  freealut = callPackage ../development/libraries/freealut { };
-
-  freeglut = callPackage ../development/libraries/freeglut { };
-
   freenect = callPackage ../development/libraries/freenect {
     inherit (darwin.apple_sdk.frameworks) Cocoa GLUT;
   };
 
-  freetype = callPackage ../development/libraries/freetype { };
-
-  freexl = callPackage ../development/libraries/freexl { };
-
-  frei0r = callPackage ../development/libraries/frei0r { };
-
-  fribidi = callPackage ../development/libraries/fribidi { };
-
-  frozen = callPackage ../development/libraries/frozen { };
-
-  funambol = callPackage ../development/libraries/funambol { };
-
-  function-runner = callPackage ../development/web/function-runner { };
-
-  functionalplus = callPackage ../development/libraries/functionalplus { };
-
-  galer = callPackage ../tools/security/galer { };
-
-  gallia = callPackage ../tools/security/gallia { };
-
   gamenetworkingsockets = callPackage ../development/libraries/gamenetworkingsockets {
     protobuf = protobuf_21;
   };
 
-  game-music-emu = callPackage ../development/libraries/audio/game-music-emu { };
-
-  ganv = callPackage ../development/libraries/ganv { };
-
-  gcab = callPackage ../development/libraries/gcab { };
-
   gcovr = with python3Packages; toPythonApplication gcovr;
 
   gcr = callPackage ../development/libraries/gcr { };
 
   gcr_4 = callPackage ../development/libraries/gcr/4.nix { };
 
-  gdl = callPackage ../development/libraries/gdl { };
-
-  gdome2 = callPackage ../development/libraries/gdome2 { };
-
   gecode_3 = callPackage ../development/libraries/gecode/3.nix { };
   gecode_6 = qt5.callPackage ../development/libraries/gecode { };
   gecode = gecode_6;
 
   geph = recurseIntoAttrs (callPackages ../applications/networking/geph { pnpm = pnpm_8; });
 
-  gephi = callPackage ../applications/science/misc/gephi { };
-
   gegl = callPackage ../development/libraries/gegl {
     inherit (darwin.apple_sdk.frameworks) OpenCL;
   };
 
   gensio = darwin.apple_sdk_11_0.callPackage ../development/libraries/gensio { };
 
-  geoclue2 = callPackage ../development/libraries/geoclue { };
-
   geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; };
 
-  geocode-glib = callPackage ../development/libraries/geocode-glib { };
-
   geocode-glib_2 = geocode-glib.override {
     libsoup = libsoup_3;
   };
@@ -19413,31 +9376,19 @@ with pkgs;
     geoipDatabase = geolite-legacy;
   };
 
-  geogram = callPackage ../development/libraries/geogram { };
-
   geoip = callPackage ../development/libraries/geoip { };
 
-  geoipjava = callPackage ../development/libraries/java/geoipjava { };
-
-  geomyidae = callPackage ../applications/networking/gopher/geomyidae { };
-
   geos = callPackage ../development/libraries/geos { };
 
   geos_3_9 = callPackage ../development/libraries/geos/3.9.nix { };
 
   geos_3_11 = callPackage ../development/libraries/geos/3.11.nix { };
 
-  getdata = callPackage ../development/libraries/getdata { };
-
   inherit (callPackages ../development/libraries/getdns { })
     getdns stubby;
 
   gettext = callPackage ../development/libraries/gettext { };
 
-  gf2x = callPackage ../development/libraries/gf2x { };
-
-  gfxstream = callPackage ../development/libraries/gfxstream { };
-
   gd = callPackage ../development/libraries/gd {
     automake = automake115x;
   };
@@ -19453,18 +9404,10 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa;
   };
 
-  ggz_base_libs = callPackage ../development/libraries/ggz_base_libs { };
-
-  gifticlib = callPackage ../development/libraries/science/biology/gifticlib { };
-
-  gio-sharp = callPackage ../development/libraries/gio-sharp { };
-
   givaro = callPackage ../development/libraries/givaro { };
   givaro_3 = callPackage ../development/libraries/givaro/3.nix { };
   givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix { };
 
-  ghc_filesystem = callPackage ../development/libraries/ghc_filesystem { };
-
   ghp-import = with python3Packages; toPythonApplication ghp-import;
 
   ghcid = haskellPackages.ghcid.bin;
@@ -19475,24 +9418,10 @@ with pkgs;
 
   graphia = qt6Packages.callPackage ../applications/science/misc/graphia { };
 
-  graphinder = callPackage ../tools/security/graphinder { };
-
-  hnswlib = callPackage ../development/libraries/hnswlib { };
-
-  icon-lang = callPackage ../development/interpreters/icon-lang { };
-
   libgit2 = callPackage ../development/libraries/libgit2 {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  libgit2-glib = callPackage ../development/libraries/libgit2-glib { };
-
-  libhsts = callPackage ../development/libraries/libhsts { };
-
-  glbinding = callPackage ../development/libraries/glbinding { };
-
-  gle = callPackage ../development/libraries/gle { };
-
   glew = callPackage ../development/libraries/glew {
     inherit (darwin.apple_sdk.frameworks) OpenGL;
   };
@@ -19515,8 +9444,6 @@ with pkgs;
   # Provided by libc on Operating Systems that use the Extensible Linker Format.
   elf-header = if stdenv.hostPlatform.isElf then null else elf-header-real;
 
-  elf-header-real = callPackage ../development/libraries/elf-header { };
-
   glibc_memusage = callPackage ../development/libraries/glibc {
     withGd = true;
   };
@@ -19616,45 +9543,21 @@ with pkgs;
     glibc32 = pkgsi686Linux.buildPackages.glibc;
   };
 
-  glm = callPackage ../development/libraries/glm { };
-
-  glog = callPackage ../development/libraries/glog { };
-
-  gloox = callPackage ../development/libraries/gloox { };
-
-  glpk = callPackage ../development/libraries/glpk { };
-
   glsurf = callPackage ../applications/science/math/glsurf {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
   };
 
-  glui = callPackage ../development/libraries/glui { };
-
   gmime2 = callPackage ../development/libraries/gmime/2.nix { };
   gmime3 = callPackage ../development/libraries/gmime/3.nix { };
   gmime = gmime2;
 
-  gmm = callPackage ../development/libraries/gmm { };
-
   gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions
   gmp6 = callPackage ../development/libraries/gmp/6.x.nix { };
   gmp = gmp6;
   gmpxx = gmp.override { cxx = true; };
 
   #GMP ex-satellite, so better keep it near gmp
-  mpfr = callPackage ../development/libraries/mpfr { };
-
-  mpfi = callPackage ../development/libraries/mpfi { };
-
-  mpdecimal = callPackage ../development/libraries/mpdecimal { };
-
-  mpfshell = callPackage ../development/tools/mpfshell { };
-
   # A GMP fork
-  mpir = callPackage ../development/libraries/mpir { };
-
-  gl3w = callPackage ../development/libraries/gl3w { };
-
   gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { });
   gns3-gui = gns3Packages.guiStable;
   gns3-server = gns3Packages.serverStable;
@@ -19668,16 +9571,6 @@ with pkgs;
   goocanvas = callPackage ../development/libraries/goocanvas { };
   goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { };
   goocanvas3 = callPackage ../development/libraries/goocanvas/3.x.nix { };
-  goocanvasmm2 = callPackage ../development/libraries/goocanvasmm { };
-
-  gflags = callPackage ../development/libraries/gflags { };
-
-  gperftools = callPackage ../development/libraries/gperftools { };
-
-  grilo = callPackage ../development/libraries/grilo { };
-
-  grilo-plugins = callPackage ../development/libraries/grilo-plugins { };
-
   grpc = darwin.apple_sdk_11_0.callPackage ../development/libraries/grpc {
     stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64
       then overrideSDK darwin.apple_sdk_11_0.stdenv { darwinMinVersion = "10.13"; }
@@ -19693,14 +9586,8 @@ with pkgs;
     inherit (darwin.apple_sdk_12_3.libs) xpc;
   });
 
-  gusb = callPackage ../development/libraries/gusb { };
-
   qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp { };
 
-  gnet = callPackage ../development/libraries/gnet { };
-
-  gnu-config = callPackage ../development/libraries/gnu-config { };
-
   gnu-efi = if stdenv.hostPlatform.isEfi
               then callPackage ../development/libraries/gnu-efi { }
             else null;
@@ -19717,30 +9604,8 @@ with pkgs;
 
   gpgme = callPackage ../development/libraries/gpgme { };
 
-  pgpdump = callPackage ../tools/security/pgpdump { };
-
-  pgpkeyserver-lite = callPackage ../servers/web-apps/pgpkeyserver-lite { };
-
-  pgweb = callPackage ../development/tools/database/pgweb { };
-
   grantlee = libsForQt5.callPackage ../development/libraries/grantlee { };
 
-  gsasl = callPackage ../development/libraries/gsasl { };
-
-  gsl = callPackage ../development/libraries/gsl { };
-
-  gsl-lite = callPackage ../development/libraries/gsl-lite { };
-
-  gsm = callPackage ../development/libraries/gsm { };
-
-  gsoap = callPackage ../development/libraries/gsoap { };
-
-  gsound = callPackage ../development/libraries/gsound { };
-
-  gss = callPackage ../development/libraries/gss { };
-
-  gtkimageview = callPackage ../development/libraries/gtkimageview { };
-
   glib = callPackage ../development/libraries/glib (let
     glib-untested = glib.overrideAttrs { doCheck = false; };
   in {
@@ -19757,16 +9622,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  glib-networking = callPackage ../development/libraries/glib-networking { };
-
-  glib-testing = callPackage ../development/libraries/glib-testing { };
-
   glirc = haskell.lib.compose.justStaticExecutables haskellPackages.glirc;
 
-  gom = callPackage ../development/libraries/gom { };
-
-  ace = callPackage ../development/libraries/ace { };
-
   # Not moved to aliases while we decide if we should split the package again.
   atk = at-spi2-core;
 
@@ -19774,12 +9631,6 @@ with pkgs;
 
   atkmm_2_36 = callPackage ../development/libraries/atkmm/2.36.nix { };
 
-  pixman = callPackage ../development/libraries/pixman { };
-
-  cairo = callPackage ../development/libraries/cairo { };
-
-  cairo-lang = callPackage ../development/compilers/cairo { };
-
   cairomm = callPackage ../development/libraries/cairomm { };
 
   cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix {
@@ -19810,10 +9661,6 @@ with pkgs;
 
   gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { };
 
-  gnome-menus = callPackage ../development/libraries/gnome-menus { };
-
-  gnote = callPackage ../applications/office/gnote { };
-
   gtk2 = callPackage ../development/libraries/gtk/2.x.nix {
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
   };
@@ -19824,8 +9671,6 @@ with pkgs;
     gdktarget = "x11";
   };
 
-  gtkextra = callPackage ../development/libraries/gtkextra { };
-
   gtk3 = callPackage ../development/libraries/gtk/3.x.nix {
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa QuartzCore;
   };
@@ -19844,18 +9689,10 @@ with pkgs;
   gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
   gtkmm4 = callPackage ../development/libraries/gtkmm/4.x.nix { };
 
-  gtk_engines = callPackage ../development/libraries/gtk-engines { };
-
-  gtk-engine-bluecurve = callPackage ../development/libraries/gtk-engine-bluecurve { };
-
-  gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { };
-
   gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { };
 
   gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { };
 
-  gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { };
-
   gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration {
     gtk = gtk3;
   };
@@ -19866,8 +9703,6 @@ with pkgs;
 
   gtk-mac-integration-gtk3 = gtk-mac-integration;
 
-  gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler { };
-
   gtksourceview = gtksourceview3;
 
   gtksourceview3 = callPackage ../development/libraries/gtksourceview/3.x.nix { };
@@ -19884,20 +9719,6 @@ with pkgs;
 
   gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };
 
-  gtkspellmm = callPackage ../development/libraries/gtkspellmm { };
-
-  gtk-layer-shell = callPackage ../development/libraries/gtk-layer-shell { };
-
-  gtk4-layer-shell = callPackage ../development/libraries/gtk4-layer-shell { };
-
-  gts = callPackage ../development/libraries/gts { };
-
-  gumbo = callPackage ../development/libraries/gumbo { };
-
-  gvfs = callPackage ../development/libraries/gvfs { };
-
-  gvm-libs = callPackage ../development/libraries/gvm-libs { };
-
   gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { };
 
   hamlib = hamlib_3;
@@ -19919,36 +9740,18 @@ with pkgs;
     withIcu = true;
   };
 
-  hawknl = callPackage ../development/libraries/hawknl { };
-
-  haxor-news = callPackage ../applications/misc/haxor-news { };
-
-  hdt = callPackage ../misc/hdt { };
-
-  hfinger = callPackage ../tools/security/hfinger { };
-
   herqq = libsForQt5.callPackage ../development/libraries/herqq { };
 
   hidapi = callPackage ../development/libraries/hidapi {
     inherit (darwin.apple_sdk.frameworks) Cocoa IOKit;
   };
 
-  highfive = callPackage ../development/libraries/highfive { };
-
   highfive-mpi = highfive.override { hdf5 = hdf5-mpi; };
 
-  hiredis = callPackage ../development/libraries/hiredis { };
-
-  hiredis-vip = callPackage ../development/libraries/hiredis-vip { };
-
   hivex = callPackage ../development/libraries/hivex {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  hmat-oss = callPackage ../development/libraries/hmat-oss { };
-
-  hound = callPackage ../development/tools/misc/hound { };
-
   hpx = callPackage ../development/libraries/hpx {
     boost = boost179;
     asio = asio.override { boost = boost179; };
@@ -19958,20 +9761,6 @@ with pkgs;
 
   hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { };
 
-  hsqldb = callPackage ../development/libraries/java/hsqldb { };
-
-  hstr = callPackage ../applications/misc/hstr { };
-
-  hstsparser = callPackage ../tools/security/hstsparser { };
-
-  htmlcxx = callPackage ../development/libraries/htmlcxx { };
-
-  http-parser = callPackage ../development/libraries/http-parser { };
-
-  httpref = callPackage ../development/tools/misc/httpref { };
-
-  hubble = callPackage ../applications/networking/cluster/hubble { };
-
   hunspell = callPackage ../development/libraries/hunspell { };
 
   hunspellDicts = recurseIntoAttrs (callPackages ../development/libraries/hunspell/dictionaries.nix {});
@@ -19980,20 +9769,10 @@ with pkgs;
 
   hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; };
 
-  hwloc = callPackage ../development/libraries/hwloc { };
-
   hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_24; };
 
-  hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
-
-  hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
-
   hydra-check = with python3.pkgs; toPythonApplication hydra-check;
 
-  hyena = callPackage ../development/libraries/hyena { };
-
-  hyperscan = callPackage ../development/libraries/hyperscan { };
-
   icu-versions = callPackages ../development/libraries/icu { };
   inherit (icu-versions)
     icu60
@@ -20013,29 +9792,12 @@ with pkgs;
 
   icu = icu74;
 
-  id3lib = callPackage ../development/libraries/id3lib { };
-
   idasen = with python3Packages; toPythonApplication idasen;
 
-  ikill = callPackage ../tools/misc/ikill { };
-
-  ilbc = callPackage ../development/libraries/ilbc { };
-
-  ilmbase = callPackage ../development/libraries/ilmbase { };
-
   imgui = callPackage ../development/libraries/imgui {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
   };
 
-  imtui = callPackage ../development/libraries/imtui { };
-
-  immer = callPackage ../development/libraries/immer { };
-
-  imv = callPackage ../applications/graphics/imv { };
-
-  iml = callPackage ../development/libraries/iml { };
-
-  imlib2 = callPackage ../development/libraries/imlib2 { };
   imlib2Full = imlib2.override {
     # Compilation error on Darwin with librsvg. For more information see:
     # https://github.com/NixOS/nixpkgs/pull/166452#issuecomment-1090725613
@@ -20051,44 +9813,20 @@ with pkgs;
 
   imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ;
 
-  impy = callPackage ../development/libraries/impy { };
-
-  ijs = callPackage ../development/libraries/ijs { };
-
   indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { };
   indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { };
 
-  indicator-sound-switcher = callPackage ../applications/audio/indicator-sound-switcher { };
-
   indilib = darwin.apple_sdk_11_0.callPackage ../development/libraries/science/astronomy/indilib { };
   indi-3rdparty = recurseIntoAttrs (callPackages ../development/libraries/science/astronomy/indilib/indi-3rdparty.nix { });
 
-  inih = callPackage ../development/libraries/inih { };
-
-  iniparser = callPackage ../development/libraries/iniparser { };
-
-  initool = callPackage ../development/tools/initool { };
-
-  intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { };
-
-  intel-media-driver = callPackage ../development/libraries/intel-media-driver { };
-
-  intltool = callPackage ../development/tools/misc/intltool { };
-
   ios-cross-compile = callPackage ../development/compilers/ios-cross-compile/9.2.nix { };
 
-  ip2location-c = callPackage ../development/libraries/ip2location-c { };
-
   irrlicht = if !stdenv.hostPlatform.isDarwin then
     callPackage ../development/libraries/irrlicht { }
   else callPackage ../development/libraries/irrlicht/mac.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL IOKit;
   };
 
-  isocodes = callPackage ../development/libraries/iso-codes { };
-
-  iso-flags = callPackage ../data/icons/iso-flags { };
-
   iso-flags-png-320x240 = iso-flags.overrideAttrs (oldAttrs: {
     buildFlags = [ "png-country-320x240-fancy" ];
     installPhase = ''
@@ -20120,66 +9858,18 @@ with pkgs;
 
   itk = itk_5;
 
-  jama = callPackage ../development/libraries/jama { };
-
-  jarowinkler-cpp = callPackage ../development/libraries/jarowinkler-cpp { };
-
-  jbig2dec = callPackage ../development/libraries/jbig2dec { };
-
-  jbig2enc = callPackage ../development/libraries/jbig2enc { };
-
-  jcal = callPackage ../development/libraries/jcal { };
-
-  jbigkit = callPackage ../development/libraries/jbigkit { };
-
-  jefferson = callPackage ../tools/filesystems/jefferson { };
-
   jemalloc = callPackage ../development/libraries/jemalloc { };
 
   rust-jemalloc-sys = callPackage ../development/libraries/jemalloc/rust.nix { };
   rust-jemalloc-sys-unprefixed = rust-jemalloc-sys.override { unprefixed = true; };
 
-  jose = callPackage ../development/libraries/jose { };
-
-  jpcre2 = callPackage ../development/libraries/jpcre2 { };
-
-  jshon = callPackage ../development/tools/parsing/jshon { };
-
-  json2hcl = callPackage ../development/tools/json2hcl { };
-
   json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml;
 
-  json-glib = callPackage ../development/libraries/json-glib { };
-
-  json_c = callPackage ../development/libraries/json-c { };
-
-  jsoncpp = callPackage ../development/libraries/jsoncpp { };
-
-  json-fortran = callPackage ../development/libraries/json-fortran { };
-
-  jsonnet = callPackage ../development/compilers/jsonnet { };
-
-  jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { };
-
-  jrsonnet = callPackage ../development/compilers/jrsonnet { };
-
-  jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { };
-
-  jxrlib = callPackage ../development/libraries/jxrlib { };
-
-  libjson = callPackage ../development/libraries/libjson { };
-
   libjodycode = callPackage ../development/libraries/libjodycode {
     # missing aligned_alloc()
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
 
-  libb64 = callPackage ../development/libraries/libb64 { };
-
-  judy = callPackage ../development/libraries/judy { };
-
-  kcp = callPackage ../development/libraries/kcp { };
-
   kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { };
 
   keybinder = callPackage ../development/libraries/keybinder {
@@ -20197,8 +9887,6 @@ with pkgs;
   };
   libkrb5 = krb5; # TODO(de11n) Try to make krb5 reuse libkrb5 as a dependency
 
-  kronosnet = callPackage ../development/libraries/kronosnet { };
-
   ktextaddons = libsForQt5.callPackage ../development/libraries/ktextaddons {};
 
   l-smash = callPackage ../development/libraries/l-smash {
@@ -20209,76 +9897,22 @@ with pkgs;
     inherit pkgs;
   });
 
-  lasem = callPackage ../development/libraries/lasem { };
-
-  lasso = callPackage ../development/libraries/lasso { };
-
-  LAStools = callPackage ../development/libraries/LAStools { };
-
   laurel = callPackage ../servers/monitoring/laurel/default.nix { };
 
-  lcm = callPackage ../development/libraries/lcm { };
-
   lcms = lcms2;
 
-  lcms1 = callPackage ../development/libraries/lcms { };
-
-  lcms2 = callPackage ../development/libraries/lcms2 { };
-
-  lcrq = callPackage ../development/libraries/lcrq { };
-
-  ldacbt = callPackage ../development/libraries/ldacbt { };
-
-  ldb = callPackage ../development/libraries/ldb { };
-
-  lensfun = callPackage ../development/libraries/lensfun { };
-
-  lesbar = callPackage ../applications/window-managers/lesbar { };
-
-  lesstif = callPackage ../development/libraries/lesstif { };
-
-  leveldb = callPackage ../development/libraries/leveldb { };
-
-  lmdb = callPackage ../development/libraries/lmdb { };
-
-  lmdbxx = callPackage ../development/libraries/lmdbxx { };
-
-  lemon-graph = callPackage ../development/libraries/lemon-graph { };
-
-  levmar = callPackage ../development/libraries/levmar { };
-
-  leptonica = callPackage ../development/libraries/leptonica { };
-
-  lerc = callPackage ../development/libraries/lerc { };
-
   lib2geom = callPackage ../development/libraries/lib2geom {
     stdenv = if stdenv.cc.isClang then llvmPackages_13.stdenv else stdenv;
   };
 
-  lib3ds = callPackage ../development/libraries/lib3ds { };
-
-  lib3mf = callPackage ../development/libraries/lib3mf { };
-
-  libaacs = callPackage ../development/libraries/libaacs { };
-
-  libaal = callPackage ../development/libraries/libaal { };
-
-  libabigail = callPackage ../development/libraries/libabigail { };
-
-  libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { };
-
   libacr38u = callPackage ../tools/security/libacr38u {
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  libad9361 = callPackage ../development/libraries/libad9361 { };
-
   libadwaita = callPackage ../development/libraries/libadwaita {
     inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation;
   };
 
-  libaec = callPackage ../development/libraries/libaec { };
-
   libagar = callPackage ../development/libraries/libagar { };
   libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { };
 
@@ -20287,24 +9921,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit;
   };
 
-  libaosd = callPackage ../development/libraries/libaosd { };
-
-  libabw = callPackage ../development/libraries/libabw { };
-
-  libamqpcpp = callPackage ../development/libraries/libamqpcpp { };
-
-  libantlr3c = callPackage ../development/libraries/libantlr3c { };
-
-  libaom = callPackage ../development/libraries/libaom { };
-
   libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
   libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
-  libappindicator = callPackage ../development/libraries/libappindicator { };
-
-  libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { };
-
-  libargs = callPackage ../development/libraries/libargs { };
-
   libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { };
 
   libaribcaption = callPackage ../by-name/li/libaribcaption/package.nix {
@@ -20313,54 +9931,18 @@ with pkgs;
 
   libasn1c = callPackage ../servers/osmocom/libasn1c/default.nix { };
 
-  libasr = callPackage ../development/libraries/libasr { };
-
-  libass = callPackage ../development/libraries/libass { };
-
-  libassuan = callPackage ../development/libraries/libassuan { };
-
-  libasyncns = callPackage ../development/libraries/libasyncns { };
-
-  libatomic_ops = callPackage ../development/libraries/libatomic_ops { };
-
-  libaudclient = callPackage ../development/libraries/libaudclient { };
-
-  libaudec = callPackage ../development/libraries/libaudec { };
-
-  libavc1394 = callPackage ../development/libraries/libavc1394 { };
-
-  libavif = callPackage ../development/libraries/libavif { };
-
-  libayatana-common = callPackage ../development/libraries/libayatana-common { };
-
-  libb2 = callPackage ../development/libraries/libb2 { };
-
-  libbacktrace = callPackage ../development/libraries/libbacktrace { };
-
   libbap = callPackage ../development/libraries/libbap {
     inherit (ocaml-ng.ocamlPackages_4_14) bap ocaml findlib ctypes ctypes-foreign;
   };
 
-  libbaseencode = callPackage ../development/libraries/libbaseencode { };
-
   libbass = (callPackage ../development/libraries/audio/libbass { }).bass;
   libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx;
   libbassmix = (callPackage ../development/libraries/audio/libbass { }).bassmix;
 
-  libbdplus = callPackage ../development/libraries/libbdplus { };
-
-  libblockdev = callPackage ../development/libraries/libblockdev { };
-
-  libblocksruntime = callPackage ../development/libraries/libblocksruntime { };
-
   libbluray = callPackage ../development/libraries/libbluray {
     inherit (darwin.apple_sdk.frameworks) DiskArbitration;
   };
 
-  libbs2b = callPackage ../development/libraries/audio/libbs2b { };
-
-  libcacard = callPackage ../development/libraries/libcacard { };
-
   libcamera-qcam = callPackage ../by-name/li/libcamera/package.nix { withQcam = true; };
 
   libcanberra = callPackage ../development/libraries/libcanberra {
@@ -20377,28 +9959,12 @@ with pkgs;
     then pkgs.libcanberra
     else pkgs.libcanberra-gtk2;
 
-  libcaption = callPackage ../development/libraries/libcaption { };
-
-  libcbor = callPackage ../development/libraries/libcbor { };
-
-  libccd = callPackage ../development/libraries/libccd { };
-
   libcec = callPackage ../development/libraries/libcec { };
 
   libcec_platform = callPackage ../development/libraries/libcec/platform.nix { };
 
   libcef = callPackage ../development/libraries/libcef { };
 
-  libcello = callPackage ../development/libraries/libcello { };
-
-  libcerf = callPackage ../development/libraries/libcerf { };
-
-  libcdada = callPackage ../development/libraries/libcdada { };
-
-  libcdaudio = callPackage ../development/libraries/libcdaudio { };
-
-  libcddb = callPackage ../development/libraries/libcddb { };
-
   libcdio = callPackage ../development/libraries/libcdio {
     inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
   };
@@ -20409,82 +9975,23 @@ with pkgs;
 
   libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; };
 
-  libchamplain = callPackage ../development/libraries/libchamplain { };
-
   libchamplain_libsoup3 = libchamplain.override { withLibsoup3 = true; };
 
-  libchardet = callPackage ../development/libraries/libchardet { };
-
   libchipcard = callPackage ../development/libraries/aqbanking/libchipcard.nix { };
 
-  libcrafter = callPackage ../development/libraries/libcrafter { };
-
-  libcrossguid = callPackage ../development/libraries/libcrossguid { };
-
-  libcs50 = callPackage ../development/libraries/libcs50 { };
-
-  libuchardet = callPackage ../development/libraries/libuchardet { };
-
-  libchop = callPackage ../development/libraries/libchop { };
-
-  libcifpp = callPackage ../development/libraries/libcifpp { };
-
-  libcint = callPackage ../development/libraries/libcint { };
-
-  libcli = callPackage ../development/libraries/libcli { };
-
-  libclthreads = callPackage ../development/libraries/libclthreads  { };
-
-  libclxclient = callPackage ../development/libraries/libclxclient  { };
-
-  libconfuse = callPackage ../development/libraries/libconfuse { };
-
-  libcangjie = callPackage ../development/libraries/libcangjie { };
-
-  libcollectdclient = callPackage ../development/libraries/libcollectdclient { };
-
   libcomps = callPackage ../tools/package-management/libcomps { python = python3; };
 
-  libcredis = callPackage ../development/libraries/libcredis { };
-
-  libctb = callPackage ../development/libraries/libctb { };
-
-  libctemplate = callPackage ../development/libraries/libctemplate { };
-
-  libctl = callPackage ../development/libraries/libctl { };
-
-  libcotp = callPackage ../development/libraries/libcotp { };
-
-  libcouchbase = callPackage ../development/libraries/libcouchbase { };
-
-  libcue = callPackage ../development/libraries/libcue { };
-
   libcxxrt = callPackage ../development/libraries/libcxxrt {
     stdenv = if stdenv.hostPlatform.useLLVM or false
              then overrideCC stdenv buildPackages.llvmPackages.tools.clangNoLibcxx
              else stdenv;
   };
 
-  libdaemon = callPackage ../development/libraries/libdaemon { };
-
-  libdatovka = callPackage ../development/libraries/libdatovka { };
-
-  libdatrie = callPackage ../development/libraries/libdatrie { };
-
-  libdazzle = callPackage ../development/libraries/libdazzle { };
-
-  libdbi = callPackage ../development/libraries/libdbi { };
-
   libdbiDriversBase = libdbiDrivers.override {
     libmysqlclient = null;
     sqlite = null;
   };
 
-  libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { };
-
-  libunity = callPackage ../development/libraries/libunity { };
-
-  libdbusmenu = callPackage ../development/libraries/libdbusmenu { };
   libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };
   libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; };
 
@@ -20492,8 +9999,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  libde265 = callPackage ../development/libraries/libde265 { };
-
   libdeflate = darwin.apple_sdk_11_0.callPackage ../development/libraries/libdeflate { };
 
   libdevil = callPackage ../development/libraries/libdevil {
@@ -20505,42 +10010,8 @@ with pkgs;
     withXorg = false;
   };
 
-  libdecor = callPackage ../development/libraries/libdecor { };
-
-  libdex = callPackage ../development/libraries/libdex { };
-
-  libdicom = callPackage ../development/libraries/libdicom { };
-
-  libdigidocpp = callPackage ../development/libraries/libdigidocpp { };
-
-  libdiscid = callPackage ../development/libraries/libdiscid { };
-
-  libdisplay-info = callPackage ../development/libraries/libdisplay-info { };
-
-  libdivecomputer = callPackage ../development/libraries/libdivecomputer { };
-
-  libdivsufsort = callPackage ../development/libraries/libdivsufsort { };
-
-  libdmtx = callPackage ../development/libraries/libdmtx { };
-
-  libdmapsharing = callPackage ../development/libraries/libdmapsharing { };
-
-  libdnet = callPackage ../development/libraries/libdnet { };
-
   libdnf = callPackage ../tools/package-management/libdnf { python = python3; };
 
-  libdovi = callPackage ../development/libraries/libdovi { };
-
-  libdrm = callPackage ../development/libraries/libdrm { };
-
-  libdv = callPackage ../development/libraries/libdv { };
-
-  libdvbcsa = callPackage ../development/libraries/libdvbcsa { };
-
-  libdvbpsi = callPackage ../development/libraries/libdvbpsi { };
-
-  libdwg = callPackage ../development/libraries/libdwg { };
-
   libdvdcss = callPackage ../development/libraries/libdvdcss {
     inherit (darwin) IOKit;
   };
@@ -20553,193 +10024,51 @@ with pkgs;
   libdvdread = callPackage ../development/libraries/libdvdread { };
   libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { };
 
-  libdwarf = callPackage ../development/libraries/libdwarf { };
   dwarfdump = libdwarf.bin;
 
-  libe57format = callPackage ../development/libraries/libe57format { };
-
-  libeatmydata = callPackage ../development/libraries/libeatmydata { };
-
-  libeb = callPackage ../development/libraries/libeb { };
-
-  libebml = callPackage ../development/libraries/libebml { };
-
-  libebur128 = callPackage ../development/libraries/libebur128 { };
-
-  libei = callPackage ../development/libraries/libei { };
-
-  libelf = callPackage ../development/libraries/libelf { };
-
-  libelfin = callPackage ../development/libraries/libelfin { };
-
-  libetpan = callPackage ../development/libraries/libetpan { };
-
-  libexecinfo = callPackage ../development/libraries/libexecinfo { };
-
-  libfaketime = callPackage ../development/libraries/libfaketime { };
-
-  libfakekey = callPackage ../development/libraries/libfakekey { };
-
-  libfido2 = callPackage ../development/libraries/libfido2 {};
-
   libfilezilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla {
     inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices;
   };
 
-  libfishsound = callPackage ../development/libraries/libfishsound { };
-
-  libfm = callPackage ../development/libraries/libfm { };
   libfm-extra = libfm.override {
     extraOnly = true;
   };
 
-  libfprint-tod = callPackage ../development/libraries/libfprint-tod { };
-
-  libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { };
-
-  libfprint-2-tod1-goodix-550a = callPackage ../development/libraries/libfprint-2-tod1-goodix-550a { };
-
-  libfprint-2-tod1-vfs0090 = callPackage ../development/libraries/libfprint-2-tod1-vfs0090 { };
-
-  libfprint-2-tod1-elan = callPackage ../development/libraries/libfprint-2-tod1-elan { };
-
-  libfpx = callPackage ../development/libraries/libfpx { };
-
-  libgadu = callPackage ../development/libraries/libgadu { };
-
-  libgbinder = callPackage ../development/libraries/libgbinder { };
-
   libgda = callPackage ../development/libraries/libgda { };
 
   libgda6 = callPackage ../development/libraries/libgda/6.x.nix { };
 
-  libgdamm = callPackage ../development/libraries/libgdamm { };
-
-  libgdata = callPackage ../development/libraries/libgdata { };
-
-  libgee = callPackage ../development/libraries/libgee { };
-
-  libgepub = callPackage ../development/libraries/libgepub { };
-
-  libgig = callPackage ../development/libraries/libgig { };
-
-  libglibutil = callPackage ../development/libraries/libglibutil { };
-
   libgnome-games-support = callPackage ../development/libraries/libgnome-games-support { };
   libgnome-games-support_2_0 = callPackage ../development/libraries/libgnome-games-support/2.0.nix { };
 
-  libgnomekbd = callPackage ../development/libraries/libgnomekbd { };
-
-  libglvnd = callPackage ../development/libraries/libglvnd { };
-
-  libgnurl = callPackage ../development/libraries/libgnurl { };
-
-  libgourou = callPackage ../development/libraries/libgourou { };
-
-  libgringotts = callPackage ../development/libraries/libgringotts { };
-
   libgrss = callPackage ../development/libraries/libgrss {
     inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit;
   };
 
-  libgweather = callPackage ../development/libraries/libgweather { };
-
-  libgxps = callPackage ../development/libraries/libgxps { };
-
   libiio = callPackage ../development/libraries/libiio {
     inherit (darwin.apple_sdk.frameworks) CFNetwork CoreServices;
     python = python3;
   };
 
-  libinjection = callPackage ../development/libraries/libinjection { };
-
-  libinklevel = callPackage ../development/libraries/libinklevel { };
-
-  libkcapi = callPackage ../development/libraries/libkcapi { };
-
-  libnats-c = callPackage ../development/libraries/libnats-c { };
-
-  liburing = callPackage ../development/libraries/liburing { };
-
-  librseq = callPackage ../development/libraries/librseq { };
-
-  libseccomp = callPackage ../development/libraries/libseccomp { };
-
-  libsecret = callPackage ../development/libraries/libsecret { };
-
-  libsegfault = callPackage ../development/libraries/libsegfault { };
-
-  libserdes = callPackage ../development/libraries/libserdes { };
-
-  libserialport = callPackage ../development/libraries/libserialport { };
-
-  libsignal-protocol-c = callPackage ../development/libraries/libsignal-protocol-c { };
-
-  libsignon-glib = callPackage ../development/libraries/libsignon-glib { };
-
   libsoundio = callPackage ../development/libraries/libsoundio {
     inherit (darwin.apple_sdk.frameworks) AudioUnit;
   };
 
-  libspelling = callPackage ../development/libraries/libspelling { };
-
-  libsystemtap = callPackage ../development/libraries/libsystemtap { };
-
-  libgtop = callPackage ../development/libraries/libgtop { };
-
-  libLAS = callPackage ../development/libraries/libLAS { };
-
-  liblaxjson = callPackage ../development/libraries/liblaxjson { };
-
-  liblo = callPackage ../development/libraries/liblo { };
-
-  liblscp = callPackage ../development/libraries/liblscp { };
-
-  libe-book = callPackage ../development/libraries/libe-book { };
-
-  libemf2svg = callPackage ../development/libraries/libemf2svg { };
-
-  libev = callPackage ../development/libraries/libev { };
-
-  libevent = callPackage ../development/libraries/libevent { };
-
-  libewf = callPackage ../development/libraries/libewf { };
-
-  libexif = callPackage ../development/libraries/libexif { };
-
-  libexosip = callPackage ../development/libraries/exosip { };
-
-  libexsid = callPackage ../development/libraries/libexsid { };
-
   libextractor = callPackage ../development/libraries/libextractor {
     libmpeg2 = mpeg2dec;
   };
 
-  libexttextcat = callPackage ../development/libraries/libexttextcat { };
-
-  libf2c = callPackage ../development/libraries/libf2c { };
-
-  libfabric = callPackage ../development/libraries/libfabric { };
-
   libfive = libsForQt5.callPackage ../development/libraries/libfive {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
     python = python3;
   };
 
-  libfixposix = callPackage ../development/libraries/libfixposix { };
-
-  libff = callPackage ../development/libraries/libff { };
-
-  libffcall = callPackage ../development/libraries/libffcall { };
-
   libffi = callPackage ../development/libraries/libffi { };
   libffi_3_3 = callPackage ../development/libraries/libffi/3.3.nix { };
   libffiBoot = libffi.override {
     doCheck = false;
   };
 
-  libfreeaptx = callPackage ../development/libraries/libfreeaptx { };
-
   libfreefare = callPackage ../development/libraries/libfreefare {
     inherit (darwin.apple_sdk.frameworks) IOKit Security;
     inherit (darwin) libobjc;
@@ -20752,8 +10081,6 @@ with pkgs;
 
   libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { };
 
-  libfyaml = callPackage ../development/libraries/libfyaml { };
-
   libgcrypt = callPackage ../development/libraries/libgcrypt { };
 
   libgcrypt_1_8 = callPackage ../development/libraries/libgcrypt/1.8.nix { };
@@ -20762,81 +10089,25 @@ with pkgs;
       inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
-  libgnt = callPackage ../development/libraries/libgnt { };
-
-  libgpg-error = callPackage ../development/libraries/libgpg-error { };
-
   # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118
   libgpg-error-gen-posix-lock-obj = libgpg-error.override {
     genPosixLockObjOnly = true;
   };
 
-  libgphoto2 = callPackage ../development/libraries/libgphoto2 { };
-
-  libgpiod = callPackage ../development/libraries/libgpiod { };
-
   libgpod = callPackage ../development/libraries/libgpod {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  libgssglue = callPackage ../development/libraries/libgssglue { };
-
-  libgudev = callPackage ../development/libraries/libgudev { };
-
-  libhangul = callPackage ../development/libraries/libhangul { };
-
-  libharu = callPackage ../development/libraries/libharu { };
-
-  libhdhomerun = callPackage ../development/libraries/libhdhomerun { };
-
-  libheif = callPackage ../development/libraries/libheif { };
-
-  libhttpseverywhere = callPackage ../development/libraries/libhttpseverywhere { };
-
-  libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { };
-
-  libhwy = callPackage ../development/libraries/libhwy { };
-
-  libHX = callPackage ../development/libraries/libHX { };
-
-  libibmad = callPackage ../development/libraries/libibmad { };
-
-  libibumad = callPackage ../development/libraries/libibumad { };
-
-  libical = callPackage ../development/libraries/libical { };
-
-  libicns = callPackage ../development/libraries/libicns { };
-
-  libieee1284 = callPackage ../development/libraries/libieee1284 { };
-
   libimobiledevice = callPackage ../development/libraries/libimobiledevice {
     inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation;
   };
 
-  libimobiledevice-glue = callPackage ../development/libraries/libimobiledevice-glue { };
-
   libindicator-gtk2 = libindicator.override { gtkVersion = "2"; };
   libindicator-gtk3 = libindicator.override { gtkVersion = "3"; };
-  libindicator = callPackage ../development/libraries/libindicator { };
-
-  libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { };
-
   libiodbc = callPackage ../development/libraries/libiodbc {
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
-  libirecovery = callPackage ../development/libraries/libirecovery { };
-
-  libivykis = callPackage ../development/libraries/libivykis { };
-
-  libkqueue = callPackage ../development/libraries/libkqueue { };
-
-  liblastfmSF = callPackage ../development/libraries/liblastfmSF { };
-
-  liblcf = callPackage ../development/libraries/liblcf { };
-
-  liblc3 = callPackage ../development/libraries/liblc3 { };
-
   inherit (callPackage ../development/libraries/libliftoff { }) libliftoff_0_4 libliftoff_0_5;
   libliftoff = libliftoff_0_5;
 
@@ -20844,56 +10115,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon AppKit;
   };
 
-  liblockfile = callPackage ../development/libraries/liblockfile { };
-
-  liblogging = callPackage ../development/libraries/liblogging { };
-
-  liblognorm = callPackage ../development/libraries/liblognorm { };
-
-  libltc = callPackage ../development/libraries/libltc { };
-
-  liblxi = callPackage ../development/libraries/liblxi { };
-
-  libmaxminddb = callPackage ../development/libraries/libmaxminddb { };
-
-  libmcfp = callPackage ../development/libraries/libmcfp { };
-
-  libmcrypt = callPackage ../development/libraries/libmcrypt { };
-
-  libmediaart = callPackage ../development/libraries/libmediaart { };
-
-  libmhash = callPackage ../development/libraries/libmhash { };
-
-  libmodbus = callPackage ../development/libraries/libmodbus { };
-
-  libmtp = callPackage ../development/libraries/libmtp { };
-
-  libmypaint = callPackage ../development/libraries/libmypaint { };
-
-  libmysofa = callPackage ../development/libraries/audio/libmysofa { };
-
-  libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { };
-
-  libnatpmp = callPackage ../development/libraries/libnatpmp { };
-
-  libnatspec = callPackage ../development/libraries/libnatspec { };
-
-  libndp = callPackage ../development/libraries/libndp { };
-
-  libnfc = callPackage ../development/libraries/libnfc { };
-
-  libnfs = callPackage ../development/libraries/libnfs { };
-
-  libnice = callPackage ../development/libraries/libnice { };
-
-  libnitrokey = callPackage ../development/libraries/libnitrokey { };
-
-  libnsl = callPackage ../development/libraries/libnsl { };
-
-  liboping = callPackage ../development/libraries/liboping { };
-
-  libplist = callPackage ../development/libraries/libplist { };
-
   libqtdbusmock = libsForQt5.callPackage ../development/libraries/libqtdbusmock {
     inherit (lomiri) cmake-extras;
   };
@@ -20906,49 +10127,21 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
   };
 
-  librecast = callPackage ../development/libraries/librecast { };
-
-  libredwg = callPackage ../development/libraries/libredwg { };
-
-  librem = callPackage ../development/libraries/librem { };
-
   libremines = qt6.callPackage ../games/libremines { };
 
-  librelp = callPackage ../development/libraries/librelp { };
-
   librepo = callPackage ../tools/package-management/librepo {
     python = python3;
   };
 
-  librevenge = callPackage ../development/libraries/librevenge { };
-
-  librime = callPackage ../development/libraries/librime { };
-
   librsb = callPackage ../development/libraries/librsb {
     # Taken from https://build.opensuse.org/package/view_file/science/librsb/librsb.spec
     memHierarchy = "L3:16/64/8192K,L2:16/64/2048K,L1:8/64/16K";
   };
 
-  librtprocess = callPackage ../development/libraries/librtprocess { };
-
   libsamplerate = callPackage ../development/libraries/libsamplerate {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon CoreServices;
   };
 
-  libsieve = callPackage ../development/libraries/libsieve { };
-
-  libsixel = callPackage ../development/libraries/libsixel { };
-
-  libsolv = callPackage ../development/libraries/libsolv { };
-
-  libspectre = callPackage ../development/libraries/libspectre { };
-
-  libspecbleach = callPackage ../development/libraries/audio/libspecbleach { };
-
-  libspnav = callPackage ../development/libraries/libspnav { };
-
-  libgsf = callPackage ../development/libraries/libgsf { };
-
   # GNU libc provides libiconv so systems with glibc don't need to
   # build libiconv separately. Additionally, Apple forked/repackaged
   # libiconv, so build and use the upstream one with a compatible ABI,
@@ -20988,80 +10181,24 @@ with pkgs;
   # On non-GNU systems we need GNU Gettext for libintl.
   libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null;
 
-  libid3tag = callPackage ../development/libraries/libid3tag { };
-
-  libidn = callPackage ../development/libraries/libidn { };
-
   libidn2 = callPackage ../development/libraries/libidn2 { };
 
-  idnkit = callPackage ../development/libraries/idnkit { };
-
-  libiec61883 = callPackage ../development/libraries/libiec61883 { };
-
-  libimagequant = callPackage ../development/libraries/libimagequant { };
-
-  libime = callPackage ../development/libraries/libime { };
-
-  libinfinity = callPackage ../development/libraries/libinfinity { };
-
   libinput = callPackage ../development/libraries/libinput {
     graphviz = graphviz-nox;
   };
 
-  libinput-gestures = callPackage ../tools/inputmethods/libinput-gestures { };
-
-  libinstpatch = callPackage ../development/libraries/audio/libinstpatch { };
-
-  libipt = callPackage ../development/libraries/libipt { };
-
-  libiptcdata = callPackage ../development/libraries/libiptcdata { };
-
-  libjcat = callPackage ../development/libraries/libjcat { };
-
-  libjpeg_original = callPackage ../development/libraries/libjpeg { };
   # also known as libturbojpeg
-  libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
   libjpeg = libjpeg_turbo;
   libjpeg8 = libjpeg_turbo.override { enableJpeg8 = true; };
 
-  libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { };
-
-  libjwt = callPackage ../development/libraries/libjwt { };
-
-  libjxl = callPackage ../development/libraries/libjxl { };
-
-  libkate = callPackage ../development/libraries/libkate { };
-
-  libkeyfinder = callPackage ../development/libraries/audio/libkeyfinder { };
-
-  libks = callPackage ../development/libraries/libks { };
-
-  libksba = callPackage ../development/libraries/libksba { };
-
-  libksi = callPackage ../development/libraries/libksi { };
-
-  liblinear = callPackage ../development/libraries/liblinear { };
-
-  libmad = callPackage ../development/libraries/libmad { };
-
   malcontent = callPackage ../development/libraries/malcontent { };
 
   malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { };
 
-  libmanette = callPackage ../development/libraries/libmanette { };
-
-  libmatchbox = callPackage ../development/libraries/libmatchbox { };
-
-  libmatheval = callPackage ../development/libraries/libmatheval { };
-
   libmatthew_java = callPackage ../development/libraries/java/libmatthew-java {
     jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
 
-  libmd = callPackage ../development/libraries/libmd { };
-
-  libmemcached = callPackage ../development/libraries/libmemcached { };
-
   inherit
     ({
       libmicrohttpd_0_9_77 = callPackage ../development/libraries/libmicrohttpd/0.9.77.nix { };
@@ -21077,131 +10214,21 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreAudio;
   };
 
-  libmilter = callPackage ../development/libraries/libmilter { };
-
-  libminc = callPackage ../development/libraries/libminc { };
-
-  libmkv = callPackage ../development/libraries/libmkv { };
-
-  libnut = callPackage ../development/libraries/libnut { };
-
-  libmms = callPackage ../development/libraries/libmms { };
-
-  libmowgli = callPackage ../development/libraries/libmowgli { };
-
-  libmng = callPackage ../development/libraries/libmng { };
-
-  libmnl = callPackage ../development/libraries/libmnl { };
-
-  libmodplug = callPackage ../development/libraries/libmodplug { };
-
-  libmodule = callPackage ../development/libraries/libmodule { };
-
-  libmpcdec = callPackage ../development/libraries/libmpcdec { };
-
-  libmp3splt = callPackage ../development/libraries/libmp3splt { };
-
-  libmspack = callPackage ../development/libraries/libmspack { };
-
   libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { };
 
   libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
 
   libmusicbrainz = libmusicbrainz3;
 
-  libmwaw = callPackage ../development/libraries/libmwaw { };
-
-  libmx = callPackage ../development/libraries/libmx { };
-
-  libndctl = callPackage ../development/libraries/libndctl { };
-
-  libnest2d = callPackage ../development/libraries/libnest2d { };
-
-  libnet = callPackage ../development/libraries/libnet { };
-
-  libnetfilter_acct = callPackage ../development/libraries/libnetfilter_acct { };
-
-  libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { };
-
-  libnetfilter_cthelper = callPackage ../development/libraries/libnetfilter_cthelper { };
-
-  libnetfilter_cttimeout = callPackage ../development/libraries/libnetfilter_cttimeout { };
-
-  libnetfilter_log = callPackage ../development/libraries/libnetfilter_log { };
-
-  libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { };
-
-  libnfnetlink = callPackage ../development/libraries/libnfnetlink { };
-
-  libnftnl = callPackage ../development/libraries/libnftnl { };
-
-  libnova = callPackage ../development/libraries/science/astronomy/libnova { };
-
-  libodfgen = callPackage ../development/libraries/libodfgen { };
-
-  libofa = callPackage ../development/libraries/libofa { };
-
-  libofx = callPackage ../development/libraries/libofx { };
-
-  libogg = callPackage ../development/libraries/libogg { };
-
-  liboggz = callPackage ../development/libraries/liboggz { };
-
-  liboil = callPackage ../development/libraries/liboil { };
-
-  libomxil-bellagio = callPackage ../development/libraries/libomxil-bellagio { };
-
-  libopenaptx = callPackage ../development/libraries/libopenaptx { };
-
-  libopenglrecorder = callPackage ../development/libraries/libopenglrecorder { };
-
-  libopusenc = callPackage ../development/libraries/libopusenc { };
-
-  libosinfo = callPackage ../development/libraries/libosinfo { };
-
-  libosip = callPackage ../development/libraries/osip { };
-
-  libosmium = callPackage ../development/libraries/libosmium { };
-
-  libosmoabis = callPackage ../servers/osmocom/libosmoabis { };
-
-  libosmocore = callPackage ../servers/osmocom/libosmocore { };
-
-  libosmo-netif = callPackage ../servers/osmocom/libosmo-netif { };
-
-  libosmo-sccp = callPackage ../servers/osmocom/libosmo-sccp { };
-
   libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { };
 
-  libotr = callPackage ../development/libraries/libotr { };
-
-  libow = callPackage ../development/libraries/libow { };
-
-  libp11 = callPackage ../development/libraries/libp11 { };
-
-  libpam-wrapper = callPackage ../development/libraries/libpam-wrapper { };
-
-  libpanel = callPackage ../development/libraries/libpanel { };
-
-  libpar2 = callPackage ../development/libraries/libpar2 { };
-
-  libpcap = callPackage ../development/libraries/libpcap { };
-
   libpeas = callPackage ../development/libraries/libpeas { };
   libpeas2 = callPackage ../development/libraries/libpeas/2.x.nix { };
 
-  libpg_query = callPackage ../development/libraries/libpg_query { };
-
-  libpipeline = callPackage ../development/libraries/libpipeline { };
-
-  libpgf = callPackage ../development/libraries/libpgf { };
-
   libphonenumber = callPackage ../development/libraries/libphonenumber {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  libplacebo = callPackage ../development/libraries/libplacebo { };
-
   libpng = callPackage ../development/libraries/libpng {
     stdenv =
       # libpng is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
@@ -21214,28 +10241,12 @@ with pkgs;
 
   libpng12 = callPackage ../development/libraries/libpng/12.nix { };
 
-  libpostal = callPackage ../development/libraries/libpostal { };
-
-  libpaper = callPackage ../development/libraries/libpaper { };
-
-  libpfm = callPackage ../development/libraries/libpfm { };
-
-  libpqxx = callPackage ../development/libraries/libpqxx { };
-
   inherit (callPackages ../development/libraries/prometheus-client-c {
     stdenv = gccStdenv; # Required for darwin
   }) libprom libpromhttp;
 
   libproxy = callPackage ../development/libraries/libproxy { };
 
-  libpseudo = callPackage ../development/libraries/libpseudo { };
-
-  libpsl = callPackage ../development/libraries/libpsl { };
-
-  libpst = callPackage ../development/libraries/libpst { };
-
-  libptytty = callPackage ../development/libraries/libptytty { };
-
   libpulsar = callPackage ../development/libraries/libpulsar {
     protobuf = protobuf_21;
   };
@@ -21244,111 +10255,35 @@ with pkgs;
     python = python3;
   };
 
-  libqalculate = callPackage ../development/libraries/libqalculate { };
-
   libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { };
 
-  librclone = callPackage ../development/libraries/librclone { };
-
-  libroxml = callPackage ../development/libraries/libroxml { };
-
   librsvg = callPackage ../development/libraries/librsvg {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
   };
 
-  librsync = callPackage ../development/libraries/librsync { };
-
-  librttopo = callPackage ../development/libraries/librttopo { };
-
-  libschrift = callPackage ../development/libraries/libschrift { };
-
-  libsciter = callPackage ../development/libraries/libsciter { };
-
-  libsearpc = callPackage ../development/libraries/libsearpc { };
-
   libsigcxx = callPackage ../development/libraries/libsigcxx { };
 
   libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { };
 
-  libsigsegv = callPackage ../development/libraries/libsigsegv { };
-
-  libslirp = callPackage ../development/libraries/libslirp { };
-
   libsndfile = callPackage ../development/libraries/libsndfile {
     inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox;
   };
 
-  libsodium = callPackage ../development/libraries/libsodium { };
-
   libsoup = callPackage ../development/libraries/libsoup { };
 
   libsoup_3 = callPackage ../development/libraries/libsoup/3.x.nix { };
 
-  libspectrum = callPackage ../development/libraries/libspectrum { };
-
-  libspiro = callPackage ../development/libraries/libspiro { };
-
-  libspng = callPackage ../development/libraries/libspng { };
-
-  libssh = callPackage ../development/libraries/libssh { };
-
-  libssh2 = callPackage ../development/libraries/libssh2 { };
-
-  libstartup_notification = callPackage ../development/libraries/startup-notification { };
-
-  libstemmer = callPackage ../development/libraries/libstemmer { };
-
-  libstroke = callPackage ../development/libraries/libstroke { };
-
-  libspatialaudio = callPackage ../development/libraries/libspatialaudio { };
-
-  libspatialite = callPackage ../development/libraries/libspatialite { };
-
   libstatgrab = callPackage ../development/libraries/libstatgrab {
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  libsvm = callPackage ../development/libraries/libsvm { };
-
-  libtar = callPackage ../development/libraries/libtar { };
-
-  libtasn1 = callPackage ../development/libraries/libtasn1 { };
-
-  libthai = callPackage ../development/libraries/libthai { };
-
-  libthreadar = callPackage ../development/libraries/libthreadar { };
-
-  libticables2 = callPackage ../development/libraries/libticables2 { };
-
   libticalcs2 = callPackage ../development/libraries/libticalcs2 {
     inherit (darwin) libobjc;
   };
 
-  libticonv = callPackage ../development/libraries/libticonv { };
-
-  libtifiles2 = callPackage ../development/libraries/libtifiles2 { };
-
-  libtiger = callPackage ../development/libraries/libtiger { };
-
-  libtommath = callPackage ../development/libraries/libtommath { };
-
-  libtomcrypt = callPackage ../development/libraries/libtomcrypt { };
-
   libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
 
-  libtpms = callPackage ../tools/security/libtpms { };
-
-  libtsm = callPackage ../development/libraries/libtsm { };
-
-  libsv = callPackage ../development/libraries/libsv { };
-
-  libgeotiff = callPackage ../development/libraries/libgeotiff { };
-
-  libu2f-host = callPackage ../development/libraries/libu2f-host { };
-
-  libu2f-server = callPackage ../development/libraries/libu2f-server { };
-
   libubox-nossl = callPackage ../development/libraries/libubox { };
 
   libubox = callPackage ../development/libraries/libubox { with_ustream_ssl = true; };
@@ -21357,43 +10292,19 @@ with pkgs;
 
   libubox-mbedtls = callPackage ../development/libraries/libubox { with_ustream_ssl = true; ustream-ssl = ustream-ssl-mbedtls; };
 
-  libudev-zero = callPackage ../development/libraries/libudev-zero { };
-
-  libudfread = callPackage ../development/libraries/libudfread { };
-
-  libuecc = callPackage ../development/libraries/libuecc { };
-
-  libuev = callPackage ../development/libraries/libuev {};
-
   libui = callPackage ../development/libraries/libui {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  libuinputplus = callPackage ../development/libraries/libuinputplus { };
-
   libuiohook = callPackage ../development/libraries/libuiohook {
     inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices Carbon;
   };
 
   libunistring = callPackage ../development/libraries/libunistring { };
 
-  libupnp = callPackage ../development/libraries/pupnp { };
-
-  libwhereami = callPackage ../development/libraries/libwhereami { };
-
-  giflib     = callPackage ../development/libraries/giflib { };
-
-  libunarr = callPackage ../development/libraries/libunarr { };
-
-  libunibreak = callPackage ../development/libraries/libunibreak { };
-
-  libuninameslist = callPackage ../development/libraries/libuninameslist { };
-
   libunique = callPackage ../development/libraries/libunique { };
   libunique3 = callPackage ../development/libraries/libunique/3.x.nix { };
 
-  liburcu = callPackage ../development/libraries/liburcu { };
-
   libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix { };
 
   libusb1 = callPackage ../development/libraries/libusb1 {
@@ -21401,16 +10312,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) IOKit Security;
   };
 
-  libusbgx = callPackage ../development/libraries/libusbgx { };
-
-  libusbsio = callPackage ../development/libraries/libusbsio { };
-
-  libucontext = callPackage ../development/libraries/libucontext { };
-
-  libutempter = callPackage ../development/libraries/libutempter { };
-
-  libuldaq = callPackage ../development/libraries/libuldaq { };
-
   libunicode = callPackage ../development/libraries/libunicode {
     catch2 = catch2_3;
     fmt = fmt_9;
@@ -21426,8 +10327,6 @@ with pkgs;
 
   libuv = darwin.apple_sdk_11_0.callPackage ../development/libraries/libuv { };
 
-  libuvc = callPackage ../development/libraries/libuvc { };
-
   libv4l = lowPrio (v4l-utils.override {
     withUtils = false;
   });
@@ -21439,18 +10338,6 @@ with pkgs;
   libva1 = callPackage ../development/libraries/libva/1.nix { };
   libva1-minimal = libva1.override { minimal = true; };
 
-  libvarlink = callPackage ../development/libraries/libvarlink { };
-
-  libvdpau = callPackage ../development/libraries/libvdpau { };
-
-  libvdwxc = callPackage ../development/libraries/science/chemistry/libvdwxc { };
-
-  libmodulemd = callPackage ../development/libraries/libmodulemd { };
-
-  libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { };
-
-  libversion = callPackage ../development/libraries/libversion { };
-
   libvgm = callPackage ../development/libraries/libvgm {
     inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox;
   };
@@ -21459,41 +10346,10 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon AppKit;
   };
 
-  libvirt-glib = callPackage ../development/libraries/libvirt-glib { };
-
-  libvisio = callPackage ../development/libraries/libvisio { };
-
-  libvisio2svg = callPackage ../development/libraries/libvisio2svg { };
-
-  libvisual = callPackage ../development/libraries/libvisual { };
-
-  libvmaf = callPackage ../development/libraries/libvmaf { };
-
   libvncserver = callPackage ../development/libraries/libvncserver {
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
-  libviper = callPackage ../development/libraries/libviper { };
-
-  libviperfx = callPackage ../development/libraries/libviperfx { };
-
-  libvpx = callPackage ../development/libraries/libvpx { };
-
-  libvterm = callPackage ../development/libraries/libvterm { };
-  libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { };
-
-  libvorbis = callPackage ../development/libraries/libvorbis { };
-
-  libvori = callPackage ../development/libraries/libvori { };
-
-  libwbxml = callPackage ../development/libraries/libwbxml { };
-
-  libwebcam = callPackage ../os-specific/linux/libwebcam { };
-
-  libwebp = callPackage ../development/libraries/libwebp { };
-
-  libwmf = callPackage ../development/libraries/libwmf { };
-
   libwnck = callPackage ../development/libraries/libwnck { };
   libwnck2 = callPackage ../development/libraries/libwnck/2.nix { };
 
@@ -21501,12 +10357,6 @@ with pkgs;
 
   libwpd_08 = callPackage ../development/libraries/libwpd/0.8.nix { };
 
-  libwps = callPackage ../development/libraries/libwps { };
-
-  libwpg = callPackage ../development/libraries/libwpg { };
-
-  libx86 = callPackage ../development/libraries/libx86 { };
-
   libxcrypt = callPackage ../development/libraries/libxcrypt {
     fetchurl = stdenv.fetchurlBoot;
     perl = buildPackages.perl.override {
@@ -21516,21 +10366,7 @@ with pkgs;
   };
   libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; };
 
-  libxdg_basedir = callPackage ../development/libraries/libxdg-basedir { };
-
-  libxisf = callPackage ../development/libraries/science/astronomy/libxisf { };
-
   libxkbcommon = libxkbcommon_8;
-  libxkbcommon_8 = callPackage ../development/libraries/libxkbcommon { };
-
-  libxklavier = callPackage ../development/libraries/libxklavier { };
-
-  libxls = callPackage ../development/libraries/libxls { };
-
-  libxlsxwriter = callPackage ../development/libraries/libxlsxwriter { };
-
-  libxmi = callPackage ../development/libraries/libxmi { };
-
   libxml2 = callPackage ../development/libraries/libxml2 {
     python = python3;
     stdenv =
@@ -21556,131 +10392,47 @@ with pkgs;
     '';
   };
 
-  libxmlb = callPackage ../development/libraries/libxmlb { };
-
   libxmlxx = callPackage ../development/libraries/libxmlxx { };
   libxmlxx3 = callPackage ../development/libraries/libxmlxx/v3.nix { };
 
-  libxmp = callPackage ../development/libraries/libxmp { };
-
   libxslt = callPackage ../development/libraries/libxslt {
     python = python3;
   };
 
-  libxsmm = callPackage ../development/libraries/libxsmm { };
-
-  libixp = callPackage ../development/libraries/libixp { };
-
   libwpe = callPackage ../development/libraries/libwpe { };
 
   libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { };
 
-  libyaml = callPackage ../development/libraries/libyaml { };
-
   yaml-cpp = callPackage ../development/libraries/yaml-cpp { };
 
   yaml-cpp_0_3 = callPackage ../development/libraries/yaml-cpp/0.3.0.nix { };
 
-  yas = callPackage ../development/libraries/yas { };
-
-  rang = callPackage ../development/libraries/rang { };
-
-  libykclient = callPackage ../development/libraries/libykclient { };
-
-  libykneomgr = callPackage ../development/libraries/libykneomgr { };
-
-  libytnef = callPackage ../development/libraries/libytnef { };
-
-  libyubikey = callPackage ../development/libraries/libyubikey { };
-
-  libyuv = callPackage ../development/libraries/libyuv { };
-
-  libzapojit = callPackage ../development/libraries/libzapojit { };
-
-  libzen = callPackage ../development/libraries/libzen { };
-
-  libzip = callPackage ../development/libraries/libzip { };
-
-  libzdb = callPackage ../development/libraries/libzdb { };
-
-  lightlocker = callPackage ../misc/screensavers/light-locker { };
-
-  lightspark = callPackage ../misc/lightspark { };
-
-  opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { };
-
-  ligolo-ng = callPackage ../tools/networking/ligolo-ng { };
-
-  linenoise = callPackage ../development/libraries/linenoise { };
-
-  linenoise-ng = callPackage ../development/libraries/linenoise-ng { };
-
-  lirc = callPackage ../development/libraries/lirc { };
-
   liquid-dsp = callPackage ../development/libraries/liquid-dsp {
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  liquidfun = callPackage ../development/libraries/liquidfun { };
-
-  litehtml = callPackage ../development/libraries/litehtml { };
-
-  llhttp = callPackage ../development/libraries/llhttp { };
-
-  log4cpp = callPackage ../development/libraries/log4cpp { };
-
-  log4cxx = callPackage ../development/libraries/log4cxx { };
-
-  log4cplus = callPackage ../development/libraries/log4cplus { };
-
-  log4shib = callPackage ../development/libraries/log4shib { };
-
-  loudmouth = callPackage ../development/libraries/loudmouth { };
-
-  lrdf = callPackage ../development/libraries/lrdf { };
-
   luabind = callPackage ../development/libraries/luabind { lua = lua5_1; };
 
   luabind_luajit = luabind.override { lua = luajit; };
 
-  luabridge = callPackage ../development/libraries/luabridge { };
-
   luksmeta = callPackage ../development/libraries/luksmeta {
     asciidoc = asciidoc-full;
   };
 
-  lyra = callPackage ../development/libraries/lyra { };
-
-  lzo = callPackage ../development/libraries/lzo { };
-
-  opencl-clang = callPackage ../development/libraries/opencl-clang { };
-
-  magic-enum = callPackage ../development/libraries/magic-enum { };
-
   mapnik = callPackage ../development/libraries/mapnik {
     harfbuzz = harfbuzz.override {
       withIcu = true;
     };
   };
 
-  marisa = callPackage ../development/libraries/marisa { };
-
-  mathgl = callPackage ../development/libraries/mathgl { };
-
-  matio = callPackage ../development/libraries/matio { };
-
   matterhorn =
     # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013
     (if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then lib.id else haskell.lib.compose.justStaticExecutables)
       haskellPackages.matterhorn;
 
-  maxflow = callPackage ../development/libraries/maxflow { };
-
   mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { };
   mbedtls = callPackage ../development/libraries/mbedtls/3.nix { };
 
-  mdctags = callPackage ../development/tools/misc/mdctags { };
-
   mediastreamer = libsForQt5.callPackage ../development/libraries/mediastreamer { };
 
   mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { };
@@ -21691,42 +10443,20 @@ with pkgs;
     propagatedBuildInputs = [ memorymapping ];
   } ../development/libraries/memorymapping/setup-hook.sh;
 
-  memray = callPackage ../development/tools/memray { };
-
   memstream = callPackage ../development/libraries/memstream { };
   memstreamHook = makeSetupHook {
     name = "memstream-hook";
     propagatedBuildInputs = [ memstream ];
   } ../development/libraries/memstream/setup-hook.sh;
 
-  menu-cache = callPackage ../development/libraries/menu-cache { };
-
   mergerfs = callPackage ../tools/filesystems/mergerfs { };
 
   mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { };
 
-  meshoptimizer = callPackage ../development/libraries/meshoptimizer { };
-
-  mctc-lib = callPackage ../development/libraries/science/chemistry/mctc-lib { };
-
-  mstore = callPackage ../development/libraries/science/chemistry/mstore { };
-
-  multicharge = callPackage ../development/libraries/science/chemistry/multicharge { };
-
-  test-drive = callPackage ../development/libraries/test-drive { };
-
-  dftd4 = callPackage ../development/libraries/science/chemistry/dftd4 { };
-
   simple-dftd3 = callPackage ../development/libraries/science/chemistry/simple-dftd3 { };
 
   tblite = callPackage ../development/libraries/science/chemistry/tblite { };
 
-  toml-f = callPackage ../development/libraries/toml-f { };
-
-  dbcsr = callPackage ../development/libraries/science/math/dbcsr { };
-
-  taco = callPackage ../development/libraries/taco { };
-
   ## libGL/libGLU/Mesa stuff
 
   # Default libGL implementation.
@@ -21781,40 +10511,12 @@ with pkgs;
 
   mesa_i686 = pkgsi686Linux.mesa; # make it build on Hydra
 
-  mesa_glu = callPackage ../development/libraries/mesa-glu {};
-
   ## End libGL/libGLU/Mesa stuff
 
-  meterbridge = callPackage ../applications/audio/meterbridge { };
-
-  mhddfs = callPackage ../tools/filesystems/mhddfs { };
-
-  microsoft-gsl = callPackage ../development/libraries/microsoft-gsl { };
-
-  micronucleus = callPackage ../development/tools/misc/micronucleus { };
-
-  markdown-anki-decks = callPackage ../tools/misc/markdown-anki-decks { };
-
-  mdk-sdk = callPackage ../development/libraries/mdk-sdk { };
-
-  mdslides = callPackage ../tools/misc/mdslides { };
-
-  micropython = callPackage ../development/interpreters/micropython { };
-
   midivisualizer = darwin.apple_sdk_11_0.callPackage ../applications/audio/midivisualizer {
     inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Carbon CoreAudio CoreMIDI CoreServices Kernel;
   };
 
-  mimalloc = callPackage ../development/libraries/mimalloc { };
-
-  miniaudio = callPackage ../development/libraries/miniaudio { };
-
-  miniz = callPackage ../development/libraries/miniz { };
-
-  minizip = callPackage ../development/libraries/minizip { };
-
-  minizip-ng = callPackage ../development/libraries/minizip-ng { };
-
   mkvtoolnix = qt6Packages.callPackage ../applications/video/mkvtoolnix {
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
@@ -21823,70 +10525,20 @@ with pkgs;
     withGUI = false;
   };
 
-  mlc = callPackage ../tools/system/mlc { };
-
   mlt = darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt { };
 
-  mlib = callPackage ../development/libraries/mlib { };
-
   mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { };
 
-  mono-addins = callPackage ../development/libraries/mono-addins { };
-
-  movine = callPackage ../development/tools/database/movine { };
-
-  movit = callPackage ../development/libraries/movit { };
-
-  moserial = callPackage ../tools/misc/moserial { };
-
-  mosquitto = callPackage ../servers/mqtt/mosquitto { };
-
-  mps = callPackage ../development/libraries/mps { };
-
-  libmpeg2 = callPackage ../development/libraries/libmpeg2 { };
-
   mpeg2dec = libmpeg2;
 
-  mqtt-benchmark = callPackage ../tools/networking/mqtt-benchmark { };
-
-  mqttmultimeter = callPackage ../tools/networking/mqttmultimeter { };
-
-  msgpack = callPackage ../development/libraries/msgpack { };
-
-  msgpack-c = callPackage ../development/libraries/msgpack-c { };
-
-  msgpack-cxx = callPackage ../development/libraries/msgpack-cxx { };
-
   msoffcrypto-tool = with python3.pkgs; toPythonApplication msoffcrypto-tool;
 
-  msilbc = callPackage ../development/libraries/msilbc { };
-
-  mp4v2 = callPackage ../development/libraries/mp4v2 { };
-
-  libmpc = callPackage ../development/libraries/libmpc { };
-
   mpich = callPackage ../development/libraries/mpich {
     ch4backend = libfabric;
   };
 
   mpich-pmix = mpich.override { pmixSupport = true; withPm = [ ]; };
 
-  mstpd = callPackage ../os-specific/linux/mstpd { };
-
-  mtdev = callPackage ../development/libraries/mtdev { };
-
-  mtpfs = callPackage ../tools/filesystems/mtpfs { };
-
-  mu = callPackage ../tools/networking/mu { };
-
-  mueval = callPackage ../development/tools/haskell/mueval { };
-
-  muparserx = callPackage ../development/libraries/muparserx { };
-
-  mutest = callPackage ../development/libraries/mutest { };
-
-  mvapich = callPackage ../development/libraries/mvapich { };
-
   mvfst = darwin.apple_sdk_11_0.callPackage ../development/libraries/mvfst { };
 
   mygpoclient = with python3.pkgs; toPythonApplication mygpoclient;
@@ -21895,30 +10547,10 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  mythes = callPackage ../development/libraries/mythes { };
-
-  nanodbc = callPackage ../development/libraries/nanodbc { };
-
-  nanomsg = callPackage ../development/libraries/nanomsg { };
-
-  nanosvg = callPackage ../development/libraries/nanosvg { };
-
   nanovna-saver = libsForQt5.callPackage ../applications/science/electronics/nanovna-saver { };
 
-  nanotts = callPackage ../tools/audio/nanotts { };
-
-  ncnn = callPackage ../development/libraries/ncnn { };
-
-  ndpi = callPackage ../development/libraries/ndpi { };
-
   nemo-qml-plugin-dbus = libsForQt5.callPackage ../development/libraries/nemo-qml-plugin-dbus { };
 
-  netflix = callPackage ../applications/video/netflix { };
-
-  nifticlib = callPackage ../development/libraries/science/biology/nifticlib { };
-
-  notify-sharp = callPackage ../development/libraries/notify-sharp { };
-
   ncurses5 = ncurses.override {
     abiVersion = "5";
   };
@@ -21939,19 +10571,10 @@ with pkgs;
 
   ndi = callPackage ../development/libraries/ndi { };
 
-  neardal = callPackage ../development/libraries/neardal { };
-
-  neatvnc = callPackage ../development/libraries/neatvnc { };
-
-  neon = callPackage ../development/libraries/neon { };
-
   nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; };
 
-  newman = callPackage ../development/web/newman { };
-
   newt = callPackage ../development/libraries/newt { python = python3; };
 
-  nghttp2 = callPackage ../development/libraries/nghttp2 { };
   libnghttp2 = nghttp2.lib;
 
   nghttp3 = callPackage ../development/libraries/nghttp3 { inherit (darwin.apple_sdk.frameworks) CoreServices; };
@@ -21959,24 +10582,10 @@ with pkgs;
   ngtcp2 = callPackage ../development/libraries/ngtcp2 { inherit (darwin.apple_sdk.frameworks) CoreServices; };
   ngtcp2-gnutls = callPackage ../development/libraries/ngtcp2/gnutls.nix { };
 
-  nix-plugins = callPackage ../development/libraries/nix-plugins { };
-
-  nika-fonts = callPackage ../data/fonts/nika-fonts { };
-
-  nikto = callPackage ../tools/networking/nikto { };
-
-  nlohmann_json = callPackage ../development/libraries/nlohmann_json { };
-
-  nng = callPackage ../development/libraries/nng { };
-
-  nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
-
   non = callPackage ../applications/audio/non {
     wafHook = (waf.override { extraTools = [ "gccdeps" ]; }).hook;
   };
 
-  ntl = callPackage ../development/libraries/ntl { };
-
   nspr = callPackage ../development/libraries/nspr {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -21986,16 +10595,6 @@ with pkgs;
   nss = nss_esr;
   nssTools = nss.tools;
 
-  nss_wrapper = callPackage ../development/libraries/nss_wrapper { };
-
-  ntbtls = callPackage ../development/libraries/ntbtls { };
-
-  ntk = callPackage ../development/libraries/audio/ntk { };
-
-  numcpp = callPackage ../development/libraries/numcpp { };
-
-  nuraft = callPackage ../development/libraries/nuraft { };
-
   nuspell = callPackage ../development/libraries/nuspell { };
   nuspellWithDicts = dicts: callPackage ../development/libraries/nuspell/wrapper.nix { inherit dicts; };
 
@@ -22013,39 +10612,21 @@ with pkgs;
 
   nvidia-vaapi-driver = lib.hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { });
 
-  nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { };
-
   nvidia-system-monitor-qt = libsForQt5.callPackage ../tools/system/nvidia-system-monitor-qt { };
 
-  nvitop = callPackage ../tools/system/nvitop { };
-
   nvtopPackages = recurseIntoAttrs (import ../tools/system/nvtop { inherit callPackage; });
 
-  ocl-icd = callPackage ../development/libraries/ocl-icd { };
-
-  ode = callPackage ../development/libraries/ode { };
-
   inherit (callPackages ../development/libraries/ogre { })
     ogre_13 ogre_14;
 
   ogre = ogre_14;
 
-  olm = callPackage ../development/libraries/olm { };
-
   one_gadget = callPackage ../development/tools/misc/one_gadget { };
 
   oneDNN = callPackage ../development/libraries/oneDNN { };
 
   oneDNN_2 = callPackage ../development/libraries/oneDNN/2.nix { };
 
-  oneko = callPackage ../applications/misc/oneko { };
-
-  oniguruma = callPackage ../development/libraries/oniguruma { };
-
-  oobicpl = callPackage ../development/libraries/science/biology/oobicpl { };
-
-  ookla-speedtest = callPackage ../tools/networking/ookla-speedtest { };
-
   openalSoft = callPackage ../development/libraries/openal-soft {
     inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
   };
@@ -22059,8 +10640,6 @@ with pkgs;
     python = python3;
   };
 
-  opencascade-occt = callPackage ../development/libraries/opencascade-occt { };
-
   opencascade-occt_7_6 = opencascade-occt.overrideAttrs rec {
     pname = "opencascade-occt";
     version = "7.6.2";
@@ -22079,21 +10658,11 @@ with pkgs;
     ];
   };
 
-  opencl-headers = callPackage ../development/libraries/opencl-headers { };
-
-  opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { };
-
-  opencollada = callPackage ../development/libraries/opencollada { };
-
-  opencore-amr = callPackage ../development/libraries/opencore-amr { };
-
   opencsg = callPackage ../development/libraries/opencsg {
     inherit (qt5) qmake;
     inherit (darwin.apple_sdk.frameworks) GLUT;
   };
 
-  openct = callPackage ../development/libraries/openct { };
-
   opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
     inherit (darwin.apple_sdk.frameworks)
       AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate;
@@ -22111,41 +10680,23 @@ with pkgs;
 
   opencv = opencv4;
 
-  imath = callPackage ../development/libraries/imath { };
-
   openexr = openexr_2;
   openexr_2 = callPackage ../development/libraries/openexr { };
   openexr_3 = callPackage ../development/libraries/openexr/3.nix { };
 
-  openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { };
-
-  openldap = callPackage ../development/libraries/openldap { };
-
   opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio {
     inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa;
   };
   opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { };
 
-  opendmarc = callPackage ../development/libraries/opendmarc { };
-
   ois = callPackage ../development/libraries/ois {
     inherit (darwin.apple_sdk.frameworks) Cocoa IOKit Kernel;
   };
 
-  openjpeg = callPackage ../development/libraries/openjpeg { };
-
-  openpa = callPackage ../development/libraries/openpa { };
-
-  opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };
-
   openscenegraph = callPackage ../development/libraries/openscenegraph {
     inherit (darwin.apple_sdk.frameworks) AGL Accelerate Carbon Cocoa Foundation;
   };
 
-  openslide = callPackage ../development/libraries/openslide { };
-
-  openslp = callPackage ../development/libraries/openslp { };
-
   openstackclient = with python311Packages; toPythonApplication python-openstackclient;
   openstackclient-full = openstackclient.overridePythonAttrs (oldAttrs: {
     dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.cli-plugins;
@@ -22178,8 +10729,6 @@ with pkgs;
 
   libressl = libressl_4_0;
 
-  boringssl = callPackage ../development/libraries/boringssl { };
-
   wolfssl = darwin.apple_sdk_11_0.callPackage ../development/libraries/wolfssl {
     inherit (darwin.apple_sdk_11_0.frameworks) Security;
   };
@@ -22195,46 +10744,11 @@ with pkgs;
     openssl_3
     openssl_3_3;
 
-  opensubdiv = callPackage ../development/libraries/opensubdiv { };
-
-  opensupaplex = callPackage ../games/opensupaplex { };
-
-  open-wbo = callPackage ../applications/science/logic/open-wbo { };
-
-  openwsman = callPackage ../development/libraries/openwsman { };
-
-  ortp = callPackage ../development/libraries/ortp { };
-
-  openhmd = callPackage ../development/libraries/openhmd { };
-
   openwebrx = callPackage ../applications/radio/openwebrx {
     inherit (python3Packages)
     buildPythonPackage buildPythonApplication setuptools pycsdr pydigiham;
   };
 
-  oras = callPackage ../development/tools/oras { };
-
-  orcania = callPackage ../development/libraries/orcania { };
-
-  orogene = callPackage ../development/tools/misc/orogene { };
-
-  osm-gps-map = callPackage ../development/libraries/osm-gps-map { };
-
-  osmid = callPackage ../applications/audio/osmid { };
-
-  osinfo-db = callPackage ../data/misc/osinfo-db { };
-  osinfo-db-tools = callPackage ../tools/misc/osinfo-db-tools { };
-
-  pacemaker = callPackage ../misc/logging/pacemaker { };
-
-  p11-kit = callPackage ../development/libraries/p11-kit { };
-
-  parsero = callPackage ../tools/security/parsero { };
-
-  pcaudiolib = callPackage ../development/libraries/pcaudiolib { };
-
-  pcg_c = callPackage ../development/libraries/pcg-c { };
-
   pcl = libsForQt5.callPackage ../development/libraries/pcl {
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
     inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL;
@@ -22247,12 +10761,8 @@ with pkgs;
 
   pcre2 = callPackage ../development/libraries/pcre2 { };
 
-  pdal = callPackage ../development/libraries/pdal { };
-
   pdfhummus = libsForQt5.callPackage ../development/libraries/pdfhummus { };
 
-  pe-parse = callPackage ../development/libraries/pe-parse { };
-
   phetch = callPackage ../applications/networking/gopher/phetch {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -22263,8 +10773,6 @@ with pkgs;
     physfs_2
     physfs;
 
-  pico-sdk = callPackage ../development/libraries/pico-sdk { };
-
   pingvin-share =  callPackage ../servers/pingvin-share { };
 
   pipelight = callPackage ../tools/misc/pipelight {
@@ -22272,26 +10780,12 @@ with pkgs;
     wine-staging = pkgsi686Linux.wine-staging;
   };
 
-  pkcs11helper = callPackage ../development/libraries/pkcs11helper { };
-
-  pkgdiff = callPackage ../tools/misc/pkgdiff { };
-
-  pkgtop = callPackage ../tools/misc/pkgtop { };
-
   place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at;
 
-  platform-folders = callPackage ../development/libraries/platform-folders { };
-
-  plib = callPackage ../development/libraries/plib { };
-
-  poco = callPackage ../development/libraries/poco { };
-
   podofo = callPackage ../development/libraries/podofo { };
 
   podofo010 = callPackage ../development/libraries/podofo/0.10.x.nix { };
 
-  polkit = callPackage ../development/libraries/polkit { };
-
   poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
 
   poppler_gi = lowPrio (poppler.override {
@@ -22308,8 +10802,6 @@ with pkgs;
     utils = true;
   };
 
-  popt = callPackage ../development/libraries/popt { };
-
   portaudio = callPackage ../development/libraries/portaudio {
     inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreAudio CoreServices Carbon;
   };
@@ -22318,18 +10810,10 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon CoreAudio CoreFoundation CoreMIDI CoreServices;
   };
 
-  presage = callPackage ../development/libraries/presage { };
-
-  present = callPackage ../misc/present { };
-
-  prime-server = callPackage ../development/libraries/prime-server { };
-
   proj = callPackage ../development/libraries/proj { };
 
   proj_7 = callPackage ../development/libraries/proj/7.nix { };
 
-  proj-datumgrid = callPackage ../development/libraries/proj-datumgrid { };
-
   proselint = callPackage ../tools/text/proselint {
     inherit (python3Packages)
     buildPythonApplication click future six;
@@ -22362,38 +10846,17 @@ with pkgs;
     protobuf_21
     ;
 
-  protobufc = callPackage ../development/libraries/protobufc { };
-
-  protolock = callPackage ../development/libraries/protolock { };
-
-  protozero = callPackage ../development/libraries/protozero { };
-
   flatbuffers = callPackage ../development/libraries/flatbuffers { };
   flatbuffers_23 = callPackage ../development/libraries/flatbuffers/23.nix { };
 
   nanopbMalloc = callPackage ../by-name/na/nanopb/package.nix { enableMalloc = true; };
 
-  gnupth = callPackage ../development/libraries/pth { };
   pth = if stdenv.hostPlatform.isMusl then npth else gnupth;
 
-  pslib = callPackage ../development/libraries/pslib { };
-
-  pstreams = callPackage ../development/libraries/pstreams { };
-
-  pufferpanel = callPackage ../servers/pufferpanel { };
-
-  pugixml = callPackage ../development/libraries/pugixml { };
-
-  pylode = callPackage ../misc/pylode { };
-
   python-qt = libsForQt5.callPackage ../development/libraries/python-qt { };
 
   pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { };
 
-  plasma-hud = callPackage ../misc/plasma-hud { };
-
-  re2 = callPackage ../development/libraries/re2 { };
-
   qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { };
 
   qdjango = libsForQt5.callPackage ../development/libraries/qdjango { };
@@ -22402,8 +10865,6 @@ with pkgs;
     inherit (lomiri) cmake-extras;
   };
 
-  qoi = callPackage ../development/libraries/qoi { };
-
   qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };
 
   quarto = callPackage ../development/libraries/quarto { };
@@ -22439,45 +10900,17 @@ with pkgs;
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   });
 
-  quark-engine = callPackage ../tools/security/quark-engine { };
-
-  quantlib = callPackage ../development/libraries/quantlib { };
-
-  quesoglc = callPackage ../development/libraries/quesoglc { };
-
-  quickmem = callPackage ../development/libraries/quickmem { };
-
-  quicksynergy = callPackage ../applications/misc/quicksynergy { };
-
   quill = callPackage ../tools/security/quill {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray { };
 
-  rabbitmq-c = callPackage ../development/libraries/rabbitmq-c { };
-
-  raft-canonical = callPackage ../development/libraries/raft-canonical { };
-
-  range-v3 = callPackage ../development/libraries/range-v3 { };
-
   rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
     jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
 
-  rapidcheck = callPackage ../development/libraries/rapidcheck { };
-
-  rapidfuzz-cpp = callPackage ../development/libraries/rapidfuzz-cpp { };
-
-  rapidxml = callPackage ../development/libraries/rapidxml { };
-
-  rapidyaml = callPackage ../development/libraries/rapidyaml {};
-
-  raul = callPackage ../development/libraries/audio/raul { };
-
-  raylib = callPackage ../development/libraries/raylib { };
-
   readline = readline82;
 
   readline70 = callPackage ../development/libraries/readline/7.0.nix { };
@@ -22486,14 +10919,6 @@ with pkgs;
 
   readmdict = with python3Packages; toPythonApplication readmdict;
 
-  readosm = callPackage ../development/libraries/readosm { };
-
-  recastnavigation = callPackage ../development/libraries/recastnavigation { };
-
-  rinutils = callPackage ../development/libraries/rinutils { };
-
-  rtrlib = callPackage ../development/libraries/rtrlib { };
-
   kissfftFloat = kissfft.override {
     datatype = "float";
   };
@@ -22502,8 +10927,6 @@ with pkgs;
     haskellLib = haskell.lib.compose;
   };
 
-  lambda-mod-zsh-theme = callPackage ../shells/zsh/lambda-mod-zsh-theme { };
-
   librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
 
   librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { };
@@ -22513,22 +10936,10 @@ with pkgs;
   librdf_redland = callPackage ../development/libraries/librdf/redland.nix { };
   redland = librdf_redland; # added 2018-04-25
 
-  libsmf = callPackage ../development/libraries/audio/libsmf { };
-
-  lilv = callPackage ../development/libraries/audio/lilv { };
-
-  lv2 = callPackage ../development/libraries/audio/lv2 { };
-
-  lvtk = callPackage ../development/libraries/audio/lvtk { };
-
-  qm-dsp = callPackage ../development/libraries/audio/qm-dsp { };
-
   qradiolink = callPackage ../applications/radio/qradiolink {
     protobuf = protobuf_21;
   };
 
-  qrupdate = callPackage ../development/libraries/qrupdate { };
-
   qadwaitadecorations-qt6 = callPackage ../by-name/qa/qadwaitadecorations/package.nix {
     useQt6 = true;
   };
@@ -22545,23 +10956,11 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  retro-gtk = callPackage ../development/libraries/retro-gtk { };
-
-  resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
-
-  restish = callPackage ../tools/networking/restish { };
-
   rhino = callPackage ../development/libraries/java/rhino {
     javac = jdk8;
     jvm = jre8;
   };
 
-  rlog = callPackage ../development/libraries/rlog { };
-
-  rlottie = callPackage ../development/libraries/rlottie { };
-
-  rocksdb = callPackage ../development/libraries/rocksdb { };
-
   rocksdb_8_11 = rocksdb.overrideAttrs rec {
     pname = "rocksdb";
     version = "8.11.4";
@@ -22606,52 +11005,22 @@ with pkgs;
    };
   };
 
-  rotate-backups = callPackage ../tools/backup/rotate-backups { };
-
-  rote = callPackage ../development/libraries/rote { };
-
-  round = callPackage ../applications/graphics/round { };
-
-  router = callPackage ../servers/http/router { };
-
   rover = callPackage ../development/tools/rover { };
 
-  rqlite = callPackage ../servers/sql/rqlite { };
-
   rshell = python3.pkgs.callPackage ../development/embedded/rshell { };
 
-  rtlcss = callPackage ../development/libraries/rtlcss { };
-
-  rttr = callPackage ../development/libraries/rttr { };
-
-  rubberband = callPackage ../development/libraries/rubberband { };
-
-  rutabaga_gfx = callPackage ../development/libraries/rutabaga_gfx { };
-
   rure = callPackage ../development/libraries/rure { };
 
-  rustc-demangle = callPackage ../development/libraries/rustc-demangle { };
-
-  s2geometry = callPackage ../development/libraries/s2geometry { };
-
-  safefile = callPackage ../development/libraries/safefile { };
-
-  sbc = callPackage ../development/libraries/sbc { };
-
   schroedinger = callPackage ../development/libraries/schroedinger {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  scope-lite = callPackage ../development/libraries/scope-lite { };
-
   SDL = SDL1;
 
   SDL2 = callPackage ../development/libraries/SDL2 {
     inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
   };
 
-  sdrplay = callPackage ../applications/radio/sdrplay { };
-
   sdr-j-fm = libsForQt5.callPackage ../applications/radio/sdr-j-fm { };
 
   sdrpp = callPackage ../applications/radio/sdrpp {
@@ -22660,59 +11029,21 @@ with pkgs;
 
   sigdigger = libsForQt5.callPackage ../applications/radio/sigdigger { };
 
-  sigutils = callPackage ../applications/radio/sigutils { };
-
-  sblim-sfcc = callPackage ../development/libraries/sblim-sfcc { };
-
-  selinux-sandbox = callPackage ../os-specific/linux/selinux-sandbox { };
-
-  sealcurses = callPackage ../development/libraries/sealcurses { };
-
-  seasocks = callPackage ../development/libraries/seasocks { };
-
-  serd = callPackage ../development/libraries/serd { };
-
-  serf = callPackage ../development/libraries/serf { };
-
   sev-snp-measure = with python3Packages; toPythonApplication sev-snp-measure;
 
-  sfsexp = callPackage ../development/libraries/sfsexp { };
-
-  shhmsg = callPackage ../development/libraries/shhmsg { };
-
-  shhopt = callPackage ../development/libraries/shhopt { };
-
-  shine = callPackage ../development/libraries/shine { };
-
   graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix { };
 
-  s2n-tls = callPackage ../development/libraries/s2n-tls { };
-
   simavr = callPackage ../development/tools/simavr {
     avrgcc = pkgsCross.avr.buildPackages.gcc;
     avrlibc = pkgsCross.avr.libcCross;
     inherit (darwin.apple_sdk.frameworks) GLUT;
   };
 
-  simgear = callPackage ../development/libraries/simgear { };
-
-  simp_le = callPackage ../tools/admin/simp_le { };
-
   simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_4; };
 
   sfml = callPackage ../development/libraries/sfml {
     inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
   };
-  csfml = callPackage ../development/libraries/csfml { };
-
-  sharness = callPackage ../development/libraries/sharness { };
-
-  shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { };
-
-  skaffold = callPackage ../development/tools/skaffold { };
-
-  skjold = callPackage ../development/tools/skjold { };
-
   skawarePackages = recurseIntoAttrs (callPackage ../development/skaware-packages { });
 
   inherit (skawarePackages)
@@ -22745,26 +11076,12 @@ with pkgs;
     inherit (skawarePackages) cleanPackaging;
   };
 
-  shaq = callPackage ../tools/audio/shaq { };
-
   slibGuile = callPackage ../development/libraries/slib {
     scheme = guile;
   };
 
-  smpeg = callPackage ../development/libraries/smpeg { };
-
-  smpeg2 = callPackage ../development/libraries/smpeg2 { };
-
-  snappy = callPackage ../development/libraries/snappy { };
-
   snac2 = darwin.apple_sdk_11_0.callPackage ../servers/snac2 { };
 
-  snappymail = callPackage ../servers/snappymail { };
-
-  snow = callPackage ../tools/security/snow { };
-
-  snowcrash = callPackage ../tools/security/snowcrash { };
-
   soapyairspy = callPackage ../applications/radio/soapyairspy {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) IOKit Security;
@@ -22786,10 +11103,6 @@ with pkgs;
 
   soapysdr = callPackage ../applications/radio/soapysdr { };
 
-  soapyremote = callPackage ../applications/radio/soapyremote { };
-
-  soapysdrplay = callPackage ../applications/radio/soapysdrplay { };
-
   soapysdr-with-plugins = callPackage ../applications/radio/soapysdr {
     extraPackages = [
       limesuite
@@ -22813,10 +11126,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) IOKit Security;
   };
 
-  social-engineer-toolkit = callPackage ../tools/security/social-engineer-toolkit { };
-
-  socket_wrapper = callPackage ../development/libraries/socket_wrapper { };
-
   sofia_sip = callPackage ../development/libraries/sofia-sip {
     inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
   };
@@ -22825,31 +11134,9 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
-  sokol = callPackage ../development/libraries/sokol { };
-
-  sonic = callPackage ../development/libraries/sonic { };
-
-  sonivox = callPackage ../development/libraries/sonivox { };
-
-  sope = callPackage ../development/libraries/sope { };
-
-  sord = callPackage ../development/libraries/sord { };
-
-  soundtouch = callPackage ../development/libraries/soundtouch { };
-
-  span-lite = callPackage ../development/libraries/span-lite { };
-
   spandsp = callPackage ../development/libraries/spandsp { };
   spandsp3 = callPackage ../development/libraries/spandsp/3.nix { };
 
-  spaceship-prompt = callPackage ../shells/zsh/spaceship-prompt { };
-
-  sparrow3d = callPackage ../development/libraries/sparrow3d {};
-
-  spdk = callPackage ../development/libraries/spdk { };
-
-  speechd = callPackage ../development/libraries/speechd { };
-
   speechd-minimal = speechd.override {
     withLibao = false;
     withPulse = false;
@@ -22881,44 +11168,8 @@ with pkgs;
 
   inherit (python3Packages) sphinxHook;
 
-  sphinxsearch = callPackage ../servers/search/sphinxsearch { };
-
-  spice = callPackage ../development/libraries/spice { };
-
-  spice-gtk = callPackage ../development/libraries/spice-gtk { };
-
-  spice-protocol = callPackage ../development/libraries/spice-protocol { };
-
-  spice-up = callPackage ../applications/office/spice-up { };
-
-  spirv-cross = callPackage ../tools/graphics/spirv-cross { };
-
-  splat = callPackage ../applications/radio/splat { };
-
-  suscan = callPackage ../applications/radio/suscan { };
-
   suwidgets = libsForQt5.callPackage ../applications/radio/suwidgets { };
 
-  sratom = callPackage ../development/libraries/audio/sratom { };
-
-  srm = callPackage ../tools/security/srm { };
-
-  srt = callPackage ../development/libraries/srt { };
-
-  srtp = callPackage ../development/libraries/srtp { };
-
-  stargate-libcds = callPackage ../development/libraries/stargate-libcds { };
-
-  stb = callPackage ../development/libraries/stb { };
-
-  stegsolve = callPackage ../tools/graphics/stegsolve { };
-
-  stxxl = callPackage ../development/libraries/stxxl { };
-
-  sv-lang = callPackage ../applications/science/electronics/sv-lang { };
-
-  sqld = callPackage ../servers/sql/sqld { };
-
   sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
 
   unqlite = lowPrio (callPackage ../development/libraries/unqlite { });
@@ -22929,86 +11180,37 @@ with pkgs;
 
   sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { };
 
-  sqlitecpp = callPackage ../development/libraries/sqlitecpp { };
-
   sqlite-interactive = (sqlite.override { interactive = true; }).bin;
 
-  sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { };
-
-  sregex = callPackage ../development/libraries/sregex { };
-
-  dqlite = callPackage ../development/libraries/dqlite { };
-
-  sqlcipher = callPackage ../development/libraries/sqlcipher { };
-
   standardnotes = callPackage ../applications/editors/standardnotes { };
 
-  stfl = callPackage ../development/libraries/stfl { };
-
   stlink = callPackage ../development/tools/misc/stlink { };
   stlink-gui = callPackage ../development/tools/misc/stlink { withGUI = true; };
 
-  stegseek = callPackage ../tools/security/stegseek { };
-
-  streamlink = callPackage ../applications/video/streamlink { };
   streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix { };
 
   structuresynth = libsForQt5.callPackage ../development/libraries/structuresynth { };
 
-  sub-batch = callPackage ../applications/video/sub-batch { };
-
-  subdl = callPackage ../applications/video/subdl { };
-
-  subtitleeditor = callPackage ../applications/video/subtitleeditor { };
-
-  subxt = callPackage ../development/tools/subxt { };
-
   suil = darwin.apple_sdk_11_0.callPackage ../development/libraries/audio/suil { };
 
   sundials = callPackage ../development/libraries/sundials {
     python = python3;
   };
 
-  sutils = callPackage ../tools/misc/sutils { };
-
-  svrcore = callPackage ../development/libraries/svrcore { };
-
   svxlink = libsForQt5.callPackage ../applications/radio/svxlink { };
 
-  szip = callPackage ../development/libraries/szip { };
-
-  t1lib = callPackage ../development/libraries/t1lib { };
-
   tachyon = callPackage ../development/libraries/tachyon {
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
   tageditor = libsForQt5.callPackage ../applications/audio/tageditor { };
 
-  ta-lib = callPackage ../development/libraries/ta-lib { };
-
-  taglib = callPackage ../development/libraries/taglib { };
-
-  taglib_extras = callPackage ../development/libraries/taglib-extras { };
-
-  taglib-sharp = callPackage ../development/libraries/taglib-sharp { };
-
-  tanidvr = callPackage ../applications/video/tanidvr { };
-
-  talloc = callPackage ../development/libraries/talloc { };
-
-  tagparser = callPackage ../development/libraries/tagparser { };
-
   tclap = tclap_1_2;
 
   tclap_1_2 = callPackage ../development/libraries/tclap/1.2.nix { };
 
   tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { };
 
-  tdb = callPackage ../development/libraries/tdb { };
-
-  tdlib = callPackage ../development/libraries/tdlib { };
-
   tectonic = callPackage ../tools/typesetting/tectonic/wrapper.nix { };
 
   tectonic-unwrapped = callPackage ../tools/typesetting/tectonic {
@@ -23017,118 +11219,30 @@ with pkgs;
 
   termbench-pro = callPackage ../development/libraries/termbench-pro { fmt = fmt_8; };
 
-  telepathy-glib = callPackage ../development/libraries/telepathy/glib { };
-
-  telepathy-farstream = callPackage ../development/libraries/telepathy/farstream { };
-
-  termbox = callPackage ../development/libraries/termbox { };
-
-  tevent = callPackage ../development/libraries/tevent { };
-
-  tet = callPackage ../development/tools/misc/tet { };
-
   texpresso = callPackage ../tools/typesetting/tex/texpresso {
     texpresso-tectonic = callPackage ../tools/typesetting/tex/texpresso/tectonic.nix { };
   };
 
-  text-engine = callPackage ../development/libraries/text-engine { };
-
-  the-foundation = callPackage ../development/libraries/the-foundation { };
-
-  theft = callPackage ../development/libraries/theft { };
-
-  thrift = callPackage ../development/libraries/thrift { };
-
-  tidyp = callPackage ../development/libraries/tidyp { };
-
-  tidal-hifi = callPackage ../applications/audio/tidal-hifi { };
-
-  tinycdb = callPackage ../development/libraries/tinycdb { };
-
   tinyxml = tinyxml2;
 
   tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
 
-  tiscamera = callPackage ../os-specific/linux/tiscamera { };
-
-  tivodecode = callPackage ../applications/video/tivodecode { };
-
   tk = tk-8_6;
 
   tk-9_0 = callPackage ../development/libraries/tk/9.0.nix { tcl = tcl-9_0; };
   tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { };
   tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; };
 
-  tkrzw = callPackage ../development/libraries/tkrzw { };
-
-  tl-expected = callPackage ../development/libraries/tl-expected { };
-
-  tnt = callPackage ../development/libraries/tnt { };
-
-  tntnet = callPackage ../development/libraries/tntnet { };
-
-  tntdb = callPackage ../development/libraries/tntdb { };
-
-  kyotocabinet = callPackage ../development/libraries/kyotocabinet { };
-
-  tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { };
-
-  tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { };
-
-  totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { };
-
   tpm2-tss = callPackage ../development/libraries/tpm2-tss {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  tremor = callPackage ../development/libraries/tremor { };
-
-  trillian = callPackage ../tools/misc/trillian { };
-
-  udns = callPackage ../development/libraries/udns { };
-
-  uid_wrapper = callPackage ../development/libraries/uid_wrapper { };
-
-  umockdev = callPackage ../development/libraries/umockdev { };
-
-  unconvert = callPackage ../development/tools/unconvert { };
-
-  uncover = callPackage ../tools/security/uncover { };
-
-  unibilium = callPackage ../development/libraries/unibilium { };
-
-  unicap = callPackage ../development/libraries/unicap { };
-
-  unicon-lang = callPackage ../development/interpreters/unicon-lang { };
-
-  updfparser = callPackage ../development/libraries/updfparser { };
-
-  tsocks = callPackage ../development/libraries/tsocks { };
-
-  unixODBC = callPackage ../development/libraries/unixODBC { };
-
   unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers { });
 
-  usrsctp = callPackage ../development/libraries/usrsctp { };
-
-  usbredir = callPackage ../development/libraries/usbredir { };
-
-  usbrip = callPackage ../tools/security/usbrip { };
-
-  uthash = callPackage ../development/libraries/uthash { };
-
-  uthenticode = callPackage ../development/libraries/uthenticode { };
-
-  ucommon = callPackage ../development/libraries/ucommon { };
-
   v8 = callPackage ../development/libraries/v8 {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
   };
 
-  vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { };
-
-  libva-vdpau-driver = callPackage ../development/libraries/libva-vdpau-driver { };
-
   valeStyles = recurseIntoAttrs (callPackages ../by-name/va/vale/styles.nix { });
 
   valhalla = callPackage ../development/libraries/valhalla {
@@ -23140,16 +11254,10 @@ with pkgs;
     };
   };
 
-  vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { };
-
   vc = callPackage ../development/libraries/vc { };
 
   vc_0_7 = callPackage ../development/libraries/vc/0.7.nix { };
 
-  vcdimager = callPackage ../development/libraries/vcdimager { };
-
-  vcg = callPackage ../development/libraries/vcg { };
-
   vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; };
 
   vid-stab = callPackage ../development/libraries/vid-stab {
@@ -23160,24 +11268,6 @@ with pkgs;
     hdf5 = hdf5.override { usev110Api = true; };
   };
 
-  vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { };
-
-  vkdt = callPackage ../applications/graphics/vkdt { };
-
-  vlock = callPackage ../misc/screensavers/vlock { };
-
-  virtualpg = callPackage ../development/libraries/virtualpg { };
-
-  vmime = callPackage ../development/libraries/vmime { };
-
-  vrb = callPackage ../development/libraries/vrb { };
-
-  vrpn = callPackage ../development/libraries/vrpn { };
-
-  vsqlite = callPackage ../development/libraries/vsqlite { };
-
-  vte = callPackage ../development/libraries/vte { };
-
   vte-gtk4 = vte.override {
     gtkVersion = "4";
   };
@@ -23202,29 +11292,12 @@ with pkgs;
 
   vulkan-cts = callPackage ../tools/graphics/vulkan-cts { };
 
-  vulkan-helper = callPackage ../tools/graphics/vulkan-helper { };
-
-  vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { };
   vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
-  vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
   vulkan-tools = callPackage ../tools/graphics/vulkan-tools {
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
   };
-  vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
-  vulkan-utility-libraries = callPackage ../development/libraries/vulkan-utility-libraries { };
-  vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
-
-  vxl = callPackage ../development/libraries/vxl { };
-
-  waffle = callPackage ../development/libraries/waffle { };
-
-  wally-cli = callPackage ../development/tools/wally-cli { };
-  zsa-udev-rules = callPackage ../os-specific/linux/zsa-udev-rules { };
-
   wangle = darwin.apple_sdk_11_0.callPackage ../development/libraries/wangle { };
 
-  wavpack = callPackage ../development/libraries/wavpack { };
-
   wayland = darwin.apple_sdk_11_0.callPackage ../development/libraries/wayland { };
   wayland-scanner = callPackage ../development/libraries/wayland/scanner.nix { };
 
@@ -23234,8 +11307,6 @@ with pkgs;
     graphviz = graphviz-nox;
   };
 
-  wcslib = callPackage ../development/libraries/science/astronomy/wcslib { };
-
   webkitgtk_4_0 = callPackage ../development/libraries/webkitgtk {
     harfbuzz = harfbuzzFull;
     inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
@@ -23251,33 +11322,21 @@ with pkgs;
     gtk3 = gtk4;
   };
 
-  webp-pixbuf-loader = callPackage ../development/libraries/webp-pixbuf-loader { };
-
-  websocketpp = callPackage ../development/libraries/websocket++ { };
-
-  wfa2-lib = callPackage ../development/libraries/wfa2-lib { };
-
   webrtc-audio-processing_1 = callPackage ../development/libraries/webrtc-audio-processing { };
   webrtc-audio-processing_0_3 = callPackage ../development/libraries/webrtc-audio-processing/0.3.nix { };
   # bump when majoring of packages have updated
   webrtc-audio-processing = webrtc-audio-processing_0_3;
 
-  whereami = callPackage ../development/libraries/whereami { };
-
   wildmidi = callPackage ../development/libraries/wildmidi {
     inherit (darwin.apple_sdk.frameworks) OpenAL CoreAudioKit;
   };
 
-  wiredtiger = callPackage ../development/libraries/wiredtiger { };
-
   wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { };
 
   wt = wt4;
   inherit (libsForQt5.callPackage ../development/libraries/wt { })
     wt4;
 
-  wxformbuilder = callPackage ../development/tools/wxformbuilder { };
-
   wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix {
     inherit (darwin.stubs) setfile;
     inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;
@@ -23292,12 +11351,6 @@ with pkgs;
     wxGTK = wxGTK32;
   };
 
-  wtk = callPackage ../development/libraries/wtk { };
-
-  x264 = callPackage ../development/libraries/x264 { };
-
-  x265 = callPackage ../development/libraries/x265 { };
-
   inherit (callPackages ../development/libraries/xapian { })
     xapian_1_4;
   xapian = xapian_1_4;
@@ -23306,87 +11359,21 @@ with pkgs;
     libmagic = file;
   };
 
-  xavs = callPackage ../development/libraries/xavs { };
-
-  Xaw3d = callPackage ../development/libraries/Xaw3d { };
-
-  xbase = callPackage ../development/libraries/xbase { };
-
   xcb-util-cursor = xorg.xcbutilcursor;
   xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { };
 
   xcbutilxrm = callPackage ../servers/x11/xorg/xcb-util-xrm.nix { };
 
-  xdo = callPackage ../tools/misc/xdo { };
-
-  xdiskusage = callPackage ../tools/misc/xdiskusage { };
-
-  xed = callPackage ../development/libraries/xed { };
-
-  xedit = callPackage ../applications/editors/xedit { };
-
-  xautolock = callPackage ../misc/screensavers/xautolock { };
-
-  xercesc = callPackage ../development/libraries/xercesc { };
-
-  xalanc = callPackage ../development/libraries/xalanc { };
-
-  xgboost = callPackage ../development/libraries/xgboost { };
-
   xgboostWithCuda = xgboost.override { cudaSupport = true; };
 
-  xgeometry-select = callPackage ../tools/X11/xgeometry-select { };
-
-  xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { };
-
-  xmlsec = callPackage ../development/libraries/xmlsec { };
-
-  xml-security-c = callPackage ../development/libraries/xml-security-c { };
-
-  xlslib = callPackage ../development/libraries/xlslib { };
-
-  xtensor = callPackage ../development/libraries/xtensor { };
-
-  xtl = callPackage ../development/libraries/xtl { };
-
-  xvidcore = callPackage ../development/libraries/xvidcore { };
-
-  xxHash = callPackage ../development/libraries/xxHash { };
-
-  xylib = callPackage ../development/libraries/xylib { };
-
-  yajl = callPackage ../development/libraries/yajl { };
-
-  yder = callPackage ../development/libraries/yder { };
-
-  yojimbo = callPackage ../development/libraries/yojimbo { };
-
   yubico-pam = callPackage ../development/libraries/yubico-pam {
     inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
   };
 
-  yubihsm-connector = callPackage ../tools/security/yubihsm-connector { };
-
-  yubikey-manager = callPackage ../tools/misc/yubikey-manager { };
-
   yubikey-manager-qt = libsForQt5.callPackage ../tools/misc/yubikey-manager-qt { };
 
-  yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { };
-
   yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { };
 
-  yubikey-agent = callPackage ../tools/security/yubikey-agent { };
-
-  yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { };
-
-  yubihsm-shell = callPackage ../tools/security/yubihsm-shell { };
-
-  yubioath-flutter = callPackage ../applications/misc/yubioath-flutter { };
-
-  yyjson = callPackage ../development/libraries/yyjson { };
-
-  zeitgeist = callPackage ../development/libraries/zeitgeist { };
-
   zlib = callPackage ../development/libraries/zlib {
     stdenv =
       # zlib is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
@@ -23397,23 +11384,9 @@ with pkgs;
         stdenv;
   };
 
-  zlib-ng = callPackage ../development/libraries/zlib-ng { };
-
-  libdynd = callPackage ../development/libraries/libdynd { };
-
-  zlog = callPackage ../development/libraries/zlog { };
-
   zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix { };
   zeromq = zeromq4;
 
-  cppzmq = callPackage ../development/libraries/cppzmq { };
-
-  czmq = callPackage ../development/libraries/czmq { };
-
-  zmqpp = callPackage ../development/libraries/zmqpp { };
-
-  libzra = callPackage ../development/libraries/libzra { };
-
   # requires a newer Apple SDK
   zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9 {
     llvmPackages = llvmPackages_13;
@@ -23443,18 +11416,6 @@ with pkgs;
 
   aroccStdenv = if stdenv.cc.isArocc then stdenv else lowPrio arocc.cc.passthru.stdenv;
 
-  zimlib = callPackage ../development/libraries/zimlib { };
-
-  zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };
-
-  zita-alsa-pcmi = callPackage ../development/libraries/audio/zita-alsa-pcmi { };
-
-  zita-resampler = callPackage ../development/libraries/audio/zita-resampler { };
-
-  zitadel-tools = callPackage ../tools/misc/zitadel-tools { };
-
-  zix = callPackage ../development/libraries/audio/zix { };
-
   gsignond = callPackage ../development/libraries/gsignond {
     plugins = [];
   };
@@ -23466,8 +11427,6 @@ with pkgs;
     mail = callPackage ../development/libraries/gsignond/plugins/mail.nix { };
   };
 
-  plumed = callPackage ../development/libraries/science/chemistry/plumed { };
-
   ### DEVELOPMENT / LIBRARIES / DARWIN SDKS
 
   apple-sdk_10_12 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "10.12"; };
@@ -23510,48 +11469,12 @@ with pkgs;
 
   ### DEVELOPMENT / LIBRARIES / BASH
 
-  bash-preexec = callPackage ../development/libraries/bash/bash-preexec { };
-
   ### DEVELOPMENT / LIBRARIES / JAVA
 
-  commonsBcel = callPackage ../development/libraries/java/commons/bcel { };
-
-  commonsBsf = callPackage ../development/libraries/java/commons/bsf { };
-
-  commonsCompress = callPackage ../development/libraries/java/commons/compress { };
-
-  commonsDaemon = callPackage ../development/libraries/java/commons/daemon { };
-
-  commonsFileUpload = callPackage ../development/libraries/java/commons/fileupload { };
-
-  commonsLang = callPackage ../development/libraries/java/commons/lang { };
-
-  commonsLogging = callPackage ../development/libraries/java/commons/logging { };
-
-  commonsIo = callPackage ../development/libraries/java/commons/io { };
-
-  commonsMath = callPackage ../development/libraries/java/commons/math { };
-
-  httpunit = callPackage ../development/libraries/java/httpunit { };
-
   javaCup = callPackage ../development/libraries/java/cup {
     jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
 
-  jdom = callPackage ../development/libraries/java/jdom { };
-
-  jffi = callPackage ../development/libraries/java/jffi { };
-
-  jflex = callPackage ../development/libraries/java/jflex { };
-
-  lombok = callPackage ../development/libraries/java/lombok { };
-
-  lucene = callPackage ../development/libraries/java/lucene { };
-
-  lucenepp = callPackage ../development/libraries/lucene++ { };
-
-  mockobjects = callPackage ../development/libraries/java/mockobjects { };
-
   saxonb = saxonb_8_8;
   saxon-he = saxon_12-he;
 
@@ -23566,8 +11489,6 @@ with pkgs;
     saxon_11-he
     saxon_12-he;
 
-  smack = callPackage ../development/libraries/java/smack { };
-
   swt_jdk8 = callPackage ../by-name/sw/swt/package.nix {
     jdk = jdk8;
   };
@@ -23575,10 +11496,6 @@ with pkgs;
 
   ### DEVELOPMENT / LIBRARIES / JAVASCRIPT
 
-  nodehun = callPackage ../development/tools/nodehun { };
-
-  yuicompressor = callPackage ../development/tools/yuicompressor { };
-
   ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT)
 
   buildBowerComponents = callPackage ../development/bower-modules/generic { };
@@ -23606,8 +11523,6 @@ with pkgs;
     go = buildPackages.go_1_23;
   };
 
-  leaps = callPackage ../development/tools/leaps { };
-
   ### DEVELOPMENT / HARE
 
   hareHook = callPackage ../by-name/ha/hare/hook.nix { };
@@ -23790,20 +11705,12 @@ with pkgs;
 
   ### SERVERS
 
-  _5etools = callPackage ../servers/web-apps/5etools { };
-
   adguardhome = callPackage ../servers/adguardhome { };
 
   alerta = callPackage ../servers/monitoring/alerta/client.nix { };
 
   alerta-server = callPackage ../servers/monitoring/alerta { };
 
-  alps = callPackage ../servers/alps { };
-
-  anuko-time-tracker = callPackage ../servers/web-apps/anuko-time-tracker { };
-
-  apache-directory-server = callPackage ../servers/ldap/apache-directory-server { };
-
   apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
@@ -23843,8 +11750,6 @@ with pkgs;
 
   appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
 
-  cadvisor = callPackage ../servers/monitoring/cadvisor { };
-
   cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
     python = python2;
@@ -23871,72 +11776,35 @@ with pkgs;
     java = jre;
   };
 
-  apcupsd = callPackage ../servers/apcupsd { };
-
   inherit (callPackages ../servers/asterisk { })
     asterisk asterisk-stable asterisk-lts
     asterisk_18 asterisk_20;
 
-  asterisk-module-sccp = callPackage ../servers/asterisk/sccp { };
-
   asterisk-ldap = lowPrio (asterisk.override { ldapSupport = true; });
 
-  baserow = callPackage ../servers/baserow { };
-
-  bftpd = callPackage ../servers/ftp/bftpd { };
-
-  bind = callPackage ../servers/dns/bind { };
   dnsutils = bind.dnsutils;
   dig = lib.addMetaAttrs { mainProgram = "dig"; } bind.dnsutils;
 
-  bird = callPackage ../servers/bird { };
-
-  bird-lg = callPackage ../servers/bird-lg { };
-
-  bloat = callPackage ../servers/bloat { };
-
-  bosun = callPackage ../servers/monitoring/bosun { };
-
-  cayley = callPackage ../servers/cayley { };
-
-  cgiserver = callPackage ../servers/http/cgiserver { };
-
   charybdis = callPackage ../servers/irc/charybdis {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  clamsmtp = callPackage ../servers/mail/clamsmtp { };
-
   clickhouse = callPackage ../servers/clickhouse {
     llvmPackages = llvmPackages_16;
   };
 
   clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;
 
-  clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { };
-
-  codeowners = callPackage ../development/tools/codeowners { };
-
   couchdb3 = callPackage ../servers/http/couchdb/3.nix { };
 
   dcnnt = python3Packages.callPackage ../servers/dcnnt { };
 
   deconz = qt5.callPackage ../servers/deconz { };
 
-  dendrite = callPackage ../servers/dendrite { };
-
-  dex-oidc = callPackage ../servers/dex { };
-
-  dex2jar = callPackage ../development/tools/java/dex2jar { };
-
   doh-proxy-rust = callPackage ../servers/dns/doh-proxy-rust {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  dgraph = callPackage ../servers/dgraph { };
-
-  dico = callPackage ../servers/dico { };
-
   dict = callPackage ../servers/dict {
     libmaa = callPackage ../servers/dict/libmaa.nix { };
   };
@@ -23947,58 +11815,27 @@ with pkgs;
 
   diod = callPackage ../servers/diod { lua = lua5_1; };
 
-  directx-headers = callPackage ../development/libraries/directx-headers { };
-
   directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {
     # https://github.com/NixOS/nixpkgs/issues/216294
     stdenv = if stdenv.cc.isGNU && stdenv.hostPlatform.isi686 then gcc11Stdenv else stdenv;
   };
 
-  dkimproxy = callPackage ../servers/mail/dkimproxy { };
-
-  dmarc-metrics-exporter = callPackage ../servers/monitoring/prometheus/dmarc-metrics-exporter { };
-
-  do-agent = callPackage ../servers/monitoring/do-agent { };
-
   dodgy = with python3Packages; toPythonApplication dodgy;
 
   dovecot = callPackage ../servers/mail/dovecot { };
-  dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { };
-  dovecot_fts_xapian = callPackage ../servers/mail/dovecot/plugins/fts_xapian { };
-
-  dspam = callPackage ../servers/mail/dspam { };
-
-  engelsystem = callPackage ../servers/web-apps/engelsystem { };
-
   envoy = callPackage ../by-name/en/envoy/package.nix {
     jdk = openjdk11_headless;
   };
 
-  ergochat = callPackage ../servers/irc/ergochat { };
-
   etcd = etcd_3_5;
   etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };
   etcd_3_5 = callPackage ../servers/etcd/3.5 { };
 
-  exhaustive = callPackage ../development/tools/exhaustive { };
-
-  hyp = callPackage ../servers/http/hyp { };
-
-  peering-manager = callPackage ../servers/web-apps/peering-manager { };
-
-  podgrab = callPackage ../servers/misc/podgrab { };
-
-  portunus = callPackage ../servers/portunus { };
-
   prosody = callPackage ../servers/xmpp/prosody {
     withExtraLibs = [];
     withExtraLuaPackages = _: [];
   };
 
-  prosody-filer = callPackage ../servers/xmpp/prosody-filer { };
-
-  biboumi = callPackage ../servers/xmpp/biboumi { };
-
   elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
     jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
@@ -24006,32 +11843,20 @@ with pkgs;
 
   eventstore = callPackage ../servers/nosql/eventstore { };
 
-  exabgp = callPackage ../servers/networking/exabgp { };
-
   rustus = callPackage ../servers/networking/rustus {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  exim = callPackage ../servers/mail/exim { };
-
-  fastnetmon-advanced = callPackage ../servers/fastnetmon-advanced { };
-
-  fcgiwrap = callPackage ../servers/fcgiwrap { };
-
   fedigroups = callPackage ../servers/fedigroups {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  ferretdb = callPackage ../servers/nosql/ferretdb { };
-
   felix = callPackage ../servers/felix { };
 
   felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { };
 
   inherit (callPackages ../servers/firebird { }) firebird_4 firebird_3 firebird_2_5 firebird;
 
-  freeradius = callPackage ../servers/freeradius { };
-
   freshrss = callPackage ../servers/web-apps/freshrss { };
   freshrss-extensions = recurseIntoAttrs (callPackage ../servers/web-apps/freshrss/extensions { });
 
@@ -24039,52 +11864,14 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
   };
 
-  fusionInventory = callPackage ../servers/monitoring/fusion-inventory { };
-
-  gamehub = callPackage ../games/gamehub { };
-
-  gatling = callPackage ../servers/http/gatling { };
-
-  glabels = callPackage ../applications/graphics/glabels { };
-
   glabels-qt = libsForQt5.callPackage ../applications/graphics/glabels-qt { };
 
-  nats-server = callPackage ../servers/nats-server { };
-
-  go-autoconfig = callPackage ../servers/go-autoconfig { };
-
-  go-cqhttp = callPackage ../servers/go-cqhttp { };
-
   grafana = callPackage ../servers/monitoring/grafana { };
   grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
 
-  grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
-
   grafana-loki = callPackage ../servers/monitoring/loki { };
   promtail = callPackage ../servers/monitoring/loki/promtail.nix { };
 
-  phlare = callPackage ../servers/monitoring/phlare { };
-
-  grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { };
-
-  grafana-dash-n-grab = callPackage ../servers/monitoring/grafana-dash-n-grab { };
-
-  gerbera = callPackage ../servers/gerbera { };
-
-  gobetween = callPackage ../servers/gobetween { };
-
-  gobgpd = callPackage ../servers/misc/gobgpd { };
-
-  graph-cli = callPackage ../tools/graphics/graph-cli { };
-
-  h2o = callPackage ../servers/http/h2o { };
-
-  haka = callPackage ../tools/security/haka { };
-
-  hashi-ui = callPackage ../servers/hashi-ui { };
-
-  hashi-up = callPackage ../applications/networking/cluster/hashi-up { };
-
   hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc810.graphql-engine;
 
   hasura-cli = callPackage ../servers/hasura/cli.nix { };
@@ -24094,14 +11881,6 @@ with pkgs;
   hbase3 = hbase_3_0;
   hbase = hbase2; # when updating, point to the latest stable release
 
-  headphones = callPackage ../servers/headphones { };
-
-  hiawatha = callPackage ../servers/http/hiawatha { };
-
-  hiraeth = callPackage ../servers/hiraeth { };
-
-  hoard = callPackage ../tools/misc/hoard { };
-
   home-assistant = callPackage ../servers/home-assistant { };
 
   buildHomeAssistantComponent = callPackage ../servers/home-assistant/build-custom-component { };
@@ -24116,16 +11895,6 @@ with pkgs;
 
   home-assistant-component-tests = recurseIntoAttrs home-assistant.tests.components;
 
-  honk = callPackage ../servers/honk { };
-
-  hqplayerd = callPackage ../servers/hqplayerd { };
-
-  https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { };
-
-  ic-keysmith = callPackage ../tools/security/ic-keysmith { };
-
-  icecream = callPackage ../servers/icecream { };
-
   icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { };
   icingaweb2-thirdparty = callPackage ../servers/icingaweb2/thirdparty.nix { };
   icingaweb2 = callPackage ../servers/icingaweb2 { };
@@ -24137,26 +11906,10 @@ with pkgs;
     theme-spring = callPackage ../servers/icingaweb2/theme-spring { };
   };
 
-  inspircd = callPackage ../servers/irc/inspircd { };
-
   inspircdMinimal = inspircd.override { extraModules = []; };
 
-  imaginary = callPackage ../servers/imaginary { };
-
-  imgproxy = callPackage ../servers/imgproxy { };
-
-  irccat = callPackage ../servers/irc/irccat { };
-
-  ircdog = callPackage ../applications/networking/irc/ircdog { };
-
-  ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
-
-  janusgraph = callPackage ../servers/nosql/janusgraph { };
-
   jboss = callPackage ../servers/http/jboss { };
 
-  jboss_mysql_jdbc = callPackage ../servers/http/jboss/jdbc/mysql { };
-
   jetty = jetty_12;
   jetty_12 = callPackage ../servers/http/jetty/12.x.nix { };
   jetty_11 = callPackage ../servers/http/jetty/11.x.nix { };
@@ -24165,29 +11918,16 @@ with pkgs;
 
   jicofo = callPackage ../servers/jicofo { };
 
-  jitsi-excalidraw = callPackage ../servers/jitsi-excalidraw { };
-
-  jigasi = callPackage ../servers/jigasi { };
-
   jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { };
 
   jitsi-meet-prosody = callPackage ../misc/jitsi-meet-prosody { };
 
   jitsi-videobridge = callPackage ../servers/jitsi-videobridge { };
 
-  kamailio = callPackage ../servers/sip/kamailio { };
-
-  kapowbang = callPackage ../servers/kapowbang { };
-
-  keycloak = callPackage ../servers/keycloak { };
-
-  knot-dns = callPackage ../servers/dns/knot-dns { };
   knot-resolver = callPackage ../servers/dns/knot-resolver {
     systemd = systemdMinimal; # in closure already anyway
   };
 
-  rdkafka = callPackage ../development/libraries/rdkafka { };
-
   leafnode = callPackage ../servers/news/leafnode { };
 
   leafnode1 = callPackage ../servers/news/leafnode/1.nix { };
@@ -24200,22 +11940,6 @@ with pkgs;
     nodejs = nodejs_18;
   };
 
-  lightgbm = callPackage ../development/libraries/lightgbm { };
-
-  lighttpd = callPackage ../servers/http/lighttpd { };
-
-  linx-server = callPackage ../servers/web-apps/linx-server { };
-
-  livepeer = callPackage ../servers/livepeer { };
-
-  lldap = callPackage ../servers/ldap/lldap { };
-
-  lwan = callPackage ../servers/http/lwan { };
-
-  labelImg = callPackage ../applications/science/machine-learning/labelimg { };
-
-  mackerel-agent = callPackage ../servers/monitoring/mackerel-agent { };
-
   mailmanPackages = callPackage ../servers/mail/mailman {
     # Hyperkitty test fails with 3.12:
     # https://gitlab.com/mailman/hyperkitty/-/issues/514
@@ -24224,10 +11948,6 @@ with pkgs;
   inherit (mailmanPackages) mailman mailman-hyperkitty;
   mailman-web = mailmanPackages.web;
 
-  listadmin = callPackage ../applications/networking/listadmin { };
-
-  maker-panel = callPackage ../tools/misc/maker-panel { };
-
   mastodon = callPackage ../servers/mastodon {
     nodejs-slim = nodejs-slim_22;
     python3 = python311;
@@ -24235,23 +11955,11 @@ with pkgs;
     yarn-berry = yarn-berry.override { nodejs = nodejs-slim_22; };
   };
 
-  gotosocial = callPackage ../servers/gotosocial { };
-
   materialize = callPackage ../servers/sql/materialize {
     inherit (buildPackages.darwin) bootstrap_cmds;
     inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation;
   };
 
-  matrix-alertmanager = callPackage ../servers/monitoring/matrix-alertmanager { };
-
-  mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { };
-
-  memcached = callPackage ../servers/memcached { };
-
-  merecat = callPackage ../servers/http/merecat { };
-
-  meteor = callPackage ../servers/meteor { };
-
   micro-full = micro.wrapper.override {
     extraPackages = [
       wl-clipboard
@@ -24271,8 +11979,6 @@ with pkgs;
     ];
   };
 
-  micronaut = callPackage ../development/tools/micronaut { };
-
   minio = callPackage ../servers/minio { };
   # Keep around to allow people to migrate their data from the old legacy fs format
   # https://github.com/minio/minio/releases/tag/RELEASE.2022-10-29T06-21-33Z
@@ -24284,24 +11990,12 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit;
   }) mpd mpd-small mpdWithFeatures;
 
-  mpdscribble = callPackage ../tools/misc/mpdscribble { };
-
   mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { };
 
-  micro-httpd = callPackage ../servers/http/micro-httpd { };
-
-  miniHttpd = callPackage ../servers/http/mini-httpd { };
-
-  mlflow-server = callPackage ../servers/mlflow-server { };
-
-  mlmmj = callPackage ../servers/mail/mlmmj { };
-
   moodle = callPackage ../servers/web-apps/moodle { };
 
   moodle-utils = callPackage ../servers/web-apps/moodle/moodle-utils.nix { };
 
-  morty = callPackage ../servers/web-apps/morty { };
-
   inherit (callPackage ../applications/networking/mullvad { })
     mullvad;
 
@@ -24309,8 +12003,6 @@ with pkgs;
 
   mullvad-closest = with python3Packages; toPythonApplication mullvad-closest;
 
-  mycorrhiza = callPackage ../servers/mycorrhiza { };
-
   napalm = with python3Packages; toPythonApplication (
     napalm.overridePythonAttrs (attrs: {
       # add community frontends that depend on the napalm python package
@@ -24320,24 +12012,8 @@ with pkgs;
     })
   );
 
-  nas = callPackage ../servers/nas { };
-
-  nats-streaming-server = callPackage ../servers/nats-streaming-server { };
-
-  neard = callPackage ../servers/neard { };
-
-  networkaudiod = callPackage ../servers/networkaudiod { };
-
-  unifiedpush-common-proxies = callPackage ../servers/unifiedpush-common-proxies { };
-
-  unit = callPackage ../servers/http/unit { };
-
-  ncdns = callPackage ../servers/dns/ncdns { };
-
   nginx = nginxStable;
 
-  nginx-doc = callPackage ../data/documentation/nginx-doc { };
-
   nginxQuic = callPackage ../servers/http/nginx/quic.nix {
     zlib = zlib-ng.override { withZlibCompat = true; };
     withPerl = false;
@@ -24376,33 +12052,13 @@ with pkgs;
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  ngircd = callPackage ../servers/irc/ngircd { };
-
-  nix-binary-cache = callPackage ../servers/http/nix-binary-cache { };
-
-  nix-tour = callPackage ../applications/misc/nix-tour { };
-
-  noseyparker = callPackage ../tools/security/noseyparker { };
-
-  nosqli = callPackage ../tools/security/nosqli { };
-
   nsd = callPackage ../servers/dns/nsd (config.nsd or {});
 
-  nsq = callPackage ../servers/nsq { };
-
-  oauth2-proxy = callPackage ../servers/oauth2-proxy { };
-
-  olaris-server = callPackage ../servers/olaris { };
-
-  onlyoffice-documentserver = callPackage ../servers/onlyoffice-documentserver { };
-
   outline = callPackage ../servers/web-apps/outline (lib.fix (super: {
     yarn = yarn.override { inherit (super) nodejs; };
     nodejs = nodejs_20;
   }));
 
-  openbgpd = callPackage ../servers/openbgpd { };
-
   openafs = callPackage ../servers/openafs/1.8 { };
 
   openresty = callPackage ../servers/http/openresty {
@@ -24413,51 +12069,18 @@ with pkgs;
   opensmtpd = callPackage ../servers/mail/opensmtpd { };
   opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { };
   opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { };
-  opensmtpd-filter-dkimsign = callPackage ../servers/mail/opensmtpd/filter-dkimsign { };
-  libopensmtpd = callPackage ../servers/mail/opensmtpd/libopensmtpd { };
-
-  openxr-loader = callPackage ../development/libraries/openxr-loader { };
-
   osrm-backend = callPackage ../servers/osrm-backend {
     tbb = tbb_2021_11;
     # https://github.com/Project-OSRM/osrm-backend/issues/6503
     boost = boost179;
   };
 
-  oven-media-engine = callPackage ../servers/misc/oven-media-engine { };
-
-  p910nd = callPackage ../servers/p910nd { };
-
-  petidomo = callPackage ../servers/mail/petidomo { };
-
-  pict-rs = callPackage ../servers/web-apps/pict-rs { };
-
-  popa3d = callPackage ../servers/mail/popa3d { };
-
   postfix = callPackage ../servers/mail/postfix { };
 
-  postfixadmin = callPackage ../servers/postfixadmin { };
-
-  postsrsd = callPackage ../servers/mail/postsrsd { };
-
-  rspamd = callPackage ../servers/mail/rspamd { };
-
   pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { };
 
   pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { };
 
-  pomerium-cli = callPackage ../tools/security/pomerium-cli { };
-
-  postgrey = callPackage ../servers/mail/postgrey { };
-
-  quark = callPackage ../servers/http/quark { };
-
-  smtprelay = callPackage ../servers/mail/smtprelay { };
-
-  soft-serve = callPackage ../servers/soft-serve { };
-
-  sympa = callPackage ../servers/mail/sympa { };
-
   system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { });
 
   # PulseAudio daemons
@@ -24488,18 +12111,8 @@ with pkgs;
 
   libpressureaudio = callPackage ../misc/apulse/pressureaudio.nix { };
 
-  libcardiacarrest = callPackage ../misc/libcardiacarrest { };
-
-  pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { };
-
   tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { };
 
-  pies = callPackage ../servers/pies { };
-
-  rpcbind = callPackage ../servers/rpcbind { };
-
-  rpcsvc-proto = callPackage ../tools/misc/rpcsvc-proto { };
-
   libmysqlclient = libmysqlclient_3_3;
   libmysqlclient_3_1 = mariadb-connector-c_3_1;
   libmysqlclient_3_2 = mariadb-connector-c_3_2;
@@ -24546,8 +12159,6 @@ with pkgs;
       if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
   };
 
-  immudb = callPackage ../servers/nosql/immudb { };
-
   influxdb = callPackage ../servers/nosql/influxdb { };
   influxdb2-server = callPackage ../servers/nosql/influxdb2 { };
   influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { };
@@ -24566,13 +12177,9 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
-
   mssql_jdbc = callPackage ../servers/sql/mssql/jdbc { };
   jtds_jdbc = callPackage ../servers/sql/mssql/jdbc/jtds.nix { };
 
-  azuredatastudio = callPackage ../applications/misc/azuredatastudio { };
-
   miniflux = callPackage ../by-name/mi/miniflux/package.nix {
     buildGoModule = buildGo123Module;
   };
@@ -24590,31 +12197,10 @@ with pkgs;
     withIcingadb = false;
   };
 
-  munin = callPackage ../servers/monitoring/munin { };
-
-  nagios = callPackage ../servers/monitoring/nagios { };
-
   nagiosPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/nagios-plugins { });
 
-  monitoring-plugins = callPackage ../servers/monitoring/plugins { };
-
-  neo4j = callPackage ../servers/nosql/neo4j { };
-
-  neo4j-desktop = callPackage ../applications/misc/neo4j-desktop { };
-
-  net-snmp = callPackage ../servers/monitoring/net-snmp { };
-
-  newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { };
-
-  nullidentdmod = callPackage ../servers/identd/nullidentdmod { };
-
-  riemann = callPackage ../servers/monitoring/riemann { };
   riemann-dash = callPackage ../servers/monitoring/riemann-dash { };
 
-  unpfs = callPackage ../servers/unpfs { };
-
-  oidentd = callPackage ../servers/identd/oidentd { };
-
   qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { };
 
   rust-hypervisor-firmware = callPackage ../applications/virtualization/rust-hypervisor-firmware { };
@@ -24631,26 +12217,10 @@ with pkgs;
     msVarsTemplate = stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isAarch64;
   };
 
-  ops = callPackage ../applications/virtualization/ops { };
-
-  vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
-
-  pgbouncer = callPackage ../servers/sql/pgbouncer { };
-
-  pgcat = callPackage ../servers/sql/pgcat {};
-
-  pgpool = callPackage ../servers/sql/pgpool { };
-
   tang = callPackage ../servers/tang {
     asciidoc = asciidoc-full;
   };
 
-  promscale = callPackage ../servers/monitoring/prometheus/promscale { };
-
-  timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { };
-
-  timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };
-
   inherit (import ../servers/sql/postgresql pkgs)
     postgresql_12
     postgresql_13
@@ -24683,16 +12253,8 @@ with pkgs;
   postgresql16JitPackages = recurseIntoAttrs postgresql_16_jit.pkgs;
   postgresql17JitPackages = recurseIntoAttrs postgresql_17_jit.pkgs;
 
-  postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
-
-  postgresqlTestHook = callPackage ../build-support/setup-hooks/postgresql-test-hook { };
-
   postgrest = haskellPackages.postgrest.bin;
 
-  redshift_jdbc = callPackage ../development/java-modules/redshift_jdbc { };
-
-  liquibase_redshift_extension = callPackage ../development/java-modules/liquibase_redshift_extension { };
-
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
   prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
   prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
@@ -24706,7 +12268,6 @@ with pkgs;
   prometheus-cloudflare-exporter = callPackage ../servers/monitoring/prometheus/cloudflare-exporter.nix { };
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
   prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
-  prometheus-dcgm-exporter = callPackage ../servers/monitoring/prometheus/dcgm-exporter { };
   prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };
   prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { };
   prometheus-fastly-exporter = callPackage ../servers/monitoring/prometheus/fastly-exporter.nix { };
@@ -24752,11 +12313,9 @@ with pkgs;
   prometheus-sachet = callPackage ../servers/monitoring/prometheus/sachet.nix { };
   prometheus-script-exporter = callPackage ../servers/monitoring/prometheus/script-exporter.nix { };
   prometheus-shelly-exporter = callPackage ../servers/monitoring/prometheus/shelly-exporter.nix { };
-  prometheus-smartctl-exporter = callPackage ../servers/monitoring/prometheus/smartctl-exporter { };
   prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { };
   prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
   prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { };
-  prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter { };
   prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { };
   prometheus-systemd-exporter = callPackage ../servers/monitoring/prometheus/systemd-exporter.nix { };
   prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { };
@@ -24768,28 +12327,14 @@ with pkgs;
   prometheus-zfs-exporter = callPackage ../servers/monitoring/prometheus/zfs-exporter.nix { };
   prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { };
 
-  prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { };
-
-  proximity-sort = callPackage ../tools/misc/proximity-sort { };
-
-  psql2csv = callPackage ../tools/misc/psql2csv { };
-
-  psqlodbc = callPackage ../development/libraries/psqlodbc { };
-
   public-inbox = perlPackages.callPackage ../servers/mail/public-inbox { };
 
-  pure-ftpd = callPackage ../servers/ftp/pure-ftpd { };
-
   spf-engine = python3.pkgs.callPackage ../servers/mail/spf-engine { };
 
   pypiserver = with python3Packages; toPythonApplication pypiserver;
 
-  qpid-cpp = callPackage ../servers/amqp/qpid-cpp { };
-
   qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { };
 
-  questdb = callPackage ../servers/nosql/questdb { };
-
   rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server {
     inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
     erlang = erlang_26;
@@ -24800,23 +12345,10 @@ with pkgs;
 
   qcal = callPackage ../tools/networking/qcal/default.nix { };
 
-  qcard = callPackage ../tools/networking/qcard { };
-
   rake = callPackage ../development/tools/build-managers/rake { };
 
-  rakkess = callPackage ../development/tools/rakkess { };
-
-  redis = callPackage ../servers/nosql/redis { };
-
-  redli = callPackage ../tools/networking/redli { };
-
-  redstore = callPackage ../servers/http/redstore { };
-
-  repro-get = callPackage ../tools/package-management/repro-get { };
-
   restic = callPackage ../tools/backup/restic { };
 
-  restic-integrity = callPackage ../applications/backup/restic-integrity { };
   restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { };
 
   rethinkdb = callPackage ../servers/nosql/rethinkdb {
@@ -24831,22 +12363,10 @@ with pkgs;
 
   rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { };
 
-  roon-bridge = callPackage ../servers/roon-bridge { };
-
-  rpiplay = callPackage ../servers/rpiplay { };
-
-  roon-server = callPackage ../servers/roon-server { };
-
   rustic = callPackage ../by-name/ru/rustic/package.nix {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  supervise = callPackage ../tools/system/supervise { };
-
-  spamassassin = callPackage ../servers/mail/spamassassin { };
-
-  deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { };
-
   samba4 = darwin.apple_sdk_11_0.callPackage ../servers/samba/4.x.nix { };
 
   samba = samba4;
@@ -24862,26 +12382,12 @@ with pkgs;
 
   sambaFull = samba4Full;
 
-  sampler = callPackage ../applications/misc/sampler { };
-
   scalene = with python3Packages; toPythonApplication scalene;
 
-  scalr-cli = callPackage ../tools/admin/scalr-cli { };
-
-  scaphandre = callPackage ../servers/scaphandre { };
-
   shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };
 
-  shairport-sync = callPackage ../servers/shairport-sync { };
-
-  sharing = callPackage ../servers/sharing { };
-
   showoff = callPackage ../servers/http/showoff { };
 
-  serfdom = callPackage ../servers/serf { };
-
-  seyren = callPackage ../servers/monitoring/seyren { };
-
   ruby-zoom = callPackage ../tools/text/ruby-zoom { };
 
   inherit (callPackages ../servers/monitoring/sensu-go { })
@@ -24896,51 +12402,13 @@ with pkgs;
 
   sickgear = callPackage ../servers/sickbeard/sickgear.nix { };
 
-  sipwitch = callPackage ../servers/sip/sipwitch { };
-
-  smcroute = callPackage ../servers/smcroute { };
-
   snipe-it = callPackage ../by-name/sn/snipe-it/package.nix {
     php = php81;
   };
 
-  sogo = callPackage ../servers/web-apps/sogo { };
-
   spacecookie =
     haskell.lib.compose.justStaticExecutables haskellPackages.spacecookie;
 
-  spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };
-
-  spring-boot-cli = callPackage ../development/tools/spring-boot-cli { };
-
-  squid = callPackage ../servers/squid { };
-
-  duckling-proxy = callPackage ../servers/duckling-proxy { };
-
-  sslh = callPackage ../servers/sslh { };
-
-  thttpd = callPackage ../servers/http/thttpd { };
-
-  static-web-server = callPackage ../servers/static-web-server { };
-
-  stone = callPackage ../servers/stone { };
-
-  storm = callPackage ../servers/computing/storm { };
-
-  switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { };
-
-  slurm = callPackage ../servers/computing/slurm { };
-
-  slurm-spank-stunnel = callPackage ../servers/computing/slurm-spank-stunnel { };
-
-  slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { };
-
-  systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
-
-  tailscale-systray = callPackage ../applications/misc/tailscale-systray { };
-
-  trafficserver = callPackage ../servers/http/trafficserver { };
-
   inherit (callPackages ../servers/http/tomcat { })
     tomcat9
     tomcat10
@@ -24948,26 +12416,11 @@ with pkgs;
 
   tomcat = tomcat11;
 
-  tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
-
   torque = callPackage ../servers/computing/torque {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
   tt-rss = callPackage ../servers/tt-rss { };
-  tt-rss-plugin-feediron = callPackage ../servers/tt-rss/plugin-feediron { };
-  tt-rss-plugin-ff-instagram = callPackage ../servers/tt-rss/plugin-ff-instagram { };
-  tt-rss-plugin-auth-ldap = callPackage ../servers/tt-rss/plugin-auth-ldap { };
-  tt-rss-theme-feedly = callPackage ../servers/tt-rss/theme-feedly { };
-
-  rss-bridge = callPackage ../servers/web-apps/rss-bridge { };
-
-  selfoss = callPackage ../servers/web-apps/selfoss { };
-
-  shaarli = callPackage ../servers/web-apps/shaarli { };
-
-  shiori = callPackage ../servers/web-apps/shiori { };
-
   inherit (callPackages ../servers/web-apps/matomo {})
     matomo
     matomo_5
@@ -24978,52 +12431,16 @@ with pkgs;
 
   unifi = unifi8;
 
-  unifi-protect-backup = callPackage ../applications/backup/unifi-protect-backup { };
-
   unpackerr = callPackage ../servers/unpackerr {
     inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;
   };
 
   unstructured-api = callPackage ../servers/unstructured-api { };
 
-  urserver = callPackage ../servers/urserver { };
-
-  vouch-proxy = callPackage ../servers/vouch-proxy { };
-
-  virtiofsd = callPackage ../servers/misc/virtiofsd { };
-
   virtualenv = with python3Packages; toPythonApplication virtualenv;
 
   virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
 
-  vsftpd = callPackage ../servers/ftp/vsftpd { };
-
-  wallabag = callPackage ../servers/web-apps/wallabag { };
-
-  webdav = callPackage ../servers/webdav { };
-
-  webdav-server-rs = callPackage ../servers/webdav-server-rs { };
-
-  webmetro = callPackage ../servers/webmetro { };
-
-  wesher = callPackage ../servers/wesher { };
-
-  wishlist = callPackage ../servers/wishlist { };
-
-  wsdd = callPackage ../servers/wsdd { };
-
-  webhook = callPackage ../servers/http/webhook { };
-
-  xinetd = callPackage ../servers/xinetd { };
-
-  zookeeper = callPackage ../servers/zookeeper { };
-
-  zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
-
-  xqilla = callPackage ../development/tools/xqilla { };
-
-  xquartz = callPackage ../servers/x11/xquartz { };
-
   quartz-wm = callPackage ../servers/x11/quartz-wm {
     stdenv = clangStdenv;
     inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
@@ -25051,12 +12468,8 @@ with pkgs;
 
   in recurseIntoAttrs xorgPackages;
 
-  xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { };
-
   xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
 
-  yaws = callPackage ../servers/http/yaws { };
-
   zabbixFor = version: rec {
     agent = (callPackages ../servers/monitoring/zabbix/agent.nix {}).${version};
     proxy-mysql = (callPackages ../servers/monitoring/zabbix/proxy.nix { mysqlSupport = true; }).${version};
@@ -25078,46 +12491,20 @@ with pkgs;
 
   zabbix = zabbix60;
 
-  zipkin = callPackage ../servers/monitoring/zipkin { };
-
   ### SERVERS / GEOSPATIAL
 
   martin = callPackage ../servers/geospatial/martin {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  pg_featureserv = callPackage ../servers/geospatial/pg_featureserv { };
-
-  pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { };
-
   ### OS-SPECIFIC
 
-  airbuddy = callPackage ../os-specific/darwin/airbuddy { };
-
-  afuse = callPackage ../os-specific/linux/afuse { };
-
-  autofs5 = callPackage ../os-specific/linux/autofs { };
-
-  _915resolution = callPackage ../os-specific/linux/915resolution { };
-
-  nfs-utils = callPackage ../os-specific/linux/nfs-utils { };
-
-  acpi = callPackage ../os-specific/linux/acpi { };
-
-  acpid = callPackage ../os-specific/linux/acpid { };
-
-  acpitool = callPackage ../os-specific/linux/acpitool { };
-
   alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { };
 
-  alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { };
-
   alsa-utils = callPackage ../by-name/al/alsa-utils/package.nix {
     fftw = fftwFloat;
   };
 
-  apparency = callPackage ../os-specific/darwin/apparency { };
-
   arm-trusted-firmware = callPackage ../misc/arm-trusted-firmware { };
   inherit (arm-trusted-firmware)
     buildArmTrustedFirmware
@@ -25132,44 +12519,20 @@ with pkgs;
     armTrustedFirmwareS905
     ;
 
-  mlxbf-bootimages = callPackage ../misc/mlxbf-bootimages { };
-
   inherit (callPackages ../os-specific/linux/apparmor { })
     libapparmor apparmor-utils apparmor-bin-utils apparmor-parser apparmor-pam
     apparmor-profiles apparmor-kernel-patches apparmorRulesFromClosure;
 
-  aseq2json = callPackage ../os-specific/linux/aseq2json { };
-
-  atop = callPackage ../os-specific/linux/atop { };
-
   ath9k-htc-blobless-firmware = callPackage ../os-specific/linux/firmware/ath9k { };
   ath9k-htc-blobless-firmware-unstable =
     callPackage ../os-specific/linux/firmware/ath9k { enableUnstable = true; };
 
-  bartender = callPackage ../os-specific/darwin/bartender { };
-
   b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { };
 
   b43Firmware_6_30_163_46 = callPackage ../os-specific/linux/firmware/b43-firmware/6.30.163.46.nix { };
 
-  b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { };
-
-  epilys-bb = callPackage ../tools/system/epilys-bb { };
-
-  below = callPackage ../os-specific/linux/below { };
-
-  bt-fw-converter = callPackage ../os-specific/linux/firmware/bt-fw-converter { };
-
-  brillo = callPackage ../os-specific/linux/brillo { };
-
-  broadcom-bt-firmware = callPackage ../os-specific/linux/firmware/broadcom-bt-firmware { };
-
   batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { };
 
-  beefi = callPackage ../os-specific/linux/beefi { };
-
-  blktrace = callPackage ../os-specific/linux/blktrace { };
-
   bluez5 = bluez;
   bluez5-experimental = bluez-experimental;
 
@@ -25177,16 +12540,6 @@ with pkgs;
     enableExperimental = true;
   };
 
-  bolt = callPackage ../os-specific/linux/bolt { };
-
-  bpf-linker = callPackage ../development/tools/bpf-linker { };
-
-  bpftune = callPackage ../os-specific/linux/bpftune { };
-
-  bpfmon = callPackage ../os-specific/linux/bpfmon { };
-
-  bridge-utils = callPackage ../os-specific/linux/bridge-utils { };
-
   busybox = callPackage ../os-specific/linux/busybox {
     # Fixes libunwind from being dynamically linked to a static binary.
     stdenv = if (stdenv.targetPlatform.useLLVM or false) then
@@ -25200,53 +12553,21 @@ with pkgs;
               else busybox;
   };
 
-  cachefilesd = callPackage ../os-specific/linux/cachefilesd { };
-
-  cariddi = callPackage ../tools/security/cariddi { };
-
-  checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
-
-  checksec = callPackage ../os-specific/linux/checksec { };
-
-  cifs-utils = callPackage ../os-specific/linux/cifs-utils { };
-
   cm-rgb = python3Packages.callPackage ../tools/system/cm-rgb { };
 
-  cpustat = callPackage ../os-specific/linux/cpustat { };
-
-  cockroachdb = callPackage ../servers/sql/cockroachdb { };
-
-  coconutbattery = callPackage ../os-specific/darwin/coconutbattery { };
-
   conky = callPackage ../os-specific/linux/conky ({
     lua = lua5_4;
     inherit (linuxPackages.nvidia_x11.settings) libXNVCtrl;
   } // config.conky or {});
 
-  conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { };
-
-  coredns = callPackage ../servers/dns/coredns { };
-
-  cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
-
   cpupower-gui = python3Packages.callPackage ../os-specific/linux/cpupower-gui {
     inherit (pkgs) meson;
   };
 
-  criu = callPackage ../os-specific/linux/criu { };
-
   cryptomator = callPackage ../tools/security/cryptomator {
     jdk = jdk23.override { enableJavaFX = true; };
   };
 
-  cryptsetup = callPackage ../os-specific/linux/cryptsetup { };
-
-  cramfsprogs = callPackage ../os-specific/linux/cramfsprogs { };
-
-  cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
-
-  cshatag = callPackage ../os-specific/linux/cshatag { };
-
   # Darwin package set
   #
   # Even though this is a set of packages not single package, use `callPackage`
@@ -25258,87 +12579,29 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
-
   displaylink = callPackage ../os-specific/linux/displaylink {
     inherit (linuxPackages) evdi;
   };
 
-  dmidecode = callPackage ../os-specific/linux/dmidecode { };
-
-  dmtcp = callPackage ../os-specific/linux/dmtcp { };
-
-  directvnc = callPackage ../os-specific/linux/directvnc { };
-
   dmraid = callPackage ../os-specific/linux/dmraid { lvm2 = lvm2_dmeventd; };
 
   drbd = callPackage ../os-specific/linux/drbd/utils.nix { };
 
-  dropwatch = callPackage ../os-specific/linux/dropwatch { };
-
-  dsd = callPackage ../applications/radio/dsd { };
-
-  dstat = callPackage ../os-specific/linux/dstat { };
-
-  esdm = callPackage ../os-specific/linux/esdm { };
-
-  evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { };
-
   # unstable until the first 1.x release
-  fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { };
-
-  fsverity-utils = callPackage ../os-specific/linux/fsverity-utils { };
-
-  fwanalyzer = callPackage ../tools/filesystems/fwanalyzer { };
-
-  fwupd-efi = callPackage ../os-specific/linux/firmware/fwupd-efi { };
-
-  firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { };
-
-  firmware-updater = callPackage ../os-specific/linux/firmware/firmware-updater { };
-
   fwts = callPackage ../os-specific/linux/fwts { };
 
-  gobi_loader = callPackage ../os-specific/linux/gobi_loader { };
-
-  libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
-
   libuuid = if stdenv.hostPlatform.isLinux
     then util-linuxMinimal
     else null;
 
-  lightum = callPackage ../os-specific/linux/lightum { };
-
-  ebtables = callPackage ../os-specific/linux/ebtables { };
-
   elegant-sddm = libsForQt5.callPackage ../data/themes/elegant-sddm { };
 
   error-inject = callPackages ../os-specific/linux/error-inject { };
 
-  extrace = callPackage ../os-specific/linux/extrace { };
-
-  facetimehd-calibration = callPackage ../os-specific/linux/firmware/facetimehd-calibration { };
-
-  facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { };
-
-  fan2go = callPackage ../os-specific/linux/fan2go { };
-
-  fanctl = callPackage ../os-specific/linux/fanctl { };
-
-  fatrace = callPackage ../os-specific/linux/fatrace { };
-
   ffado = callPackage ../os-specific/linux/ffado { };
   ffado-mixer = callPackage ../os-specific/linux/ffado { withMixer = true; };
   libffado = ffado;
 
-  fbterm = callPackage ../os-specific/linux/fbterm { };
-
-  firejail = callPackage ../os-specific/linux/firejail { };
-
-  fnotifystat = callPackage ../os-specific/linux/fnotifystat { };
-
-  forkstat = callPackage ../os-specific/linux/forkstat { };
-
   freefall = callPackage ../os-specific/linux/freefall {
     inherit (linuxPackages) kernel;
   };
@@ -25350,16 +12613,6 @@ with pkgs;
   fuse2 = lowPrio (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fusePackages.fuse_2);
   fuse3 = fusePackages.fuse_3;
 
-  fxload = callPackage ../os-specific/linux/fxload { };
-
-  gfxtablet = callPackage ../os-specific/linux/gfxtablet { };
-
-  gmailctl = callPackage ../applications/networking/gmailctl { };
-
-  gomp = callPackage ../applications/version-management/gomp { };
-
-  gomplate = callPackage ../development/tools/gomplate { };
-
   gpm = callPackage ../servers/gpm {
     withNcurses = false; # Keep curses disabled for lack of value
 
@@ -25370,24 +12623,6 @@ with pkgs;
 
   gpm-ncurses = gpm.override { withNcurses = true; };
 
-  gpu-switch = callPackage ../os-specific/linux/gpu-switch { };
-
-  gradm = callPackage ../os-specific/linux/gradm { };
-
-  gt = callPackage ../os-specific/linux/gt { };
-
-  gtop = callPackage ../tools/system/gtop { };
-
-  hd-idle = callPackage ../os-specific/linux/hd-idle { };
-
-  hdparm = callPackage ../os-specific/linux/hdparm { };
-
-  health-check = callPackage ../os-specific/linux/health-check { };
-
-  hibernate = callPackage ../os-specific/linux/hibernate { };
-
-  hostapd = callPackage ../os-specific/linux/hostapd { };
-
   htop = callPackage ../tools/system/htop {
     inherit (darwin) IOKit;
   };
@@ -25401,37 +12636,8 @@ with pkgs;
   btop = darwin.apple_sdk_11_0.callPackage ../tools/system/btop { };
   btop-rocm = btop.override { rocmSupport = true; };
 
-  nmon = callPackage ../os-specific/linux/nmon { };
-
-  hwdata = callPackage ../os-specific/linux/hwdata { };
-
   i7z = qt5.callPackage ../os-specific/linux/i7z { };
 
-  pcm = callPackage ../os-specific/linux/pcm { };
-
-  ifmetric = callPackage ../os-specific/linux/ifmetric { };
-
-  ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { };
-
-  intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { };
-
-  intel-cmt-cat = callPackage ../os-specific/linux/intel-cmt-cat { };
-
-  intel-compute-runtime = callPackage ../os-specific/linux/intel-compute-runtime { };
-
-  intel-ocl = callPackage ../os-specific/linux/intel-ocl { };
-
-  level-zero = callPackage ../development/libraries/level-zero { };
-
-  iomelt = callPackage ../os-specific/linux/iomelt { };
-
-  iotop = callPackage ../os-specific/linux/iotop { };
-  iotop-c = callPackage ../os-specific/linux/iotop-c { };
-
-  iproute2 = callPackage ../os-specific/linux/iproute { };
-
-  ipu6-camera-bins = callPackage ../os-specific/linux/firmware/ipu6-camera-bins {};
-
   ipu6-camera-hal = callPackage ../development/libraries/ipu6-camera-hal {};
 
   ipu6ep-camera-hal = callPackage ../development/libraries/ipu6-camera-hal {
@@ -25442,8 +12648,6 @@ with pkgs;
     ipuVersion = "ipu6epmtl";
   };
 
-  ivsc-firmware = callPackage ../os-specific/linux/firmware/ivsc-firmware { };
-
   iputils = hiPrio (callPackage ../os-specific/linux/iputils { });
   # hiPrio for collisions with inetutils (ping)
 
@@ -25451,80 +12655,12 @@ with pkgs;
   iptables-legacy = callPackage ../os-specific/linux/iptables { nftablesCompat = false; };
   iptables-nftables-compat = iptables;
 
-  iptstate = callPackage ../os-specific/linux/iptstate { } ;
-
-  ipset = callPackage ../os-specific/linux/ipset { };
-
-  irqbalance = callPackage ../os-specific/linux/irqbalance { };
-
-  itpp = callPackage ../development/libraries/science/math/itpp { };
-
-  iwd = callPackage ../os-specific/linux/iwd { };
-
   jool-cli = callPackage ../os-specific/linux/jool/cli.nix { };
 
-  juju = callPackage ../applications/networking/juju { };
-
-  jujuutils = callPackage ../os-specific/linux/jujuutils { };
-
-  karabiner-elements = callPackage ../os-specific/darwin/karabiner-elements { };
-
-  kbd = callPackage ../os-specific/linux/kbd { };
-
-  kbdlight = callPackage ../os-specific/linux/kbdlight { };
-
-  kinect-audio-setup = callPackage ../os-specific/linux/kinect-audio-setup { };
-
-  kmscon = callPackage ../os-specific/linux/kmscon { };
-
-  kmscube = callPackage ../os-specific/linux/kmscube { };
-
-  kmsxx = callPackage ../development/libraries/kmsxx { };
-
-  latencytop = callPackage ../os-specific/linux/latencytop { };
-
-  ldm = callPackage ../os-specific/linux/ldm { };
-
-  libaio = callPackage ../os-specific/linux/libaio { };
-
-  libajantv2 = callPackage ../development/libraries/libajantv2 { };
-
-  libargon2 = callPackage ../development/libraries/libargon2 { };
-
-  libatasmart = callPackage ../os-specific/linux/libatasmart { };
-
-  libax25 = callPackage ../development/libraries/libax25 { };
-
-  libcgroup = callPackage ../os-specific/linux/libcgroup { };
-
-  libdatachannel = callPackage ../development/libraries/libdatachannel { };
-
-  libkrun = callPackage ../development/libraries/libkrun { };
-
   libkrun-sev = libkrun.override { sevVariant = true; };
 
-  libkrunfw = callPackage ../development/libraries/libkrunfw { };
-
-  libnl = callPackage ../os-specific/linux/libnl { };
-
-  libnl-tiny = callPackage ../os-specific/linux/libnl-tiny { };
-
-  libtraceevent = callPackage ../os-specific/linux/libtraceevent { };
-
-  libtracefs = callPackage ../os-specific/linux/libtracefs { };
-
-  lieer = callPackage ../applications/networking/lieer { };
-
-  linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
-
   linthesia = callPackage ../games/linthesia/default.nix { };
 
-  libreelec-dvb-firmware = callPackage ../os-specific/linux/firmware/libreelec-dvb-firmware { };
-
-  openiscsi = callPackage ../os-specific/linux/open-iscsi { };
-
-  open-isns = callPackage ../os-specific/linux/open-isns { };
-
   osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp {
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
@@ -25533,22 +12669,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) DiskArbitration;
   };
 
-  osxsnarf = callPackage ../os-specific/darwin/osxsnarf { };
-
-  plistwatch = callPackage ../os-specific/darwin/plistwatch { };
-
-  power-calibrate = callPackage ../os-specific/linux/power-calibrate { };
-
-  powercap = callPackage ../os-specific/linux/powercap { };
-
-  powerstat = callPackage ../os-specific/linux/powerstat { };
-
   projecteur = libsForQt5.callPackage ../os-specific/linux/projecteur { };
 
-  smemstat = callPackage ../os-specific/linux/smemstat { };
-
-  tgt = callPackage ../tools/networking/tgt { };
-
   lkl = callPackage ../applications/virtualization/lkl { };
   lklWithFirewall = callPackage ../applications/virtualization/lkl { firewallSupport = true; };
 
@@ -25641,12 +12763,6 @@ with pkgs;
 
   cryptodev = linuxPackages.cryptodev;
 
-  dpdk = callPackage ../os-specific/linux/dpdk { };
-
-  keyutils = callPackage ../os-specific/linux/keyutils { };
-
-  libselinux = callPackage ../os-specific/linux/libselinux { };
-
   libsemanage = callPackage ../os-specific/linux/libsemanage {
     python = python3;
   };
@@ -25655,12 +12771,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
   };
 
-  libraqm = callPackage ../development/libraries/libraqm { };
-
-  libraw = callPackage ../development/libraries/libraw { };
-
-  libraw1394 = callPackage ../development/libraries/libraw1394 { };
-
   librealsense = darwin.apple_sdk_11_0.callPackage ../development/libraries/librealsense { };
 
   librealsenseWithCuda = callPackage ../development/libraries/librealsense {
@@ -25678,38 +12788,8 @@ with pkgs;
     enableGUI = true;
   };
 
-  libsass = callPackage ../development/libraries/libsass { };
-
-  libsepol = callPackage ../os-specific/linux/libsepol { };
-
-  libsmbios = callPackage ../os-specific/linux/libsmbios { };
-
-  libsurvive = callPackage ../development/libraries/libsurvive { };
-
-  lm_sensors = callPackage ../os-specific/linux/lm-sensors { };
-
-  lockdep = callPackage ../os-specific/linux/lockdep { };
-
-  lsirec = callPackage ../os-specific/linux/lsirec { };
-
-  lsiutil = callPackage ../os-specific/linux/lsiutil { };
-
-  kaitai-struct-compiler = callPackage ../development/compilers/kaitai-struct-compiler { };
-
   kmod = callPackage ../os-specific/linux/kmod { };
 
-  kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { };
-
-  libcap = callPackage ../os-specific/linux/libcap { };
-
-  libcap_ng = callPackage ../os-specific/linux/libcap-ng { };
-
-  libnotify = callPackage ../development/libraries/libnotify { };
-
-  libvolume_id = callPackage ../os-specific/linux/libvolume_id { };
-
-  lsscsi = callPackage ../os-specific/linux/lsscsi { };
-
   lvm2 = callPackage ../os-specific/linux/lvm2/2_03.nix {
     # break the cyclic dependency:
     # util-linux (non-minimal) depends (optionally, but on by default) on systemd,
@@ -25725,19 +12805,7 @@ with pkgs;
     enableVDO = true;
   };
 
-  maddy = callPackage ../servers/maddy { };
-
-  mbelib = callPackage ../development/libraries/audio/mbelib { };
-
-  mbpfan = callPackage ../os-specific/linux/mbpfan { };
-
   mdadm = mdadm4;
-  mdadm4 = callPackage ../os-specific/linux/mdadm { };
-
-  mdevctl = callPackage ../os-specific/linux/mdevctl { };
-
-  metastore = callPackage ../os-specific/linux/metastore { };
-
   minimal-bootstrap = recurseIntoAttrs (import ../os-specific/linux/minimal-bootstrap {
     inherit (stdenv) buildPlatform hostPlatform;
     inherit lib config;
@@ -25753,38 +12821,17 @@ with pkgs;
     inherit (stdenv) hostPlatform;
   };
 
-  mingetty = callPackage ../os-specific/linux/mingetty { };
-
-  miraclecast = callPackage ../os-specific/linux/miraclecast { };
-
-  mkinitcpio-nfs-utils = callPackage ../os-specific/linux/mkinitcpio-nfs-utils { };
-
-  mmc-utils = callPackage ../os-specific/linux/mmc-utils { };
-
   aggregateModules = modules:
     callPackage ../os-specific/linux/kmod/aggregator.nix {
       inherit (buildPackages) kmod;
       inherit modules;
     };
 
-  multipart-parser-c = callPackage ../development/libraries/multipart-parser-c { };
-
-  multipath-tools = callPackage ../os-specific/linux/multipath-tools { };
-
-  musl = callPackage ../os-specific/linux/musl { };
-
-  musl-fts = callPackage ../os-specific/linux/musl-fts { };
-  musl-obstack = callPackage ../os-specific/linux/musl-obstack { };
-
-  nsh = callPackage ../shells/nsh { };
-
   nushell = darwin.apple_sdk_11_0.callPackage ../shells/nushell {
     inherit (darwin.apple_sdk_11_0) Libsystem;
     inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security;
   };
 
-  nu_scripts = callPackage ../shells/nushell/nu_scripts { };
-
   nushellPlugins = recurseIntoAttrs (callPackage ../shells/nushell/plugins {
     inherit (darwin.apple_sdk.frameworks) Security;
     inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Foundation;
@@ -25800,238 +12847,34 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Hypervisor;
   };
 
-  numactl = callPackage ../os-specific/linux/numactl { };
-
-  numad = callPackage ../os-specific/linux/numad { };
-
-  nvme-cli = callPackage ../os-specific/linux/nvme-cli { };
-
-  nvmet-cli = callPackage ../os-specific/linux/nvmet-cli { };
-
-  system76-firmware = callPackage ../os-specific/linux/firmware/system76-firmware { };
-
-  system76-keyboard-configurator = callPackage ../applications/misc/system76-keyboard-configurator { };
-
-  ocf-resource-agents = callPackage ../os-specific/linux/ocf-resource-agents { };
-
   open-vm-tools-headless = open-vm-tools.override { withX = false; };
 
-  oxtools = callPackage ../os-specific/linux/oxtools { };
-
-  air = callPackage ../development/tools/air { };
-
-  delve = callPackage ../development/tools/delve { };
-
-  easyjson = callPackage ../development/tools/easyjson { };
-
-  iferr = callPackage ../development/tools/iferr { };
-
-  gci = callPackage ../development/tools/gci { };
-
-  gcov2lcov = callPackage ../development/tools/gcov2lcov { };
-
-  ginkgo = callPackage ../development/tools/ginkgo { };
-
   gdlv = callPackage ../by-name/gd/gdlv/package.nix {
     inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics Foundation Metal;
   };
 
-  go-bindata = callPackage ../development/tools/go-bindata { };
-
-  go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { };
-
-  go-minimock = callPackage ../development/tools/go-minimock { };
-
-  go-protobuf = callPackage ../development/tools/go-protobuf { };
-
-  go-toml = callPackage ../development/tools/go-toml { };
-
-  go-outline = callPackage ../development/tools/go-outline { };
-
-  gocode-gomod = callPackage ../development/tools/gocode-gomod { };
-
-  goconst = callPackage ../development/tools/goconst { };
-
-  goconvey = callPackage ../development/tools/goconvey { };
-
-  go-callvis = callPackage ../development/tools/go-callvis { };
-
-  gotags = callPackage ../development/tools/gotags { };
-
-  go-task = callPackage ../development/tools/go-task { };
-
-  golines = callPackage ../development/tools/golines { };
-
-  golint = callPackage ../development/tools/golint { };
-
-  golangci-lint = callPackage ../development/tools/golangci-lint { };
-
-  golangci-lint-langserver = callPackage ../development/tools/golangci-lint-langserver { };
-
-  gocyclo = callPackage ../development/tools/gocyclo { };
-
-  godef = callPackage ../development/tools/godef { };
-
-  goimports-reviser = callPackage ../development/tools/goimports-reviser { };
-
-  gopkgs = callPackage ../development/tools/gopkgs { };
-
-  gosec = callPackage ../development/tools/gosec { };
-
-  gotemplate = callPackage ../development/tools/gotemplate { };
-
-  gotraceui = callPackage ../development/tools/gotraceui { };
-
-  goverview = callPackage ../tools/security/goverview { };
-
-  go-tools = callPackage ../development/tools/go-tools { };
-
-  gotest = callPackage ../development/tools/gotest { };
-
-  gotestfmt = callPackage ../development/tools/gotestfmt { };
-
   gotop = callPackage ../tools/system/gotop {
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  go-migrate = callPackage ../development/tools/go-migrate { };
-
-  go-jet = callPackage ../development/tools/go-jet { };
-
-  go-mockery = callPackage ../development/tools/go-mockery { };
-
-  go-mod-graph-chart = callPackage ../development/tools/go-mod-graph-chart { };
-
-  gomacro = callPackage ../development/tools/gomacro { };
-
-  gomodifytags = callPackage ../development/tools/gomodifytags { };
-
-  gops = callPackage ../development/tools/gops { };
-
-  gore = callPackage ../development/tools/gore { };
-
-  goresym = callPackage ../development/tools/goresym { };
-
-  gotests = callPackage ../development/tools/gotests { };
-
-  gqlgenc = callPackage ../development/tools/gqlgenc { };
-
-  impl = callPackage ../development/tools/impl { };
-
-  moq = callPackage ../development/tools/moq { };
-
-  quicktemplate = callPackage ../development/tools/quicktemplate { };
-
-  linux_logo = callPackage ../tools/misc/linux-logo { };
-
-  linux-pam = callPackage ../os-specific/linux/pam { };
-
-  nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
-
-  octomap = callPackage ../development/libraries/octomap { };
-
   odin = callPackage ../by-name/od/odin/package.nix {
     inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK;
     inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security;
     llvmPackages = llvmPackages_18;
   };
 
-  odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
-
-  odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { };
-
-  ofono = callPackage ../tools/networking/ofono { };
-
   okapi = callPackage ../development/libraries/okapi {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  openbsm = callPackage ../development/libraries/openbsm { };
-
-  pagemon = callPackage ../os-specific/linux/pagemon { };
-
   pam = if stdenv.hostPlatform.isLinux then linux-pam else openpam;
 
   # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )
 
-  pam_ccreds = callPackage ../os-specific/linux/pam_ccreds { };
-
-  pam_dp9ik = callPackage ../os-specific/linux/pam_dp9ik { };
-
-  pam_gnupg = callPackage ../os-specific/linux/pam_gnupg { };
-
-  pam_krb5 = callPackage ../os-specific/linux/pam_krb5 { };
-
-  pam_ldap = callPackage ../os-specific/linux/pam_ldap { };
-
-  pam_mktemp = callPackage ../os-specific/linux/pam_mktemp { };
-
-  pam_mount = callPackage ../os-specific/linux/pam_mount { };
-
-  pam_mysql = callPackage ../os-specific/linux/pam_mysql { };
-
-  pam_p11 = callPackage ../os-specific/linux/pam_p11 { };
-
-  pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { };
-
-  pam_rssh = callPackage ../os-specific/linux/pam_rssh { };
-
-  pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { };
-
-  pam_tmpdir = callPackage ../os-specific/linux/pam_tmpdir { };
-
-  pam_u2f = callPackage ../os-specific/linux/pam_u2f { };
-
-  pam_ussh = callPackage ../os-specific/linux/pam_ussh { };
-
-  paxctl = callPackage ../os-specific/linux/paxctl { };
-
-  paxtest = callPackage ../os-specific/linux/paxtest { };
-
-  pax-utils = callPackage ../os-specific/linux/pax-utils { };
-
-  pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { };
-
-  pcstat = callPackage ../tools/system/pcstat { };
-
-  perf-tools = callPackage ../os-specific/linux/perf-tools { };
-
-  picoprobe-udev-rules = callPackage ../os-specific/linux/picoprobe-udev-rules { };
-
-  pipes = callPackage ../misc/screensavers/pipes { };
-
-  pipes-rs = callPackage ../misc/screensavers/pipes-rs { };
-
-  pipework = callPackage ../os-specific/linux/pipework { };
-
-  pktgen = callPackage ../os-specific/linux/pktgen { };
-
-  plymouth = callPackage ../os-specific/linux/plymouth { };
-
-  pmount = callPackage ../os-specific/linux/pmount { };
-
-  pmutils = callPackage ../os-specific/linux/pm-utils { };
-
-  policycoreutils = callPackage ../os-specific/linux/policycoreutils { };
-
-  semodule-utils = callPackage ../os-specific/linux/semodule-utils { };
-
-  pdns = callPackage ../servers/dns/pdns { };
-
-  powerdns-admin = callPackage ../applications/networking/powerdns-admin { };
-
-  dnsdist = callPackage ../servers/dns/dnsdist { };
-
-  pps-tools = callPackage ../os-specific/linux/pps-tools { };
-
   procps = if stdenv.hostPlatform.isLinux
     then callPackage ../os-specific/linux/procps-ng { }
     else unixtools.procps;
 
-  procdump = callPackage ../os-specific/linux/procdump { };
-
-  prototool = callPackage ../development/tools/prototool { };
-
   qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
   qemu_full = lowPrio (qemu.override {
     smbdSupport = lib.meta.availableOn stdenv.hostPlatform samba;
@@ -26041,128 +12884,44 @@ with pkgs;
 
   qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; });
 
-  quick-lint-js = callPackage ../development/tools/quick-lint-js { };
-
   linux-firmware = callPackage ../os-specific/linux/firmware/linux-firmware { };
 
-  qmk-udev-rules = callPackage ../os-specific/linux/qmk-udev-rules { };
-
-  radeontools = callPackage ../os-specific/linux/radeontools { };
-
-  radeontop = callPackage ../os-specific/linux/radeontop { };
-
-  rasdaemon = callPackage ../os-specific/linux/rasdaemon { };
-
   raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi { };
-  raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { };
-
   raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix { };
 
-  reap = callPackage ../os-specific/linux/reap { };
-
-  regionset = callPackage ../os-specific/linux/regionset { };
-
   rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { };
 
-  riscv-pk = callPackage ../misc/riscv-pk { };
-
-  ristate = callPackage ../tools/misc/ristate { };
-
-  roccat-tools = callPackage ../os-specific/linux/roccat-tools { };
-
-  rojo = callPackage ../development/tools/rojo { };
-
-  rtkit = callPackage ../os-specific/linux/rtkit { };
-
-  rt-tests = callPackage ../os-specific/linux/rt-tests { };
-
-  rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { };
-
-  rtl8192su-firmware = callPackage ../os-specific/linux/firmware/rtl8192su-firmware { };
-
-  rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { };
-
-  rvvm = callPackage ../applications/virtualization/rvvm { };
-
-  s3ql = callPackage ../tools/backup/s3ql { };
-
-  sasutils = callPackage ../os-specific/linux/sasutils { };
-
   sass = callPackage ../development/tools/sass { };
 
-  sassc = callPackage ../development/tools/sassc { };
-
-  scanmem = callPackage ../tools/misc/scanmem { };
-
-  schedtool = callPackage ../os-specific/linux/schedtool { };
-
   sddm-astronaut = qt6Packages.callPackage ../data/themes/sddm-astronaut { };
 
   sddm-chili-theme = libsForQt5.callPackage ../data/themes/chili-sddm { };
 
   sddm-sugar-dark = libsForQt5.callPackage ../data/themes/sddm-sugar-dark { };
 
-  sdparm = callPackage ../os-specific/linux/sdparm { };
-
   sdrangel = qt6Packages.callPackage ../applications/radio/sdrangel {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "12.3" else stdenv;
   };
 
-  setools = callPackage ../os-specific/linux/setools { };
-
-  seturgent = callPackage ../os-specific/linux/seturgent { };
-
-  sgx-azure-dcap-client = callPackage ../os-specific/linux/sgx/azure-dcap-client { };
-
   sgx-sdk = callPackage ../os-specific/linux/sgx/sdk { };
 
-  sgx-ssl = callPackage ../os-specific/linux/sgx/ssl { };
-
   sgx-psw = callPackage ../os-specific/linux/sgx/psw {
     protobuf = protobuf_21;
   };
 
-  shadow = callPackage ../os-specific/linux/shadow { };
-
-  shortcat = callPackage ../os-specific/darwin/shortcat { };
-
   sinit = callPackage ../os-specific/linux/sinit {
     rcinit = "/etc/rc.d/rc.init";
     rcshutdown = "/etc/rc.d/rc.shutdown";
   };
 
-  skopeo = callPackage ../development/tools/skopeo { };
-
-  srisum = callPackage ../tools/misc/srisum { };
-
-  smem = callPackage ../os-specific/linux/smem { };
-
-  smimesign = callPackage ../os-specific/darwin/smimesign { };
-
-  statik = callPackage ../development/tools/statik { };
-
-  statifier = callPackage ../os-specific/linux/statifier { };
-
-  steamos-devkit = callPackage ../development/tools/steamos-devkit { };
-
-  swiftdefaultapps = callPackage ../os-specific/darwin/swiftdefaultapps { };
-
   sysdig = callPackage ../os-specific/linux/sysdig {
     kernel = null;
   }; # sysdig is a client, for a driver look at linuxPackagesFor
 
-  sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
-
   sysprof = callPackage ../development/tools/profiling/sysprof { };
 
   libsysprof-capture = callPackage ../development/tools/profiling/sysprof/capture.nix { };
 
-  sysklogd = callPackage ../os-specific/linux/sysklogd { };
-
-  syslinux = callPackage ../os-specific/linux/syslinux { };
-
-  sysstat = callPackage ../os-specific/linux/sysstat { };
-
   systemd = callPackage ../os-specific/linux/systemd {
     # break some cyclic dependencies
     util-linux = util-linuxMinimal;
@@ -26232,39 +12991,17 @@ with pkgs;
     if (with stdenv.hostPlatform; isLinux && isStatic) then libudev-zero
     else systemdLibs;
 
-  systemd-wait = callPackage ../os-specific/linux/systemd-wait { };
-
-  sysvinit = callPackage ../os-specific/linux/sysvinit { };
-
   sysvtools = sysvinit.override {
     withoutInitTools = true;
   };
 
   # FIXME: `tcp-wrapper' is actually not OS-specific.
-  tcp_wrappers = callPackage ../os-specific/linux/tcp-wrappers { };
-
-  tiptop = callPackage ../os-specific/linux/tiptop { };
-
-  tpacpi-bat = callPackage ../os-specific/linux/tpacpi-bat { };
-
   trickster = callPackage ../servers/trickster/trickster.nix { };
 
-  trinity = callPackage ../os-specific/linux/trinity { };
-
-  trino-cli = callPackage ../development/tools/database/trino-cli { };
-
   trinsic-cli = callPackage ../tools/admin/trinsic-cli {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  trustymail = callPackage ../tools/security/trustymail { };
-
-  tunctl = callPackage ../os-specific/linux/tunctl { };
-
-  twa = callPackage ../tools/networking/twa { };
-
-  twingate = callPackage ../applications/networking/twingate { };
-
   # Upstream U-Boots:
   inherit (callPackage ../misc/uboot {})
     buildUBoot
@@ -26336,36 +13073,12 @@ with pkgs;
     util-linux = util-linuxMinimal;
   };
 
-  libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { };
-
   udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
   udisks = udisks2;
 
-  ugtrain = callPackage ../tools/misc/ugtrain { };
-
-  unscd = callPackage ../os-specific/linux/unscd { };
-
-  untie = callPackage ../os-specific/linux/untie { };
-
-  upower = callPackage ../os-specific/linux/upower { };
-
-  usbguard = callPackage ../os-specific/linux/usbguard { };
-
-  usbguard-notifier = callPackage ../os-specific/linux/usbguard-notifier { };
-
   usbrelay = callPackage ../os-specific/linux/usbrelay { };
   usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { };
 
-  usbtop = callPackage ../os-specific/linux/usbtop { };
-
-  usbutils = callPackage ../os-specific/linux/usbutils { };
-
-  userhosts = callPackage ../tools/networking/userhosts { };
-
-  usermount = callPackage ../os-specific/linux/usermount { };
-
-  util-linux = callPackage ../os-specific/linux/util-linux { };
-
   util-linuxMinimal = util-linux.override {
     nlsSupport = false;
     ncursesSupport = false;
@@ -26375,38 +13088,12 @@ with pkgs;
 
   v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { };
 
-  v4l2-relayd = callPackage ../os-specific/linux/v4l2-relayd { };
-
-  vendir = callPackage ../development/tools/vendir { };
-
-  vdo = callPackage ../os-specific/linux/vdo { };
-
   windows = callPackages ../os-specific/windows {};
 
-  wirelesstools = callPackage ../os-specific/linux/wireless-tools { };
-
-  wooting-udev-rules = callPackage ../os-specific/linux/wooting-udev-rules { };
-
-  teensy-udev-rules = callPackage ../os-specific/linux/teensy-udev-rules { };
-
-  sensible-side-buttons = callPackage ../os-specific/darwin/sensible-side-buttons { };
-
   wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
 
   wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
 
-  xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { };
-
-  xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
-
-  xf86_video_nested = callPackage ../os-specific/linux/xf86-video-nested { };
-
-  xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };
-
-  zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
-
-  zenmonitor = callPackage ../os-specific/linux/zenmonitor { };
-
   inherit
     ({
       zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix {
@@ -26426,183 +13113,37 @@ with pkgs;
 
   ### DATA
 
-  _3270font = callPackage ../data/fonts/3270font { };
-
-  adapta-backgrounds = callPackage ../data/misc/adapta-backgrounds { };
-
-  adapta-gtk-theme = callPackage ../data/themes/adapta { };
-
-  adapta-kde-theme = callPackage ../data/themes/adapta-kde { };
-
-  adementary-theme = callPackage ../data/themes/adementary { };
-
-  adi1090x-plymouth-themes = callPackage ../data/themes/adi1090x-plymouth-themes { };
-
   adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { };
 
   adwaita-qt6 = qt6Packages.callPackage ../data/themes/adwaita-qt {
     useQt6 = true;
   };
 
-  agave = callPackage ../data/fonts/agave { };
-
-  aileron = callPackage ../data/fonts/aileron { };
-
-  alacritty-theme = callPackage ../data/themes/alacritty-theme { };
-
-  albatross = callPackage ../data/themes/albatross { };
-
-  alegreya = callPackage ../data/fonts/alegreya { };
-
-  alegreya-sans = callPackage ../data/fonts/alegreya-sans { };
-
-  alice = callPackage ../data/fonts/alice { };
-
-  alkalami = callPackage ../data/fonts/alkalami { };
-
-  amber-theme = callPackage ../data/themes/amber { };
-
-  amiri = callPackage ../data/fonts/amiri { };
-
-  anarchism = callPackage ../data/documentation/anarchism { };
-
-  ananicy = callPackage ../misc/ananicy { };
-
-  andagii = callPackage ../data/fonts/andagii { };
-
-  andika = callPackage ../data/fonts/andika { };
-
   androguard = with python3.pkgs; toPythonApplication androguard;
 
-  android-udev-rules = callPackage ../os-specific/linux/android-udev-rules { };
-
   andromeda-gtk-theme = libsForQt5.callPackage ../data/themes/andromeda-gtk-theme { };
 
   ankacoder = callPackage ../data/fonts/ankacoder { };
   ankacoder-condensed = callPackage ../data/fonts/ankacoder/condensed.nix { };
 
-  annapurna-sil = callPackage ../data/fonts/annapurna-sil { };
-
-  anonymousPro = callPackage ../data/fonts/anonymous-pro { };
-
   ant-theme = callPackage ../data/themes/ant-theme/ant.nix { };
 
   ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { };
 
-  dracula-theme = callPackage ../data/themes/dracula-theme { };
-
-  dracula-qt5-theme = callPackage ../data/themes/dracula-qt5-theme { };
-
   ant-nebula-theme = callPackage ../data/themes/ant-theme/ant-nebula.nix { };
 
-  arc-icon-theme = callPackage ../data/icons/arc-icon-theme { };
-
-  arc-kde-theme = callPackage ../data/themes/arc-kde { };
-
-  arc-theme = callPackage ../data/themes/arc { };
-
-  arkpandora_ttf = callPackage ../data/fonts/arkpandora { };
-
-  aurulent-sans = callPackage ../data/fonts/aurulent-sans { };
-
-  ayu-theme-gtk = callPackage ../data/themes/ayu-theme-gtk { };
-
-  b612  = callPackage ../data/fonts/b612 { };
-
-  babelstone-han = callPackage ../data/fonts/babelstone-han { };
-
-  baekmuk-ttf = callPackage ../data/fonts/baekmuk-ttf { };
-
-  bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { };
-
-  barlow = callPackage ../data/fonts/barlow { };
-
-  base16-schemes = callPackage ../data/themes/base16-schemes { };
-
-  bgnet = callPackage ../data/documentation/bgnet { };
-
   bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { };
 
-  apple-cursor = callPackage ../data/icons/apple-cursor { };
-
-  blackbird = callPackage ../data/themes/blackbird { };
-
-  blackout = callPackage ../data/fonts/blackout { };
-
   breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { };
 
-  brise = callPackage ../data/misc/brise { };
-
-  bqn386 = callPackage ../data/fonts/bqn386 { };
-
   cacert = callPackage ../data/misc/cacert { };
 
-  caladea = callPackage ../data/fonts/caladea { };
-
-  canta-theme = callPackage ../data/themes/canta { };
-
-  cantarell-fonts = callPackage ../data/fonts/cantarell-fonts { };
-
-  capitaine-cursors = callPackage ../data/icons/capitaine-cursors { };
-
-  capitaine-cursors-themed = callPackage ../data/icons/capitaine-cursors-themed { };
-
-  carlito = callPackage ../data/fonts/carlito { };
-
-  cascadia-code = callPackage ../data/fonts/cascadia-code { };
-
-  ccsymbols = callPackage ../data/fonts/ccsymbols { };
-
-  charis-sil = callPackage ../data/fonts/charis-sil { };
-
-  changie = callPackage ../development/tools/changie { };
-
-  cherry = callPackage ../data/fonts/cherry { };
-
-  chonburi-font = callPackage ../data/fonts/chonburi { };
-
-  chunk = callPackage ../data/fonts/chunk { };
-
-  cldr-annotations = callPackage ../data/misc/cldr-annotations { };
-
-  clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };
-
   cnspec = callPackage ../tools/security/cnspec {
     buildGoModule = buildGo123Module;
   };
 
-  cnstrokeorder = callPackage ../data/fonts/cnstrokeorder { };
-
-  colloid-gtk-theme = callPackage ../data/themes/colloid-gtk-theme { };
-
-  colloid-icon-theme = callPackage ../data/icons/colloid-icon-theme { };
-
-  comfortaa = callPackage ../data/fonts/comfortaa { };
-
   colloid-kde = libsForQt5.callPackage ../data/themes/colloid-kde { };
 
-  comic-mono = callPackage ../data/fonts/comic-mono { };
-
-  comic-relief = callPackage ../data/fonts/comic-relief { };
-
-  comixcursors = callPackage ../data/icons/comixcursors { };
-
-  courier-prime = callPackage ../data/fonts/courier-prime { };
-
-  cozette = callPackage ../data/fonts/cozette { };
-
-  culmus = callPackage ../data/fonts/culmus { };
-
-  clearlyU = callPackage ../data/fonts/clearlyU { };
-
-  cm_unicode = callPackage ../data/fonts/cm-unicode { };
-
-  creep = callPackage ../data/fonts/creep { };
-
-  crimson = callPackage ../data/fonts/crimson { };
-
-  crimson-pro = callPackage ../data/fonts/crimson-pro { };
-
   dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {});
 
   # solve collision for nix-env before https://github.com/NixOS/nix/pull/815
@@ -26611,13 +13152,6 @@ with pkgs;
     paths = [ dejavu_fonts.out ];
   };
 
-  dina-font = callPackage ../data/fonts/dina { };
-
-  dm-sans = callPackage ../data/fonts/dm-sans { };
-  dns-root-data = callPackage ../data/misc/dns-root-data { };
-
-  docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { };
-
   docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { };
 
   docbook_sgml_dtd_41 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/4.1.nix { };
@@ -26632,8 +13166,6 @@ with pkgs;
 
   docbook_xml_dtd_45 = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix { };
 
-  docbook_xml_ebnf_dtd = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { };
-
   inherit (callPackages ../data/sgml+xml/stylesheets/xslt/docbook-xsl { })
     docbook-xsl-nons
     docbook-xsl-ns;
@@ -26644,151 +13176,30 @@ with pkgs;
 
   documentation-highlighter = callPackage ../misc/documentation-highlighter { };
 
-  mmdoc = callPackage ../tools/text/mmdoc { };
-
-  documize-community = callPackage ../servers/documize-community { };
-
-  doulos-sil = callPackage ../data/fonts/doulos-sil { };
-
-  cabin = callPackage ../data/fonts/cabin { };
-
-  camingo-code = callPackage ../data/fonts/camingo-code { };
-
-  combinatorial_designs = callPackage ../data/misc/combinatorial_designs { };
-
-  commit-mono = callPackage ../data/fonts/commit-mono { };
-
-  cooper-hewitt = callPackage ../data/fonts/cooper-hewitt { };
-
-  d2coding = callPackage ../data/fonts/d2coding { };
-
-  dosis = callPackage ../data/fonts/dosis { };
-
-  dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { };
-
-  dotcolon-fonts = callPackage ../data/fonts/dotcolon-fonts { };
-
-  dracula-icon-theme = callPackage ../data/icons/dracula-icon-theme { };
-
-  e17gtk = callPackage ../data/themes/e17gtk { };
-
-  eb-garamond = callPackage ../data/fonts/eb-garamond { };
-
-  edukai = callPackage ../data/fonts/edukai { };
-
-  eduli = callPackage ../data/fonts/eduli { };
-
   epapirus-icon-theme = papirus-icon-theme.override { withElementary = true; };
 
   moeli = eduli;
 
-  edusong = callPackage ../data/fonts/edusong { };
-
-  efont-unicode = callPackage ../data/fonts/efont-unicode { };
-
-  elliptic_curves = callPackage ../data/misc/elliptic_curves { };
-
-  equilux-theme = callPackage ../data/themes/equilux-theme { };
-
-  eunomia = callPackage ../data/fonts/eunomia { };
-
-  fa_1 = callPackage ../data/fonts/fa_1 { };
-
-  f1_8 = callPackage ../data/fonts/f1_8 { };
-
-  f5_6 = callPackage ../data/fonts/f5_6 { };
-
-  faba-icon-theme = callPackage ../data/icons/faba-icon-theme { };
-
-  faba-mono-icons = callPackage ../data/icons/faba-mono-icons { };
-
-  ferrum = callPackage ../data/fonts/ferrum { };
-
-  fg-virgil = callPackage ../data/fonts/fg-virgil { };
-
-  fixedsys-excelsior = callPackage ../data/fonts/fixedsys-excelsior { };
-
-  graphs = callPackage ../data/misc/graphs { };
-
-  emacs-all-the-icons-fonts = callPackage ../data/fonts/emacs-all-the-icons-fonts { };
-
   emojione = callPackage ../data/fonts/emojione {
     inherit (nodePackages) svgo;
   };
 
-  emojipick = callPackage ../applications/misc/emojipick { };
-
-  encode-sans = callPackage ../data/fonts/encode-sans { };
-
-  envypn-font = callPackage ../data/fonts/envypn-font { };
-
-  ezra-sil = callPackage ../data/fonts/ezra-sil { };
-
-  fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono { };
-
-  fanwood = callPackage ../data/fonts/fanwood { };
-
   fira-code = callPackage ../data/fonts/fira-code { };
   fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { };
   fira-code-nerdfont = nerdfonts.override {
     fonts = [ "FiraCode" ];
   };
 
-  fira-go = callPackage ../data/fonts/fira-go { };
-
   flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme {
     inherit (plasma5Packages) breeze-icons;
   };
-  flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { };
-  flat-remix-gnome = callPackage ../data/themes/flat-remix-gnome { };
-
-  fluent-icon-theme = callPackage ../data/icons/fluent-icon-theme { };
-
   font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4;
   font-awesome_5 = (callPackage ../data/fonts/font-awesome { }).v5;
   font-awesome_6 = (callPackage ../data/fonts/font-awesome { }).v6;
   font-awesome = font-awesome_6;
 
-  fraunces = callPackage ../data/fonts/fraunces { };
-
-  freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
-
-  freepats = callPackage ../data/misc/freepats { };
-
-  game-devices-udev-rules = callPackage ../os-specific/linux/game-devices-udev-rules { };
-
-  garamond-libre = callPackage ../data/fonts/garamond-libre { };
-
-  g15daemon = callPackage ../os-specific/linux/g15daemon { };
-
-  galatia-sil = callPackage ../data/fonts/galatia-sil { };
-
-  gentium = callPackage ../data/fonts/gentium { };
-
-  gentium-book-basic = callPackage ../data/fonts/gentium-book-basic { };
-
-  geolite-legacy = callPackage ../data/misc/geolite-legacy { };
-
-  gohufont = callPackage ../data/fonts/gohufont { };
-
-  gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { };
-
-  gsettings-desktop-schemas = callPackage ../development/libraries/gsettings-desktop-schemas { };
-
-  gnome-icon-theme = callPackage ../data/icons/gnome-icon-theme { };
-
-  go-font = callPackage ../data/fonts/go-font { };
-
-  goudy-bookletter-1911 = callPackage ../data/fonts/goudy-bookletter-1911 { };
-
-  graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { };
-
   graphite-kde-theme = libsForQt5.callPackage ../data/themes/graphite-kde-theme { };
 
-  greybird = callPackage ../data/themes/greybird { };
-
-  gruvbox-dark-gtk = callPackage ../data/themes/gruvbox-dark-gtk { };
-
   palenight-theme = callPackage ../data/themes/gtk-theme-framework { theme = "palenight"; };
 
   amarena-theme = callPackage ../data/themes/gtk-theme-framework { theme = "amarena"; };
@@ -26820,46 +13231,10 @@ with pkgs;
     inherit (plasma5Packages) breeze-icons;
   };
 
-  gubbi-font = callPackage ../data/fonts/gubbi { };
-
-  gyre-fonts = callPackage ../data/fonts/gyre { };
-
-  hack-font = callPackage ../data/fonts/hack { };
-
   hackgen-font = callPackage ../data/fonts/hackgen { };
 
   hackgen-nf-font = callPackage ../data/fonts/hackgen/nerdfont.nix { };
 
-  helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { };
-
-  helvum = callPackage ../applications/audio/helvum { };
-
-  hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { };
-
-  hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { };
-
-  hannom = callPackage ../data/fonts/hannom { };
-
-  hanazono = callPackage ../data/fonts/hanazono { };
-
-  hermit = callPackage ../data/fonts/hermit { };
-
-  hubot-sans = callPackage ../data/fonts/hubot-sans { };
-
-  humanity-icon-theme = callPackage ../data/icons/humanity-icon-theme { };
-
-  hyperscrypt-font = callPackage ../data/fonts/hyperscrypt { };
-
-  ia-writer-duospace = callPackage ../data/fonts/ia-writer-duospace { };
-
-  i-dot-ming = callPackage ../data/fonts/i-dot-ming { };
-
-  ibm-plex = callPackage ../data/fonts/ibm-plex { };
-
-  iconpack-jade = callPackage ../data/icons/iconpack-jade { };
-
-  iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { };
-
   inconsolata = callPackage ../data/fonts/inconsolata { };
 
   inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix { };
@@ -26868,142 +13243,37 @@ with pkgs;
     fonts = [ "Inconsolata" ];
   };
 
-  intel-one-mono = callPackage ../data/fonts/intel-one-mono {};
-
   input-fonts = callPackage ../data/fonts/input-fonts { };
 
-  inriafonts = callPackage ../data/fonts/inriafonts { };
-
   iosevka = callPackage ../data/fonts/iosevka { };
   iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix { };
   iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix {});
 
-  ipafont = callPackage ../data/fonts/ipafont { };
-  ipaexfont = callPackage ../data/fonts/ipaexfont { };
-
-  iwona = callPackage ../data/fonts/iwona { };
-
-  jetbrains-mono = callPackage ../data/fonts/jetbrains-mono { };
-
-  jost = callPackage ../data/fonts/jost { };
-
   joypixels = callPackage ../data/fonts/joypixels { };
 
-  junction-font = callPackage ../data/fonts/junction { };
-
-  junicode = callPackage ../data/fonts/junicode { };
-
-  julia-mono = callPackage ../data/fonts/julia-mono { };
-
-  juno-theme = callPackage ../data/themes/juno { };
-
-  kanit-font = callPackage ../data/fonts/kanit { };
-
-  kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font { };
-
-  kacst = callPackage ../data/fonts/kacst { };
-
-  kawkab-mono-font = callPackage ../data/fonts/kawkab-mono { };
-
   kde-rounded-corners = kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { };
 
-  khmeros = callPackage ../data/fonts/khmeros { };
-
-  knewave = callPackage ../data/fonts/knewave { };
-
-  kochi-substitute = callPackage ../data/fonts/kochi-substitute { };
-
-  kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 { };
-
-  kode-mono = callPackage ../data/fonts/kode-mono { };
-
-  kopia = callPackage ../tools/backup/kopia { };
-
   kora-icon-theme = callPackage ../data/icons/kora-icon-theme {
     inherit (libsForQt5.kdeFrameworks) breeze-icons;
   };
 
-  koreader = callPackage ../applications/misc/koreader { };
-
-  kreative-square-fonts = callPackage ../data/fonts/kreative-square-fonts { };
-
   la-capitaine-icon-theme = callPackage ../data/icons/la-capitaine-icon-theme {
     inherit (plasma5Packages) breeze-icons;
     inherit (pantheon) elementary-icon-theme;
   };
 
-  layan-gtk-theme = callPackage ../data/themes/layan-gtk-theme { };
-
   layan-kde = libsForQt5.callPackage ../data/themes/layan-kde { };
 
-  lao = callPackage ../data/fonts/lao { };
-
-  lato = callPackage ../data/fonts/lato { };
-
-  league-gothic = callPackage ../data/fonts/league-gothic { };
-
-  league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type { };
-
-  league-script-number-one = callPackage ../data/fonts/league-script-number-one { };
-
-  league-spartan = callPackage ../data/fonts/league-spartan { };
-
-  ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules { };
-
-  libGDSII = callPackage ../development/libraries/science/chemistry/libGDSII { };
-
   inherit (callPackages ../data/fonts/liberation-fonts { })
     liberation_ttf_v1
     liberation_ttf_v2
     ;
   liberation_ttf = liberation_ttf_v2;
 
-  liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { };
-
-  libevdevc = callPackage ../os-specific/linux/libevdevc { };
-
-  libgestures = callPackage ../os-specific/linux/libgestures { };
-
-  liberastika = callPackage ../data/fonts/liberastika { };
-
-  libertine = callPackage ../data/fonts/libertine { };
-
-  libertinus = callPackage ../data/fonts/libertinus { };
-
-  libratbag = callPackage ../os-specific/linux/libratbag { };
-
-  librist = callPackage ../development/libraries/librist { };
-
-  libre-baskerville = callPackage ../data/fonts/libre-baskerville { };
-
-  libre-bodoni = callPackage ../data/fonts/libre-bodoni { };
-
-  libre-caslon = callPackage ../data/fonts/libre-caslon { };
-
-  libre-franklin = callPackage ../data/fonts/libre-franklin { };
-
   lightly-qt = libsForQt5.callPackage ../data/themes/lightly-qt { };
 
   lightly-boehs = libsForQt5.callPackage ../data/themes/lightly-boehs { };
 
-  linden-hill = callPackage ../data/fonts/linden-hill { };
-
-  line-awesome = callPackage ../data/fonts/line-awesome { };
-
-  linearicons-free = callPackage ../data/fonts/linearicons-free { };
-
-  linja-pi-pu-lukin = callPackage ../data/fonts/linja-pi-pu-lukin { };
-
-  linja-sike = callPackage ../data/fonts/linja-sike { };
-
-  linux-manual = callPackage ../data/documentation/linux-manual { };
-
-  lklug-sinhala = callPackage ../data/fonts/lklug-sinhala { };
-
-  lmmath = callPackage ../data/fonts/lmmath { };
-
-  lmodern = callPackage ../data/fonts/lmodern { };
-
   # ltunifi and solaar both provide udev rules but solaar's rules are more
   # up-to-date so we simply use that instead of having to maintain our own rules
   logitech-udev-rules = solaar.udev;
@@ -27014,110 +13284,18 @@ with pkgs;
   # lohit-fonts.kashmiri lohit-fonts.konkani lohit-fonts.maithili lohit-fonts.sindhi
   lohit-fonts = recurseIntoAttrs ( callPackages ../data/fonts/lohit-fonts { } );
 
-  lounge-gtk-theme = callPackage ../data/themes/lounge { };
-
-  luculent = callPackage ../data/fonts/luculent { };
-
   maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { };
 
-  mailcap = callPackage ../data/misc/mailcap { };
-
-  marathi-cursive = callPackage ../data/fonts/marathi-cursive { };
-
-  man-pages = callPackage ../data/documentation/man-pages { };
-
-  man-pages-posix = callPackage ../data/documentation/man-pages-posix { };
-
-  manrope = callPackage ../data/fonts/manrope { };
-
-  martian-mono = callPackage ../data/fonts/martian-mono { };
-
   marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix {
     inherit (kdePackages) breeze-icons;
   };
 
-  matcha-gtk-theme = callPackage ../data/themes/matcha { };
-
-  materia-theme = callPackage ../data/themes/materia-theme { };
-
-  materia-kde-theme = callPackage ../data/themes/materia-kde { };
-
-  material-design-icons = callPackage ../data/fonts/material-design-icons { };
-
-  material-icons = callPackage ../data/fonts/material-icons { };
-
-  material-symbols = callPackage ../data/fonts/material-symbols { };
-
   material-kwin-decoration = libsForQt5.callPackage ../data/themes/material-kwin-decoration { };
 
-  meslo-lg = callPackage ../data/fonts/meslo-lg { };
-
-  meslo-lgs-nf = callPackage ../data/fonts/meslo-lgs-nf { };
-
-  migmix = callPackage ../data/fonts/migmix { };
-
-  migu = callPackage ../data/fonts/migu { };
-
-  miscfiles = callPackage ../data/misc/miscfiles { };
-
-  media-player-info = callPackage ../data/misc/media-player-info { };
-
-  medio = callPackage ../data/fonts/medio { };
-
-  melete = callPackage ../data/fonts/melete { };
-
-  mno16 = callPackage ../data/fonts/mno16 { };
-
-  mnist = callPackage ../data/machine-learning/mnist { };
-
-  mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { };
-
-  mojave-gtk-theme = callPackage ../data/themes/mojave { };
-
-  moka-icon-theme = callPackage ../data/icons/moka-icon-theme { };
-
-  mona-sans = callPackage ../data/fonts/mona-sans { };
-
-  monoid = callPackage ../data/fonts/monoid { };
-
-  mononoki = callPackage ../data/fonts/mononoki { };
-
-  montserrat = callPackage ../data/fonts/montserrat { };
-
-  mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
-
   mplus-outline-fonts = recurseIntoAttrs (callPackage ../data/fonts/mplus-outline-fonts { });
 
-  mro-unicode = callPackage ../data/fonts/mro-unicode { };
-
-  mustache-spec = callPackage ../data/documentation/mustache-spec { };
-
-  mustache-go = callPackage ../development/tools/mustache-go { };
-
-  mustache-hpp = callPackage ../development/libraries/mustache-hpp { };
-
-  myrddin = callPackage ../development/compilers/myrddin { };
-
-  myrica = callPackage ../data/fonts/myrica { };
-
-  nacelle = callPackage ../data/fonts/nacelle { };
-
-  nafees = callPackage ../data/fonts/nafees { };
-
-  nanum = callPackage ../data/fonts/nanum {  };
-
-  nanum-gothic-coding = callPackage ../data/fonts/nanum-gothic-coding {  };
-
-  nasin-nanpa = callPackage ../data/fonts/nasin-nanpa { };
-
-  national-park-typeface = callPackage ../data/fonts/national-park { };
-
   nordic = libsForQt5.callPackage ../data/themes/nordic { };
 
-  nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { };
-
-  nordzy-icon-theme = callPackage ../data/icons/nordzy-icon-theme { };
-
   noto-fonts-lgc-plus = callPackage ../by-name/no/noto-fonts/package.nix {
     suffix = "-lgc-plus";
     variants = [
@@ -27135,8 +13313,6 @@ with pkgs;
     '';
   };
 
-  nuclei = callPackage ../tools/security/nuclei { };
-
   nullmailer = callPackage ../servers/mail/nullmailer {
     stdenv = gccStdenv;
   };
@@ -27145,58 +13321,10 @@ with pkgs;
     inherit (plasma5Packages) breeze-icons;
   };
 
-  numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { };
-
-  numix-icon-theme-square = callPackage ../data/icons/numix-icon-theme-square { };
-
-  numix-cursor-theme = callPackage ../data/icons/numix-cursor-theme { };
-
-  numix-gtk-theme = callPackage ../data/themes/numix { };
-
-  numix-solarized-gtk-theme = callPackage ../data/themes/numix-solarized { };
-
-  numix-sx-gtk-theme = callPackage ../data/themes/numix-sx { };
-
-  _0xproto = callPackage ../data/fonts/0xproto { };
-
-  oldstandard = callPackage ../data/fonts/oldstandard { };
-
-  oldsindhi = callPackage ../data/fonts/oldsindhi { };
-
-  omni-gtk-theme = callPackage ../data/themes/omni-gtk-theme { };
-
-  onestepback = callPackage ../data/themes/onestepback { };
-
-  open-dyslexic = callPackage ../data/fonts/open-dyslexic { };
-
-  open-sans = callPackage ../data/fonts/open-sans { };
-
   openmoji-color = callPackage ../data/fonts/openmoji { fontFormats = ["glyf_colr_0"]; };
 
   openmoji-black = callPackage ../data/fonts/openmoji { fontFormats = ["glyf"]; };
 
-  openzone-cursors = callPackage ../data/themes/openzone { };
-
-  oranchelo-icon-theme = callPackage ../data/icons/oranchelo-icon-theme { };
-
-  orbitron = callPackage ../data/fonts/orbitron { };
-
-  orbuculum = callPackage ../development/embedded/orbuculum { };
-
-  orchis-theme = callPackage ../data/themes/orchis-theme { };
-
-  orion = callPackage ../data/themes/orion { };
-
-  ostrich-sans = callPackage ../data/fonts/ostrich-sans { };
-
-  overpass = callPackage ../data/fonts/overpass { };
-
-  oxygenfonts = callPackage ../data/fonts/oxygenfonts { };
-
-  paper-gtk-theme = callPackage ../data/themes/paper-gtk { };
-
-  paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };
-
   papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme {
     inherit (pantheon) elementary-icon-theme;
     inherit (plasma5Packages) breeze-icons;
@@ -27206,242 +13334,55 @@ with pkgs;
     inherit (plasma5Packages) breeze-icons;
   };
 
-  papirus-folders = callPackage ../data/misc/papirus-folders { };
-
-  papirus-nord = callPackage ../data/icons/papirus-nord { };
-
-  plasma-overdose-kde-theme = callPackage ../data/themes/plasma-overdose-kde-theme { };
-
   papis = with python3Packages; toPythonApplication papis;
 
-  paperlike-go = callPackage ../tools/misc/paperlike-go { };
-
-  paps = callPackage ../tools/misc/paps { };
-
-  pecita = callPackage ../data/fonts/pecita { };
-
   paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix { };
   paratype-pt-sans = callPackage ../data/fonts/paratype-pt/sans.nix { };
   paratype-pt-serif = callPackage ../data/fonts/paratype-pt/serif.nix { };
 
-  pari-galdata = callPackage ../data/misc/pari-galdata { };
-
-  pari-seadata-small = callPackage ../data/misc/pari-seadata-small { };
-
-  penna = callPackage ../data/fonts/penna { };
-
-  pitch-black = callPackage ../data/themes/pitch-black { };
-
-  plano-theme = callPackage ../data/themes/plano { };
-
   plata-theme = callPackage ../data/themes/plata {
     inherit (mate) marco;
   };
 
-  poly = callPackage ../data/fonts/poly { };
-
   polychromatic = qt6Packages.callPackage ../applications/misc/polychromatic { };
 
-  polytopes_db = callPackage ../data/misc/polytopes_db { };
-
-  pop-gtk-theme = callPackage ../data/themes/pop-gtk { };
-
-  pop-icon-theme = callPackage ../data/icons/pop-icon-theme { };
-
-  powerline-fonts = callPackage ../data/fonts/powerline-fonts { };
-
-  powerline-symbols = callPackage ../data/fonts/powerline-symbols { };
-
-  powerline-go = callPackage ../tools/misc/powerline-go { };
-
   powerline-rs = callPackage ../tools/misc/powerline-rs {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  prociono = callPackage ../data/fonts/prociono { };
-
   profont = callPackage ../data/fonts/profont { };
 
-  proggyfonts = callPackage ../data/fonts/proggyfonts { };
-
-  public-sans  = callPackage ../data/fonts/public-sans { };
-
-  publicsuffix-list = callPackage ../data/misc/publicsuffix-list { };
-
-  phinger-cursors = callPackage ../data/icons/phinger-cursors { };
-
-  qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { };
-
   qogir-kde = libsForQt5.callPackage ../data/themes/qogir-kde { };
 
-  qogir-theme = callPackage ../data/themes/qogir { };
-
-  quintom-cursor-theme = callPackage ../data/icons/quintom-cursor-theme { };
-
-  redhat-official-fonts = callPackage ../data/fonts/redhat-official { };
-
   ricochet-refresh = callPackage ../by-name/ri/ricochet-refresh/package.nix {
     protobuf = protobuf_21; # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178
   };
 
-  rime-data = callPackage ../data/misc/rime-data { };
-
   roapi-http = callPackage ../servers/roapi/http.nix { };
 
-  rose-pine-gtk-theme = callPackage ../data/themes/rose-pine-gtk { };
-  rose-pine-icon-theme = callPackage ../data/icons/rose-pine { };
-
-  route159 = callPackage ../data/fonts/route159 { };
-
-  ruwudu = callPackage ../data/fonts/ruwudu { };
-
-  sampradaya = callPackage ../data/fonts/sampradaya { };
-
-  sarabun-font = callPackage ../data/fonts/sarabun { };
-
-  savepagenow = callPackage ../tools/misc/savepagenow { };
-
-  scheme-manpages = callPackage ../data/documentation/scheme-manpages { };
-
-  scowl = callPackage ../data/misc/scowl { };
-
-  seshat = callPackage ../data/fonts/seshat { };
-
-  session-desktop = callPackage ../applications/networking/instant-messengers/session-desktop { };
-
   shaderc = callPackage ../development/compilers/shaderc {
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { };
-
   sierra-breeze-enhanced = libsForQt5.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { useQt5 = true; };
 
-  simp1e-cursors = callPackage ../data/icons/simp1e-cursors { };
-
-  sjasmplus = callPackage ../development/compilers/sjasmplus { };
-
-  skeu = callPackage ../data/themes/skeu { };
-
-  sweet-nova = callPackage ../data/themes/sweet-nova { };
-
-  shared-mime-info = callPackage ../data/misc/shared-mime-info { };
-
-  shared_desktop_ontologies = callPackage ../data/misc/shared-desktop-ontologies { };
-
   scheherazade = callPackage ../data/fonts/scheherazade { version = "2.100"; };
 
   scheherazade-new = callPackage ../data/fonts/scheherazade { };
 
-  signwriting = callPackage ../data/fonts/signwriting { };
-
-  sierra-gtk-theme = callPackage ../data/themes/sierra { };
-
-  sil-abyssinica = callPackage ../data/fonts/sil-abyssinica { };
-
-  sil-padauk = callPackage ../data/fonts/sil-padauk { };
-
-  snap7 = callPackage ../development/libraries/snap7 { };
-
-  sniglet = callPackage ../data/fonts/sniglet { };
-
-  snowblind = callPackage ../data/themes/snowblind { };
-
-  solarc-gtk-theme = callPackage ../data/themes/solarc { };
-
-  sorts-mill-goudy = callPackage ../data/fonts/sorts-mill-goudy { };
-
-  soundfont-fluid = callPackage ../data/soundfonts/fluid { };
-
-  soundfont-generaluser = callPackage ../data/soundfonts/generaluser { };
-
-  soundfont-ydp-grand = callPackage ../data/soundfonts/ydp-grand { };
-
-  spdx-license-list-data = callPackage ../data/misc/spdx-license-list-data { };
-
-  stdmanpages = callPackage ../data/documentation/std-man-pages { };
-
-  star-history = callPackage ../tools/misc/star-history { };
-
-  starfetch = callPackage ../tools/misc/starfetch { };
-
-  starry = callPackage ../tools/misc/starry { };
-
   starship = callPackage ../tools/misc/starship {
     inherit (darwin.apple_sdk.frameworks) Security Foundation Cocoa;
   };
 
-  stig = callPackage ../applications/networking/p2p/stig { };
-
-  stix-otf = callPackage ../data/fonts/stix-otf { };
-
-  stix-two = callPackage ../data/fonts/stix-two { };
-
-  super-tiny-icons = callPackage ../data/icons/super-tiny-icons { };
-
   inherit (callPackages ../data/fonts/gdouros { })
     aegan aegyptus akkadian assyrian eemusic maya symbola textfonts unidings;
 
-  iana-etc = callPackage ../data/misc/iana-etc { };
-
-  poppler_data = callPackage ../data/misc/poppler-data { };
-
   inherit (callPackages ../data/fonts/pretendard { })
     pretendard
     pretendard-gov
     pretendard-jp
     pretendard-std;
 
-  quattrocento = callPackage ../data/fonts/quattrocento { };
-
-  quattrocento-sans = callPackage ../data/fonts/quattrocento-sans { };
-
-  quivira = callPackage ../data/fonts/quivira { };
-
-  raleway = callPackage ../data/fonts/raleway { };
-
-  recursive = callPackage ../data/fonts/recursive { };
-
-  reversal-icon-theme = callPackage ../data/icons/reversal-icon-theme { };
-
-  rubik = callPackage ../data/fonts/rubik { };
-
-  rhodium-libre = callPackage ../data/fonts/rhodium-libre { };
-
-  rictydiminished-with-firacode = callPackage ../data/fonts/rictydiminished-with-firacode { };
-
-  roboto = callPackage ../data/fonts/roboto { };
-
-  roboto-mono = callPackage ../data/fonts/roboto-mono { };
-
-  roboto-serif = callPackage ../data/fonts/roboto-serif { };
-
-  roboto-slab = callPackage ../data/fonts/roboto-slab { };
-
-  hasklig = callPackage ../data/fonts/hasklig { };
-
-  inter = callPackage ../data/fonts/inter { };
-
-  open-fonts = callPackage ../data/fonts/open-fonts { };
-
-  scientifica = callPackage ../data/fonts/scientifica { };
-
-  siji = callPackage ../data/fonts/siji { };
-
-  smc-chilanka = callPackage ../data/fonts/smc-chilanka { };
-
-  sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { };
-
-  source-code-pro = callPackage ../data/fonts/source-code-pro { };
-
-  source-sans = callPackage ../data/fonts/source-sans { };
-  source-sans-pro = callPackage ../data/fonts/source-sans-pro { };
-
-  source-serif = callPackage ../data/fonts/source-serif { };
-  source-serif-pro = callPackage ../data/fonts/source-serif-pro { };
-
-  source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { };
-
   sourceHanPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han { });
   source-han-sans = sourceHanPackages.sans;
   source-han-serif = sourceHanPackages.serif;
@@ -27451,54 +13392,18 @@ with pkgs;
   source-han-serif-vf-otf = sourceHanPackages.serif-vf-otf;
   source-han-serif-vf-ttf = sourceHanPackages.serif-vf-ttf;
 
-  spleen = callPackage ../data/fonts/spleen { };
-
-  stilo-themes = callPackage ../data/themes/stilo { };
-
-  sudo-font = callPackage ../data/fonts/sudo { };
-
   inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;
 
-  takao = callPackage ../data/fonts/takao { };
-
-  taskspooler = callPackage ../tools/system/taskspooler { };
-
-  tamsyn = callPackage ../data/fonts/tamsyn { };
-
-  tamzen = callPackage ../data/fonts/tamzen { };
-
   tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
     gtk = res.gtk2;
   };
 
-  tau-hydrogen = callPackage ../data/icons/tau-hydrogen { };
-
-  theme-jade1 = callPackage ../data/themes/jade1 { };
-
-  theme-obsidian2 = callPackage ../data/themes/obsidian2 { };
-
   themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) { };
 
-  theano = callPackage ../data/fonts/theano { };
-
-  the-neue-black = callPackage ../data/fonts/the-neue-black { };
-
   tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme {
     inherit (libsForQt5) breeze-icons;
   };
 
-  tela-icon-theme = callPackage ../data/icons/tela-icon-theme { };
-
-  template-glib = callPackage ../development/libraries/template-glib { };
-
-  tempora_lgc = callPackage ../data/fonts/tempora-lgc { };
-
-  tenderness = callPackage ../data/fonts/tenderness { };
-
-  terminus_font = callPackage ../data/fonts/terminus-font { };
-
-  terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { };
-
   terminus-nerdfont = nerdfonts.override {
     fonts = [ "Terminus" ];
   };
@@ -27507,127 +13412,17 @@ with pkgs;
 
   tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };
 
-  theme-vertex = callPackage ../data/themes/vertex { };
-
-  tibetan-machine = callPackage ../data/fonts/tibetan-machine { };
-
-  times-newer-roman = callPackage ../data/fonts/times-newer-roman { };
-
-  tipa = callPackage ../data/fonts/tipa { };
-
-  ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { };
-
-  ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r { };
-
-  ttf-tw-moe = callPackage ../data/fonts/ttf-tw-moe { };
-
-  twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { };
-
-  twitter-color-emoji = callPackage ../data/fonts/twitter-color-emoji { };
-
-  tzdata = callPackage ../data/misc/tzdata { };
-
-  ubuntu-themes = callPackage ../data/themes/ubuntu-themes { };
-
-  ucs-fonts = callPackage ../data/fonts/ucs-fonts { };
-
-  bront_fonts = callPackage ../data/fonts/bront { };
-
-  ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { };
-
-  ultralist = callPackage ../applications/misc/ultralist { };
-
-  undefined-medium = callPackage ../data/fonts/undefined-medium { };
-
-  unfonts-core = callPackage ../data/fonts/unfonts-core { };
-
-  uni-vga = callPackage ../data/fonts/uni-vga { };
-
-  unicode-character-database = callPackage ../data/misc/unicode-character-database { };
-
-  unicode-emoji = callPackage ../data/misc/unicode-emoji { };
-
-  unihan-database = callPackage ../data/misc/unihan-database { };
-
-  unifont = callPackage ../data/fonts/unifont { };
-
-  unifont_upper = callPackage ../data/fonts/unifont_upper { };
-
-  unscii = callPackage ../data/fonts/unscii { };
-
   utterly-nord-plasma = kdePackages.callPackage ../data/themes/utterly-nord-plasma {
     # renamed in KF6
     plasma-framework = kdePackages.libplasma;
   };
 
-  utterly-round-plasma-style = callPackage ../data/themes/utterly-round-plasma-style { };
-
-  uw-ttyp0 = callPackage ../data/fonts/uw-ttyp0 { };
-
-  u001-font = callPackage ../data/fonts/u001 { };
-
-  vanilla-dmz = callPackage ../data/icons/vanilla-dmz { };
-
-  vdrsymbols = callPackage ../data/fonts/vdrsymbols { };
-
-  vegur = callPackage ../data/fonts/vegur { };
-
-  vegeta = callPackage ../tools/networking/vegeta { };
-
-  venta = callPackage ../data/themes/venta { };
-
-  victor-mono = callPackage ../data/fonts/victor-mono { };
-
-  vimix-cursor-theme = callPackage ../data/icons/vimix-cursor-theme { };
-
-  vimix-gtk-themes = callPackage ../data/themes/vimix { };
-
-  vimix-icon-theme = callPackage ../data/icons/vimix-icon-theme { };
-
-  vistafonts = callPackage ../data/fonts/vista-fonts { };
-
-  vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { };
-
-  vistafonts-cht = callPackage ../data/fonts/vista-fonts-cht { };
-
-  vollkorn = callPackage ../data/fonts/vollkorn { };
-
-  weather-icons = callPackage ../data/fonts/weather-icons { };
-
-  whitesur-cursors = callPackage ../data/icons/whitesur-cursors { };
-
-  whitesur-gtk-theme = callPackage ../data/themes/whitesur { };
-
-  whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { };
-
   whitesur-kde = kdePackages.callPackage ../data/themes/whitesur-kde { };
 
-  wireless-regdb = callPackage ../data/misc/wireless-regdb { };
-
-  work-sans  = callPackage ../data/fonts/work-sans { };
-
-  wqy_microhei = callPackage ../data/fonts/wqy-microhei { };
-
-  wqy_zenhei = callPackage ../data/fonts/wqy-zenhei { };
-
-  xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { };
-
-  xits-math = callPackage ../data/fonts/xits-math { };
-
-  xkcd-font = callPackage ../data/fonts/xkcd-font { };
-
   xkeyboard_config = xorg.xkeyboardconfig;
 
   xlsx2csv = with python3Packages; toPythonApplication xlsx2csv;
 
-  xorg-rgb = callPackage ../data/misc/xorg-rgb { };
-
-  yanone-kaffeesatz = callPackage ../data/fonts/yanone-kaffeesatz { };
-
-  yaru-theme = callPackage ../data/themes/yaru { };
-
-  yaru-remix-theme = callPackage ../data/themes/yaru-remix { };
-
   zafiro-icons = callPackage ../data/icons/zafiro-icons {
     inherit (plasma5Packages) breeze-icons;
   };
@@ -27638,10 +13433,6 @@ with pkgs;
     qtx11extras = null; # Because it does not exist in qt6
   };
 
-  zilla-slab = callPackage ../data/fonts/zilla-slab { };
-
-  zuki-themes = callPackage ../data/themes/zuki { };
-
   ### APPLICATIONS / GIS
 
   grass = callPackage ../applications/gis/grass {
@@ -27659,10 +13450,6 @@ with pkgs;
     wxGTK = wxGTK32;
   };
 
-  spatialite_tools = callPackage ../applications/gis/spatialite-tools { };
-
-  udig = callPackage ../applications/gis/udig { };
-
   whitebox-tools = callPackage ../applications/gis/whitebox-tools {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -27675,20 +13462,10 @@ with pkgs;
     patches = config."2bwm".patches or [];
   };
 
-  a2jmidid = callPackage ../applications/audio/a2jmidid { };
-
-  aacgain = callPackage ../applications/audio/aacgain { };
-
-  aaxtomp3 = callPackage ../applications/audio/aaxtomp3 { };
-
   abcde = callPackage ../applications/audio/abcde {
     inherit (python3Packages) eyed3;
   };
 
-  abiword = callPackage ../applications/office/abiword { };
-
-  abook = callPackage ../applications/misc/abook { };
-
   acd-cli = callPackage ../applications/networking/sync/acd_cli {
     inherit (python3Packages)
       buildPythonApplication appdirs colorama python-dateutil
@@ -27704,14 +13481,8 @@ with pkgs;
 
   activitywatch = callPackage ../applications/office/activitywatch/wrapper.nix { };
 
-  aw-watcher-window-wayland = callPackage ../tools/wayland/aw-watcher-window-wayland {  };
-
   adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { };
 
-  adl = callPackage ../applications/video/adl { };
-
-  appvm = callPackage ../applications/virtualization/appvm { };
-
   anilibria-winmaclinux = libsForQt5.callPackage ../applications/video/anilibria-winmaclinux { };
 
   masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { };
@@ -27735,50 +13506,20 @@ with pkgs;
     pdfstudioviewer
     ;
 
-  abaddon = callPackage ../applications/networking/instant-messengers/abaddon { };
-
   acpic = callPackage ../applications/misc/acpic/default.nix { };
 
-  adguardian = callPackage ../applications/networking/adguardian { };
-
   aeolus = callPackage ../applications/audio/aeolus { };
   aeolus-stops = callPackage ../applications/audio/aeolus/stops.nix { };
 
-  aewan = callPackage ../applications/editors/aewan { };
-
-  agedu = callPackage ../tools/misc/agedu { };
-
-  agenda = callPackage ../applications/office/agenda { };
-
-  ahoviewer = callPackage ../applications/graphics/ahoviewer { };
-
   airwave = libsForQt5.callPackage ../applications/audio/airwave { };
 
-  akira-unstable = callPackage ../applications/graphics/akira { };
-
   alembic = callPackage ../development/libraries/alembic {
     openexr = openexr_3;
   };
 
-  alfaview = callPackage ../applications/networking/instant-messengers/alfaview { };
-
-  alchemy = callPackage ../applications/graphics/alchemy { };
-
-  alock = callPackage ../misc/screensavers/alock { };
-
-  alot = callPackage ../applications/networking/mailreaders/alot { };
-
-  alpine = callPackage ../applications/networking/mailreaders/alpine { };
-
-  msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { };
-
   amarok = libsForQt5.callPackage ../applications/audio/amarok { };
   amarok-kf5 = amarok; # for compatibility
 
-  AMB-plugins = callPackage ../applications/audio/AMB-plugins { };
-
-  ams-lv2 = callPackage ../applications/audio/ams-lv2 { };
-
   androidStudioPackages = recurseIntoAttrs
     (callPackage ../applications/editors/android-studio { });
   android-studio = androidStudioPackages.stable;
@@ -27788,20 +13529,12 @@ with pkgs;
     (callPackage ../applications/editors/android-studio-for-platform { });
   android-studio-for-platform = androidStudioForPlatformPackages.stable;
 
-  antfs-cli = callPackage ../applications/misc/antfs-cli { };
-
   antimony = libsForQt5.callPackage ../applications/graphics/antimony { };
 
-  antiword = callPackage ../applications/office/antiword { };
-
   anup = callPackage ../applications/misc/anup {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  anytone-emu = callPackage ../applications/radio/anytone-emu { };
-
-  apache-directory-studio = callPackage ../applications/networking/apache-directory-studio { };
-
   apkeep = callPackage ../tools/misc/apkeep {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
@@ -27809,80 +13542,28 @@ with pkgs;
   apngasm = callPackage ../applications/graphics/apngasm { };
   apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix { };
 
-  appcleaner = callPackage ../applications/misc/appcleaner { };
-
-  appeditor = callPackage ../applications/misc/appeditor { };
-
-  appgate-sdp = callPackage ../applications/networking/appgate-sdp { };
-
   ardour = callPackage ../applications/audio/ardour { };
   ardour_7 = callPackage ../applications/audio/ardour/7.nix { };
 
   arelle = with python3Packages; toPythonApplication arelle;
 
-  argo = callPackage ../applications/networking/cluster/argo { };
-
-  argocd = callPackage ../applications/networking/cluster/argocd { };
-
-  argocd-autopilot = callPackage ../applications/networking/cluster/argocd-autopilot { };
-
-  argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { };
-
-  ario = callPackage ../applications/audio/ario { };
-
-  arion = callPackage ../applications/virtualization/arion { };
-
-  arkade = callPackage ../applications/networking/cluster/arkade { };
-
-  artem = callPackage ../applications/graphics/artem { };
-
   asuka = callPackage ../applications/networking/browsers/asuka {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  ascii-image-converter = callPackage ../applications/graphics/ascii-image-converter { };
-
-  artha = callPackage ../applications/misc/artha { };
-
-  atlassian-cli = callPackage ../applications/office/atlassian-cli { };
-
-  asap = callPackage ../tools/audio/asap { };
-
-  assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { };
-
   astroid = callPackage ../applications/networking/mailreaders/astroid {
     vim = vim-full.override { features = "normal"; };
     protobuf = protobuf_21;
   };
 
-  aucatctl = callPackage ../applications/audio/aucatctl { };
-
   audacious = qt6Packages.callPackage ../applications/audio/audacious { };
   audacious-plugins = qt6Packages.callPackage ../applications/audio/audacious/plugins.nix {
     # Avoid circular dependency
     audacious = audacious.override { audacious-plugins = null; };
   };
 
-  audio-recorder = callPackage ../applications/audio/audio-recorder { };
-
-  auto-multiple-choice = callPackage ../applications/misc/auto-multiple-choice { };
-
-  autokey = callPackage ../applications/office/autokey { };
-
-  autotalent = callPackage ../applications/audio/autotalent { };
-
-  autotrace = callPackage ../applications/graphics/autotrace { };
-
   av-98 = callPackage ../applications/networking/browsers/av-98 { };
 
-  avizo = callPackage ../applications/misc/avizo { };
-
-  avocode = callPackage ../applications/graphics/avocode { };
-
-  ax25-apps = callPackage ../applications/radio/ax25-apps { };
-
-  ax25-tools = callPackage ../applications/radio/ax25-tools { };
-
   bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker {
     stdenv = if stdenv.hostPlatform.isDarwin then
       darwin.apple_sdk_11_0.stdenv
@@ -27896,14 +13577,6 @@ with pkgs;
       stdenv;
   };
 
-  blocky = callPackage ../applications/networking/blocky { };
-
-  brutefir = callPackage ../applications/audio/brutefir { };
-
-  cheesecutter = callPackage ../applications/audio/cheesecutter { };
-
-  cutecapture = callPackage ../applications/video/cutecapture { };
-
   milkytracker = callPackage ../applications/audio/milkytracker {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio Foundation;
   };
@@ -27916,14 +13589,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  jnetmap = callPackage ../applications/networking/jnetmap { };
-
-  jxplorer  = callPackage ../applications/networking/jxplorer {};
-
-  joincap = callPackage ../tools/security/joincap { };
-
-  json-plot = callPackage ../applications/graphics/json-plot { };
-
   libbitcoin = callPackage ../tools/misc/libbitcoin/libbitcoin.nix {
     boost = boost175; # fatal error: 'boost/interprocess/detail/posix_time_types_wrk.hpp' file not found
   };
@@ -27940,14 +13605,10 @@ with pkgs;
     boost = boost175;
   };
 
-  autopanosiftc = callPackage ../applications/graphics/autopanosiftc { };
-
   ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { };
 
   avidemux = libsForQt5.callPackage ../applications/video/avidemux { };
 
-  avrdudess = callPackage ../applications/misc/avrdudess { };
-
   awesome = callPackage ../applications/window-managers/awesome {
     cairo = cairo.override { xcbSupport = true; };
     inherit (texFunctions) fontsConf;
@@ -27955,32 +13616,14 @@ with pkgs;
 
   awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { };
 
-  badwolf = callPackage ../applications/networking/browsers/badwolf { };
-
   backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { };
 
   backintime-qt = qt6.callPackage ../applications/networking/sync/backintime/qt.nix { };
 
   backintime = backintime-qt;
 
-  balsa = callPackage ../applications/networking/mailreaders/balsa { };
-
-  bandwidth = callPackage ../tools/misc/bandwidth { };
-
-  banking = callPackage ../applications/office/banking { };
-
   barrier = libsForQt5.callPackage ../applications/misc/barrier { };
 
-  bashSnippets = callPackage ../applications/misc/bashSnippets { };
-
-  batsignal = callPackage ../applications/misc/batsignal { };
-
-  baudline = callPackage ../applications/audio/baudline { };
-
-  bb =  callPackage ../applications/misc/bb { };
-
-  bchoppr = callPackage ../applications/audio/bchoppr { };
-
   bespokesynth = darwin.apple_sdk_11_0.callPackage ../applications/audio/bespokesynth {
     inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit CoreServices CoreAudioKit IOBluetooth MetalKit;
   };
@@ -27996,16 +13639,6 @@ with pkgs;
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
   bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };
 
-  bitlbee-discord = callPackage ../applications/networking/instant-messengers/bitlbee-discord { };
-
-  bitlbee-facebook = callPackage ../applications/networking/instant-messengers/bitlbee-facebook { };
-
-  bitlbee-steam = callPackage ../applications/networking/instant-messengers/bitlbee-steam { };
-
-  bitlbee-mastodon = callPackage ../applications/networking/instant-messengers/bitlbee-mastodon { };
-
-  bitmeter = callPackage ../applications/audio/bitmeter { };
-
   bitscope = recurseIntoAttrs
     (callPackage ../applications/science/electronics/bitscope/packages.nix { });
 
@@ -28019,18 +13652,10 @@ with pkgs;
 
   bitwig-studio = bitwig-studio5;
 
-  bgpdump = callPackage ../tools/networking/bgpdump { };
-
-  bgpq3 = callPackage ../tools/networking/bgpq3 { };
-
-  bgpq4 = callPackage ../tools/networking/bgpq4 { };
-
   blackbox = callPackage ../applications/version-management/blackbox {
     pinentry = pinentry-curses;
   };
 
-  bleachbit = callPackage ../applications/misc/bleachbit { };
-
   blender = callPackage  ../applications/misc/blender {
     openexr = openexr_3;
     python3Packages = python311Packages;
@@ -28039,12 +13664,6 @@ with pkgs;
 
   blender-hip = blender.override { hipSupport = true; };
 
-  blflash = callPackage ../tools/misc/blflash { };
-
-  blogc = callPackage ../applications/misc/blogc { };
-
-  bloodhound = callPackage ../applications/misc/bloodhound { };
-
   blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix {
     inherit (haskellPackages) ghcWithPackages;
   };
@@ -28062,56 +13681,12 @@ with pkgs;
 
   bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { };
 
-  bluemail = callPackage ../applications/networking/mailreaders/bluemail { };
-
-  blugon = callPackage ../applications/misc/blugon { };
-
-  bombadillo = callPackage ../applications/networking/browsers/bombadillo { };
-
-  bombono = callPackage ../applications/video/bombono { };
-
-  bonzomatic = callPackage ../applications/editors/bonzomatic { };
-
-  booster = callPackage ../applications/system/booster { };
-
   bottles = callPackage ../applications/misc/bottles/fhsenv.nix { };
 
   bottles-unwrapped = callPackage ../applications/misc/bottles { };
 
-  buzztrax = callPackage ../applications/audio/buzztrax { };
-
-  break-time = callPackage ../applications/misc/break-time { };
-
   breezy = with python3Packages; toPythonApplication breezy;
 
-  notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { };
-
-  brig = callPackage ../applications/networking/brig { };
-
-  bristol = callPackage ../applications/audio/bristol { };
-
-  brlcad = callPackage ../applications/graphics/brlcad { };
-
-  bjumblr = callPackage ../applications/audio/bjumblr { };
-
-  bschaffl = callPackage ../applications/audio/bschaffl { };
-
-  bsequencer = callPackage ../applications/audio/bsequencer { };
-
-  bslizr = callPackage ../applications/audio/bslizr { };
-
-  bshapr = callPackage ../applications/audio/bshapr { };
-
-  bspwm = callPackage ../applications/window-managers/bspwm { };
-
-  bvi = callPackage ../applications/editors/bvi { };
-
-  bviplus = callPackage ../applications/editors/bviplus { };
-
-  caerbannog = callPackage ../applications/misc/caerbannog { };
-
-  cardo = callPackage ../data/fonts/cardo { };
-
   cage = callPackage ../applications/window-managers/cage {
     wlroots = wlroots_0_18;
   };
@@ -28122,10 +13697,6 @@ with pkgs;
 
   calcmysky = qt6Packages.callPackage ../applications/science/astronomy/calcmysky { };
 
-  calcurse = callPackage ../applications/misc/calcurse { };
-
-  calculix = callPackage ../applications/science/math/calculix { };
-
   calibre = callPackage ../by-name/ca/calibre/package.nix {
     podofo = podofo010;
   };
@@ -28141,36 +13712,10 @@ with pkgs;
     calicoctl
     confd-calico;
 
-  perkeep = callPackage ../applications/misc/perkeep { };
-
-  canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { };
-
-  canto-daemon = callPackage ../applications/networking/feedreaders/canto-daemon { };
-
-  caprine-bin = callPackage ../applications/networking/instant-messengers/caprine-bin { };
-
-  carddav-util = callPackage ../tools/networking/carddav-util { };
-
-  cardinal = callPackage ../applications/audio/cardinal { };
-
   carla = libsForQt5.callPackage ../applications/audio/carla { };
 
-  castor = callPackage ../applications/networking/browsers/castor { };
-
-  catfs = callPackage ../os-specific/linux/catfs { };
-
-  catgirl = callPackage ../applications/networking/irc/catgirl { };
-
-  catimg = callPackage ../tools/misc/catimg { };
-
-  catt = callPackage ../applications/video/catt { };
-
   cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
 
-  cbatticon = callPackage ../applications/misc/cbatticon { };
-
-  cbc = callPackage ../applications/science/math/cbc { };
-
   cbconvert-gui = cbconvert.gui;
 
   cddiscid = callPackage ../applications/audio/cd-discid {
@@ -28184,30 +13729,14 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
-  celeste = callPackage ../applications/networking/sync/celeste { };
-
-  cyan = callPackage ../applications/graphics/cyan { };
-
-  centerim = callPackage ../applications/networking/instant-messengers/centerim { };
-
-  chatty = callPackage ../applications/networking/instant-messengers/chatty { };
-
-  browsh = callPackage ../applications/networking/browsers/browsh { };
-
   brotab = callPackage ../tools/misc/brotab {
     python = python3;
   };
 
-  bookworm = callPackage ../applications/office/bookworm { };
-
-  boops = callPackage ../applications/audio/boops { };
-
   bumblebee-status = callPackage ../applications/window-managers/i3/bumblebee-status {
     python = python3;
   };
 
-  cgif = callPackage ../tools/graphics/cgif { };
-
   chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {});
 
   chuck = callPackage ../applications/audio/chuck {
@@ -28215,14 +13744,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport;
   };
 
-  cinelerra = callPackage ../applications/video/cinelerra { };
-
-  cipher = callPackage ../applications/misc/cipher { };
-
-  clapper = callPackage ../applications/video/clapper { };
-
-  claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { };
-
   cligh = python3Packages.callPackage ../development/tools/github/cligh { };
 
   clight = callPackage ../applications/misc/clight { };
@@ -28233,144 +13754,59 @@ with pkgs;
 
   clipgrab = libsForQt5.callPackage ../applications/video/clipgrab { };
 
-  clipmenu = callPackage ../applications/misc/clipmenu { };
-
-  clipit = callPackage ../applications/misc/clipit { };
-
-  clipqr = callPackage ../applications/misc/clipqr { };
-
-  cloud-hypervisor = callPackage ../applications/virtualization/cloud-hypervisor { };
-
-  clp = callPackage ../applications/science/math/clp { };
-
-  pokemon-colorscripts-mac = callPackage ../applications/misc/pokemon-colorscripts-mac { };
-
-  cmctl = callPackage ../applications/networking/cluster/cmctl { };
-
   cmus = callPackage ../applications/audio/cmus {
     inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio VideoToolbox;
     libjack = libjack2;
   };
 
-  cmusfm = callPackage ../applications/audio/cmusfm { };
-
   cni = callPackage ../applications/networking/cluster/cni { };
   cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix { };
 
-  dnsname-cni = callPackage ../applications/networking/cluster/dnsname-cni { };
-
-  multus-cni = callPackage ../applications/networking/cluster/multus-cni { };
-
-  cntr = callPackage ../applications/virtualization/cntr { };
-
   communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
 
-  complete-alias = callPackage ../tools/misc/complete-alias { };
-
   completely = callPackage ../tools/misc/completely { };
 
   confclerk = libsForQt5.callPackage ../applications/misc/confclerk { };
 
   copyq = qt6Packages.callPackage ../applications/misc/copyq { };
 
-  coreth = callPackage ../applications/networking/coreth { };
-
   cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { };
 
-  csa = callPackage ../applications/audio/csa { };
-
   csound = callPackage ../applications/audio/csound {
     inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AudioUnit CoreAudio CoreMIDI;
   };
 
-  csound-manual = callPackage ../applications/audio/csound/csound-manual { };
-
   csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { };
 
-  codeblocks = callPackage ../applications/editors/codeblocks { };
   codeblocksFull = codeblocks.override { contribPlugins = true; };
 
   cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; };
   cudatext-gtk = callPackage ../applications/editors/cudatext { widgetset = "gtk2"; };
   cudatext = cudatext-qt;
 
-  convos = callPackage ../applications/networking/irc/convos { };
-
   comical = callPackage ../applications/graphics/comical {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  containerd = callPackage ../applications/virtualization/containerd { };
-
-  container2wasm = callPackage ../development/tools/container2wasm { };
-
-  convchain = callPackage ../tools/graphics/convchain { };
-
-  cordless = callPackage ../applications/networking/instant-messengers/cordless { };
-
-  coursera-dl = callPackage ../applications/misc/coursera-dl { };
-
-  cozy-drive = callPackage ../applications/networking/cozy-drive { };
-
-  cplay-ng = callPackage ../applications/audio/cplay-ng { };
-
   cqrlog = callPackage ../applications/radio/cqrlog {
     hamlib = hamlib_4;
   };
 
-  crun = callPackage ../applications/virtualization/crun { };
-
-  csdp = callPackage ../applications/science/math/csdp { };
-
-  csv2svg = callPackage ../tools/graphics/csv2svg { };
-
-  ctop = callPackage ../tools/system/ctop { };
-
   cubicsdr = callPackage ../applications/radio/cubicsdr {
     inherit (darwin.apple_sdk.frameworks) Cocoa WebKit;
   };
 
-  cum = callPackage ../applications/misc/cum { };
-
-  cuneiform = callPackage ../tools/graphics/cuneiform { };
-
-  curseradio = callPackage ../applications/audio/curseradio { };
-
-  curtail = callPackage ../applications/graphics/curtail { };
-
   cutecom = libsForQt5.callPackage ../tools/misc/cutecom { };
 
-  cvs = callPackage ../applications/version-management/cvs { };
-
-  cvsps = callPackage ../applications/version-management/cvsps { };
-
-  cvsq = callPackage ../applications/version-management/cvsq { };
-
-  cvs2svn = callPackage ../applications/version-management/cvs2svn { };
-
-  cwm = callPackage ../applications/window-managers/cwm { };
-
-  cyber = callPackage ../development/interpreters/cyber { };
-
-  cyberduck = callPackage ../applications/networking/cyberduck { };
-
-  cyclone = callPackage ../applications/audio/pd-plugins/cyclone  { };
-
-  daktilo = callPackage ../tools/misc/daktilo { };
-
   darcs = haskell.lib.compose.disableCabalFlag "library"
     (haskell.lib.compose.justStaticExecutables haskellPackages.darcs);
 
-  darkman = callPackage ../applications/misc/darkman { };
-
   darktable = callPackage ../by-name/da/darktable/package.nix {
     lua = lua5_4;
     pugixml = pugixml.override { shared = true; };
     stdenv = if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then overrideSDK llvmPackages_18.stdenv { darwinMinVersion = "10.14"; darwinSdkVersion = "11.0"; } else stdenv;
   };
 
-  das_watchdog = callPackage ../tools/system/das_watchdog { };
-
   datadog-agent = callPackage ../tools/networking/dd-agent/datadog-agent.nix {
     pythonPackages = datadog-integrations-core { };
   };
@@ -28380,10 +13816,6 @@ with pkgs;
     extraIntegrations = extras;
   };
 
-  dayon = callPackage ../applications/networking/remote/dayon { };
-
-  ddgr = callPackage ../applications/misc/ddgr { };
-
   deadbeef = callPackage ../applications/audio/deadbeef { };
 
   deadbeefPlugins = {
@@ -28407,26 +13839,10 @@ with pkgs;
 
   dfilemanager = libsForQt5.callPackage ../applications/file-managers/dfilemanager { };
 
-  dht = callPackage ../applications/networking/p2p/dht { };
-
-  dia = callPackage ../applications/graphics/dia { };
-
-  diebahn = callPackage ../applications/misc/diebahn { };
-
-  digital = callPackage ../applications/science/electronics/digital { };
-
   direwolf = callPackage ../applications/radio/direwolf {
     hamlib = hamlib_4;
   };
 
-  dirt = callPackage ../applications/audio/dirt { };
-
-  dit = callPackage ../applications/editors/dit { };
-
-  djvulibre = callPackage ../applications/misc/djvulibre { };
-
-  djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { };
-
   djview = libsForQt5.callPackage ../applications/graphics/djview { };
   djview4 = djview;
 
@@ -28439,16 +13855,10 @@ with pkgs;
     inherit (python3Packages) buildPythonApplication requests;
   };
 
-  dmrconfig = callPackage ../applications/radio/dmrconfig { };
-
   dmtx-utils = callPackage ../tools/graphics/dmtx-utils {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  dnd-tools = callPackage ../applications/misc/dnd-tools { };
-
-  dnglab = callPackage ../tools/graphics/dnglab { };
-
   inherit (callPackage ../applications/virtualization/docker {})
     docker_24 docker_25 docker_26 docker_27;
 
@@ -28459,35 +13869,11 @@ with pkgs;
   docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { };
   docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { };
 
-  dockfmt = callPackage ../development/tools/dockfmt { };
-
-  afterburn = callPackage ../tools/admin/afterburn { };
-
   docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { };
   docker-compose = callPackage ../applications/virtualization/docker/compose.nix { };
   docker-sbom = callPackage ../applications/virtualization/docker/sbom.nix { };
 
 
-  amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { };
-
-  dk = callPackage ../applications/window-managers/dk { };
-
-  docker-credential-helpers = callPackage ../tools/admin/docker-credential-helpers { };
-
-  dockstarter = callPackage ../tools/virtualization/dockstarter { };
-
-  doodle = callPackage ../applications/search/doodle { };
-
-  dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { };
-
-  dracut = callPackage ../os-specific/linux/dracut { };
-
-  dragonflydb = callPackage ../servers/nosql/dragonflydb { };
-
-  dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { };
-
-  drawing = callPackage ../applications/graphics/drawing { };
-
   drawio = callPackage ../applications/graphics/drawio {
     inherit (darwin) autoSignDarwinBinariesHook;
   };
@@ -28504,33 +13890,15 @@ with pkgs;
 
   droopy = python3Packages.callPackage ../applications/networking/droopy { };
 
-  drumgizmo = callPackage ../applications/audio/drumgizmo { };
-
-  dsf2flac = callPackage ../applications/audio/dsf2flac { };
-
   dust = callPackage ../by-name/du/dust/package.nix {
     inherit (darwin.apple_sdk_11_0.frameworks) AppKit;
   };
 
-  dutree = callPackage ../tools/misc/dutree { };
-
-  devede = callPackage ../applications/video/devede { };
-
-  denemo = callPackage ../applications/audio/denemo { };
-
   dexed = darwin.apple_sdk_11_0.callPackage ../applications/audio/dexed {
     inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit MetalKit DiscRecording CoreAudioKit;
     inherit (darwin.apple_sdk_11_0.libs) simd;
   };
 
-  dvdauthor = callPackage ../applications/video/dvdauthor { };
-
-  dvdbackup = callPackage ../applications/video/dvdbackup { };
-
-  dvd-slideshow = callPackage ../applications/video/dvd-slideshow { };
-
-  dyff = callPackage ../development/tools/dyff { };
-
   dwl = callPackage ../by-name/dw/dwl/package.nix {
     wlroots = wlroots_0_18;
   };
@@ -28541,40 +13909,18 @@ with pkgs;
     patches = config.dwm.patches or [];
   };
 
-  dwmblocks = callPackage ../applications/misc/dwmblocks { };
-
-  dwmbar = callPackage ../applications/misc/dwmbar { };
-
   dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { };
 
-  emoji-picker = callPackage ../applications/misc/emoji-picker { };
-
-  exploitdb = callPackage ../tools/security/exploitdb { };
-
   evilwm = callPackage ../applications/window-managers/evilwm {
     patches = config.evilwm.patches or [];
   };
 
-  dzen2 = callPackage ../applications/window-managers/dzen2 { };
-
-  e16 = callPackage ../applications/window-managers/e16 { };
-
-  eaglemode = callPackage ../applications/misc/eaglemode { };
-
-  ebumeter = callPackage ../applications/audio/ebumeter { };
-
-  echoip = callPackage ../servers/echoip { };
-
   eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { });
 
   ecpdap = callPackage ../development/embedded/fpga/ecpdap {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  ecs-agent = callPackage ../applications/virtualization/ecs-agent { };
-
-  oed = callPackage ../applications/editors/oed { };
-
   electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { };
 
   electrum = libsForQt5.callPackage ../applications/misc/electrum { };
@@ -28585,8 +13931,6 @@ with pkgs;
 
   elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { };
 
-  elfx86exts = callPackage ../applications/misc/elfx86exts { };
-
   elinks = callPackage ../applications/networking/browsers/elinks {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
@@ -28625,32 +13969,10 @@ with pkgs;
   # If you turn this into "real" alias again, please add it to pkgs/top-level/packages-config.nix again too
   emacsPackages = emacs.pkgs // { __recurseIntoDerivationForReleaseJobs = true; };
 
-  emptty = callPackage ../applications/display-managers/emptty { };
-
-  endeavour = callPackage ../applications/office/endeavour { };
-
-  enhanced-ctorrent = callPackage ../applications/networking/p2p/enhanced-ctorrent { };
-
-  eolie = callPackage ../applications/networking/browsers/eolie { };
-
-  eos-installer = callPackage ../applications/misc/eos-installer { };
-
-  epeg = callPackage ../applications/graphics/epeg { };
-
-  epgstation = callPackage ../applications/video/epgstation { };
-
-  ephemeral = callPackage ../applications/networking/browsers/ephemeral { };
-
   epick = callPackage ../applications/graphics/epick {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  epr = callPackage ../applications/misc/epr { };
-
-  eq10q = callPackage ../applications/audio/eq10q { };
-
-  errbot = callPackage ../applications/networking/errbot { };
-
   espeak-classic = callPackage ../applications/audio/espeak { };
 
   espeak-ng = callPackage ../applications/audio/espeak-ng {
@@ -28660,38 +13982,12 @@ with pkgs;
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
 
-  espeakup = callPackage ../applications/accessibility/espeakup { };
-
   espflash = callPackage ../by-name/es/espflash/package.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
   };
 
-  etebase-server = callPackage ../servers/etebase {};
-
-  etesync-dav = callPackage ../applications/misc/etesync-dav { };
-
-  etherape = callPackage ../applications/networking/sniffers/etherape { };
-
   evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { };
 
-  exaile = callPackage ../applications/audio/exaile { };
-
-  exercism = callPackage ../applications/misc/exercism { };
-
-  expenses = callPackage ../applications/misc/expenses { };
-
-  furtherance = callPackage ../applications/misc/furtherance { };
-
-  gigalixir = callPackage ../tools/misc/gigalixir { };
-
-  go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { };
-
-  go-motion = callPackage ../development/tools/go-motion { };
-
-  go-musicfox = callPackage ../applications/audio/go-musicfox { };
-
-  gpg-mdp = callPackage ../applications/misc/gpg-mdp { };
-
   greenfoot = callPackage ../applications/editors/greenfoot {
     openjdk = openjdk17.override {
       enableJavaFX = true;
@@ -28699,16 +13995,10 @@ with pkgs;
     };
   };
 
-  gspeech = callPackage ../applications/audio/gspeech { };
-
   haruna = kdePackages.callPackage ../applications/video/haruna { };
 
   hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { };
 
-  helix = callPackage ../applications/editors/helix { };
-
-  icesl = callPackage ../applications/misc/icesl { };
-
   input-leap = qt6Packages.callPackage ../applications/misc/input-leap {
     avahi = avahi.override { withLibdnssdCompat = true; };
   };
@@ -28718,62 +14008,18 @@ with pkgs;
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
 
-  keepass-diff = callPackage ../applications/misc/keepass-diff { };
-
   evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; };
   evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { };
   evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { };
   evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; };
 
-  keepass-charactercopy = callPackage ../applications/misc/keepass-plugins/charactercopy { };
-
-  keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { };
-
-  keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { };
-
-  keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { };
-
-  keepass-keetraytotp = callPackage ../applications/misc/keepass-plugins/keetraytotp { };
-
-  keepass-otpkeyprov = callPackage ../applications/misc/keepass-plugins/otpkeyprov { };
-
-  keepass-qrcodeview = callPackage ../applications/misc/keepass-plugins/qrcodeview { };
-
-  kerbrute = callPackage ../tools/security/kerbrute { };
-
-  kvmtool = callPackage ../applications/virtualization/kvmtool { };
-
-  exrtools = callPackage ../applications/graphics/exrtools { };
-
-  f1viewer = callPackage ../applications/video/f1viewer { };
-
-  falcoctl = callPackage ../applications/networking/cluster/falcoctl { };
-
-  faircamp = callPackage ../applications/misc/faircamp { };
-
   famistudio = darwin.apple_sdk_11_0.callPackage ../applications/audio/famistudio { };
 
-  fasttext = callPackage ../applications/science/machine-learning/fasttext { };
-
-  fbmenugen = callPackage ../applications/misc/fbmenugen { };
-
-  fbpanel = callPackage ../applications/window-managers/fbpanel { };
-
   fdr = libsForQt5.callPackage ../applications/science/programming/fdr { };
 
-  feedbackd = callPackage ../applications/misc/feedbackd { };
-
-  fehlstart = callPackage ../applications/misc/fehlstart { };
-
   fetchmail = callPackage ../applications/misc/fetchmail { };
   fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { };
 
-  ff2mpv = callPackage ../applications/misc/ff2mpv { };
-
-  fff = callPackage ../applications/misc/fff { };
-
-  fig2dev = callPackage ../applications/graphics/fig2dev { };
-
   finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -28782,64 +14028,30 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  firewalld = callPackage ../applications/networking/firewalld { };
-
   firewalld-gui = firewalld.override { withGui = true; };
 
   flacon = libsForQt5.callPackage ../applications/audio/flacon { };
 
-  flamp = callPackage ../applications/radio/flamp { };
-
   fldigi = callPackage ../applications/radio/fldigi {
     hamlib = hamlib_4;
   };
 
-  flink = callPackage ../applications/networking/cluster/flink { };
-
-  fllog = callPackage ../applications/radio/fllog { };
-
-  flmsg = callPackage ../applications/radio/flmsg { };
-
-  flrig = callPackage ../applications/radio/flrig { };
-
-  fluxus = callPackage ../applications/graphics/fluxus { };
-
-  flwrap = callPackage ../applications/radio/flwrap { };
-
   fluidsynth = callPackage ../applications/audio/fluidsynth {
     inherit (darwin.apple_sdk.frameworks) AppKit AudioUnit CoreAudio CoreMIDI CoreServices;
   };
 
   fmit = libsForQt5.callPackage ../applications/audio/fmit { };
 
-  fmsynth = callPackage ../applications/audio/fmsynth { };
-
   fnc = darwin.apple_sdk_11_0.callPackage ../applications/version-management/fnc { };
 
-  focus = callPackage ../tools/X11/focus { };
-
-  focus-stack = callPackage ../applications/graphics/focus-stack { };
-
   focuswriter = qt6Packages.callPackage ../applications/editors/focuswriter { };
 
-  foliate = callPackage ../applications/office/foliate { };
-
-  fontfinder = callPackage ../applications/misc/fontfinder { };
-
-  fontpreview = callPackage ../applications/misc/fontpreview { };
-
   fossil = callPackage ../applications/version-management/fossil {
     sqlite = sqlite.override { enableDeserialize = true; };
   };
 
-  freebayes = callPackage ../applications/science/biology/freebayes { };
-
-  freewheeling = callPackage ../applications/audio/freewheeling { };
-
   fritzing = qt6Packages.callPackage ../applications/science/electronics/fritzing { };
 
-  fsv = callPackage ../applications/misc/fsv { };
-
   ft2-clone = callPackage ../applications/audio/ft2-clone {
     inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa;
   };
@@ -28860,29 +14072,9 @@ with pkgs;
 
   gazelle-origin = python3Packages.callPackage ../tools/misc/gazelle-origin { };
 
-  gcal = callPackage ../applications/misc/gcal { };
-
-  gcstar = callPackage ../applications/misc/gcstar { };
-
   geany = callPackage ../applications/editors/geany { };
   geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { };
 
-  geek-life = callPackage ../applications/misc/geek-life { };
-
-  genact = callPackage ../applications/misc/genact { };
-
-  genxword = callPackage ../applications/misc/genxword { };
-
-  geoipupdate = callPackage ../applications/misc/geoipupdate { };
-
-  glicol-cli = callPackage ../applications/audio/glicol-cli { };
-
-  globe-cli = callPackage ../applications/misc/globe-cli { };
-
-  gnmic = callPackage ../applications/networking/gnmic { };
-
-  gnss-sdr = callPackage ../applications/radio/gnss-sdr { };
-
   gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix {
     unwrapped = callPackage ../applications/radio/gnuradio {
       inherit (darwin.apple_sdk.frameworks) CoreAudio;
@@ -28967,24 +14159,12 @@ with pkgs;
   goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
   goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { };
 
-  gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };
-
   inherit (ocamlPackages) google-drive-ocamlfuse;
 
   googler = callPackage ../applications/misc/googler {
     python = python3;
   };
 
-  gopher = callPackage ../applications/networking/gopher/gopher { };
-
-  gophernotes = callPackage ../applications/editors/gophernotes { };
-
-  goxel = callPackage ../applications/graphics/goxel { };
-
-  gpa = callPackage ../applications/misc/gpa { };
-
-  gpx = callPackage ../applications/misc/gpx { };
-
   gqrx = qt6Packages.callPackage ../applications/radio/gqrx { };
   gqrx-portaudio = qt6Packages.callPackage ../applications/radio/gqrx {
     portaudioSupport = true;
@@ -28995,20 +14175,6 @@ with pkgs;
     pulseaudioSupport = false;
   };
 
-  gpx-viewer = callPackage ../applications/misc/gpx-viewer { };
-
-  grepcidr = callPackage ../applications/search/grepcidr { };
-
-  grepm = callPackage ../applications/search/grepm { };
-
-  grip-search = callPackage ../tools/text/grip-search { };
-
-  grip = callPackage ../applications/misc/grip { };
-
-  gsimplecal = callPackage ../applications/misc/gsimplecal { };
-
-  gthumb = callPackage ../applications/graphics/gthumb { };
-
   guitarix = callPackage ../applications/audio/guitarix {
     fftw = fftwSinglePrec;
   };
@@ -29017,20 +14183,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  gjay = callPackage ../applications/audio/gjay { };
-
-  stratovirt = callPackage ../applications/virtualization/stratovirt { };
-
-  rhythmbox = callPackage ../applications/audio/rhythmbox { };
-
   puddletag = libsForQt5.callPackage ../applications/audio/puddletag { };
 
-  w_scan = callPackage ../applications/video/w_scan { };
-
-  w_scan2 = callPackage ../applications/video/w_scan2 { };
-
-  wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { };
-
   welle-io = qt6Packages.callPackage ../applications/radio/welle-io { };
 
   wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark {
@@ -29047,24 +14201,14 @@ with pkgs;
     libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; };
   };
 
-  sngrep = callPackage ../applications/networking/sniffers/sngrep { };
-
-  termshark = callPackage ../tools/networking/termshark { };
-
-  fbida = callPackage ../applications/graphics/fbida { };
-
   fclones = callPackage ../tools/misc/fclones { };
 
   fclones-gui = darwin.apple_sdk_11_0.callPackage ../tools/misc/fclones/gui.nix { };
 
-  fdupes = callPackage ../tools/misc/fdupes { };
-
   feh = callPackage ../applications/graphics/feh {
     imlib2 = imlib2Full;
   };
 
-  feishu = callPackage ../applications/networking/instant-messengers/feishu { };
-
   filezilla = darwin.apple_sdk_11_0.callPackage ../applications/networking/ftp/filezilla {
     inherit (darwin.apple_sdk_11_0.frameworks) CoreServices Security;
   };
@@ -29147,22 +14291,10 @@ with pkgs;
 
   firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { };
 
-  flac = callPackage ../applications/audio/flac { };
-
-  redoflacs = callPackage ../applications/audio/redoflacs { };
-
-  flex-ncat = callPackage ../applications/radio/flex-ncat { };
-
-  flex-ndax = callPackage ../applications/radio/flex-ndax { };
-
   floorp-unwrapped = callPackage ../applications/networking/browsers/floorp { };
 
   floorp = wrapFirefox floorp-unwrapped { };
 
-  fomp = callPackage ../applications/audio/fomp { };
-
-  formatter = callPackage ../applications/misc/formatter { };
-
   formiko = with python3Packages; callPackage ../applications/editors/formiko {
     inherit buildPythonApplication;
   };
@@ -29171,10 +14303,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL;
   };
 
-  foxtrotgps = callPackage ../applications/misc/foxtrotgps { };
-
-  fractal = callPackage ../applications/networking/instant-messengers/fractal { };
-
   freedv = callPackage ../applications/radio/freedv {
     inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia;
     codec2 = codec2.override {
@@ -29189,15 +14317,10 @@ with pkgs;
 
   freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { };
 
-  freepv = callPackage ../applications/graphics/freepv { };
-
-  xfontsel = callPackage ../applications/misc/xfontsel { };
   inherit (xorg) xlsfonts;
 
   xrdp = callPackage ../applications/networking/remote/xrdp { };
 
-  pulseaudio-module-xrdp = callPackage ../applications/networking/remote/xrdp/pulseaudio-module-xrdp { };
-
   inherit
     ({
       freerdp = callPackage ../applications/networking/remote/freerdp {
@@ -29215,20 +14338,6 @@ with pkgs;
 
   freerdpUnstable = freerdp;
 
-  g933-utils = callPackage ../tools/misc/g933-utils { };
-
-  gavrasm = callPackage ../development/compilers/gavrasm { };
-
-  gcalcli = callPackage ../applications/misc/gcalcli { };
-
-  vcal = callPackage ../applications/misc/vcal { };
-
-  gcolor3 = callPackage ../applications/graphics/gcolor3 { };
-
-  get_iplayer = callPackage ../applications/misc/get_iplayer { };
-
-  getxbook = callPackage ../applications/misc/getxbook { };
-
   gimp = callPackage ../applications/graphics/gimp {
     autoreconfHook = buildPackages.autoreconfHook269;
     lcms = lcms2;
@@ -29245,17 +14354,8 @@ with pkgs;
     gtk = gtk3;
   };
 
-  gitolite = callPackage ../applications/version-management/gitolite { };
-
-  goffice = callPackage ../development/libraries/goffice { };
-
-  gtkterm = callPackage ../tools/misc/gtkterm { };
-
   gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; };
 
-  gum = callPackage ../applications/misc/gum { };
-  pop = callPackage ../applications/misc/pop { };
-
   hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
     inherit miniupnpc swftools;
     inherit (qt6) wrapQtAppsHook qtbase qtcharts;
@@ -29282,28 +14382,18 @@ with pkgs;
     };
   });
 
-  jmusicbot = callPackage ../applications/audio/jmusicbot { };
-
-  junction = callPackage ../applications/misc/junction { };
-
-  lemonade = callPackage ../applications/misc/lemonade { };
-
   librespot = callPackage ../applications/audio/librespot {
     withALSA = stdenv.hostPlatform.isLinux;
     withPulseAudio = config.pulseaudio or stdenv.hostPlatform.isLinux;
     withPortAudio = stdenv.hostPlatform.isDarwin;
   };
 
-  limesctl = callPackage ../applications/misc/limesctl { };
-
   linssid = libsForQt5.callPackage ../applications/networking/linssid { };
 
   linvstmanager = qt5.callPackage ../applications/audio/linvstmanager { };
 
   deadd-notification-center = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../applications/misc/deadd-notification-center { });
 
-  losslessaudiochecker = callPackage ../applications/audio/losslessaudiochecker { };
-
   m32edit = callPackage ../applications/audio/midas/m32edit.nix { };
 
   manim = python3Packages.toPythonApplication python3Packages.manim;
@@ -29322,56 +14412,22 @@ with pkgs;
 
   mindforger = libsForQt5.callPackage ../applications/editors/mindforger { };
 
-  mi2ly = callPackage ../applications/audio/mi2ly { };
-
   molsketch = libsForQt5.callPackage ../applications/editors/molsketch { };
 
-  multiviewer-for-f1 = callPackage ../applications/video/multiviewer-for-f1 { };
-
-  muzika = callPackage ../applications/audio/muzika { };
-
   openutau = callPackage ../applications/audio/openutau { };
 
   pattypan = callPackage ../applications/misc/pattypan {
     jdk = jdk.override { enableJavaFX = true; };
   };
 
-  praat = callPackage ../applications/audio/praat { };
-
-  rhvoice = callPackage ../applications/audio/rhvoice { };
-
-  svox = callPackage ../applications/audio/svox { };
-
-  genesys = callPackage ../applications/misc/genesys { };
-
-  giada = callPackage ../applications/audio/giada { };
-
-  giara = callPackage ../applications/networking/giara { };
-
-  gitit = callPackage ../applications/misc/gitit { };
-
   gkrellm = callPackage ../applications/misc/gkrellm {
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  glow = callPackage ../applications/editors/glow { };
-
-  glowing-bear = callPackage ../applications/networking/irc/glowing-bear { };
-
-  gmu = callPackage ../applications/audio/gmu { };
-
-  gnaural = callPackage ../applications/audio/gnaural { };
-
-  gnumeric = callPackage ../applications/office/gnumeric { };
-
   gnunet = callPackage ../applications/networking/p2p/gnunet { };
 
   gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { };
 
-  gocr = callPackage ../applications/graphics/gocr { };
-
-  gobby = callPackage ../applications/editors/gobby { };
-
   gphoto2 = callPackage ../applications/misc/gphoto2 { };
 
   gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { };
@@ -29385,40 +14441,16 @@ with pkgs;
 
   grisbi = callPackage ../applications/office/grisbi { gtk = gtk3; };
 
-  gscreenshot = callPackage ../applications/graphics/gscreenshot { };
-
-  guacamole-client = callPackage ../servers/guacamole-client { };
-
-  guacamole-server = callPackage ../servers/guacamole-server { };
-
   q4wine = libsForQt5.callPackage ../applications/misc/q4wine { };
 
   qrencode = callPackage ../development/libraries/qrencode {
     inherit (darwin) libobjc;
   };
 
-  geeqie = callPackage ../applications/graphics/geeqie { };
-
-  gigedit = callPackage ../applications/audio/gigedit { };
-
-  gnomecast = callPackage ../applications/video/gnomecast { };
-
-  gnome-recipes = callPackage ../applications/misc/gnome-recipes { };
-
   gollum = callPackage ../applications/misc/gollum { };
 
-  gonic = callPackage ../servers/gonic { };
-
-  goodvibes = callPackage ../applications/audio/goodvibes { };
-
   googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { };
 
-  go-graft = callPackage ../applications/networking/go-graft { };
-
-  gostatic = callPackage ../applications/misc/gostatic { };
-
-  gossa = callPackage ../applications/networking/gossa { };
-
   gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
 
   gpsbabel-gui = gpsbabel.override {
@@ -29426,8 +14458,6 @@ with pkgs;
     withDoc = true;
   };
 
-  gpsd = callPackage ../servers/gpsd { };
-
   gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { };
 
   gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { };
@@ -29440,10 +14470,6 @@ with pkgs;
 
   gpxsee = gpxsee-qt5;
 
-  gspell = callPackage ../development/libraries/gspell { };
-
-  gst123 = callPackage ../applications/audio/gst123 { };
-
   gtklock = callPackage ../tools/wayland/gtklock { };
 
   gtklock-playerctl-module = callPackage ../tools/wayland/gtklock/playerctl-module.nix { };
@@ -29452,72 +14478,19 @@ with pkgs;
 
   gtklock-userinfo-module = callPackage ../tools/wayland/gtklock/userinfo-module.nix { };
 
-  gv = callPackage ../applications/misc/gv { };
-
   guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { };
 
-  gwc = callPackage ../applications/audio/gwc { };
-
-  gxmessage = callPackage ../applications/misc/gxmessage { };
-
-  gxmatcheq-lv2 = callPackage ../applications/audio/gxmatcheq-lv2 { };
-
-  gxplugins-lv2 = callPackage ../applications/audio/gxplugins-lv2 { };
-
   hachoir = with python3Packages; toPythonApplication hachoir;
 
-  hackrf = callPackage ../applications/radio/hackrf { };
-
-  hacksaw = callPackage ../tools/misc/hacksaw { };
-
-  hakuneko = callPackage ../tools/misc/hakuneko { };
-
-  halp = callPackage ../tools/misc/halp { };
-
-  manga-cli = callPackage ../tools/misc/manga-cli { };
-
-  hamster = callPackage ../applications/misc/hamster { };
-
-  hacpack = callPackage ../tools/compression/hacpack { };
-
-  hashit = callPackage ../tools/misc/hashit { };
-
-  hactool = callPackage ../tools/compression/hactool { };
-
-  hdhomerun-config-gui = callPackage ../applications/video/hdhomerun-config-gui { };
-
-  headlines = callPackage ../applications/networking/headlines { };
-
-  hedgedoc-cli = callPackage ../tools/admin/hedgedoc-cli { };
-
   heimer = libsForQt5.callPackage ../applications/misc/heimer { };
 
-  hello-wayland = callPackage ../applications/graphics/hello-wayland { };
-
-  hello-unfree = callPackage ../applications/misc/hello-unfree { };
-
-  helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };
-
-  herbe = callPackage ../applications/misc/herbe { };
-
-  herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
-
-  hex-a-hop = callPackage ../games/hex-a-hop { };
-
-  hexcurse = callPackage ../applications/editors/hexcurse { };
-
-  hexdino = callPackage ../applications/editors/hexdino { };
-
   hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { };
 
   hydrogen-web = callPackage ../applications/networking/instant-messengers/hydrogen-web/wrapper.nix {
     conf = config.hydrogen-web.conf or { };
   };
 
-  hivelytracker = callPackage ../applications/audio/hivelytracker { };
-
   hledger = haskell.lib.compose.justStaticExecutables haskellPackages.hledger;
-  hledger-check-fancyassertions = callPackage ../applications/office/hledger-check-fancyassertions { };
   hledger-iadd = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-iadd;
   hledger-interest = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-interest;
   hledger-ui = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-ui;
@@ -29527,8 +14500,6 @@ with pkgs;
     haskellPackages.hledger-web;
   hledger-utils = with python3.pkgs; toPythonApplication hledger-utils;
 
-  hmm = callPackage ../applications/misc/hmm { };
-
   hollywood = callPackage ../applications/misc/hollywood {
     inherit (python3Packages) pygments;
   };
@@ -29537,76 +14508,30 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  hover = callPackage ../development/tools/hover { };
-
   hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { };
 
-  howl = callPackage ../applications/editors/howl { };
-
-  hdl-dump = callPackage ../tools/misc/hdl-dump { };
-
   hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack;
 
-  hpl = callPackage ../tools/misc/hpl { };
-
   hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { };
 
-  ht = callPackage ../applications/editors/ht { };
-
-  xh = callPackage ../tools/networking/xh { };
-
-  hubstaff = callPackage ../applications/misc/hubstaff { };
-
   hue-cli = callPackage ../tools/networking/hue-cli { };
 
-  hueadm = callPackage ../tools/misc/hueadm { };
-
   hugin = callPackage ../applications/graphics/hugin {
     wxGTK = wxGTK32;
   };
 
   huggle = libsForQt5.callPackage ../applications/misc/huggle { };
 
-  ghosttohugo = callPackage ../applications/misc/ghosttohugo {};
-
-  gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { };
-
-  go-org = callPackage ../applications/misc/go-org { };
-
   hushboard = python3.pkgs.callPackage ../applications/audio/hushboard { };
 
-  husky = callPackage ../development/tools/misc/husky { };
-
   hydrogen = qt5.callPackage ../applications/audio/hydrogen { };
 
-  hydroxide = callPackage ../applications/networking/hydroxide { };
-
   hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { };
 
-  hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { };
-
-  hypnotix = callPackage ../applications/video/hypnotix { };
-
   jackline = callPackage ../applications/networking/instant-messengers/jackline {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  jay = callPackage ../applications/window-managers/jay { };
-
-  keyleds = callPackage ../applications/misc/keyleds { };
-
-  keylight-controller-mschneider82 = callPackage ../applications/misc/keylight-controller-mschneider82 { };
-
-  leftwm = callPackage ../applications/window-managers/leftwm { };
-
-  levant = callPackage ../applications/networking/cluster/levant { };
-
-  marker = callPackage ../applications/editors/marker { };
-
-  matcha-rss-digest = callPackage ../applications/misc/matcha-rss-digest { };
-
-  meek = callPackage ../tools/networking/meek { };
-
   meerk40t = callPackage ../applications/misc/meerk40t { };
 
   meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { };
@@ -29619,42 +14544,18 @@ with pkgs;
 
   noson = libsForQt5.callPackage ../applications/audio/noson { };
 
-  owl-compositor = callPackage ../applications/window-managers/owl { };
-
-  p2pool = callPackage ../applications/misc/p2pool { };
-
   pass2csv = python3Packages.callPackage ../tools/security/pass2csv { };
 
-  pass-secret-service = callPackage ../applications/misc/pass-secret-service { };
-
-  passky-desktop = callPackage ../applications/misc/passky-desktop { };
-
   pinboard = with python3Packages; toPythonApplication pinboard;
 
   pinboard-notes-backup = haskell.lib.compose.justStaticExecutables haskellPackages.pinboard-notes-backup;
 
   pixel2svg = python310Packages.callPackage ../tools/graphics/pixel2svg { };
 
-  pixelfed = callPackage ../servers/web-apps/pixelfed { };
-
-  pixelnuke = callPackage ../applications/graphics/pixelnuke { };
-
-  pixeluvo = callPackage ../applications/graphics/pixeluvo { };
-
   pixinsight = qt6Packages.callPackage ../applications/graphics/pixinsight { };
 
-  planner = callPackage ../applications/office/planner { };
-
-  please-cli = callPackage ../applications/misc/please-cli { };
-
   protonup-qt = python3Packages.callPackage ../applications/misc/protonup-qt { };
 
-  pokeget-rs = callPackage ../tools/misc/pokeget-rs { };
-
-  popura = callPackage ../tools/networking/popura { };
-
-  pureref = callPackage ../applications/graphics/pureref { };
-
   inherit (callPackage ../applications/virtualization/singularity/packages.nix { })
     apptainer
     singularity
@@ -29662,54 +14563,16 @@ with pkgs;
     singularity-overriden-nixos
     ;
 
-  skate = callPackage ../applications/misc/skate { };
-
   slack = callPackage ../applications/networking/instant-messengers/slack { };
 
-  slack-cli = callPackage ../tools/networking/slack-cli { };
-
-  slack-term = callPackage ../applications/networking/instant-messengers/slack-term { };
-
-  sleep-on-lan = callPackage ../tools/networking/sleep-on-lan { };
-
-  sonixd = callPackage ../applications/audio/sonixd { };
-
-  sonobus = callPackage ../applications/audio/sonobus { };
-
   sosreport = python3Packages.callPackage ../applications/logging/sosreport { };
 
-  spectmorph = callPackage ../applications/audio/spectmorph { };
-
-  smooth = callPackage ../development/libraries/smooth { };
-
-  spectrwm = callPackage ../applications/window-managers/spectrwm { };
-
-  spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { };
-
-  srain = callPackage ../applications/networking/irc/srain { };
-
-  super-productivity = callPackage ../applications/office/super-productivity { };
-
   inherit (callPackages ../development/libraries/wlroots {})
     wlroots_0_17
     wlroots_0_18;
 
   sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });
 
-  swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { };
-
-  swaynag-battery = callPackage ../applications/misc/swaynag-battery { };
-
-  tiramisu = callPackage ../applications/misc/tiramisu { };
-
-  rlaunch = callPackage ../applications/misc/rlaunch { };
-
-  remontoire = callPackage ../applications/misc/remontoire { };
-
-  wayshot = callPackage ../tools/misc/wayshot { };
-
-  waylevel = callPackage ../tools/misc/waylevel { };
-
   i3 = callPackage ../applications/window-managers/i3 {
     xcb-util-cursor = if stdenv.hostPlatform.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
   };
@@ -29752,16 +14615,6 @@ with pkgs;
 
   i3lock-fancy-rapid = callPackage ../applications/window-managers/i3/lock-fancy-rapid.nix { };
 
-  i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { };
-
-  betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { };
-
-  multilockscreen = callPackage ../misc/screensavers/multilockscreen { };
-
-  i3minator = callPackage ../tools/misc/i3minator { };
-
-  i3nator = callPackage ../tools/misc/i3nator { };
-
   i3status = callPackage ../applications/window-managers/i3/status.nix { };
 
   i3status-rust = callPackage ../applications/window-managers/i3/status-rust.nix { };
@@ -29778,22 +14631,8 @@ with pkgs;
 
   workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };
 
-  windowchef = callPackage ../applications/window-managers/windowchef { };
-
   wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { };
 
-  wmfs = callPackage ../applications/window-managers/wmfs { };
-
-  i810switch = callPackage ../os-specific/linux/i810switch { };
-
-  ical2orgpy = callPackage ../tools/misc/ical2orgpy { };
-
-  icon-library = callPackage ../applications/graphics/icon-library { };
-
-  id3v2 = callPackage ../applications/audio/id3v2 { };
-
-  ifenslave = callPackage ../os-specific/linux/ifenslave { };
-
   ii = callPackage ../applications/networking/irc/ii {
     stdenv = gccStdenv;
   };
@@ -29821,12 +14660,6 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  image-roll = callPackage ../applications/graphics/image-roll { };
-
-  imagej = callPackage ../applications/graphics/imagej { };
-
-  fiji = callPackage ../applications/graphics/fiji { };
-
   imagemagick6_light = imagemagick6.override {
     bzip2Support = false;
     zlibSupport = false;
@@ -29888,26 +14721,14 @@ with pkgs;
     ghostscriptSupport = true;
   });
 
-  imagination = callPackage ../applications/video/imagination { };
-
   inherit (nodePackages) imapnotify;
 
-  imdshift = callPackage ../tools/security/imdshift { };
-
   img2pdf = with python3Packages; toPythonApplication img2pdf;
 
-  imgcat = callPackage ../applications/graphics/imgcat { };
-
-  img-cat = callPackage ../applications/graphics/img-cat { };
-
   imgp = python3Packages.callPackage ../applications/graphics/imgp { };
 
-  inframap = callPackage ../applications/networking/cluster/inframap { };
-
   inkcut = libsForQt5.callPackage ../applications/misc/inkcut { };
 
-  inklingreader = callPackage ../tools/misc/inklingreader { };
-
   inkscape = callPackage ../applications/graphics/inkscape {
     lcms = lcms2;
   };
@@ -29918,10 +14739,6 @@ with pkgs;
 
   inlyne = darwin.apple_sdk_11_0.callPackage ../applications/misc/inlyne { };
 
-  inspectrum = callPackage ../applications/radio/inspectrum { };
-
-  inputplug = callPackage ../tools/X11/inputplug { };
-
   ion3 = callPackage ../applications/window-managers/ion-3 {
     lua = lua5_1;
   };
@@ -29931,24 +14748,10 @@ with pkgs;
     lua5 = lua5_3;
   };
 
-  iptraf-ng = callPackage ../applications/networking/iptraf-ng { };
-
-  irccloud = callPackage ../applications/networking/irc/irccloud { };
-
   irssi = callPackage ../applications/networking/irc/irssi { };
 
-  filebrowser = callPackage ../applications/networking/filebrowser { };
-
-  fish-irssi = callPackage ../applications/networking/irc/irssi/fish { };
-
   ir.lv2 = callPackage ../applications/audio/ir.lv2 { };
 
-  istioctl = callPackage ../applications/networking/cluster/istioctl { };
-
-  bip = callPackage ../applications/networking/irc/bip { };
-
-  j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop { };
-
   jabcode = callPackage ../development/libraries/jabcode { };
 
   jabcode-writer = callPackage ../development/libraries/jabcode {
@@ -29966,47 +14769,15 @@ with pkgs;
     };
   };
 
-  jack_capture = callPackage ../applications/audio/jack-capture { };
-
-  jack_oscrolloscope = callPackage ../applications/audio/jack-oscrolloscope { };
-
-  jack-passthrough = callPackage ../applications/audio/jack-passthrough { };
-
-  jack_rack = callPackage ../applications/audio/jack-rack { };
-
-  jackmeter = callPackage ../applications/audio/jackmeter { };
-
   jackmix = libsForQt5.callPackage ../applications/audio/jackmix { };
   jackmix_jack1 = jackmix.override { jack = jack1; };
 
-  jaeles = callPackage ../tools/security/jaeles { };
-
   jalv-qt = jalv.override { useQt = true; };
 
   jameica = callPackage ../applications/office/jameica {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  jamin = callPackage ../applications/audio/jamin { };
-
-  japa = callPackage ../applications/audio/japa { };
-
-  dupd = callPackage ../tools/misc/dupd { };
-
-  jconvolver = callPackage ../applications/audio/jconvolver { };
-
-  jdupes = callPackage ../tools/misc/jdupes { };
-
-  jed = callPackage ../applications/editors/jed { };
-
-  jedit = callPackage ../applications/editors/jedit { };
-
-  jgmenu = callPackage ../applications/misc/jgmenu { };
-
-  jitsi = callPackage ../applications/networking/instant-messengers/jitsi { };
-
-  johnny = callPackage ../applications/misc/johnny { };
-
   js8call = qt5.callPackage ../applications/radio/js8call { };
 
   jwm = callPackage ../applications/window-managers/jwm { };
@@ -30021,70 +14792,32 @@ with pkgs;
     ;
   k3s = k3s_1_31;
 
-  k3sup = callPackage ../applications/networking/cluster/k3sup { };
-
-  kail = callPackage ../tools/networking/kail {  };
-
-  kapitonov-plugins-pack = callPackage ../applications/audio/kapitonov-plugins-pack { };
-
   kapow = libsForQt5.callPackage ../applications/misc/kapow { };
 
-  kbt = callPackage ../applications/misc/kbt { };
-
   kchmviewer = libsForQt5.callPackage ../applications/misc/kchmviewer { };
 
-  kappanhang = callPackage ../applications/radio/kappanhang { };
-
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 
   k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
 
   kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
 
-  kbst = callPackage ../applications/networking/cluster/kbst { };
-
   kaidan = libsForQt5.callPackage ../applications/networking/instant-messengers/kaidan { };
 
-  kde-gruvbox = callPackage ../data/themes/kde-gruvbox { };
-
   kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { };
 
-  keet = callPackage ../applications/networking/instant-messengers/keet { };
-
-  kepler = callPackage ../tools/security/kepler { };
-
-  kepubify = callPackage ../tools/misc/kepubify { };
-
-  kermit = callPackage ../tools/misc/kermit { };
-
   kexi = libsForQt5.callPackage ../applications/office/kexi { };
 
-  khronos = callPackage ../applications/office/khronos { };
-
-  keyfinder-cli = callPackage ../applications/audio/keyfinder-cli { };
-
-  kfilt = callPackage ../applications/networking/cluster/kfilt { };
-
   kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { };
 
-  khal = callPackage ../applications/misc/khal { };
-
-  khoj = callPackage ../servers/search/khoj { };
-
-  khard = callPackage ../applications/misc/khard { };
-
   kid3-cli = kid3.override { withCLI = true; withKDE = false; withQt = false; };
   kid3-kde = kid3.override { withCLI = true; withKDE = true; withQt = false; };
   kid3-qt = kid3.override { withCLI = true; withKDE = false; withQt = true; };
 
-  kile = callPackage ../applications/editors/kile { };
-
   kiwix = libsForQt5.callPackage ../applications/misc/kiwix { };
 
   kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { };
 
-  kickoff = callPackage ../applications/misc/kickoff { };
-
   klayout = libsForQt5.callPackage ../applications/misc/klayout { };
 
   klee = callPackage ../applications/science/logic/klee {
@@ -30097,38 +14830,14 @@ with pkgs;
 
   kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { };
 
-  kn = callPackage ../applications/networking/cluster/kn { };
-
-  kns = callPackage ../applications/networking/cluster/kns { };
-
-  kondo = callPackage ../applications/misc/kondo { };
-
   kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { };
 
-  kpt = callPackage ../applications/networking/cluster/kpt { };
-
-  krabby = callPackage ../applications/misc/krabby { };
-
-  kraft = callPackage ../applications/virtualization/kraft { };
-
   krane = callPackage ../applications/networking/cluster/krane { };
 
   krita = callPackage ../applications/graphics/krita/wrapper.nix { };
 
-  ksuperkey = callPackage ../tools/X11/ksuperkey { };
-
   ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { };
 
-  kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { };
-
-  kubedog = callPackage ../applications/networking/cluster/kubedog { };
-
-  kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
-
-  kubefirst = callPackage ../applications/networking/cluster/kubefirst { };
-
-  kube-score = callPackage ../applications/networking/cluster/kube-score { };
-
   kubectl-evict-pod = callPackage ../applications/networking/cluster/kubectl-evict-pod {
   };
 
@@ -30136,68 +14845,16 @@ with pkgs;
 
   kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { };
 
-  kubevela = callPackage ../applications/networking/cluster/kubevela { };
-
   kubernetes = callPackage ../applications/networking/cluster/kubernetes { };
   kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { };
   kubectl-convert = kubectl.convert;
 
-  kubectl-view-secret = callPackage ../applications/networking/cluster/kubectl-view-secret { };
-
-  kubernetes-metrics-server = callPackage ../applications/networking/cluster/kubernetes-metrics-server { };
-
-  kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { };
-
-  kubeseal = callPackage ../applications/networking/cluster/kubeseal { };
-
-  kubestroyer = callPackage ../tools/security/kubestroyer { };
-
-  kubernix = callPackage ../applications/networking/cluster/kubernix { };
-
-  kubeconform = callPackage ../applications/networking/cluster/kubeconform { };
-
-  kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { };
-
-  kuttl = callPackage ../applications/networking/cluster/kuttl { };
-
-  kubectl-cnpg = callPackage ../applications/networking/cluster/kubectl-cnpg { };
-
-  kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { };
-
-  kubectl-explore = callPackage ../applications/networking/cluster/kubectl-explore { };
-
-  kubectl-klock = callPackage ../applications/networking/cluster/kubectl-klock { };
-
-  kubectl-node-shell = callPackage ../applications/networking/cluster/kubectl-node-shell { };
-
   kubectl-view-allocations = callPackage ../applications/networking/cluster/kubectl-view-allocations {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  kubelogin = callPackage ../applications/networking/cluster/kubelogin { };
-
-  kubevpn = callPackage ../applications/networking/cluster/kubevpn { };
-
-  k9s = callPackage ../applications/networking/cluster/k9s { };
-
-  kubecm = callPackage ../applications/networking/cluster/kubecm { };
-
-  ktunnel = callPackage ../applications/networking/cluster/ktunnel { };
-
-  ktop = callPackage ../applications/networking/cluster/ktop { };
-
-  pinniped = callPackage ../applications/networking/cluster/pinniped { };
-
   kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { };
 
-  pgo-client = callPackage ../applications/networking/cluster/pgo-client { };
-
-  popeye = callPackage ../applications/networking/cluster/popeye { };
-
-  kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { };
-
-  fluxctl = callPackage ../applications/networking/cluster/fluxctl { };
-
   linkerd = callPackage ../applications/networking/cluster/linkerd { };
   linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { };
   linkerd_stable = linkerd;
@@ -30221,14 +14878,6 @@ with pkgs;
     pname = "kuma-dp";
   };
 
-  kile-wl = callPackage ../applications/misc/kile-wl { };
-
-  kiln = callPackage ../applications/misc/kiln { };
-
-  kubernetes-code-generator = callPackage ../development/tools/kubernetes-code-generator { };
-
-  kubernetes-controller-tools = callPackage ../development/tools/kubernetes-controller-tools { };
-
   kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
 
   wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { };
@@ -30237,30 +14886,12 @@ with pkgs;
 
   kubernetes-helmPlugins = recurseIntoAttrs (callPackage ../applications/networking/cluster/helm/plugins { });
 
-  chart-testing = callPackage ../applications/networking/cluster/helm/chart-testing { };
-
-  helm-docs = callPackage ../applications/networking/cluster/helm-docs { };
-
-  kubetail = callPackage ../applications/networking/cluster/kubetail { } ;
-
-  kubexit = callPackage ../applications/networking/cluster/kubexit { } ;
-
   kup = libsForQt5.callPackage ../applications/misc/kup { };
 
-  kupfer = callPackage ../applications/misc/kupfer { };
-
-  kuro = callPackage ../applications/misc/kuro { };
-
   timoni = callPackage ../applications/networking/cluster/timoni { };
 
   kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { };
 
-  lame = callPackage ../development/libraries/lame { };
-
-  larswm = callPackage ../applications/window-managers/larswm { };
-
-  lash = callPackage ../applications/audio/lash { };
-
   ladspaH = callPackage ../applications/audio/ladspa-sdk/ladspah.nix { };
 
   ladspaPlugins = callPackage ../applications/audio/ladspa-plugins {
@@ -30274,34 +14905,16 @@ with pkgs;
     inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation OpenGL;
   };
 
-  caps = callPackage ../applications/audio/caps { };
-
-  lbdb = callPackage ../tools/misc/lbdb { };
-
-  lbry = callPackage ../applications/video/lbry { };
-
-  lbzip2 = callPackage ../tools/compression/lbzip2 { };
-
-  lci = callPackage ../applications/science/logic/lci { };
-
   lemonbar = callPackage ../applications/window-managers/lemonbar { };
 
   lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };
 
   lenovo-legion = libsForQt5.callPackage ../os-specific/linux/lenovo-legion/app.nix { };
 
-  legitify = callPackage ../development/tools/legitify { };
-
-  lens = callPackage ../applications/networking/cluster/lens { };
-
   leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { };
 
   libkiwix = callPackage ../applications/misc/kiwix/lib.nix { };
 
-  libowfat = callPackage ../development/libraries/libowfat { };
-
-  libowlevelzs = callPackage ../development/libraries/libowlevelzs { };
-
   librecad = libsForQt5.callPackage ../applications/misc/librecad { };
 
   libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { };
@@ -30373,78 +14986,30 @@ with pkgs;
   libutp = callPackage ../applications/networking/p2p/libutp { };
   libutp_3_4 = callPackage ../applications/networking/p2p/libutp/3.4.nix { };
 
-  lifelines = callPackage ../applications/misc/lifelines { };
-
-  liferea = callPackage ../applications/networking/newsreaders/liferea { };
-
-  lightworks = callPackage ../applications/video/lightworks { };
-
-  lingot = callPackage ../applications/audio/lingot { };
-
-  litebrowser = callPackage ../applications/networking/browsers/litebrowser { };
-
   littlegptracker = callPackage ../applications/audio/littlegptracker {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
   ledger-web = callPackage ../applications/office/ledger-web { };
 
-  ledger2beancount = callPackage ../tools/text/ledger2beancount { };
-
   lightburn = libsForQt5.callPackage ../applications/graphics/lightburn { };
 
   lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  liblinphone = callPackage ../development/libraries/liblinphone { };
-
-  links2 = callPackage ../applications/networking/browsers/links2 { };
-
   linphone = libsForQt5.callPackage ../applications/networking/instant-messengers/linphone { };
 
-  linuxsampler = callPackage ../applications/audio/linuxsampler { };
-
-  llpp = callPackage ../applications/misc/llpp { };
-
-  lls = callPackage ../applications/networking/lls { };
-
   lmms = libsForQt5.callPackage ../applications/audio/lmms {
     lame = null;
     libsoundio = null;
     portaudio = null;
   };
 
-  lokinet = callPackage ../applications/networking/p2p/lokinet { };
-
-  losslesscut-bin = callPackage ../applications/video/losslesscut-bin { };
-
-  loxodo = callPackage ../applications/misc/loxodo { };
-
-  lrzsz = callPackage ../tools/misc/lrzsz { };
-
   lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php82; };
 
-  ltex-ls = callPackage ../tools/text/ltex-ls { };
-
   luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { };
 
-  lxdvdrip = callPackage ../applications/video/lxdvdrip { };
-
-  handlr = callPackage ../tools/misc/handlr { };
-
-  jftui = callPackage ../applications/video/jftui { };
-
-  lime = callPackage ../development/libraries/lime { };
-
-  looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { };
-
-  ltc-tools = callPackage ../applications/audio/ltc-tools { };
-
-  lscolors = callPackage ../applications/misc/lscolors { };
-
-  lswt = callPackage ../applications/misc/lswt { };
-
   luddite = with python3Packages; toPythonApplication luddite;
 
   goobook = with python3Packages; toPythonApplication goobook;
@@ -30453,35 +15018,19 @@ with pkgs;
     lua = lua5_1;
   };
 
-  luppp = callPackage ../applications/audio/luppp { };
-
   lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { };
   lutris = callPackage ../applications/misc/lutris/fhsenv.nix { };
   lutris-free = lutris.override {
     steamSupport = false;
   };
 
-  lv2bm = callPackage ../applications/audio/lv2bm { };
-
   lv2lint = callPackage ../applications/audio/lv2lint/default.nix { };
 
-  lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { };
-
   lxi-tools = callPackage ../tools/networking/lxi-tools { };
   lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; };
 
-  lynx = callPackage ../applications/networking/browsers/lynx { };
-
-  lyrebird = callPackage ../applications/audio/lyrebird { };
-
   lyx = libsForQt5.callPackage ../applications/misc/lyx { };
 
-  m4acut = callPackage ../applications/audio/m4acut { };
-
-  mac = callPackage ../development/libraries/mac { };
-
-  macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { };
-
   magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
 
   magic-wormhole-rs = callPackage ../tools/networking/magic-wormhole-rs {
@@ -30501,40 +15050,18 @@ with pkgs;
     shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand  { };
   };
 
-  makeself = callPackage ../applications/misc/makeself { };
-
   mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { };
 
   mapmap = libsForQt5.callPackage ../applications/video/mapmap { };
 
-  marathonctl = callPackage ../tools/virtualization/marathonctl { };
-
-  mark = callPackage ../tools/text/mark { };
-
-  markets = callPackage ../applications/misc/markets { };
-
-  markscribe = callPackage ../tools/text/markscribe { };
-
-  magnetico = callPackage ../applications/networking/p2p/magnetico { };
-
   mastodon-bot = nodePackages.mastodon-bot;
 
-  matchbox = callPackage ../applications/window-managers/matchbox { };
-
   matrix-commander = python3Packages.callPackage ../applications/networking/instant-messengers/matrix-commander { };
 
-  matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { };
-
-  iamb = callPackage ../applications/networking/instant-messengers/iamb { };
-
-  mblaze = callPackage ../applications/networking/mailreaders/mblaze { };
-
   mbrola = callPackage ../applications/audio/mbrola { };
 
   mbrola-voices = callPackage ../applications/audio/mbrola/voices.nix { };
 
-  mda_lv2 = callPackage ../applications/audio/mda-lv2 { };
-
   mdzk = callPackage ../applications/misc/mdzk {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -30543,28 +15070,12 @@ with pkgs;
   mediaelch-qt5 = libsForQt5.callPackage ../applications/misc/mediaelch { };
   mediaelch-qt6 = qt6Packages.callPackage ../applications/misc/mediaelch { };
 
-  mediathekview = callPackage ../applications/video/mediathekview { };
-
-  meteo = callPackage ../applications/networking/weather/meteo { };
-
-  meld = callPackage ../applications/version-management/meld { };
-
   melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { };
 
-  melody = callPackage ../tools/misc/melody { };
-
-  meme-bingo-web = callPackage ../servers/web-apps/meme-bingo-web { };
-
-  meme-image-generator = callPackage ../applications/graphics/meme-image-generator { };
-
-  meme-suite = callPackage ../applications/science/biology/meme-suite { };
-
   mendeley = libsForQt5.callPackage ../applications/office/mendeley {
     gconf = gnome2.GConf;
   };
 
-  menumaker = callPackage ../applications/misc/menumaker { };
-
   menyoki = callPackage ../applications/graphics/menyoki {
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
@@ -30579,25 +15090,14 @@ with pkgs;
 
   mercurialFull = mercurial.override { fullBuild = true; };
 
-  mepo = callPackage ../applications/misc/mepo { };
-
   meshcentral = callPackage ../tools/admin/meshcentral { };
 
   meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };
 
-  metadata-cleaner = callPackage ../applications/misc/metadata-cleaner { };
-
-  metersLv2 = callPackage ../applications/audio/meters_lv2 { };
-
   michabo = libsForQt5.callPackage ../applications/misc/michabo { };
 
-  mid2key = callPackage ../applications/audio/mid2key { };
-
-  midori-unwrapped = callPackage ../applications/networking/browsers/midori { };
   midori = wrapFirefox midori-unwrapped { };
 
-  mikmod = callPackage ../applications/audio/mikmod { };
-
   miniaudicle = qt6Packages.callPackage ../applications/audio/miniaudicle { };
 
   minidsp = callPackage ../applications/audio/minidsp {
@@ -30608,34 +15108,18 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  minigalaxy = callPackage ../applications/misc/minigalaxy { };
-
-  minimodem = callPackage ../applications/radio/minimodem { };
-
-  minidjvu = callPackage ../applications/graphics/minidjvu { };
-
   minikube = callPackage ../applications/networking/cluster/minikube {
     inherit (darwin.apple_sdk.frameworks) vmnet;
   };
 
   minitube = libsForQt5.callPackage ../applications/video/minitube { };
 
-  mimic = callPackage ../applications/audio/mimic { };
-
-  meh = callPackage ../applications/graphics/meh { };
-
   mixxx = libsForQt5.callPackage ../applications/audio/mixxx { };
 
-  mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
-
   mldonkey = callPackage ../applications/networking/p2p/mldonkey {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
   };
 
-  mlvwm = callPackage ../applications/window-managers/mlvwm { };
-
-  MMA = callPackage ../applications/audio/MMA { };
-
   mmex = callPackage ../applications/office/mmex {
     wxGTK32 = wxGTK32.override {
       withWebKit = true;
@@ -30653,36 +15137,16 @@ with pkgs;
     };
   };
 
-  mmsd = callPackage ../tools/networking/mmsd { };
-
-  mmsd-tng = callPackage ../tools/networking/mmsd-tng { };
-
-  mmtc = callPackage ../applications/audio/mmtc { };
-
-  mnamer = callPackage ../applications/misc/mnamer { };
-
   moc = callPackage ../applications/audio/moc {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  mod-arpeggiator-lv2 = callPackage ../applications/audio/mod-arpeggiator-lv2 { };
-
-  mod-distortion = callPackage ../applications/audio/mod-distortion { };
-
-  monitorcontrol = callPackage ../applications/misc/monitorcontrol { };
-
   xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { };
 
   xmrig-mo = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/moneroocean.nix { };
 
   xmrig-proxy = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/proxy.nix { };
 
-  molot-lite = callPackage ../applications/audio/molot-lite { };
-
-  monkeysAudio = callPackage ../applications/audio/monkeys-audio { };
-
-  monkeysphere = callPackage ../tools/security/monkeysphere { };
-
   monotone = callPackage ../applications/version-management/monotone {
     lua = lua5;
   };
@@ -30697,12 +15161,6 @@ with pkgs;
 
   moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };
 
-  moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { };
-
-  mooSpace = callPackage ../applications/audio/mooSpace { };
-
-  mop = callPackage ../applications/misc/mop { };
-
   mopidyPackages = (callPackages ../applications/audio/mopidy {
     python = python3;
   }) // { __attrsFailEvaluation = true; };
@@ -30731,24 +15189,8 @@ with pkgs;
     mopidy-youtube
     mopidy-ytmusic;
 
-  monocypher = callPackage ../development/libraries/monocypher { };
-
-  motif = callPackage ../development/libraries/motif { };
-
-  mozjpeg = callPackage ../applications/graphics/mozjpeg { };
-
   edgetx = libsForQt5.callPackage ../applications/misc/edgetx { };
 
-  easytag = callPackage ../applications/audio/easytag { };
-
-  mp3gain = callPackage ../applications/audio/mp3gain { };
-
-  mp3splt = callPackage ../applications/audio/mp3splt { };
-
-  mp3val = callPackage ../applications/audio/mp3val { };
-
-  mpc123 = callPackage ../applications/audio/mpc123 { };
-
   mpg123 = callPackage ../applications/audio/mpg123 {
     inherit (darwin.apple_sdk.frameworks) AudioUnit AudioToolbox;
     jack = libjack2;
@@ -30761,22 +15203,8 @@ with pkgs;
 
   nbstripout = callPackage ../applications/version-management/nbstripout { };
 
-  ncmpc = callPackage ../applications/audio/ncmpc { };
-
-  ncmpcpp = callPackage ../applications/audio/ncmpcpp { };
-
-  pms = callPackage ../applications/audio/pms { };
-
   pragha = libsForQt5.callPackage ../applications/audio/pragha { };
 
-  river-tag-overlay = callPackage ../applications/misc/river-tag-overlay { };
-
-  rofi-mpd = callPackage ../applications/audio/rofi-mpd { };
-
-  rofi-bluetooth = callPackage ../applications/misc/rofi-bluetooth { };
-
-  rofi-calc = callPackage ../applications/science/math/rofi-calc { };
-
   rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3;
   rofi-emoji-wayland = (
     callPackage ../applications/misc/rofi-emoji {
@@ -30784,12 +15212,6 @@ with pkgs;
     }
   ).v4;
 
-  rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { };
-
-  rofi-power-menu = callPackage ../applications/misc/rofi-power-menu { };
-
-  rofi-pulse-select = callPackage ../applications/audio/rofi-pulse-select { };
-
   rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw {
     waylandSupport = false;
     x11Support = false;
@@ -30803,37 +15225,11 @@ with pkgs;
     x11Support = true;
   };
 
-  rofi-screenshot = callPackage ../applications/misc/rofi-screenshot { };
-
-  rofi-top = callPackage ../applications/misc/rofi-top { };
-
-  rofi-vpn = callPackage ../applications/networking/rofi-vpn { };
-
   seamly2d = libsForQt5.callPackage ../applications/graphics/seamly2d { };
 
-  ympd = callPackage ../applications/audio/ympd { };
-
   # a somewhat more maintained fork of ympd
-  mympd = callPackage ../applications/audio/mympd { };
-
-  nload = callPackage ../applications/networking/nload { };
-
-  nali = callPackage ../applications/networking/nali { };
-
-  normalize = callPackage ../applications/audio/normalize { };
-
-  norouter = callPackage ../tools/networking/norouter { };
-
-  nqptp = callPackage ../tools/networking/nqptp { };
-
-  mailspring = callPackage ../applications/networking/mailreaders/mailspring { };
-
   memento = qt6Packages.callPackage ../applications/video/memento { };
 
-  mm = callPackage ../applications/networking/instant-messengers/mm { };
-
-  mm-common = callPackage ../development/libraries/mm-common { };
-
   mpc-qt = qt6Packages.callPackage ../applications/video/mpc-qt { };
 
   mplayer = callPackage ../applications/video/mplayer ({
@@ -30853,20 +15249,8 @@ with pkgs;
     abseil-cpp = abseil-cpp_202401;
   };
 
-  mpvpaper = callPackage ../tools/wayland/mpvpaper { };
-
-  open-in-mpv = callPackage ../applications/video/open-in-mpv { };
-
-  mpv-shim-default-shaders = callPackage ../applications/video/mpv-shim-default-shaders { };
-
-  mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { };
-
-  mtpaint = callPackage ../applications/graphics/mtpaint { };
-
   mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { };
 
-  multimon-ng = callPackage ../applications/radio/multimon-ng { };
-
   murmur = (callPackages ../applications/networking/mumble {
       avahi = avahi-compat;
       pulseSupport = config.pulseaudio or false;
@@ -30891,88 +15275,23 @@ with pkgs;
 
   musescore = qt6.callPackage ../applications/audio/musescore { };
 
-  mmh = callPackage ../applications/networking/mailreaders/mmh { };
-  mutt = callPackage ../applications/networking/mailreaders/mutt { };
-
-  mutt-wizard = callPackage ../tools/misc/mutt-wizard { };
-
-  mutt-ics = callPackage ../tools/networking/mutt-ics { };
-
-  mw = callPackage ../tools/text/mw { };
-
   mwic = callPackage ../applications/misc/mwic {
     pythonPackages = python3Packages;
   };
 
   neomutt = darwin.apple_sdk_11_0.callPackage ../applications/networking/mailreaders/neomutt { };
 
-  neosay = callPackage ../applications/networking/instant-messengers/neosay { };
-
   natron = libsForQt5.callPackage ../applications/video/natron { };
 
-  natural-docs = callPackage ../applications/misc/natural-docs { };
-
-  neocomp  = callPackage ../applications/window-managers/neocomp { };
-
-  nerd-font-patcher = callPackage ../applications/misc/nerd-font-patcher { };
-
   netmaker = callPackage ../applications/networking/netmaker {subPackages = ["."];};
   netmaker-full = callPackage ../applications/networking/netmaker { };
 
-  newsflash = callPackage ../applications/networking/feedreaders/newsflash { };
-
-  nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { };
-
-  nixos-shell = callPackage ../tools/virtualization/nixos-shell { };
-
-  noaa-apt = callPackage ../applications/radio/noaa-apt { };
-
-  node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { };
-
   ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; };
 
-  ninjas2 = callPackage ../applications/audio/ninjas2 { };
-
   nootka = qt5.callPackage ../applications/audio/nootka { };
 
-  novnc = callPackage ../applications/networking/novnc { };
-
-  ns-usbloader = callPackage ../applications/misc/ns-usbloader { };
-
-  nwg-bar = callPackage ../applications/misc/nwg-bar { };
-
-  nwg-displays = callPackage ../applications/misc/nwg-displays { };
-
-  nwg-dock = callPackage ../applications/misc/nwg-dock { };
-
-  nwg-launchers = callPackage ../applications/misc/nwg-launchers { };
-
-  nwg-look = callPackage ../applications/misc/nwg-look { };
-
-  nwg-menu = callPackage ../applications/misc/nwg-menu { };
-
-  nwg-wrapper = callPackage ../applications/misc/nwg-wrapper { };
-
-  ocm = callPackage ../applications/networking/cluster/ocm { };
-
-  odo = callPackage ../applications/networking/cluster/odo { };
-
-  odin2 = callPackage ../applications/audio/odin2 { };
-
-  onmetal-image = callPackage ../tools/virtualization/onmetal-image { };
-
-  opcr-policy = callPackage ../development/tools/opcr-policy { };
-
   opcua-client-gui = libsForQt5.callPackage ../misc/opcua-client-gui { };
 
-  open-policy-agent = callPackage ../development/tools/open-policy-agent { };
-
-  openmm = callPackage ../development/libraries/science/chemistry/openmm { };
-
-  openshift = callPackage ../applications/networking/cluster/openshift { };
-
-  opsdroid = callPackage ../applications/networking/opsdroid { };
-
   ostinato = libsForQt5.callPackage ../applications/networking/ostinato {
     protobuf = protobuf_21;
   };
@@ -30980,50 +15299,29 @@ with pkgs;
   p4 = callPackage ../applications/version-management/p4 {
     inherit (darwin.apple_sdk.frameworks) CoreServices Foundation Security;
   };
-  p4d = callPackage ../applications/version-management/p4d { };
   p4v = qt6Packages.callPackage ../applications/version-management/p4v { };
 
-  parson = callPackage ../development/libraries/parson { };
-
-  partio = callPackage ../development/libraries/partio { };
-
   pc-ble-driver = callPackage ../development/libraries/pc-ble-driver {
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
   pcmanfm-qt = lxqt.pcmanfm-qt;
 
-  pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { };
-
   pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { };
 
-  pdfmm = callPackage ../applications/office/pdfmm { };
-
-  pig = callPackage ../applications/networking/cluster/pig { };
-
-  pijul = callPackage ../applications/version-management/pijul { };
-
   pijuice = with python3Packages; toPythonApplication pijuice;
 
   pinegrow6 = callPackage ../applications/editors/pinegrow { pinegrowVersion = "6"; };
 
   pinegrow = callPackage ../applications/editors/pinegrow { };
 
-  piper = callPackage ../os-specific/linux/piper { };
-
   pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { };
 
-  planify = callPackage ../applications/office/planify { };
-
-  plank = callPackage ../applications/misc/plank { };
-
   playonlinux = callPackage ../applications/misc/playonlinux
     { stdenv = stdenv_32bit; };
 
   pleroma-bot = python3Packages.callPackage ../development/python-modules/pleroma-bot { };
 
-  pluto = callPackage ../applications/networking/cluster/pluto { };
-
   pnglatex = with python3Packages; toPythonApplication pnglatex;
 
   polybarFull = polybar.override {
@@ -31036,33 +15334,15 @@ with pkgs;
     i3Support = true;
   };
 
-  yambar-hyprland-wses = callPackage ../applications/misc/yambar-hyprland-wses { };
-
   polyphone = qt6.callPackage ../applications/audio/polyphone { };
 
-  psi-notify = callPackage ../applications/misc/psi-notify { };
-
-  ptex = callPackage ../development/libraries/ptex { };
-
-  qbec = callPackage ../applications/networking/cluster/qbec { };
-
-  qemacs = callPackage ../applications/editors/qemacs { };
-
-  ragnarwm = callPackage ../applications/window-managers/ragnarwm {};
-
-  rime-cli = callPackage ../applications/office/rime-cli { };
-
   roxctl = callPackage ../applications/networking/cluster/roxctl {
   };
 
   rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
 
-  scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
-
   scx = recurseIntoAttrs (callPackage ../os-specific/linux/scx { });
 
-  shod = callPackage ../applications/window-managers/shod { };
-
   shogun = callPackage ../applications/science/machine-learning/shogun {
     protobuf = protobuf_21;
   };
@@ -31071,40 +15351,12 @@ with pkgs;
 
   softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix { };
 
-  songrec = callPackage ../applications/audio/songrec { };
-
-  storj-uplink = callPackage ../applications/networking/sync/storj-uplink {};
-
-  storrent = callPackage ../applications/networking/p2p/storrent { };
-
-  speedread = callPackage ../applications/misc/speedread { };
-
-  station = callPackage ../applications/networking/station { };
-
-  stochas = callPackage ../applications/audio/stochas { };
-
-  synapse = callPackage ../applications/misc/synapse { };
-
   synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };
 
-  synfigstudio = callPackage ../applications/graphics/synfigstudio { };
-
-  typora = callPackage ../applications/editors/typora { };
-
   taxi-cli = with python3Packages; toPythonApplication taxi;
 
-  tcping-go = callPackage ../applications/networking/tcping-go { };
-
-  reproc = callPackage ../development/libraries/reproc { };
-
-  sc68 = callPackage ../applications/audio/sc68 { };
-
-  sidplayfp = callPackage ../applications/audio/sidplayfp { };
-
-  sndpeek = callPackage ../applications/audio/sndpeek { };
-
   mpop = callPackage ../applications/networking/mpop {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -31118,15 +15370,10 @@ with pkgs;
     lua = lua5;
   };
 
-  maxlib = callPackage ../applications/audio/pd-plugins/maxlib { };
-
-  pdfdiff = callPackage ../applications/misc/pdfdiff { };
-
   pdfsam-basic = callPackage ../applications/misc/pdfsam-basic {
     jdk21 = openjdk21.override { enableJavaFX = true; };
   };
 
-  mupdf = callPackage ../applications/misc/mupdf { };
   mupdf-headless = mupdf.override {
     enableX11 = false;
     enableGL = false;
@@ -31136,8 +15383,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  mystem = callPackage ../applications/misc/mystem { };
-
   diffpdf = libsForQt5.callPackage ../applications/misc/diffpdf { };
 
   diff-pdf = callPackage ../applications/misc/diff-pdf {
@@ -31145,46 +15390,18 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  diffuse = callPackage ../applications/misc/diffuse { };
-
-  mlocate = callPackage ../tools/misc/mlocate { };
-
-  mlxbf-bootctl = callPackage ../tools/misc/mlxbf-bootctl { };
-
-  plocate = callPackage ../tools/misc/plocate { };
-
-  mypaint = callPackage ../applications/graphics/mypaint { };
-
   mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { };
 
   mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { };
 
   mythtv = libsForQt5.callPackage ../applications/video/mythtv { };
 
-  mle = callPackage ../applications/editors/mle { };
-
-  namaka = callPackage ../development/tools/misc/namaka { };
-
   nano = callPackage ../applications/editors/nano { };
 
-  nanoblogger = callPackage ../applications/misc/nanoblogger { };
-
-  nanorc = callPackage ../applications/editors/nano/nanorc { };
-
-  netcoredbg = callPackage ../development/tools/misc/netcoredbg { };
-
   ncdu = callPackage ../tools/misc/ncdu { };
 
   ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };
 
-  ncview = callPackage ../tools/X11/ncview { } ;
-
-  ne = callPackage ../applications/editors/ne { };
-
-  nedit = callPackage ../applications/editors/nedit { };
-
-  ngt = callPackage ../development/libraries/ngt { };
-
   notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { };
 
   notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };
@@ -31204,20 +15421,10 @@ with pkgs;
     addThumbnailer = true;
   };
 
-  notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { };
-
-  nova-filters = callPackage ../applications/audio/nova-filters { };
-
-  nvi = callPackage ../applications/editors/nvi { };
-
-  nvpy = callPackage ../applications/editors/nvpy { };
-
   gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  obs-cli = callPackage ../applications/misc/obs-cli { };
-
   obs-studio = qt6Packages.callPackage ../applications/video/obs-studio {
     ffmpeg = ffmpeg-full;
   };
@@ -31225,28 +15432,12 @@ with pkgs;
   obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {});
   wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { };
 
-  octoprint = callPackage ../applications/misc/octoprint { };
-
-  oculante = callPackage ../applications/graphics/oculante { };
-
-  ocr-a = callPackage ../data/fonts/ocr-a { };
-
-  ocrad = callPackage ../applications/graphics/ocrad { };
-
-  offrss = callPackage ../applications/networking/offrss { };
-
-  ogmtools = callPackage ../applications/video/ogmtools { };
-
   omegat = callPackage ../applications/misc/omegat.nix { };
 
-  omxplayer = callPackage ../applications/video/omxplayer { };
-
   inherit (callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui;
 
   openambit = qt5.callPackage ../applications/misc/openambit { };
 
-  openbox = callPackage ../applications/window-managers/openbox { };
-
   openbox-menu = callPackage ../applications/misc/openbox-menu {
     stdenv = gccStdenv;
   };
@@ -31258,8 +15449,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  openfx = callPackage ../development/libraries/openfx { };
-
   openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio {
     openexr = openexr_3;
   };
@@ -31282,8 +15471,6 @@ with pkgs;
 
   openscad = libsForQt5.callPackage ../applications/graphics/openscad { };
 
-  open-stage-control = callPackage ../applications/audio/open-stage-control { };
-
   opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client { };
 
   opentoonz = libsForQt5.callPackage ../applications/graphics/opentoonz { };
@@ -31294,80 +15481,24 @@ with pkgs;
 
   openvi = darwin.apple_sdk_11_0.callPackage ../applications/editors/openvi { };
 
-  opera = callPackage ../applications/networking/browsers/opera { };
-
-  oranda = callPackage ../applications/misc/oranda { };
-
-  orca-c = callPackage ../applications/audio/orca-c { };
-
   organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { };
 
-  osm2xmap = callPackage ../applications/misc/osm2xmap { };
-
-  osmctools = callPackage ../applications/misc/osmctools { };
-
-  osmium-tool = callPackage ../applications/misc/osmium-tool { };
-
-  osmtogeojson = callPackage ../applications/misc/osmtogeojson { };
-
-  owamp = callPackage ../applications/networking/owamp { };
-
   owofetch = callPackage ../tools/misc/owofetch {
     inherit (darwin.apple_sdk.frameworks) Foundation DiskArbitration;
   };
 
-  vgmplay-libvgm = callPackage ../applications/audio/vgmplay-libvgm { };
-
-  vgmtools = callPackage ../tools/audio/vgmtools { };
-
-  vital = callPackage ../applications/audio/vital { };
-
   vivaldi = callPackage ../applications/networking/browsers/vivaldi { };
 
   vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix { };
 
   libopenmpt = callPackage ../development/libraries/audio/libopenmpt { };
 
-  libopenmpt-modplug = callPackage ../development/libraries/audio/libopenmpt-modplug { };
-
   openrazer-daemon = python3Packages.toPythonApplication python3Packages.openrazer-daemon;
 
-  opusfile = callPackage ../applications/audio/opusfile { };
-
-  opustags = callPackage ../applications/audio/opustags { };
-
-  opusTools = callPackage ../applications/audio/opus-tools { };
-
   orpie = callPackage ../applications/misc/orpie {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  osmo = callPackage ../applications/office/osmo { };
-
-  osmo-bsc = callPackage ../servers/osmocom/osmo-bsc { };
-
-  osmo-bts = callPackage ../servers/osmocom/osmo-bts { };
-
-  osmo-ggsn = callPackage ../servers/osmocom/osmo-ggsn { };
-
-  osmo-hlr = callPackage ../servers/osmocom/osmo-hlr { };
-
-  osmo-hnbgw = callPackage ../servers/osmocom/osmo-hnbgw { };
-
-  osmo-hnodeb = callPackage ../servers/osmocom/osmo-hnodeb { };
-
-  osmo-iuh = callPackage ../servers/osmocom/osmo-iuh { };
-
-  osmo-mgw = callPackage ../servers/osmocom/osmo-mgw { };
-
-  osmo-msc = callPackage ../servers/osmocom/osmo-msc { };
-
-  osmo-pcu = callPackage ../servers/osmocom/osmo-pcu { };
-
-  osmo-sgsn = callPackage ../servers/osmocom/osmo-sgsn { };
-
-  osmo-sip-connector = callPackage ../servers/osmocom/osmo-sip-connector { };
-
   osmscout-server = libsForQt5.callPackage ../applications/misc/osmscout-server {
     protobuf = protobuf_21.override {
       abseil-cpp = abseil-cpp_202103.override {
@@ -31378,20 +15509,6 @@ with pkgs;
 
   palemoon-bin = callPackage ../applications/networking/browsers/palemoon/bin.nix { };
 
-  paleta = callPackage ../applications/graphics/paleta { };
-
-  pamix = callPackage ../applications/audio/pamix { };
-
-  pamixer = callPackage ../applications/audio/pamixer { };
-
-  ncpamixer = callPackage ../applications/audio/ncpamixer { };
-
-  pan = callPackage ../applications/networking/newsreaders/pan { };
-
-  panotools = callPackage ../applications/graphics/panotools { };
-
-  paprefs = callPackage ../applications/audio/paprefs { };
-
   pantalaimon = callPackage ../applications/networking/instant-messengers/pantalaimon { };
 
   pantalaimon-headless = callPackage ../applications/networking/instant-messengers/pantalaimon {
@@ -31400,28 +15517,8 @@ with pkgs;
 
   parsec-bin = callPackage ../applications/misc/parsec/bin.nix { };
 
-  pavucontrol = callPackage ../applications/audio/pavucontrol { };
-
   paraview = libsForQt5.callPackage ../applications/graphics/paraview { };
 
-  parlatype = callPackage ../applications/audio/parlatype { };
-
-  packet-sd = callPackage ../development/tools/packet-sd { };
-
-  metal-cli = callPackage ../development/tools/metal-cli { };
-
-  pb_cli = callPackage ../tools/misc/pb_cli { };
-
-  capture = callPackage ../tools/misc/capture { };
-
-  pbrt = callPackage ../applications/graphics/pbrt { };
-
-  pcloud = callPackage ../applications/networking/pcloud { };
-
-  jpsxdec = callPackage ../tools/games/jpsxdec { };
-
-  pdfslicer = callPackage ../applications/misc/pdfslicer { };
-
   pekwm = callPackage ../by-name/pe/pekwm/package.nix {
     awk = gawk;
     grep = gnugrep;
@@ -31431,20 +15528,10 @@ with pkgs;
   pencil = callPackage ../applications/graphics/pencil {
   };
 
-  pentestgpt = callPackage ../tools/security/pentestgpt { };
-
-  perseus = callPackage ../applications/science/math/perseus { };
-
   petrifoo = callPackage ../applications/audio/petrifoo {
     inherit (gnome2) libgnomecanvas;
   };
 
-  pdfchain = callPackage ../tools/typesetting/pdfchain { };
-
-  pdfcpu = callPackage ../applications/graphics/pdfcpu { };
-  pdftk = callPackage ../tools/typesetting/pdftk { };
-  pdfgrep  = callPackage ../tools/typesetting/pdfgrep { };
-
   pdfpc = callPackage ../applications/misc/pdfpc {
     inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav;
   };
@@ -31453,20 +15540,10 @@ with pkgs;
     stdenv = gccStdenv;
   };
 
-  peek = callPackage ../applications/video/peek { };
-
   peertube = callPackage ../servers/peertube {
     nodejs = nodejs_18;
   };
 
-  peroxide = callPackage ../applications/networking/peroxide { };
-
-  pflask = callPackage ../os-specific/linux/pflask { };
-
-  pfsshell = callPackage ../tools/misc/pfsshell { };
-
-  phantomsocks = callPackage ../tools/networking/phantomsocks { };
-
   photoqt = callPackage ../by-name/ph/photoqt/package.nix {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
   };
@@ -31475,52 +15552,20 @@ with pkgs;
 
   phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };
 
-  phrasendrescher = callPackage ../tools/security/phrasendrescher { };
-
-  phrase-cli = callPackage ../tools/misc/phrase-cli { };
-
-  phylactery = callPackage ../servers/web-apps/phylactery { };
-
-  pianobar = callPackage ../applications/audio/pianobar { };
-
   pianobooster = qt5.callPackage ../applications/audio/pianobooster { };
 
   pianoteq = callPackage ../applications/audio/pianoteq { };
 
-  picard = callPackage ../applications/audio/picard { };
-
-  picoloop = callPackage ../applications/audio/picoloop { };
-
-  picosnitch = callPackage ../tools/networking/picosnitch { };
-
   pidginPackages = recurseIntoAttrs (callPackage ../applications/networking/instant-messengers/pidgin/pidgin-plugins { });
 
   inherit (pidginPackages) pidgin;
 
-  pika-backup = callPackage ../applications/backup/pika-backup { };
-
-  pur = callPackage ../development/tools/pur { };
-
-  purpur = callPackage ../games/purpur { };
-
-  pikopixel = callPackage ../applications/graphics/pikopixel { };
-
   pithos = callPackage ../applications/audio/pithos {
     pythonPackages = python3Packages;
   };
 
   pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { };
 
-  pinfo = callPackage ../applications/misc/pinfo { };
-
-  pinpoint = callPackage ../applications/office/pinpoint { };
-
-  pistol = callPackage ../tools/misc/pistol { };
-
-  piston-cli = callPackage ../tools/misc/piston-cli { };
-
-  pizarra = callPackage ../applications/graphics/pizarra { };
-
   plater = libsForQt5.callPackage ../applications/misc/plater { };
 
   plexamp = callPackage ../applications/audio/plexamp { };
@@ -31531,101 +15576,43 @@ with pkgs;
 
   plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
 
-  plugdata = callPackage ../applications/audio/plugdata { };
-
-  plugin-torture = callPackage ../applications/audio/plugin-torture { };
-
   pokefinder = qt6Packages.callPackage ../tools/games/pokefinder { };
 
-  pokemonsay = callPackage ../tools/misc/pokemonsay { };
-
-  polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { };
-
-  polar-bookshelf1 = callPackage ../applications/misc/polar-bookshelf1 { };
-
-  poezio = callPackage ../applications/networking/instant-messengers/poezio { };
-
-  pommed_light = callPackage ../os-specific/linux/pommed-light { };
-
-  polylith = callPackage ../development/tools/misc/polylith { };
-
-  polymake = callPackage ../applications/science/math/polymake { };
-
   pomodoro = callPackage ../applications/misc/pomodoro {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  ponymix = callPackage ../applications/audio/ponymix { };
-
   pothos = libsForQt5.callPackage ../applications/radio/pothos { };
 
-  potrace = callPackage ../applications/graphics/potrace { };
-
   qiv = callPackage ../applications/graphics/qiv {
     imlib2 = imlib2Full;
   };
 
-  premid = callPackage ../applications/misc/premid { };
-
   processing = callPackage ../applications/graphics/processing {
     jdk = jdk17;
   };
 
   # perhaps there are better apps for this task? It's how I had configured my preivous system.
   # And I don't want to rewrite all rules
-  procmail = callPackage ../applications/misc/procmail { };
-
   profanity = callPackage ../applications/networking/instant-messengers/profanity ({
   } // (config.profanity or {}));
 
-  properties-cpp = callPackage ../development/libraries/properties-cpp { };
-
-  proteus = callPackage ../applications/audio/proteus { };
-
-  protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { };
-
   protonvpn-cli = python3Packages.callPackage ../applications/networking/protonvpn-cli { };
   protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { };
 
   protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { };
 
-  ps2client = callPackage ../applications/networking/ps2client { };
-
-  ps2eps = callPackage ../tools/typesetting/ps2eps { };
-
   psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
 
   psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };
 
-  psol = callPackage ../development/libraries/psol { };
-
-  pstree = callPackage ../applications/misc/pstree { };
-
-  pt2-clone = callPackage ../applications/audio/pt2-clone { };
-
-  ptask = callPackage ../applications/misc/ptask { };
-
-  pulseaudio-ctl = callPackage ../applications/audio/pulseaudio-ctl { };
-
-  pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { };
-
   pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { };
 
   puredata = callPackage ../applications/audio/puredata { };
   puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; };
 
-  puremapping = callPackage ../applications/audio/pd-plugins/puremapping { };
-
   pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { };
 
-  pwdsafety = callPackage ../tools/security/pwdsafety { };
-
-  pwvucontrol = callPackage ../applications/audio/pwvucontrol { };
-
-  pyload-ng = callPackage ../applications/networking/pyload-ng {};
-
-  pyrosimple = callPackage ../applications/networking/p2p/pyrosimple { };
-
   qbittorrent = qt6Packages.callPackage ../applications/networking/p2p/qbittorrent {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
@@ -31684,8 +15671,6 @@ with pkgs;
   qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
   qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
 
-  qmidiarp = callPackage ../applications/audio/qmidiarp { };
-
   qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { };
 
   qmmp = qt6Packages.callPackage ../applications/audio/qmmp { };
@@ -31725,8 +15710,6 @@ with pkgs;
 
   qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
 
-  quantomatic = callPackage ../applications/science/physics/quantomatic { };
-
   quassel = libsForQt5.callPackage ../applications/networking/irc/quassel {
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
@@ -31744,12 +15727,6 @@ with pkgs;
     tag = "-daemon-qt5";
   };
 
-  quill-qr = callPackage ../tools/security/quill-qr { };
-
-  quirc = callPackage ../tools/graphics/quirc { };
-
-  quisk = callPackage ../applications/radio/quisk { };
-
   quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss { };
 
   quodlibet = callPackage ../applications/audio/quodlibet {
@@ -31807,28 +15784,12 @@ with pkgs;
     fltk = fltk13;
   };
 
-  renoise = callPackage ../applications/audio/renoise { };
-
-  redux = callPackage ../applications/audio/redux { };
-
-  roomeqwizard = callPackage ../applications/audio/roomeqwizard { };
-
-  radioboat = callPackage ../applications/audio/radioboat { };
-
   radiotray-ng = callPackage ../applications/audio/radiotray-ng {
     wxGTK = wxGTK32;
   };
 
-  raiseorlaunch = callPackage ../applications/misc/raiseorlaunch { };
-
   rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { };
 
-  rapidsvn = callPackage ../applications/version-management/rapidsvn { };
-
-  ratmen = callPackage ../tools/X11/ratmen { };
-
-  ratox = callPackage ../applications/networking/instant-messengers/ratox { };
-
   rawtherapee = callPackage ../applications/graphics/rawtherapee {
     fftw = fftwSinglePrec;
   };
@@ -31837,63 +15798,35 @@ with pkgs;
 
   rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { };
 
-  rcs = callPackage ../applications/version-management/rcs { };
-
-  rcshist = callPackage ../applications/version-management/rcshist { };
-
-  rdesktop = callPackage ../applications/networking/remote/rdesktop { };
-
   rdedup = callPackage ../tools/backup/rdedup {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  rdup = callPackage ../tools/backup/rdup { };
-
   reaper = callPackage ../applications/audio/reaper {
     jackLibrary = libjack2; # Another option is "pipewire.jack".
     ffmpeg = ffmpeg_4-headless;
   };
 
-  recapp = callPackage ../applications/video/recapp { };
-
-  recode = callPackage ../tools/text/recode { };
-
   reddsaver = callPackage ../applications/misc/reddsaver {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   rednotebook = python3Packages.callPackage ../applications/editors/rednotebook { };
 
-  remotebox = callPackage ../applications/virtualization/remotebox { };
-
   restique = libsForQt5.callPackage ../applications/backup/restique { };
 
   retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { };
 
-  revanced-cli = callPackage ../applications/misc/revanced-cli { };
-
   rgp = libsForQt5.callPackage ../development/tools/rgp { };
 
-  ries = callPackage ../applications/science/math/ries { };
-
   ripcord = if stdenv.hostPlatform.isLinux then
     qt5.callPackage ../applications/networking/instant-messengers/ripcord { }
   else
     callPackage ../applications/networking/instant-messengers/ripcord/darwin.nix { };
 
-  ripser = callPackage ../applications/science/math/ripser { };
-
-  rkdeveloptool = callPackage ../misc/rkdeveloptool { };
-
-  rkdeveloptool-pine64 = callPackage ../misc/rkdeveloptool-pine64 { };
-
-  rke = callPackage ../applications/networking/cluster/rke { };
-
   inherit (callPackage ../applications/networking/cluster/rke2 { }) rke2_stable rke2_latest rke2_testing;
   rke2 = rke2_stable;
 
-  rocketchat-desktop = callPackage ../applications/networking/instant-messengers/rocketchat-desktop { };
-
   rofi-unwrapped = callPackage ../applications/misc/rofi { };
   rofi = callPackage ../applications/misc/rofi/wrapper.nix { };
   rofi-wayland-unwrapped = callPackage ../applications/misc/rofi/wayland.nix { };
@@ -31906,14 +15839,6 @@ with pkgs;
     backend = "wayland";
   };
 
-  rofi-menugen = callPackage ../applications/misc/rofi-menugen { };
-
-  rofi-systemd = callPackage ../tools/system/rofi-systemd { };
-
-  rootlesskit = callPackage ../tools/virtualization/rootlesskit { };
-
-  rsclock = callPackage ../applications/misc/rsclock { };
-
   rstudio = libsForQt5.callPackage ../applications/editors/rstudio {
     jdk = jdk8;
   };
@@ -31923,12 +15848,6 @@ with pkgs;
   rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {});
   rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix { };
 
-  rtfm = callPackage ../applications/misc/rtfm { };
-
-  rtl_433 = callPackage ../applications/radio/rtl_433 { };
-
-  rtl-ais = callPackage ../applications/radio/rtl-ais { };
-
   inherit (callPackages ../applications/radio/rtl-sdr { })
     rtl-sdr-librtlsdr
     rtl-sdr-osmocom
@@ -31936,151 +15855,41 @@ with pkgs;
 
   rtl-sdr = rtl-sdr-blog;
 
-  rubyripper = callPackage ../applications/audio/rubyripper { };
-
   rucredstash = callPackage ../tools/security/rucredstash {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  runc = callPackage ../applications/virtualization/runc { };
-
-  rust-traverse = callPackage ../applications/misc/rust-traverse { };
-
-  rusty-psn = callPackage ../applications/misc/rusty-psn { };
-
   rusty-psn-gui = rusty-psn.override { withGui = true; };
 
-  rymcast = callPackage ../applications/audio/rymcast { };
-
   rymdport = callPackage ../applications/networking/rymdport {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };
 
-  uade = callPackage ../applications/audio/uade { };
-
-  sacc = callPackage ../applications/networking/gopher/sacc { };
-
   savvycan = libsForQt5.callPackage ../applications/networking/sniffers/savvycan {};
 
   sayonara = libsForQt5.callPackage ../applications/audio/sayonara { };
 
-  sbagen = callPackage ../applications/misc/sbagen { };
-
   scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { };
 
   scantailor-universal = libsForQt5.callPackage ../applications/graphics/scantailor/universal.nix { };
 
-  sc-im = callPackage ../applications/misc/sc-im { };
-
-  scli = callPackage ../applications/misc/scli { };
-
   scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { };
   scribus = scribus_1_5;
 
   seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { };
 
-  seatd = callPackage ../applications/misc/seatd { };
-
-  secrets-extractor = callPackage ../tools/security/secrets-extractor { };
-
-  secretscanner = callPackage ../tools/security/secretscanner { };
-
-  semiphemeral = callPackage ../tools/misc/semiphemeral { };
-
-  semver = callPackage ../applications/misc/semver { };
-
-  sent = callPackage ../applications/misc/sent { };
-
-  seq24 = callPackage ../applications/audio/seq24 { };
-
   seq66 = qt5.callPackage ../applications/audio/seq66 { };
 
-  setbfree = callPackage ../applications/audio/setbfree { };
-
-  sfizz = callPackage ../applications/audio/sfizz { };
-
-  sfxr = callPackage ../applications/audio/sfxr { };
-
   sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };
 
-  shadowfox = callPackage ../tools/networking/shadowfox { };
-
-  shavee = callPackage ../applications/misc/shavee { };
-
-  shfmt = callPackage ../tools/text/shfmt { };
-
-  shipments = callPackage ../applications/misc/shipments { };
-
-  shotgun = callPackage ../tools/graphics/shotgun { };
-
-  shot-scraper = callPackage ../tools/graphics/shot-scraper { };
-
-  shutter = callPackage ../applications/graphics/shutter { };
-
-  sic-image-cli = callPackage ../tools/graphics/sic-image-cli { };
-
-  siproxd = callPackage ../applications/networking/siproxd { };
-
-  sish = callPackage ../tools/networking/sish { };
-
-  slingshot = callPackage ../tools/misc/slingshot { };
-
-  slop = callPackage ../tools/misc/slop { };
-
-  slowhttptest = callPackage ../tools/security/slowhttptest { };
-
-  slrn = callPackage ../applications/networking/newsreaders/slrn { };
-
-  smartcrop = callPackage ../tools/graphics/smartcrop { };
-
-  sniffnet = callPackage ../applications/networking/sniffnet { };
-
-  sniproxy = callPackage ../applications/networking/sniproxy { };
-
-  snixembed = callPackage ../applications/misc/snixembed { };
-
   sommelier = callPackage ../applications/window-managers/sommelier { };
 
-  sooperlooper = callPackage ../applications/audio/sooperlooper { };
-
-  sops = callPackage ../tools/security/sops { };
-
-  sorcer = callPackage ../applications/audio/sorcer { };
-
-  sound-juicer = callPackage ../applications/audio/sound-juicer { };
-
-  soundtracker = callPackage ../applications/audio/soundtracker { };
-
-  spice-vdagent = callPackage ../applications/virtualization/spice-vdagent { };
-
-  spike = callPackage ../applications/virtualization/spike { };
-
-  tensorman = callPackage ../tools/misc/tensorman { };
-
-  spideroak = callPackage ../applications/networking/spideroak { };
-
   spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { };
 
-  spotify-tray = callPackage ../applications/misc/spotify-tray { };
-
-  sptlrx = callPackage ../applications/audio/sptlrx { };
-
-  sptk = callPackage ../development/libraries/sptk { };
-
   squishyball = callPackage ../applications/audio/squishyball {
     ncurses = ncurses5;
   };
 
-  stw = callPackage ../applications/misc/stw { };
-
-  styx = callPackage ../applications/misc/styx { };
-
-  sway-launcher-desktop = callPackage ../applications/misc/sway-launcher-desktop { };
-
-  tart = callPackage ../applications/virtualization/tart { };
-
-  wavebox = callPackage ../applications/networking/instant-messengers/wavebox { };
-
   sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
 
   stag = callPackage ../applications/misc/stag {
@@ -32094,8 +15903,6 @@ with pkgs;
     })
   );
 
-  swingsane = callPackage ../applications/graphics/swingsane { };
-
   sxiv = callPackage ../applications/graphics/sxiv {
     imlib2 = imlib2Full;
   };
@@ -32104,26 +15911,16 @@ with pkgs;
     imlib2 = imlib2Full;
   };
 
-  resilio-sync = callPackage ../applications/networking/resilio-sync { };
-
   dropbox = callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { };
 
-  synology-drive-client = callPackage ../applications/networking/synology-drive-client { };
-
-  synology-cloud-sync-decryption-tool = callPackage ../applications/networking/synology-cloud-sync-decryption-tool { };
-
-  litemdview = callPackage ../applications/graphics/litemdview { };
-
   maestral = with python3Packages; toPythonApplication maestral;
 
   maestral-gui = qt6Packages.callPackage ../applications/networking/maestral-qt { };
 
   myfitnesspal = with python3Packages; toPythonApplication myfitnesspal;
 
-  lemurs = callPackage ../applications/display-managers/lemurs { };
-
   libstrangle = callPackage ../tools/X11/libstrangle {
     stdenv = stdenv_32bit;
   };
@@ -32132,24 +15929,12 @@ with pkgs;
 
   lightdm_qt = lightdm.override { withQt5 = true; };
 
-  lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { };
-
   lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix {
     inherit (xfce) xfce4-dev-tools;
   };
 
-  lightdm-slick-greeter = callPackage ../applications/display-managers/lightdm-slick-greeter { };
-
-  lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { };
-
-  lightdm-mobile-greeter = callPackage ../applications/display-managers/lightdm-mobile-greeter { };
-
-  lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter { };
-
   ly = callPackage ../applications/display-managers/ly { };
 
-  slic3r = callPackage ../applications/misc/slic3r { };
-
   curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { };
 
   curaengine = callPackage ../applications/misc/curaengine {
@@ -32161,12 +15946,6 @@ with pkgs;
 
   curaPlugins = callPackage ../applications/misc/cura/plugins.nix { };
 
-  peru = callPackage ../applications/version-management/peru { };
-
-  pmidi = callPackage ../applications/audio/pmidi { };
-
-  printrun = callPackage ../applications/misc/printrun { };
-
   prusa-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer {
     # Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory
     # on this particular code base (OOM with 32GB memory and --cores 16 on GCC, succeeds
@@ -32184,29 +15963,14 @@ with pkgs;
 
   orca-slicer = callPackage ../applications/misc/bambu-studio/orca-slicer.nix {};
 
-  snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { };
-
-  robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
-
-  routedns = callPackage ../tools/networking/routedns { };
-
   skrooge = libsForQt5.callPackage ../applications/office/skrooge { };
 
   smartdeblur = libsForQt5.callPackage ../applications/graphics/smartdeblur { };
 
-  snapper = callPackage ../tools/misc/snapper { };
-  snapper-gui = callPackage ../applications/misc/snapper-gui { };
-
   snd = darwin.apple_sdk_11_0.callPackage ../applications/audio/snd {
     inherit (darwin.apple_sdk_11_0.frameworks) CoreServices CoreMIDI;
   };
 
-  sharpsat-td = callPackage ../applications/science/logic/sharpsat-td { };
-
-  shntool = callPackage ../applications/audio/shntool { };
-
-  sipp = callPackage ../development/tools/misc/sipp { };
-
   soci = callPackage ../development/libraries/soci { };
 
   socialscan = with python3.pkgs; toPythonApplication socialscan;
@@ -32217,50 +15981,26 @@ with pkgs;
 
   soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { };
 
-  soundsource = callPackage ../applications/audio/soundsource { };
-
   sox = callPackage ../applications/misc/audio/sox {
     inherit (darwin.apple_sdk.frameworks) CoreAudio;
   };
 
-  soxr = callPackage ../applications/misc/audio/soxr { };
-
   spek = callPackage ../applications/audio/spek {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  spotify = callPackage ../applications/audio/spotify { };
-
-  spotify-player = callPackage ../applications/audio/spotify-player { };
-
   psst = callPackage ../applications/audio/psst { };
 
   squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix {
     audioBackend = "pulse";
   };
 
-  ltunify = callPackage ../tools/misc/ltunify { };
-
-  ssrc = callPackage ../applications/audio/ssrc { };
-
-  stalonetray = callPackage ../applications/window-managers/stalonetray { };
-
   inherit (ocaml-ng.ocamlPackages) stog;
 
-  stp = callPackage ../applications/science/logic/stp { };
-
-  stretchly = callPackage ../applications/misc/stretchly { };
-
-  stuffbin = callPackage ../tools/filesystems/stuffbin { };
-
-  stumpish = callPackage ../applications/window-managers/stumpish { };
-
   stumpwm = sbclPackages.stumpwm;
 
   stumpwm-unwrapped = sbclPackages.stumpwm-unwrapped;
 
-  sublime = callPackage ../applications/editors/sublime/2 { };
-
   sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { });
 
   sublime3 = sublime3Packages.sublime3;
@@ -32286,18 +16026,12 @@ with pkgs;
     pythonBindings = true;
   };
 
-  subtitlr = callPackage ../applications/audio/subtitlr { };
-
-  subunit = callPackage ../development/libraries/subunit { };
-
   surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
 
   surge = callPackage ../applications/audio/surge {
     git = gitMinimal;
   };
 
-  surge-XT = callPackage ../applications/audio/surge-XT { };
-
   survex = callPackage ../applications/misc/survex {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };
@@ -32306,26 +16040,14 @@ with pkgs;
     waylandSupport = true;
   };
 
-  svkbd = callPackage ../applications/accessibility/svkbd { };
-
-  swaglyrics = callPackage ../tools/misc/swaglyrics { };
-
-  swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
-
   sylpheed = callPackage ../applications/networking/mailreaders/sylpheed {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  symbolic-preview = callPackage ../applications/graphics/symbolic-preview { };
-
-  symlinks = callPackage ../tools/system/symlinks { };
-
   syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { };
 
   syncplay-nogui = syncplay.override { enableGUI = false; };
 
-  syncterm = callPackage ../applications/terminal-emulators/syncterm { };
-
   inherit (callPackages ../applications/networking/syncthing {
     inherit (darwin) autoSignDarwinBinariesHook;
    })
@@ -32364,100 +16086,28 @@ with pkgs;
 
   tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho { };
 
-  tagger = callPackage ../applications/audio/tagger { };
-
-  tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs { };
-
-  tailor-gui = callPackage ../os-specific/linux/tailor-gui { };
-
-  taizen = callPackage ../applications/misc/taizen { };
-
-  talosctl = callPackage ../applications/networking/cluster/talosctl { };
-
-  talentedhack = callPackage ../applications/audio/talentedhack { };
-
-  tambura = callPackage ../applications/audio/tambura { };
-
   tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { };
 
-  tanka = callPackage ../applications/networking/cluster/tanka { };
-
-  teams = callPackage ../applications/networking/instant-messengers/teams { };
-
   teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
   taskjuggler = callPackage ../applications/misc/taskjuggler { };
 
-  tabula-java = callPackage ../applications/misc/tabula-java { };
-
-  tasknc = callPackage ../applications/misc/tasknc { };
-
-  tasktimer = callPackage ../applications/misc/tasktimer { };
-
-  taskwarrior-tui = callPackage ../applications/misc/taskwarrior-tui { };
-
-  dstask = callPackage ../applications/misc/dstask { };
-
-  tasksh = callPackage ../applications/misc/tasksh { };
-
-  taskserver = callPackage ../servers/misc/taskserver { };
-
-  taskopen = callPackage ../applications/misc/taskopen { };
-
   telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop {
     stdenv = if stdenv.hostPlatform.isDarwin
       then llvmPackages_19.stdenv
       else stdenv;
   };
 
-  tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { };
-
   tg = python3Packages.callPackage ../applications/networking/instant-messengers/telegram/tg { };
 
-  telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { };
-
-  telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze { };
-
-  telepathy-logger = callPackage ../applications/networking/instant-messengers/telepathy/logger { };
-
-  telepathy-mission-control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };
-
-  telepathy-idle = callPackage ../applications/networking/instant-messengers/telepathy/idle { };
-
-  tempo = callPackage ../servers/tracing/tempo { };
-
-  temporal = callPackage ../applications/networking/cluster/temporal { };
-
-  temporal-cli = callPackage ../applications/networking/cluster/temporal-cli { };
-
-  temporalite = callPackage ../applications/networking/cluster/temporalite { };
-
-  tenacity = callPackage ../applications/audio/tenacity { };
-
-  tendermint = callPackage ../tools/networking/tendermint { };
-
-  termdbms = callPackage ../development/tools/database/termdbms { };
-
   termdown = python3Packages.callPackage ../applications/misc/termdown { };
 
-  termimage = callPackage ../tools/graphics/termimage { };
-
   terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects ;
 
-  terminal-notifier = callPackage ../applications/misc/terminal-notifier { };
-
-  textplots = callPackage ../tools/graphics/textplots { };
-
-  texture-synthesis = callPackage ../tools/graphics/texture-synthesis { };
-
   texturepacker = qt6.callPackage ../applications/graphics/texturepacker { };
 
-  termtosvg = callPackage ../tools/misc/termtosvg { };
-
-  tessen = callPackage ../tools/security/tessen { };
-
   inherit (callPackage ../applications/graphics/tesseract {
     inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
   })
@@ -32466,18 +16116,6 @@ with pkgs;
     tesseract5;
   tesseract = tesseract5;
 
-  tetraproc = callPackage ../applications/audio/tetraproc { };
-
-  tev = callPackage ../applications/graphics/tev { };
-
-  textual-paint = callPackage ../applications/graphics/textual-paint { };
-
-  themechanger = callPackage ../applications/misc/themechanger { };
-
-  thinkingRock = callPackage ../applications/misc/thinking-rock { };
-
-  thokr = callPackage ../applications/misc/thokr { };
-
   thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix {
     callPackage = newScope {
       inherit (rustPackages) cargo rustc;
@@ -32505,22 +16143,10 @@ with pkgs;
     generated = import ../applications/networking/mailreaders/thunderbird-bin/release_sources.nix;
   };
 
-  thunderbolt = callPackage ../os-specific/linux/thunderbolt { };
-
-  ticpp = callPackage ../development/libraries/ticpp { };
-
-  ticker = callPackage ../applications/misc/ticker { };
-
-  tickrs = callPackage ../applications/misc/tickrs { };
-
-  tijolo = callPackage ../applications/editors/tijolo { };
-
   timbreid = callPackage ../applications/audio/pd-plugins/timbreid {
     fftw = fftwSinglePrec;
   };
 
-  timelimit = callPackage ../tools/misc/timelimit { };
-
   inherit
     ({
       timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { };
@@ -32532,84 +16158,29 @@ with pkgs;
     timeshift-minimal
     ;
 
-  timewarrior = callPackage ../applications/misc/timewarrior { };
-
-  timew-sync-server = callPackage ../applications/misc/timew-sync-server { };
-
-  timg = callPackage ../tools/graphics/timg { };
-
   timidity = callPackage ../tools/misc/timidity {
     inherit (darwin.apple_sdk.frameworks) CoreAudio;
     inherit (darwin) libobjc;
   };
 
-  tint2 = callPackage ../applications/misc/tint2 { };
-
   tiny = callPackage ../applications/networking/irc/tiny {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
   tipp10 = qt6.callPackage ../applications/misc/tipp10 { };
 
-  tkrev = callPackage ../applications/version-management/tkrev { };
-
-  tla = callPackage ../applications/version-management/arch { };
-
-  tlf = callPackage ../applications/radio/tlf { };
-
   tlp = callPackage ../tools/misc/tlp {
     inherit (linuxPackages) x86_energy_perf_policy;
   };
 
-  tmatrix = callPackage ../applications/misc/tmatrix { };
-
-  tnef = callPackage ../applications/misc/tnef { };
-
-  todiff = callPackage ../applications/misc/todiff { };
-
-  todo-txt-cli = callPackage ../applications/office/todo.txt-cli { };
-
-  todofi-sh = callPackage ../applications/office/todofi.sh { };
-
-  todoman = callPackage ../applications/office/todoman { };
-
-  tofi = callPackage ../applications/misc/tofi { };
-
-  topydo = callPackage ../applications/misc/topydo { };
-
-  torrential = callPackage ../applications/networking/p2p/torrential { };
-
   torrenttools = callPackage ../tools/misc/torrenttools {
     fmt = fmt_8;
   };
 
-  tortoisehg = callPackage ../applications/version-management/tortoisehg { };
-
-  tone = callPackage ../applications/audio/tone { };
-
-  tonelib-gfx = callPackage ../applications/audio/tonelib-gfx { };
-
-  tonelib-jam = callPackage ../applications/audio/tonelib-jam { };
-
-  tonelib-zoom = callPackage ../applications/audio/tonelib-zoom { };
-
-  tonelib-metal = callPackage ../applications/audio/tonelib-metal { };
-
-  tonelib-noisereducer = callPackage ../applications/audio/tonelib-noisereducer { };
-
   tony = libsForQt5.callPackage ../applications/audio/tony { };
 
-  toipe = callPackage ../applications/misc/toipe { };
-
-  toxiproxy = callPackage ../development/tools/toxiproxy { };
-
-  tqsl = callPackage ../applications/radio/tqsl { };
   trustedqsl = tqsl; # Alias added 2019-02-10
 
-  transcode = callPackage ../applications/audio/transcode { };
-
-  transcribe = callPackage ../applications/audio/transcribe { };
-
   libtransmission_3 = transmission_3.override {
     installLib = true;
     enableDaemon = false;
@@ -32635,95 +16206,51 @@ with pkgs;
   transmission_4-qt6 = transmission_4.override { enableQt6 = true; };
   transmission_4-qt = transmission_4-qt5;
 
-  transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk { };
-
-  transgui = callPackage ../applications/networking/p2p/transgui { };
-
   traverso = libsForQt5.callPackage ../applications/audio/traverso { };
 
-  trayer = callPackage ../applications/window-managers/trayer { };
-
   tinywl = callPackage ../applications/window-managers/tinywl {
     wlroots = wlroots_0_18;
   };
 
   tree-from-tags = callPackage ../applications/audio/tree-from-tags { };
 
-  tdrop = callPackage ../applications/misc/tdrop { };
-
-  tre-command = callPackage ../tools/system/tre-command { };
-
-  tree = callPackage ../tools/system/tree { };
-
   treesheets = callPackage ../applications/office/treesheets {
     wxGTK = wxGTK32;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  tremc = callPackage ../applications/networking/p2p/tremc { };
-
-  trillian-im = callPackage ../applications/networking/instant-messengers/trillian-im { };
-
   trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
 
-  ttyper = callPackage ../applications/misc/ttyper { };
-
-  tuba = callPackage ../applications/misc/tuba { };
-
-  tudu = callPackage ../applications/office/tudu { };
-
-  tuna = callPackage ../os-specific/linux/tuna { };
-
   tunefish = callPackage ../applications/audio/tunefish {
     stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4
   };
 
-  tut = callPackage ../applications/misc/tut { };
-
   tuxclocker = libsForQt5.callPackage ../applications/misc/tuxclocker {
     tuxclocker-plugins = tuxclocker-plugins-with-unfree;
   };
 
   tuxclocker-without-unfree = libsForQt5.callPackage ../applications/misc/tuxclocker { };
 
-  tuxedo-rs = callPackage ../os-specific/linux/tuxedo-rs { };
-
   twmn = libsForQt5.callPackage ../applications/misc/twmn { };
 
-  testssl = callPackage ../applications/networking/testssl { };
-
   tests-stdenv-gcc-stageCompare = callPackage ../test/stdenv/gcc-stageCompare.nix { };
 
   t-rec = callPackage ../misc/t-rec {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
-  ulauncher = callPackage ../applications/misc/ulauncher { };
-
   twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { };
 
-  terminal-stocks = callPackage ../applications/misc/terminal-stocks { };
-
   terminal-typeracer = callPackage ../applications/misc/terminal-typeracer {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  typer = callPackage ../applications/misc/typer { };
-
-  typioca = callPackage ../applications/misc/typioca { };
-
   ueberzug = with python3Packages; toPythonApplication ueberzug;
 
   ueberzugpp = callPackage ../by-name/ue/ueberzugpp/package.nix {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
   };
 
-  uefi-run = callPackage ../tools/virtualization/uefi-run { };
-
-  umurmur = callPackage ../applications/networking/umurmur { };
-
-  udocker = callPackage ../tools/virtualization/udocker { };
-
   uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {});
   uefitool = uefitoolPackages.new-engine;
 
@@ -32732,70 +16259,32 @@ with pkgs;
     channel = "ungoogled-chromium";
   });
 
-  uni = callPackage ../applications/misc/uni { };
-
-  unigine-valley = callPackage ../applications/graphics/unigine-valley { };
-
-  unigine-heaven = callPackage ../applications/graphics/unigine-heaven { };
-
   unigine-tropics = pkgsi686Linux.callPackage ../applications/graphics/unigine-tropics { };
 
   unigine-sanctuary = pkgsi686Linux.callPackage ../applications/graphics/unigine-sanctuary { };
 
   unigine-superposition = libsForQt5.callPackage ../applications/graphics/unigine-superposition { };
 
-  unpaper = callPackage ../tools/graphics/unpaper { };
-
-  unison-ucm = callPackage ../development/compilers/unison { };
-
-  upnp-router-control = callPackage ../applications/networking/upnp-router-control { };
-
-  urh = callPackage ../applications/radio/urh { };
-
-  uroboros = callPackage ../tools/system/uroboros { };
-
   uuagc = haskell.lib.compose.justStaticExecutables haskellPackages.uuagc;
 
-  uucp = callPackage ../tools/misc/uucp { };
-
-  uvccapture = callPackage ../applications/video/uvccapture { };
-
-  uwimap = callPackage ../tools/networking/uwimap { };
-
-  utm = callPackage ../os-specific/darwin/utm { };
-
-  utox = callPackage ../applications/networking/instant-messengers/utox { };
-
   valentina = libsForQt5.callPackage ../applications/misc/valentina { };
 
-  vbindiff = callPackage ../applications/editors/vbindiff { };
-
   vcprompt = callPackage ../applications/version-management/vcprompt {
     autoconf = buildPackages.autoconf269;
   };
 
-  vcs = callPackage ../applications/video/vcs { };
-
-  vcv-rack = callPackage ../applications/audio/vcv-rack { };
-
   vdirsyncer = with python3Packages; toPythonApplication vdirsyncer;
 
-  vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
-
   vengi-tools = darwin.apple_sdk_11_0.callPackage ../applications/graphics/vengi-tools {
     inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL;
   };
 
-  verbiste = callPackage ../applications/misc/verbiste { };
-
   veusz = libsForQt5.callPackage ../applications/graphics/veusz { };
 
   vim = vimUtils.makeCustomizable (callPackage ../applications/editors/vim {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   });
 
-  vimiv-qt = callPackage ../applications/graphics/vimiv-qt { };
-
   macvim = let
     macvimUtils = callPackage ../applications/editors/vim/macvim-configurable.nix { };
   in macvimUtils.makeCustomizable (callPackage ../applications/editors/vim/macvim.nix {
@@ -32823,16 +16312,10 @@ with pkgs;
 
   vimacs = callPackage ../applications/editors/vim/vimacs.nix { };
 
-  vimv = callPackage ../tools/misc/vimv { };
-
-  vimv-rs = callPackage ../tools/misc/vimv-rs { };
-
   qpdfview = libsForQt5.callPackage ../applications/office/qpdfview { };
 
   vimgolf = callPackage ../games/vimgolf { };
 
-  vimpc = callPackage ../applications/audio/vimpc { };
-
   # this is a lower-level alternative to wrapNeovim conceived to handle
   # more usecases when wrapping neovim. The interface is being actively worked on
   # so expect breakage. use wrapNeovim instead if you want a stable alternative
@@ -32851,16 +16334,10 @@ with pkgs;
 
   gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
 
-  virter = callPackage ../applications/virtualization/virter { };
-
-  virt-viewer = callPackage ../applications/virtualization/virt-viewer { };
-
   virt-top = callPackage ../applications/virtualization/virt-top {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  virt-what = callPackage ../applications/virtualization/virt-what { };
-
   virt-manager = callPackage ../applications/virtualization/virt-manager {
     system-libvirt = libvirt;
   };
@@ -32869,8 +16346,6 @@ with pkgs;
     qtermwidget = lxqt.qtermwidget_1_4;
   };
 
-  virtual-ans = callPackage ../applications/audio/virtual-ans { };
-
   virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox {
     stdenv = stdenv_32bit;
     inherit (gnome2) libIDL;
@@ -32934,13 +16409,8 @@ with pkgs;
       else null;
   };
 
-  uvcdynctrl = callPackage ../os-specific/linux/uvcdynctrl { };
-
-  viper4linux = callPackage ../applications/audio/viper4linux { };
   viper4linux-gui = libsForQt5.callPackage ../applications/audio/viper4linux-gui { };
 
-  vkeybd = callPackage ../applications/audio/vkeybd { };
-
   vlc-bin-universal = vlc-bin.override { variant = "universal"; };
 
   libvlc = vlc.override {
@@ -32952,22 +16422,10 @@ with pkgs;
 
   vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { };
 
-  vmware-workstation = callPackage ../applications/virtualization/vmware-workstation { };
-
-  vocproc = callPackage ../applications/audio/vocproc { };
-
-  vnstat = callPackage ../applications/networking/vnstat { };
-
-  vocal = callPackage ../applications/audio/vocal { };
-
-  volnoti = callPackage ../applications/misc/volnoti { };
-
   vorbis-tools = callPackage ../applications/audio/vorbis-tools {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
-  vpv = callPackage ../applications/graphics/vpv { };
-
   vscode = callPackage ../applications/editors/vscode/vscode.nix { };
   vscode-fhs = vscode.fhs;
   vscode-fhsWithPackages = vscode.fhsWithPackages;
@@ -32996,25 +16454,13 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security;
   };
 
-  vue = callPackage ../applications/misc/vue { };
-
   vuze = callPackage ../applications/networking/p2p/vuze {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
     jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
 
-  vwm = callPackage ../applications/window-managers/vwm { };
-
-  wad = callPackage ../tools/security/wad { };
-
-  wafw00f = callPackage ../tools/security/wafw00f { };
-
   whispers = with python3Packages; toPythonApplication whispers;
 
-  whisper-ctranslate2 = callPackage ../tools/audio/whisper-ctranslate2 { };
-
-  waon = callPackage ../applications/audio/waon { };
-
   warp = callPackage ../applications/networking/warp {
     inherit (darwin.apple_sdk.frameworks) Security Foundation;
   };
@@ -33023,14 +16469,6 @@ with pkgs;
     buildGoModule = buildGo122Module;
   };
 
-  warpd = callPackage ../applications/misc/warpd { };
-
-  watershot = callPackage ../applications/misc/watershot { };
-
-  waypaper = callPackage ../applications/misc/waypaper { };
-
-  w3m = callPackage ../applications/networking/browsers/w3m { };
-
   # Should always be the version with the most features
   w3m-full = w3m;
 
@@ -33054,14 +16492,6 @@ with pkgs;
     imlib2 = imlib2-nox;
   };
 
-  watchmate = callPackage ../applications/misc/watchmate { };
-
-  watson = callPackage ../applications/office/watson { };
-
-  wapiti = callPackage ../tools/security/wapiti { };
-
-  weave-gitops = callPackage ../applications/networking/cluster/weave-gitops { };
-
   wayfire = callPackage ../applications/window-managers/wayfire/default.nix {
     wlroots = wlroots_0_17;
   };
@@ -33074,30 +16504,18 @@ with pkgs;
     plugins = with wayfirePlugins; [ wcm wf-shell ];
   };
 
-  waypipe = callPackage ../applications/networking/remote/waypipe { };
-
-  wayv = callPackage ../tools/X11/wayv { };
-
-  wayvnc = callPackage ../applications/networking/remote/wayvnc { };
-
-  webanalyze = callPackage ../tools/security/webanalyze { };
-
   webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { };
 
   webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_32; };
 
   webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_31; };
 
-  webex = callPackage ../applications/networking/instant-messengers/webex { };
-
   webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {
     stdenv = if stdenv.cc.isClang then gccStdenv else stdenv;
   };
 
   webssh = with python3Packages; toPythonApplication webssh;
 
-  webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { };
-
   wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };
 
   weechat-unwrapped = callPackage ../applications/networking/irc/weechat {
@@ -33128,56 +16546,20 @@ with pkgs;
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
 
-  weston = callPackage ../applications/window-managers/weston { };
-
   wgnord = callPackage ../applications/networking/wgnord/default.nix { };
 
   whalebird = callPackage ../applications/misc/whalebird {
     electron = electron_27;
   };
 
-  windowlab = callPackage ../applications/window-managers/windowlab { };
-
   inherit (windowmaker) dockapps;
 
-  wily = callPackage ../applications/editors/wily { };
-
-  wings = callPackage ../applications/graphics/wings { };
-
-  wlc = callPackage  ../tools/misc/wlc { };
-
-  wlclock = callPackage ../applications/misc/wlclock { };
-
-  wlcs = callPackage ../development/tools/wlcs { };
-
-  wllvm = callPackage  ../development/tools/wllvm { };
-
-  wmname = callPackage ../applications/misc/wmname { };
-
-  wmctrl = callPackage ../tools/X11/wmctrl { };
-
-  wmderland = callPackage ../applications/window-managers/wmderland { };
-
-  wmderlandc = callPackage ../applications/window-managers/wmderlandc { };
-
-  wmii = callPackage ../applications/window-managers/wmii { };
-
-  wofi = callPackage ../applications/misc/wofi { };
-
   wofi-pass = callPackage ../../pkgs/tools/security/pass/wofi-pass.nix { };
 
-  wofi-emoji = callPackage ../applications/misc/wofi-emoji { };
-
-  cl-wordle = callPackage ../games/cl-wordle { };
-
-  wordbook = callPackage ../applications/misc/wordbook { };
-
   wordnet = callPackage ../applications/misc/wordnet {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  wordgrinder = callPackage ../applications/office/wordgrinder { };
-
   workrave = callPackage ../applications/misc/workrave {
     inherit (python3Packages) jinja2;
     inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good;
@@ -33194,8 +16576,6 @@ with pkgs;
 
   wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { };
 
-  wp4nix = callPackage ../development/tools/wp4nix { };
-
   wsjtx = qt5.callPackage ../applications/radio/wsjtx { };
 
   wxhexeditor = callPackage ../applications/editors/wxhexeditor {
@@ -33208,46 +16588,16 @@ with pkgs;
     autoconf = buildPackages.autoconf269;
   };
 
-  x11vnc = callPackage ../tools/X11/x11vnc { };
-
-  x11spice = callPackage ../tools/X11/x11spice { };
-
   x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { };
 
-  x2goserver = callPackage ../applications/networking/remote/x2goserver { };
-
-  x2vnc = callPackage ../tools/X11/x2vnc { };
-
   x32edit = callPackage ../applications/audio/midas/x32edit.nix { };
 
-  x42-avldrums = callPackage ../applications/audio/x42-avldrums { };
-
-  x42-gmsynth = callPackage ../applications/audio/x42-gmsynth { };
-
-  x42-plugins = callPackage ../applications/audio/x42-plugins { };
-
-  xannotate = callPackage ../tools/X11/xannotate { };
-
   xaos = libsForQt5.callPackage ../applications/graphics/xaos { };
 
-  xastir = callPackage ../applications/misc/xastir { };
-
-  xautomation = callPackage ../tools/X11/xautomation { };
-
-  xawtv = callPackage ../applications/video/xawtv { };
-
-  xbattbar = callPackage ../applications/misc/xbattbar { };
-
-  xbindkeys = callPackage ../tools/X11/xbindkeys { };
-
   xbindkeys-config = callPackage ../tools/X11/xbindkeys-config {
     gtk = gtk2;
   };
 
-  xborders = callPackage ../tools/X11/xborders { };
-
-  xxh = callPackage ../tools/networking/xxh { };
-
   kodiPackages = recurseIntoAttrs (kodi.packages);
 
   kodi = callPackage ../applications/video/kodi {
@@ -33267,64 +16617,18 @@ with pkgs;
     gbmSupport = true;
   };
 
-  kodi-cli = callPackage ../tools/misc/kodi-cli { };
-
   xca = qt6Packages.callPackage ../applications/misc/xca { };
 
-  xcalib = callPackage ../tools/X11/xcalib { };
-
-  xcape = callPackage ../tools/X11/xcape { };
-
-  xcat = callPackage ../tools/security/xcat { };
-
-  xchainkeys = callPackage ../tools/X11/xchainkeys { };
-
   inherit (xorg) xcompmgr;
 
-  x-create-mouse-void = callPackage ../applications/window-managers/x-create-mouse-void { };
-
-  xd = callPackage ../applications/networking/p2p/xd { };
-
-  xdaliclock = callPackage ../tools/misc/xdaliclock { };
-
-  xdg-dbus-proxy = callPackage ../development/libraries/xdg-dbus-proxy { };
-
   xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { };
 
-  xdg-desktop-portal-gnome = callPackage ../development/libraries/xdg-desktop-portal-gnome { };
-
-  xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { };
-
   xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland {
     inherit (qt6) qtbase qttools qtwayland wrapQtAppsHook;
   };
 
-  xdg-desktop-portal-wlr = callPackage ../development/libraries/xdg-desktop-portal-wlr { };
-
-  xdg-desktop-portal-xapp = callPackage ../development/libraries/xdg-desktop-portal-xapp { };
-
-  xdg-utils = callPackage ../tools/X11/xdg-utils {};
-
-  xdgmenumaker = callPackage ../applications/misc/xdgmenumaker { };
-
-  xdotool = callPackage ../tools/X11/xdotool { };
-
   buildXenPackage = callPackage ../build-support/xen { };
 
-  xkbset = callPackage ../tools/X11/xkbset { };
-
-  xkbmon = callPackage ../applications/misc/xkbmon { };
-
-  win-spice = callPackage ../applications/virtualization/driver/win-spice { };
-
-  xfig = callPackage ../applications/graphics/xfig { };
-
-  xfractint = callPackage ../applications/graphics/xfractint { };
-
-  xmind = callPackage ../applications/misc/xmind { };
-
-  xneur = callPackage ../applications/misc/xneur { };
-
   gxneur = callPackage ../applications/misc/gxneur  {
     inherit (gnome2) libglade GConf;
   };
@@ -33341,16 +16645,6 @@ with pkgs;
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };
 
-  xplugd = callPackage ../tools/X11/xplugd { };
-
-  xkb-switch = callPackage ../tools/X11/xkb-switch { };
-
-  xkb-switch-i3 = callPackage ../tools/X11/xkb-switch-i3 { };
-
-  xkblayout-state = callPackage ../applications/misc/xkblayout-state { };
-
-  xlife = callPackage ../applications/graphics/xlife { };
-
   xmobar = haskellPackages.xmobar.bin;
 
   xmonad-with-packages = callPackage ../applications/window-managers/xmonad/wrapper.nix {
@@ -33374,10 +16668,6 @@ with pkgs;
     desktopSupport = "xfce4";
   };
 
-  xmountains = callPackage ../applications/graphics/xmountains { };
-
-  xmppc = callPackage ../applications/networking/instant-messengers/xmppc { };
-
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
   xpra = callPackage ../tools/X11/xpra { };
@@ -33387,38 +16677,10 @@ with pkgs;
   };
   libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
 
-  xrectsel = callPackage ../tools/X11/xrectsel { };
-
-  xrestop = callPackage ../tools/X11/xrestop { };
-
   xsd = callPackage ../development/libraries/xsd {
     stdenv = gcc9Stdenv;
   };
 
-  xscope = callPackage ../applications/misc/xscope { };
-
-  xsubfind3r = callPackage ../tools/security/xsubfind3r {  };
-
-  xsuspender = callPackage ../applications/misc/xsuspender {  };
-
-  xss-lock = callPackage ../misc/screensavers/xss-lock { };
-
-  xloadimage = callPackage ../tools/X11/xloadimage { };
-
-  xssproxy = callPackage ../misc/screensavers/xssproxy { };
-
-  xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { };
-
-  xtrace = callPackage ../tools/X11/xtrace { };
-
-  xtruss = callPackage ../tools/X11/xtruss { };
-
-  xtuner = callPackage ../applications/audio/xtuner { };
-
-  xmacro = callPackage ../tools/X11/xmacro { };
-
-  xmenu = callPackage ../applications/misc/xmenu { };
-
   xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
@@ -33427,44 +16689,16 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio;
   };
 
-  xnee = callPackage ../tools/X11/xnee { };
-
-  xnotify = callPackage ../tools/X11/xnotify { };
-
-  xpano = callPackage ../applications/graphics/xpano { };
-
-  xv = callPackage ../applications/graphics/xv { };
-
   xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
 
-  xzgv = callPackage ../applications/graphics/xzgv { };
-
   yabar = callPackage ../applications/window-managers/yabar { };
 
   yabar-unstable = callPackage ../applications/window-managers/yabar/unstable.nix { };
 
-  yarp = callPackage ../applications/science/robotics/yarp { };
-
-  yate = callPackage ../applications/misc/yate { };
-
-  yaup = callPackage ../applications/networking/yaup { };
-
   ydiff = with python3.pkgs; toPythonApplication ydiff;
 
-  ydict = callPackage ../applications/misc/ydict { };
-
-  yed = callPackage ../applications/graphics/yed { };
-
-  yeetgif = callPackage ../applications/graphics/yeetgif { };
-
-  yelp-tools = callPackage ../development/misc/yelp-tools { };
-
-  yewtube = callPackage ../applications/misc/yewtube { };
-
   yokadi = python3Packages.callPackage ../applications/misc/yokadi { };
 
-  yoshimi = callPackage ../applications/audio/yoshimi { };
-
   your-editor = callPackage ../applications/editors/your-editor { stdenv = gccStdenv; };
 
   youtube-dl = with python3Packages; toPythonApplication youtube-dl;
@@ -33487,47 +16721,19 @@ with pkgs;
 
   youtube-viewer = perlPackages.WWWYoutubeViewer;
 
-  ytalk = callPackage ../applications/networking/instant-messengers/ytalk { };
-
-  ytarchive = callPackage ../tools/misc/ytarchive { };
-
-  ytcast = callPackage ../tools/misc/ytcast { };
-
-  ytcc = callPackage ../tools/networking/ytcc { };
-
-  ytmdl = callPackage ../tools/misc/ytmdl { };
-
   yuview = libsForQt5.yuview;
 
-  zam-plugins = callPackage ../applications/audio/zam-plugins { };
-
   zammad = callPackage ../applications/networking/misc/zammad { };
 
-  zarf = callPackage ../applications/networking/cluster/zarf { };
-
   zathuraPkgs = callPackage ../applications/misc/zathura { };
   zathura = zathuraPkgs.zathuraWrapper;
 
-  zdns = callPackage ../tools/security/zdns { };
-
-  zerobin = callPackage ../applications/networking/zerobin { };
-
-  zeroc-ice = callPackage ../development/libraries/zeroc-ice { };
-
   zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; };
 
-  zeronet = callPackage ../applications/networking/p2p/zeronet { };
-
-  zeronet-conservancy = callPackage ../applications/networking/p2p/zeronet-conservancy { };
-
   zexy = callPackage ../applications/audio/pd-plugins/zexy {
     autoconf = buildPackages.autoconf269;
   };
 
-  zgrab2 = callPackage ../tools/security/zgrab2 { };
-
-  zgrviewer = callPackage ../applications/graphics/zgrviewer { };
-
   zgv = callPackage ../applications/graphics/zgv {
     # Enable the below line for terminal display. Note
     # that it requires sixel graphics compatible terminals like mlterm
@@ -33535,28 +16741,10 @@ with pkgs;
     SDL = SDL_sixel;
   };
 
-  zim = callPackage ../applications/office/zim { };
-
-  zine = callPackage ../applications/misc/zine { };
-
-  zita-ajbridge = callPackage ../applications/audio/zita-ajbridge { };
-
-  zita-at1 = callPackage ../applications/audio/zita-at1 { };
-
-  zita-njbridge = callPackage ../applications/audio/zita-njbridge { };
-
-  zotero = callPackage ../applications/office/zotero { };
-
   zotero_7 = pkgs.zotero-beta;
 
-  zscroll = callPackage ../applications/misc/zscroll { };
-
   zsteg = callPackage ../tools/security/zsteg { };
 
-  zx = callPackage ../tools/system/zx { };
-
-  zxfer = callPackage ../applications/system/zxfer { };
-
   zynaddsubfx = callPackage ../applications/audio/zynaddsubfx {
     guiModule = "zest";
     fftw = fftwSinglePrec;
@@ -33579,12 +16767,6 @@ with pkgs;
     withGui = false;
   };
 
-  aperture = callPackage ../applications/blockchains/aperture { };
-
-  backdown = callPackage ../tools/misc/backdown { };
-
-  balanceofsatoshis = callPackage ../tools/misc/balanceofsatoshis { };
-
   bitcoin  = libsForQt5.callPackage ../applications/blockchains/bitcoin {
     stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
     withGui = true;
@@ -33601,16 +16783,6 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  btcd = callPackage ../applications/blockchains/btcd { };
-
-  cgminer = callPackage ../applications/blockchains/cgminer { };
-
-  clboss = callPackage ../applications/blockchains/clboss { };
-
-  clightning = callPackage ../applications/blockchains/clightning { };
-
-  besu = callPackage ../applications/blockchains/besu { };
-
   bitcoin-abc  = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc {
     withGui = true;
     protobuf = protobuf_21;
@@ -33627,12 +16799,6 @@ with pkgs;
 
   cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
 
-  dcrctl = callPackage ../applications/blockchains/dcrctl { };
-  dcrd = callPackage ../applications/blockchains/dcrd { };
-  dcrwallet = callPackage ../applications/blockchains/dcrwallet { };
-
-  eclair = callPackage ../applications/blockchains/eclair { };
-
   electrs = callPackage ../applications/blockchains/electrs {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -33655,12 +16821,6 @@ with pkgs;
     };
   };
 
-  ergo = callPackage ../applications/blockchains/ergo { };
-
-  erigon = callPackage ../applications/blockchains/erigon { };
-
-  faraday = callPackage ../applications/blockchains/faraday { };
-
   fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { };
 
   go-ethereum = callPackage ../by-name/go/go-ethereum/package.nix {
@@ -33668,8 +16828,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  go-exploitdb = callPackage ../tools/security/go-exploitdb { };
-
   gridcoin-research = libsForQt5.callPackage ../applications/blockchains/gridcoin-research {
     boost = boost179;
   };
@@ -33686,30 +16844,12 @@ with pkgs;
 
   ledger-agent = with python3Packages; toPythonApplication ledger-agent;
 
-  ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { };
-
-  lightning-loop = callPackage ../applications/blockchains/lightning-loop { };
-
-  lightning-pool = callPackage ../applications/blockchains/lightning-pool { };
-
   litecoin  = libsForQt5.callPackage ../applications/blockchains/litecoin {
     inherit (darwin.apple_sdk.frameworks) AppKit;
     boost = pkgs.boost177;
   };
   litecoind = litecoin.override { withGui = false; };
 
-  livedl = callPackage ../tools/misc/livedl { };
-
-  lnd = callPackage ../applications/blockchains/lnd { };
-
-  lndconnect = callPackage ../applications/blockchains/lndconnect { };
-
-  lndinit = callPackage ../applications/blockchains/lndinit { };
-
-  lndhub-go = callPackage ../applications/blockchains/lndhub-go { };
-
-  lndmanage = callPackage ../applications/blockchains/lndmanage { };
-
   monero-cli = callPackage ../applications/blockchains/monero-cli {
     inherit (darwin.apple_sdk.frameworks) CoreData IOKit;
   };
@@ -33724,36 +16864,18 @@ with pkgs;
 
   nano-wallet = libsForQt5.callPackage ../applications/blockchains/nano-wallet { };
 
-  namecoind = callPackage ../applications/blockchains/namecoin { };
-
-  nbxplorer = callPackage ../applications/blockchains/nbxplorer { };
-
   pycoin = with python3Packages; toPythonApplication pycoin;
 
-  stellar-core = callPackage ../applications/blockchains/stellar-core { };
-
-  sumokoin = callPackage ../applications/blockchains/sumokoin { };
-
   solana-validator = callPackage ../applications/blockchains/solana-validator { };
 
   snarkos = callPackage ../applications/blockchains/snarkos {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  taproot-assets = callPackage ../applications/blockchains/taproot-assets { };
-
   inherit (callPackages ../applications/blockchains/teos { })
     teos
     teos-watchtower-plugin;
 
-  terra-station = callPackage ../applications/blockchains/terra-station { };
-
-  tessera = callPackage ../applications/blockchains/tessera { };
-
-  ton = callPackage ../applications/blockchains/ton { };
-
-  torq = callPackage ../applications/blockchains/torq { };
-
   vertcoin  = libsForQt5.callPackage ../applications/blockchains/vertcoin {
     withGui = true;
   };
@@ -33761,33 +16883,17 @@ with pkgs;
     withGui = false;
   };
 
-  wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { };
-
-  wasabibackend = callPackage ../applications/blockchains/wasabibackend { };
-
-  wownero = callPackage ../applications/blockchains/wownero { };
-
   zcash = callPackage ../applications/blockchains/zcash {
     inherit (darwin.apple_sdk.frameworks) Security;
     stdenv = llvmPackages_14.stdenv;
   };
 
-  zecwallet-lite = callPackage ../applications/blockchains/zecwallet-lite { };
-
-  lightwalletd = callPackage ../applications/blockchains/lightwalletd { };
-
   polkadot = callPackage ../applications/blockchains/polkadot {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  particl-core = callPackage ../applications/blockchains/particl-core { };
-
-  quorum = callPackage ../applications/blockchains/quorum { };
-
   samplv1 = libsForQt5.callPackage ../applications/audio/samplv1 { };
 
-  scaleft = callPackage ../applications/networking/scaleft { };
-
   beancount = with python3.pkgs; toPythonApplication beancount;
 
   beancount-black = with python3.pkgs; toPythonApplication beancount-black;
@@ -33804,24 +16910,14 @@ with pkgs;
   cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { };
   cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { };
 
-  conceal = callPackage ../applications/misc/conceal { };
-
-  conmon = callPackage ../applications/virtualization/conmon { };
-
-  conmon-rs = callPackage ../applications/virtualization/conmon-rs { };
-
   drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { };
 
   eureka-ideas = callPackage ../applications/misc/eureka-ideas {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  nux = callPackage ../tools/misc/nux { };
-
   phonemizer = with python3Packages; toPythonApplication phonemizer;
 
-  tts = callPackage ../tools/audio/tts { };
-
   wyoming-faster-whisper = callPackage ../tools/audio/wyoming/faster-whisper.nix { };
 
   wyoming-openwakeword = callPackage ../tools/audio/wyoming/openwakeword.nix { };
@@ -33834,45 +16930,13 @@ with pkgs;
   _2048-cli-curses = callPackage ../games/2048-cli { ui = "curses"; };
   _2048-cli-terminal = callPackage ../games/2048-cli { ui = "terminal"; };
 
-  _2048-in-terminal = callPackage ../games/2048-in-terminal { };
-
-  _20kly = callPackage ../games/20kly { };
-
   _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; };
 
-  among-sus = callPackage ../games/among-sus { };
-
-  antsimulator = callPackage ../games/antsimulator { };
-
-  augustus = callPackage ../games/augustus { };
-
-  ballerburg = callPackage ../games/ballerburg { } ;
-
-  colobot = callPackage ../games/colobot { };
-
-  corsix-th = callPackage ../games/corsix-th { };
-
-  enigma = callPackage ../games/enigma { };
-
-  everspace = callPackage ../games/everspace { };
-
-  ezquake = callPackage ../games/ezquake { };
-
-  freedroid = callPackage ../games/freedroid { };
-
-  freedroidrpg = callPackage ../games/freedroidrpg { };
-
-  freenukum = callPackage ../games/freenukum { };
-
   inherit (callPackages ../games/fteqw {})
     fteqw
     fteqw-dedicated
     fteqcc;
 
-  gamepad-tool = callPackage ../games/gamepad-tool { };
-
-  gotypist = callPackage ../games/gotypist { };
-
   heroic-unwrapped = callPackage ../games/heroic {
     # Match the version used by the upstream package.
     electron = electron_31;
@@ -33880,44 +16944,18 @@ with pkgs;
 
   heroic = callPackage ../games/heroic/fhsenv.nix { };
 
-  julius = callPackage ../games/julius { };
-
-  jumpnbump = callPackage ../games/jumpnbump { };
-
-  katawa-shoujo = callPackage ../games/katawa-shoujo { };
-
-  keeperrl = callPackage ../games/keeperrl { };
-
-  shipwright = callPackage ../games/shipwright { };
-
   wipeout-rewrite = callPackage ../games/wipeout-rewrite {
     inherit (darwin.apple_sdk.frameworks) Foundation;
   };
 
   ### GAMES/DOOM-PORTS
 
-  dhewm3 = callPackage ../games/doom-ports/dhewm3 { };
-
   doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { };
 
   doomrunner = qt5.callPackage ../games/doom-ports/doomrunner { };
 
-  chocolate-doom = callPackage ../games/doom-ports/chocolate-doom { };
-
-  crispy-doom = callPackage ../games/doom-ports/crispy-doom { };
-
-  eureka-editor = callPackage ../games/doom-ports/eureka-editor { };
-
   enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { };
 
-  eternity = callPackage ../games/doom-ports/eternity-engine { };
-
-  odamex = callPackage ../games/doom-ports/odamex { };
-
-  prboom-plus = callPackage ../games/doom-ports/prboom-plus { };
-
-  rbdoom-3-bfg = callPackage ../games/doom-ports/rbdoom-3-bfg { };
-
   slade = callPackage ../games/doom-ports/slade {
     wxGTK = (wxGTK32.overrideAttrs {
       patches = [
@@ -33968,30 +17006,10 @@ with pkgs;
 
   zdoom = callPackage ../games/doom-ports/zdoom { };
 
-  maelstrom = callPackage ../games/maelstrom { };
-
-  mar1d = callPackage ../games/mar1d { } ;
-
-  oh-my-git = callPackage ../games/oh-my-git { };
-
-  opendune = callPackage ../games/opendune { };
-
-  openrct2 = callPackage ../games/openrct2 { };
-
-  opensearch = callPackage ../servers/search/opensearch { };
-
   pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { };
 
   qgo = libsForQt5.callPackage ../games/qgo { };
 
-  rotp = callPackage ../games/rotp { };
-
-  rpg-cli = callPackage ../games/rpg-cli { };
-
-  runelite = callPackage ../games/runelite { };
-
-  runescape = callPackage ../games/runescape-launcher { };
-
   sm64ex = callPackage ../games/sm64ex {
     branch = "sm64ex";
   };
@@ -34000,33 +17018,9 @@ with pkgs;
     branch = "sm64ex-coop";
   };
 
-  snipes = callPackage ../games/snipes { };
-
-  unvanquished = callPackage ../games/unvanquished { };
-
-  xbill = callPackage ../games/xbill { };
-
-  xmage = callPackage ../games/xmage { };
-
-  abbaye-des-morts = callPackage ../games/abbaye-des-morts { };
-
-  abuse = callPackage ../games/abuse { };
-
-  airshipper = callPackage ../games/airshipper { };
-
-  airstrike = callPackage ../games/airstrike { };
-
-  alienarena = callPackage ../games/alienarena { };
-
   amoeba = callPackage ../games/amoeba { };
   amoeba-data = callPackage ../games/amoeba/data.nix { };
 
-  andyetitmoves = callPackage ../games/andyetitmoves { };
-
-  angband = callPackage ../games/angband { };
-
-  animatch = callPackage ../games/animatch { };
-
   anki = callPackage ../games/anki {
     inherit (darwin.apple_sdk.frameworks) AVKit CoreAudio;
   };
@@ -34037,8 +17031,6 @@ with pkgs;
 
   armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; };
 
-  arena = callPackage ../games/arena { };
-
   art = callPackage ../by-name/ar/art/package.nix {
     fftw = fftwSinglePrec;
   };
@@ -34050,18 +17042,6 @@ with pkgs;
     physfs = physfs_2;
   };
 
-  assaultcube = callPackage ../games/assaultcube { };
-
-  astromenace = callPackage ../games/astromenace { };
-
-  atanks = callPackage ../games/atanks { };
-
-  azimuth = callPackage ../games/azimuth { };
-
-  banner = callPackage ../games/banner { };
-
-  bastet = callPackage ../games/bastet { };
-
   beancount-ing-diba = callPackage ../applications/office/beancount/beancount-ing-diba.nix { };
 
   beancount-share = callPackage ../applications/office/beancount/beancount_share.nix { };
@@ -34070,20 +17050,6 @@ with pkgs;
     inherit (perlPackages) PathTiny;
   };
 
-  blackshades = callPackage ../games/blackshades { };
-
-  blobby = callPackage ../games/blobby { };
-
-  blobwars = callPackage ../games/blobwars { };
-
-  boohu = callPackage ../games/boohu { };
-
-  braincurses = callPackage ../games/braincurses { };
-
-  brutalmaze = callPackage ../games/brutalmaze { };
-
-  bsdgames = callPackage ../games/bsdgames { };
-
   bugdom = callPackage ../games/bugdom {
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
     inherit (darwin.apple_sdk_11_0.frameworks) IOKit Foundation OpenGL;
@@ -34099,32 +17065,16 @@ with pkgs;
 
   cataclysm-dda-git = cataclysmDDA.git.tiles;
 
-  cbonsai = callPackage ../games/cbonsai { };
-
-  cdogs-sdl = callPackage ../games/cdogs-sdl { };
-
-  cgoban = callPackage ../games/cgoban { };
-
-  chessdb = callPackage ../games/chessdb { };
-
   chessx = libsForQt5.callPackage ../games/chessx { };
 
   chiaki = libsForQt5.callPackage ../games/chiaki { };
 
   chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };
 
-  clonehero = callPackage ../games/clonehero { };
-
-  vintagestory = callPackage ../games/vintagestory { };
-
-  ckan = callPackage ../games/ckan { };
-
   cockatrice = libsForQt5.callPackage ../games/cockatrice {
     protobuf = protobuf_21;
   };
 
-  commandergenius = callPackage ../games/commandergenius { };
-
   construoBase = lowPrio (callPackage ../games/construo {
     libGL = null;
     libGLU = null;
@@ -34135,8 +17085,6 @@ with pkgs;
     inherit libGL libGLU libglut;
   };
 
-  crack_attack = callPackage ../games/crack-attack { };
-
   crawlTiles = callPackage ../games/crawl {
     tileMode = true;
   };
@@ -34146,8 +17094,6 @@ with pkgs;
   inherit (import ../games/crossfire pkgs)
     crossfire-server crossfire-arch crossfire-maps crossfire-client;
 
-  crrcsim = callPackage ../games/crrcsim { };
-
   curseofwar = callPackage ../games/curseofwar { SDL = null; };
   curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; };
 
@@ -34155,10 +17101,6 @@ with pkgs;
 
   cutemaze = qt6Packages.callPackage ../games/cutemaze { };
 
-  cuyo = callPackage ../games/cuyo { };
-
-  darkplaces = callPackage ../games/darkplaces { };
-
   deliantra-server = callPackage ../games/deliantra/server.nix {
     # perl538 defines 'struct object' in sv.h. many conflicts result
     perl = perl540;
@@ -34173,8 +17115,6 @@ with pkgs;
   };
   ddnet-server = ddnet.override { buildClient = false; };
 
-  ddns-go = callPackage ../tools/networking/ddns-go { };
-
   devilutionx = callPackage ../games/devilutionx {
     fmt = fmt_9;
     SDL2 = SDL2.override {
@@ -34182,8 +17122,6 @@ with pkgs;
     };
   };
 
-  domination = callPackage ../games/domination { };
-
   duckmarines = callPackage ../games/duckmarines { love = love_0_10; };
 
   dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { });
@@ -34206,18 +17144,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation AudioUnit AudioToolbox;
   };
 
-  ecwolf = callPackage ../games/ecwolf { };
-
-  egoboo = callPackage ../games/egoboo { };
-
-  eidolon = callPackage ../games/eidolon { };
-
-  endgame-singularity = callPackage ../games/endgame-singularity { };
-
-  endless-sky = callPackage ../games/endless-sky { };
-
-  extremetuxracer = callPackage ../games/extremetuxracer { };
-
   exult = callPackage ../games/exult {
     inherit (darwin.apple_sdk.frameworks) AudioUnit;
   };
@@ -34251,24 +17177,12 @@ with pkgs;
 
   factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { };
 
-  fairymax = callPackage ../games/fairymax { };
-
   ferium = callPackage ../games/ferium {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  fheroes2 = callPackage ../games/fheroes2 { };
-
-  fish-fillets-ng = callPackage ../games/fish-fillets-ng { };
-
-  jumpy = callPackage ../games/jumpy { };
-
   flightgear = libsForQt5.callPackage ../games/flightgear { };
 
-  flock = callPackage ../development/tools/flock { };
-
-  forge-mtg = callPackage ../games/forge-mtg { };
-
   freecad-wayland = freecad.override { withWayland = true; };
 
   freeciv = callPackage ../games/freeciv {
@@ -34291,114 +17205,36 @@ with pkgs;
 
   freeciv_gtk = freeciv;
 
-  freedink = callPackage ../games/freedink { };
-
-  freeorion = callPackage ../games/freeorion { };
-
-  freesweep = callPackage ../games/freesweep { };
-
-  frotz = callPackage ../games/frotz { };
-
-  frogatto = callPackage ../games/frogatto { };
-
-  fsg = callPackage ../games/fsg { };
-
-  gambit-chess = callPackage ../games/gambit { };
-
   garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
 
-  gargoyle = callPackage ../games/gargoyle { };
-
-  gav = callPackage ../games/gav { };
-
   gcompris = libsForQt5.callPackage ../games/gcompris { };
 
-  gemrb = callPackage ../games/gemrb { };
-
-  gimx = callPackage ../games/gimx { };
-
-  gl117 = callPackage ../games/gl-117 { };
-
-  globulation2 = callPackage ../games/globulation { };
-
-  gltron = callPackage ../games/gltron { };
-
   gl-gsync-demo = callPackage ../games/gl-gsync-demo {
     libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
   };
 
-  gmad = callPackage ../games/gmad { };
-
-  gnonograms = callPackage ../games/gnonograms { };
-
-  gnubg = callPackage ../games/gnubg { };
-
-  gnuchess = callPackage ../games/gnuchess { };
-
-  gnugo = callPackage ../games/gnugo { };
-
-  gnujump = callPackage ../games/gnujump { };
-
-  gnushogi = callPackage ../games/gnushogi { };
-
   gogdl = python3Packages.callPackage ../games/gogdl { };
 
-  gogui = callPackage ../games/gogui { };
-
   gscrabble = python3Packages.callPackage ../games/gscrabble { };
 
   gshogi = python3Packages.callPackage ../games/gshogi { };
 
   qtads = qt5.callPackage ../games/qtads { };
 
-  graphwar = callPackage ../games/graphwar { };
-
-  gtypist = callPackage ../games/gtypist { };
-
-  harmonist = callPackage ../games/harmonist { };
-
-  hase = callPackage ../games/hase { };
-
   hedgewars = libsForQt5.callPackage ../games/hedgewars { };
 
-  hikounomizu = callPackage ../games/hikounomizu { };
-
-  hmcl = callPackage ../games/hmcl { };
-
-  hyperrogue = callPackage ../games/hyperrogue { };
-
   ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
 
-  icbm3d = callPackage ../games/icbm3d { };
-
-  infra = callPackage ../tools/admin/infra { };
-
-  infra-arcana = callPackage ../games/infra-arcana { };
-
-  ingen = callPackage ../applications/audio/ingen { };
-
-  ideogram = callPackage ../applications/graphics/ideogram { };
-
   instaloader = python3Packages.callPackage ../tools/misc/instaloader { };
 
-  instead = callPackage ../games/instead { };
-
   iortcw = callPackage ../games/iortcw { };
   # used as base package for iortcw forks
   iortcw_sp = callPackage ../games/iortcw/sp.nix { };
 
-  ironwail = callPackage ../games/ironwail { };
-
-  ivan = callPackage ../games/ivan { };
-
   ja2-stracciatella = callPackage ../games/ja2-stracciatella {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };
 
-  jfsw = callPackage ../games/jfsw { };
-
-  katago = callPackage ../games/katago { };
-
   katagoWithCuda = katago.override {
     backend = "cuda";
     cudaPackages = cudaPackages_12;
@@ -34413,18 +17249,12 @@ with pkgs;
     cudaPackages = cudaPackages_12;
   };
 
-  klavaro = callPackage ../games/klavaro { };
-
-  kobodeluxe = callPackage ../games/kobodeluxe { };
-
   koboredux = callPackage ../games/koboredux { };
 
   koboredux-free = callPackage ../games/koboredux {
     useProprietaryAssets = false;
   };
 
-  koules = callPackage ../games/koules { };
-
   ldmud = callPackage ../games/ldmud { };
 
   ldmud-full = callPackage ../games/ldmud {
@@ -34441,12 +17271,6 @@ with pkgs;
 
   legendary-gl = python3Packages.callPackage ../games/legendary-gl { };
 
-  left4gore-bin = callPackage ../games/left4gore { };
-
-  liberal-crime-squad = callPackage ../games/liberal-crime-squad { };
-
-  liberation-circuit = callPackage ../games/liberation-circuit { };
-
   lincity = callPackage ../games/lincity { };
 
   lincity_ng = callPackage ../games/lincity/ng.nix {
@@ -34461,8 +17285,6 @@ with pkgs;
   liquidwar5 = callPackage ../games/liquidwar/5.nix {
   };
 
-  lugaru = callPackage ../games/lugaru { };
-
   macopix = callPackage ../games/macopix {
     gtk = gtk2;
   };
@@ -34475,20 +17297,8 @@ with pkgs;
     openjfx = openjfx21;
   };
 
-  mari0 = callPackage ../games/mari0 { };
-
   manaplus = callPackage ../games/manaplus { stdenv = gcc11Stdenv; };
 
-  marble-marcher-ce = callPackage ../games/marble-marcher-ce { };
-
-  mars = callPackage ../games/mars { };
-
-  mchprs = callPackage ../games/mchprs { };
-
-  megaglest = callPackage ../games/megaglest { };
-
-  methane = callPackage ../games/methane { };
-
   mindustry = callPackage ../games/mindustry { };
   mindustry-wayland = callPackage ../games/mindustry {
     enableWayland = true;
@@ -34501,15 +17311,9 @@ with pkgs;
 
   minecraft = callPackage ../games/minecraft { };
 
-  minecraft-server-hibernation = callPackage ../tools/games/minecraft/minecraft-server-hibernation { };
-
   minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; };
   minecraft-server = minecraftServers.vanilla; # backwards compatibility
 
-  minesweep-rs = callPackage ../games/minesweep-rs { };
-
-  moon-buggy = callPackage ../games/moon-buggy { };
-
   minetest = callPackage ../games/minetest {
     inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa Kernel;
   };
@@ -34532,14 +17336,6 @@ with pkgs;
 
   blightmud-tts = callPackage ../games/blightmud { withTTS = true; };
 
-  n2048 = callPackage ../games/n2048 { };
-
-  naev = callPackage ../games/naev { };
-
-  nanosaur = callPackage ../games/nanosaur { };
-
-  nanosaur2 = callPackage ../games/nanosaur2 { };
-
   nethack = callPackage ../games/nethack { };
 
   nethack-qt = callPackage ../games/nethack {
@@ -34549,39 +17345,13 @@ with pkgs;
 
   nethack-x11 = callPackage ../games/nethack { x11Mode = true; };
 
-  netris = callPackage ../games/netris { };
-
-  neverball = callPackage ../games/neverball { };
-
-  nexuiz = callPackage ../games/nexuiz { };
-
   nile = python3Packages.callPackage ../games/nile { };
 
-  ninvaders = callPackage ../games/ninvaders { };
-
-  njam = callPackage ../games/njam { };
-
   npush = callPackage ../games/npush { };
   run-npush = callPackage ../games/npush/run.nix { };
 
-  newtonwars = callPackage ../games/newtonwars { };
-
-  nsnake = callPackage ../games/nsnake { };
-
-  nudoku = callPackage ../games/nudoku { };
-
   oilrush = callPackage ../games/oilrush { };
 
-  openarena = callPackage ../games/openarena { };
-
-  opendungeons = callPackage ../games/opendungeons { };
-
-  openlierox = callPackage ../games/openlierox { };
-
-  openclonk = callPackage ../games/openclonk { };
-
-  openjk = callPackage ../games/openjk { };
-
   openloco = pkgsi686Linux.callPackage ../games/openloco { };
 
   openmw = libsForQt5.callPackage ../games/openmw {
@@ -34590,16 +17360,6 @@ with pkgs;
 
   openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { };
 
-  opensoldat = callPackage ../games/opensoldat { };
-
-  portmod = callPackage ../games/portmod { };
-
-  tr-patcher = callPackage ../games/tr-patcher { };
-
-  tes3cmd = callPackage ../games/tes3cmd { };
-
-  otto-matic = callPackage ../games/otto-matic { };
-
   openraPackages_2019 = import ../games/openra_2019 {
     inherit lib;
     pkgs = pkgs.__splicedPackages;
@@ -34632,8 +17392,6 @@ with pkgs;
   openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { };
   openttd-nml = callPackage ../games/openttd/nml.nix { };
 
-  opentyrian = callPackage ../games/opentyrian { };
-
   openxcom = callPackage ../games/openxcom { SDL = SDL_compat; };
 
   openxray = callPackage ../games/openxray {
@@ -34644,8 +17402,6 @@ with pkgs;
 
   orthorobot = callPackage ../games/orthorobot { love = love_0_10; };
 
-  pacvim = callPackage ../games/pacvim { };
-
   papermcServers = callPackages ../games/papermc { };
 
   papermc = papermcServers.papermc;
@@ -34654,20 +17410,6 @@ with pkgs;
 
   pentobi = libsForQt5.callPackage ../games/pentobi { };
 
-  pinball = callPackage ../games/pinball { };
-
-  pingus = callPackage ../games/pingus { };
-
-  pioneer = callPackage ../games/pioneer { };
-
-  pioneers = callPackage ../games/pioneers { };
-
-  planetary_annihilation = callPackage ../games/planetaryannihilation { };
-
-  principia = callPackage ../games/principia { };
-
-  pong3d = callPackage ../games/pong3d { };
-
   pokerth = libsForQt5.callPackage ../games/pokerth {
     protobuf = protobuf_21;
   };
@@ -34677,14 +17419,8 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  pokete = callPackage ../games/pokete { };
-
-  powermanga = callPackage ../games/powermanga { };
-
   pysolfc = python3Packages.callPackage ../games/pysolfc { };
 
-  qqwing = callPackage ../games/qqwing { };
-
   quake3wrapper = callPackage ../games/quake3/wrapper { };
 
   quake3demo = quake3wrapper {
@@ -34704,45 +17440,16 @@ with pkgs;
   };
   vkquake = callPackage ../games/quakespasm/vulkan.nix { };
 
-  ioquake3 = callPackage ../games/quake3/ioquake { };
-  quake3e = callPackage ../games/quake3/quake3e { };
-
-  quantumminigolf = callPackage ../games/quantumminigolf { };
-
-  r2mod_cli = callPackage ../games/r2mod_cli { };
-
-  r2modman = callPackage ../games/r2modman { };
-
-  racer = callPackage ../games/racer { };
-
-  randtype = callPackage ../games/randtype { };
-
-  raylib-games = callPackage ../games/raylib-games { };
-
-  redeclipse = callPackage ../games/redeclipse { };
-
-  rftg = callPackage ../games/rftg { };
-
-  rigsofrods-bin = callPackage ../games/rigsofrods-bin { };
-
-  riko4 = callPackage ../games/riko4 { };
-
-  rili = callPackage ../games/rili { };
-
   rogue = callPackage ../games/rogue {
     ncurses = ncurses5;
   };
 
-  rocksndiamonds = callPackage ../games/rocksndiamonds { };
-
   rott = callPackage ../games/rott { SDL = SDL_compat; };
 
   rott-shareware = rott.override {
     buildShareware = true;
   };
 
-  rrootage = callPackage ../games/rrootage { };
-
   space-cadet-pinball = callPackage ../games/space-cadet-pinball {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
@@ -34751,10 +17458,6 @@ with pkgs;
     openjdk = openjdk8;
   };
 
-  scid = callPackage ../games/scid { };
-
-  scid-vs-pc = callPackage ../games/scid-vs-pc { };
-
   scummvm = callPackage ../games/scummvm {
     inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit;
   };
@@ -34767,14 +17470,6 @@ with pkgs;
     flight-of-the-amazon-queen
     lure-of-the-temptress;
 
-  scorched3d = callPackage ../games/scorched3d { };
-
-  scrolls = callPackage ../games/scrolls { };
-
-  service-wrapper = callPackage ../os-specific/linux/service-wrapper { };
-
-  sfrotz = callPackage ../games/sfrotz { };
-
   sgt-puzzles = callPackage ../games/sgt-puzzles { };
 
   sgt-puzzles-mobile = callPackage ../games/sgt-puzzles {
@@ -34788,20 +17483,9 @@ with pkgs;
   summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon { };
   shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon { };
 
-  shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { };
-
-  sienna = callPackage ../games/sienna { };
-
-  sil = callPackage ../games/sil { };
-
-  sil-q = callPackage ../games/sil-q { };
-
-  simutrans = callPackage ../games/simutrans { };
   # get binaries without data built by Hydra
   simutrans_binaries = lowPrio simutrans.binaries;
 
-  snake4 = callPackage ../games/snake4 { };
-
   soi = callPackage ../games/soi {
     lua = lua5_1;
   };
@@ -34810,25 +17494,13 @@ with pkgs;
   solarus = libsForQt5.callPackage ../games/solarus { };
   solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { };
 
-  sollya = callPackage ../development/interpreters/sollya { };
-
-  solicurses = callPackage ../games/solicurses { };
-
   # You still can override by passing more arguments.
-  space-orbit = callPackage ../games/space-orbit { };
-
   space-station-14-launcher = callPackage ../games/space-station-14-launcher { };
 
   spring = callPackage ../games/spring { asciidoc = asciidoc-full; };
 
   springLobby = callPackage ../games/spring/springlobby.nix { };
 
-  ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { };
-
-  stardust = callPackage ../games/stardust { };
-
-  stockfish = callPackage ../games/stockfish { };
-
   steam-run = steam.run;
 
   # This exists so Hydra tries to build all of Steam's dependencies.
@@ -34836,10 +17508,6 @@ with pkgs;
 
   steam-run-free = steam-fhsenv-without-steam.run;
 
-  steam-tui = callPackage ../games/steam-tui { };
-
-  steam-acf = callPackage ../tools/games/steam-acf { };
-
   steamback = python311.pkgs.callPackage ../tools/games/steamback { };
 
   protontricks = python3Packages.callPackage ../tools/package-management/protontricks {
@@ -34849,35 +17517,15 @@ with pkgs;
 
   protonup-ng = with python3Packages; toPythonApplication protonup-ng;
 
-  steam-rom-manager = callPackage ../tools/games/steam-rom-manager { };
-
-  sdlpop = callPackage ../games/sdlpop { };
-
-  stepmania = callPackage ../games/stepmania { };
-
-  stone-kingdoms = callPackage ../games/stone-kingdoms { };
-
-  stt = callPackage ../tools/audio/stt { };
-
   stuntrally = callPackage ../games/stuntrally
     { };
 
-  superTux = callPackage ../games/supertux { };
-
   superTuxKart = darwin.apple_sdk_11_0.callPackage ../games/super-tux-kart {
     inherit (darwin.apple_sdk_11_0.frameworks) Cocoa IOKit OpenAL IOBluetooth;
   };
 
   synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { };
 
-  snis = callPackage ../games/snis { };
-
-  system-syzygy = callPackage ../games/system-syzygy { };
-
-  t4kcommon = callPackage ../games/t4kcommon { };
-
-  tcl2048 = callPackage ../games/tcl2048 { };
-
   the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix {
     lua = lua5_2;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
@@ -34885,12 +17533,6 @@ with pkgs;
 
   tbe = libsForQt5.callPackage ../games/the-butterfly-effect { };
 
-  tbls = callPackage ../tools/misc/tbls { };
-
-  tecnoballz = callPackage ../games/tecnoballz { };
-
-  teetertorture = callPackage ../games/teetertorture { };
-
   teeworlds = callPackage ../games/teeworlds {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
@@ -34900,109 +17542,41 @@ with pkgs;
     modules = with nginxModules; [ rtmp dav moreheaders modsecurity ];
   };
 
-  tennix = callPackage ../games/tennix { };
-
-  terraria-server = callPackage ../games/terraria-server { };
-
   tibia = pkgsi686Linux.callPackage ../games/tibia { };
 
-  tintin = callPackage ../games/tintin { };
-
-  tinyfugue = callPackage ../games/tinyfugue { };
-
-  titanion = callPackage ../games/titanion { };
-
-  tome2 = callPackage ../games/tome2 { };
-
-  tome4 = callPackage ../games/tome4 { };
-
   toppler = callPackage ../games/toppler {
     SDL2_image = SDL2_image_2_0;
   };
 
-  torus-trooper = callPackage ../games/torus-trooper { };
-
-  trackballs = callPackage ../games/trackballs { };
-
-  try = callPackage ../tools/admin/try { };
-
-  tumiki-fighters = callPackage ../games/tumiki-fighters { };
-
-  tuxpaint = callPackage ../games/tuxpaint { };
-
-  tuxtype = callPackage ../games/tuxtype { };
-
   speed_dreams = callPackage ../games/speed-dreams {
     # Torcs wants to make shared libraries linked with plib libraries (it provides static).
     # i686 is the only platform I know than can do that linking without plib built with -fPIC
     libpng = libpng12;
   };
 
-  torcs = callPackage ../games/torcs { };
-
-  trigger = callPackage ../games/trigger { };
-
-  typespeed = callPackage ../games/typespeed { };
-
-  u2ps = callPackage ../tools/text/u2ps { };
-
-  uchess = callPackage ../games/uchess { };
-
-  ufoai = callPackage ../games/ufoai { };
-
-  uhexen2 = callPackage ../games/uhexen2 { };
-
-  ultimatestunts = callPackage ../games/ultimatestunts { };
-
   ultrastar-creator = libsForQt5.callPackage ../tools/misc/ultrastar-creator { };
 
   ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
 
-  ultrastardx = callPackage ../games/ultrastardx { };
-
-  umoria = callPackage ../games/umoria { };
-
-  unnethack = callPackage ../games/unnethack { };
-
-  uqm = callPackage ../games/uqm { };
-
-  urbanterror = callPackage ../games/urbanterror { };
-
   ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });
 
   ut2004Packages = dontRecurseIntoAttrs (callPackage ../games/ut2004 { });
 
   ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];
 
-  vassal = callPackage ../games/vassal { };
-
-  vdrift = callPackage ../games/vdrift { };
-
   # To ensure vdrift's code is built on hydra
   vdrift-bin = vdrift.bin;
 
-  vectoroids = callPackage ../games/vectoroids { };
-
   vessel = pkgsi686Linux.callPackage ../games/vessel { };
 
-  vitetris = callPackage ../games/vitetris { };
-
-  voxelands = callPackage ../games/voxelands { };
-
   vvvvvv = callPackage ../by-name/vv/vvvvvv/package.nix {
     inherit (darwin.apple_sdk.frameworks) Foundation IOKit;
   };
 
-  wargus = callPackage ../games/wargus { };
-
-  warmux = callPackage ../games/warmux { };
-
   warsow-engine = callPackage ../games/warsow/engine.nix { };
 
   warsow = callPackage ../games/warsow { };
 
-  warzone2100 = callPackage ../games/warzone2100 { };
-
   wesnoth = callPackage ../games/wesnoth {
     inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
     # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234
@@ -35015,27 +17589,6 @@ with pkgs;
 
   wesnoth-dev = wesnoth;
 
-  widelands = callPackage ../games/widelands { };
-
-  wolfstoneextract = callPackage ../games/wolfstoneextract { };
-
-  worldofgoo = callPackage ../games/worldofgoo { };
-
-  xboard =  callPackage ../games/xboard { };
-
-  xbomb = callPackage ../games/xbomb { };
-
-  xconq = callPackage ../games/xconq { };
-
-  xcowsay = callPackage ../games/xcowsay { };
-
-  xgalagapp = callPackage ../games/xgalaga++ { };
-
-  xjump = callPackage ../games/xjump { };
-
-  xmoto = callPackage ../games/xmoto { };
-
-
   inherit (callPackage ../games/xonotic { })
     xonotic-data
     xonotic;
@@ -35060,16 +17613,6 @@ with pkgs;
   bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix { };
   bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix { };
 
-  xskat = callPackage ../games/xskat { };
-
-  xsnow = callPackage ../games/xsnow { };
-
-  xsok = callPackage ../games/xsok { };
-
-  xsokoban = callPackage ../games/xsokoban { };
-
-  xtris = callPackage ../games/xtris { };
-
   inherit (callPackage ../games/quake2/yquake2 {
     inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
   })
@@ -35079,14 +17622,6 @@ with pkgs;
     yquake2-the-reckoning
     yquake2-all-games;
 
-  zaz = callPackage ../games/zaz { };
-
-  zod = callPackage ../games/zod { };
-
-  zoom = callPackage ../games/zoom { };
-
-  keen4 = callPackage ../games/keen4 { };
-
   zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad {
     wxGTK = wxGTK32;
     fmt = fmt_9;
@@ -35094,20 +17629,6 @@ with pkgs;
 
   zeroad = zeroadPackages.zeroad;
 
-  _7kaa = callPackage ../games/7kaa { };
-
-  hhexen = callPackage ../games/hhexen { };
-
-  hheretic = callPackage ../games/hheretic { };
-
-  wyvern = callPackage ../games/wyvern { };
-
-  hsetroot = callPackage ../tools/X11/hsetroot { };
-
-  imwheel = callPackage ../tools/X11/imwheel { };
-
-  kakasi = callPackage ../tools/text/kakasi { };
-
   ### DESKTOP ENVIRONMENTS
 
   arcan-wrapped = arcan.wrapper.override { };
@@ -35133,8 +17654,6 @@ with pkgs;
     appls = [ prio ];
   };
 
-  cdesktopenv = callPackage ../desktops/cdesktopenv { };
-
   cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });
 
   deepin = recurseIntoAttrs (callPackage ../desktops/deepin { });
@@ -35166,15 +17685,9 @@ with pkgs;
 
   gnome-extensions-cli = python3Packages.callPackage ../desktops/gnome/misc/gnome-extensions-cli { };
 
-  gnome-bluetooth_1_0 = callPackage ../by-name/gn/gnome-bluetooth/1.0 { };
-
-  gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { };
-
   gnome-session-ctl = callPackage ../by-name/gn/gnome-session/ctl.nix { };
 
   # Using 43 to match Mutter used in Pantheon
-  gnome-settings-daemon43 = callPackage ../by-name/gn/gnome-settings-daemon/43 { };
-
   gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { });
 
   lomiri = recurseIntoAttrs (callPackage ../desktops/lomiri { });
@@ -35204,18 +17717,12 @@ with pkgs;
   mate = recurseIntoAttrs (callPackage ../desktops/mate { });
 
   # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided
-  mutter43 = callPackage ../by-name/mu/mutter/43 { };
-
   pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });
 
-  wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { };
-
   rox-filer = callPackage ../desktops/rox/rox-filer {
     gtk = gtk2;
   };
 
-  surf-display = callPackage ../desktops/surf-display { };
-
   xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
 
   plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
@@ -35234,24 +17741,14 @@ with pkgs;
 
   latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { };
 
-  xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
-
   ### SCIENCE/CHEMISTY
 
-  apbs = callPackage ../applications/science/chemistry/apbs { };
-
   avogadrolibs = libsForQt5.callPackage ../development/libraries/science/chemistry/avogadrolibs { };
 
   molequeue = libsForQt5.callPackage ../development/libraries/science/chemistry/molequeue { };
 
   avogadro2 = libsForQt5.callPackage ../applications/science/chemistry/avogadro2 { };
 
-  d-seams = callPackage ../applications/science/chemistry/d-seams { };
-
-  ergoscf = callPackage ../applications/science/chemistry/ergoscf { };
-
-  gwyddion = callPackage ../applications/science/chemistry/gwyddion { };
-
   jmol = callPackage ../applications/science/chemistry/jmol {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
@@ -35260,23 +17757,13 @@ with pkgs;
 
   molbar = with python3Packages; toPythonApplication molbar;
 
-  molden = callPackage ../applications/science/chemistry/molden { };
-
-  mopac = callPackage ../applications/science/chemistry/mopac { };
-
   nwchem = callPackage ../applications/science/chemistry/nwchem {
     blas = blas-ilp64;
     lapack = lapack-ilp64;
   };
 
-  octopus = callPackage ../applications/science/chemistry/octopus { };
-
   autodock-vina = callPackage ../applications/science/chemistry/autodock-vina { };
 
-  dkh = callPackage ../applications/science/chemistry/dkh { };
-
-  openmolcas = callPackage ../applications/science/chemistry/openmolcas { };
-
   pdb2pqr = with python3Packages; toPythonApplication pdb2pqr;
 
   pymol = callPackage ../applications/science/chemistry/pymol {
@@ -35291,267 +17778,83 @@ with pkgs;
 
   siesta-mpi = callPackage ../applications/science/chemistry/siesta { useMpi = true; };
 
-  wxmacmolplt = callPackage ../applications/science/chemistry/wxmacmolplt { };
-
   ### SCIENCE/GEOMETRY
 
-  gama = callPackage ../applications/science/geometry/gama { };
-
   tetgen = callPackage ../applications/science/geometry/tetgen { }; # AGPL3+
   tetgen_1_4 = callPackage ../applications/science/geometry/tetgen/1.4.nix { }; # MIT
 
   ### SCIENCE/BENCHMARK
 
-  papi = callPackage ../development/libraries/science/benchmark/papi { };
-
   ### SCIENCE/BIOLOGY
 
-  alliance = callPackage ../applications/science/electronics/alliance { };
-
-  angsd = callPackage ../applications/science/biology/angsd { };
-
   ants = callPackage ../applications/science/biology/ants {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  aragorn = callPackage ../applications/science/biology/aragorn { };
-
-  astral = callPackage ../applications/science/biology/astral { };
-
-  archimedes = callPackage ../applications/science/electronics/archimedes { };
-
-  bamtools = callPackage ../applications/science/biology/bamtools { };
-
-  bayescan = callPackage ../applications/science/biology/bayescan { };
-
-  bedops = callPackage ../applications/science/biology/bedops { };
-
-  bedtools = callPackage ../applications/science/biology/bedtools { };
-
-  bcftools = callPackage ../applications/science/biology/bcftools { };
-
-  bftools = callPackage ../applications/science/biology/bftools { };
-
-  bioawk = callPackage ../applications/science/biology/bioawk { };
-
   blast = callPackage ../applications/science/biology/blast {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
   };
 
   blast-bin = callPackage ../applications/science/biology/blast/bin.nix { };
 
-  bpp-core = callPackage ../development/libraries/science/biology/bpp-core { };
-
-  bpp-phyl = callPackage ../development/libraries/science/biology/bpp-phyl { };
-
-  bpp-popgen = callPackage ../development/libraries/science/biology/bpp-popgen { };
-
-  bpp-seq = callPackage ../development/libraries/science/biology/bpp-seq { };
-
-  bppsuite = callPackage ../applications/science/biology/bppsuite { };
-
   cd-hit = callPackage ../applications/science/biology/cd-hit {
     inherit (llvmPackages) openmp;
   };
 
-  ciftilib = callPackage ../development/libraries/science/biology/ciftilib { };
-
-  cmtk = callPackage ../applications/science/biology/cmtk { };
-
-  clustal-omega = callPackage ../applications/science/biology/clustal-omega { };
-
-  conglomerate = callPackage ../applications/science/biology/conglomerate { };
-
-  dalfox = callPackage ../tools/security/dalfox { };
-
-  davtest = callPackage ../tools/security/davtest { };
-
-  dcm2niix = callPackage ../applications/science/biology/dcm2niix { };
-
   deepdiff = with python3Packages; toPythonApplication deepdiff;
 
-  deepsea = callPackage ../tools/security/deepsea { };
-
   deepsecrets = callPackage ../tools/security/deepsecrets {
     python3 = python311;
   };
 
-  deeptools = callPackage ../applications/science/biology/deeptools { };
-
   deep-translator = with python3Packages; toPythonApplication deep-translator;
 
-  delly = callPackage ../applications/science/biology/delly { };
-
-  diamond = callPackage ../applications/science/biology/diamond { };
-
-  dssp = callPackage ../applications/science/biology/dssp { };
-
-  ecopcr = callPackage ../applications/science/biology/ecopcr { };
-
-  eggnog-mapper = callPackage ../applications/science/biology/eggnog-mapper { };
-
-  emboss = callPackage ../applications/science/biology/emboss { };
-
-  est-sfs = callPackage ../applications/science/biology/est-sfs { };
-
-  ezminc = callPackage ../applications/science/biology/EZminc { };
-
-  exonerate = callPackage ../applications/science/biology/exonerate { };
-
-  fastp = callPackage ../applications/science/biology/fastp { };
-
-  flywheel-cli = callPackage ../applications/science/biology/flywheel-cli { };
-
   hh-suite = callPackage ../applications/science/biology/hh-suite {
     inherit (llvmPackages) openmp;
   };
 
-  hisat2 = callPackage ../applications/science/biology/hisat2 { };
-
-  htslib = callPackage ../development/libraries/science/biology/htslib { };
-
-  igv = callPackage ../applications/science/biology/igv { };
-
-  inormalize = callPackage ../applications/science/biology/inormalize { };
-
-  iqtree = callPackage ../applications/science/biology/iqtree { };
-
-  itsx = callPackage ../applications/science/biology/itsx { };
-
   iv = callPackage ../applications/science/biology/iv {
     neuron-version = neuron.version;
   };
 
-  kalign = callPackage ../applications/science/biology/kalign { };
-
   kallisto = callPackage ../applications/science/biology/kallisto {
     autoconf = buildPackages.autoconf269;
   };
 
-  kasmweb = callPackage ../servers/web-apps/kasmweb { };
-
-  kssd = callPackage ../applications/science/biology/kssd { };
-
-  last = callPackage ../applications/science/biology/last { };
-
-  macse = callPackage ../applications/science/biology/macse { };
-
-  macs2 = callPackage ../applications/science/biology/macs2 { };
-
-  mafft = callPackage ../applications/science/biology/mafft { };
-
-  migrate = callPackage ../applications/science/biology/migrate { };
-
-  minia = callPackage ../applications/science/biology/minia { };
-
   mirtk = callPackage ../development/libraries/science/biology/mirtk { itk = itk_5_2; };
 
-  muscle = callPackage ../applications/science/biology/muscle { };
-
-  n3 = callPackage ../applications/science/biology/N3 { };
-
   nest = callPackage ../applications/science/biology/nest { };
 
   nest-mpi = callPackage ../applications/science/biology/nest { withMpi = true; };
 
-  neuron = callPackage ../applications/science/biology/neuron { };
-
   neuron-mpi = neuron.override {useMpi = true; };
 
   neuron-full = neuron-mpi.override { useCore = true; useRx3d = true; };
 
-  mrbayes = callPackage ../applications/science/biology/mrbayes { };
-
   mrtrix = callPackage ../applications/science/biology/mrtrix { python = python3; };
 
-  megahit = callPackage ../applications/science/biology/megahit { };
-
-  messer-slim = callPackage ../applications/science/biology/messer-slim { };
-
   minc_tools = callPackage ../applications/science/biology/minc-tools {
     inherit (perlPackages) perl TextFormat;
   };
 
-  minc_widgets = callPackage ../applications/science/biology/minc-widgets { };
-
-  mni_autoreg = callPackage ../applications/science/biology/mni_autoreg { };
-
-  minimap2 = callPackage ../applications/science/biology/minimap2 { };
-
   mmseqs2 = callPackage ../applications/science/biology/mmseqs2 {
     inherit (llvmPackages) openmp;
   };
 
-  niftyreg = callPackage ../applications/science/biology/niftyreg { };
-
-  niftyseg = callPackage ../applications/science/biology/niftyseg { };
-
-  manta = callPackage ../applications/science/biology/manta { };
-
   obitools3 = callPackage ../applications/science/biology/obitools/obitools3.nix { };
 
-  octopus-caller = callPackage ../applications/science/biology/octopus { };
-
-  paml = callPackage ../applications/science/biology/paml { };
-
-  picard-tools = callPackage ../applications/science/biology/picard-tools { };
-
-  platypus = callPackage ../applications/science/biology/platypus { };
-
-  plink-ng = callPackage ../applications/science/biology/plink-ng { };
-
-  prodigal = callPackage ../applications/science/biology/prodigal { };
-
-  quast = callPackage ../applications/science/biology/quast { };
-
-  raxml = callPackage ../applications/science/biology/raxml { };
-
   raxml-mpi = raxml.override { useMpi = true; };
 
-  sambamba = callPackage ../applications/science/biology/sambamba { };
-
-  samblaster = callPackage ../applications/science/biology/samblaster { };
-
   samtools = callPackage ../applications/science/biology/samtools { };
   samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix {
     stdenv = gccStdenv;
   };
 
-  seqtk = callPackage ../applications/science/biology/seqtk { };
-
-  seqkit = callPackage ../applications/science/biology/seqkit { };
-
-  snpeff = callPackage ../applications/science/biology/snpeff { };
-
-  somafm-cli = callPackage ../tools/misc/somafm-cli { };
-
-  somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { };
-
-  sortmerna = callPackage ../applications/science/biology/sortmerna { };
-
-  stacks = callPackage ../applications/science/biology/stacks { };
-
-  star = callPackage ../applications/science/biology/star { };
-
-  strelka = callPackage ../applications/science/biology/strelka { };
-
   inherit (callPackages ../applications/science/biology/sumatools {})
       sumalibs
       sumaclust
       sumatra;
 
-  seaview = callPackage ../applications/science/biology/seaview { };
-
-  svaba = callPackage ../applications/science/biology/svaba { };
-
-  tebreak = callPackage ../applications/science/biology/tebreak { };
-
-  treemix = callPackage ../applications/science/biology/treemix { };
-
-  trf = callPackage ../applications/science/biology/trf { };
-
-  trimal = callPackage ../applications/science/biology/trimal { };
-
   trimmomatic = callPackage ../applications/science/biology/trimmomatic {
     jdk = pkgs.jdk11_headless;
     # Reduce closure size
@@ -35563,97 +17866,28 @@ with pkgs;
 
   truvari = callPackage ../applications/science/biology/truvari { };
 
-  varscan = callPackage ../applications/science/biology/varscan { };
-
-  whisper = callPackage ../applications/science/biology/whisper { };
-
-  xenomapper = callPackage ../applications/science/biology/xenomapper { };
-
-  hmmer = callPackage ../applications/science/biology/hmmer { };
-
-  bwa = callPackage ../applications/science/biology/bwa { };
-
-  bwa-mem2 = callPackage ../applications/science/biology/bwa-mem2 { };
-
   ### SCIENCE/MACHINE LEARNING
 
-  nengo-gui = callPackage ../applications/science/machine-learning/nengo-gui { };
-
   sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { };
 
   streamlit = with python3Packages; toPythonApplication streamlit;
 
-  uarmsolver = callPackage ../applications/science/machine-learning/uarmsolver { };
-
   ### SCIENCE/MATH
 
-  almonds = callPackage ../applications/science/math/almonds { };
-
-  adolc = callPackage ../applications/science/math/adolc { };
-
-  amd-blis = callPackage ../development/libraries/science/math/amd-blis { };
-
-  amd-libflame = callPackage ../development/libraries/science/math/amd-libflame { };
-
-  arpack = callPackage ../development/libraries/science/math/arpack { };
-
-  blas = callPackage ../build-support/alternatives/blas { };
-
   blas-ilp64 = blas.override { isILP64 = true; };
 
-  blas-reference = callPackage ../development/libraries/science/math/blas { };
-
-  bonmin = callPackage ../development/libraries/science/math/bonmin { };
-
-  brial = callPackage ../development/libraries/science/math/brial { };
-
   cantor = libsForQt5.cantor;
 
   clblas = callPackage ../development/libraries/science/math/clblas {
     inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL;
   };
 
-  clblast = callPackage ../development/libraries/science/math/clblast { };
-
-  cliquer = callPackage ../development/libraries/science/math/cliquer { };
-
-  coin-utils = callPackage ../development/libraries/science/math/coin-utils { };
-
-  ecos = callPackage ../development/libraries/science/math/ecos { };
-
-  getdp = callPackage ../applications/science/math/getdp { };
-
-  gurobi = callPackage ../applications/science/math/gurobi { };
-
-  jags = callPackage ../applications/science/math/jags { };
-
   labplot = libsForQt5.callPackage ../applications/science/math/labplot { };
 
-  lapack = callPackage ../build-support/alternatives/lapack { };
-
   lapack-ilp64 = lapack.override { isILP64 = true; };
 
-  lapack-reference = callPackage ../development/libraries/science/math/liblapack { };
   liblapack = lapack-reference;
 
-  libamplsolver = callPackage ../development/libraries/science/math/libamplsolver { };
-
-  libbraiding = callPackage ../development/libraries/science/math/libbraiding { };
-
-  libhomfly = callPackage ../development/libraries/science/math/libhomfly { };
-
-  liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
-
-  lrs = callPackage ../development/libraries/science/math/lrs { };
-
-  m4ri = callPackage ../development/libraries/science/math/m4ri { };
-
-  m4rie = callPackage ../development/libraries/science/math/m4rie { };
-
-  mkl = callPackage ../development/libraries/science/math/mkl { };
-
-  nasc = callPackage ../applications/science/math/nasc { };
-
   nota = haskellPackages.callPackage ../applications/science/math/nota { };
 
   notus-scanner = with python3Packages; toPythonApplication notus-scanner;
@@ -35666,22 +17900,6 @@ with pkgs;
   # standard BLAS and LAPACK.
   openblasCompat = openblas.override { blas64 = false; };
 
-  openlibm = callPackage ../development/libraries/science/math/openlibm { };
-
-  openspecfun = callPackage ../development/libraries/science/math/openspecfun { };
-
-  planarity = callPackage ../development/libraries/science/math/planarity { };
-
-  scalapack = callPackage ../development/libraries/science/math/scalapack { };
-
-  rankwidth = callPackage ../development/libraries/science/math/rankwidth { };
-
-  lcalc = callPackage ../development/libraries/science/math/lcalc { };
-
-  lrcalc = callPackage ../applications/science/math/lrcalc { };
-
-  lie = callPackage ../applications/science/math/LiE { };
-
   inherit (callPackage ../development/libraries/science/math/magma { }) magma magma_2_7_2 magma_2_6_2;
 
   magma-cuda = magma.override {
@@ -35698,8 +17916,6 @@ with pkgs;
     rocmSupport = true;
   };
 
-  clmagma = callPackage ../development/libraries/science/math/clmagma { };
-
   mathematica = callPackage ../applications/science/math/mathematica { };
 
   mathematica-webdoc = callPackage ../applications/science/math/mathematica {
@@ -35715,12 +17931,6 @@ with pkgs;
     cudaSupport = true;
   };
 
-  metis = callPackage ../development/libraries/science/math/metis { };
-
-  nauty = callPackage ../applications/science/math/nauty { };
-
-  osi = callPackage ../development/libraries/science/math/osi { };
-
   or-tools = callPackage ../development/libraries/science/math/or-tools {
     inherit (darwin) DarwinTools;
     stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
@@ -35734,8 +17944,6 @@ with pkgs;
     };
   };
 
-  rubiks = callPackage ../development/libraries/science/math/rubiks { };
-
   p4est-sc = callPackage ../development/libraries/science/math/p4est-sc {
     p4est-sc-debugEnable = false;
   };
@@ -35748,15 +17956,8 @@ with pkgs;
     p4est-sc = p4est-sc-dbg;
   };
 
-  QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { };
-
-  sage = callPackage ../applications/science/math/sage { };
   sageWithDoc = sage.override { withDoc = true; };
 
-  sagetex = callPackage ../misc/sagetex { };
-
-  subread = callPackage ../applications/science/biology/subread { };
-
   suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { };
   suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse/4.4.nix { };
   suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {
@@ -35764,14 +17965,6 @@ with pkgs;
   };
   suitesparse = suitesparse_5_3;
 
-  suitesparse-graphblas = callPackage ../development/libraries/science/math/suitesparse-graphblas { };
-
-  superlu = callPackage ../development/libraries/science/math/superlu { };
-
-  symmetrica = callPackage ../applications/science/math/symmetrica { };
-
-  sympow = callPackage ../development/libraries/science/math/sympow { };
-
   trilinos = callPackage ../development/libraries/science/math/trilinos { };
 
   trilinos-mpi = callPackage ../development/libraries/science/math/trilinos { withMPI = true; };
@@ -35782,18 +17975,8 @@ with pkgs;
 
   wolfram-notebook = callPackage ../applications/science/math/wolfram-engine/notebook.nix { };
 
-  ipopt = callPackage ../development/libraries/science/math/ipopt { };
-
-  gmsh = callPackage ../applications/science/math/gmsh { };
-
-  wcpg = callPackage ../development/libraries/science/math/wcpg { };
-
-  zn_poly = callPackage ../development/libraries/science/math/zn_poly { };
-
   ### SCIENCE/MOLECULAR-DYNAMICS
 
-  dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { };
-
   gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {
     singlePrec = true;
     fftw = fftwSinglePrec;
@@ -35831,69 +18014,23 @@ with pkgs;
 
   ### SCIENCE/MEDICINE
 
-  dcmtk = callPackage ../applications/science/medicine/dcmtk { };
-
-  xmedcon = callPackage ../applications/science/medicine/xmedcon { };
-
   ### SCIENCE/PHYSICS
 
-  dawn = callPackage ../applications/science/physics/dawn { };
-
-  dawncut = callPackage ../applications/science/physics/dawncut { };
-
-  elmerfem = callPackage ../applications/science/physics/elmerfem { };
-
-  fasthenry = callPackage ../applications/science/physics/fasthenry { };
-
   mcfm = callPackage ../applications/science/physics/MCFM {
     stdenv = gccStdenv;
     lhapdf = lhapdf.override { stdenv = gccStdenv; python = null; };
   };
 
-  nnpdf = callPackage ../applications/science/physics/nnpdf { };
-
-  professor = callPackage ../applications/science/physics/professor { };
-
-  sacrifice = callPackage ../applications/science/physics/sacrifice { };
-
-  sherpa = callPackage ../applications/science/physics/sherpa { };
-
-  shtns = callPackage ../applications/science/physics/shtns { };
-
-  xfitter = callPackage ../applications/science/physics/xfitter { };
-
   xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { };
 
-  xnec2c = callPackage ../applications/science/physics/xnec2c { };
-
   ### SCIENCE/PROGRAMMING
 
-  dafny = callPackage ../applications/science/logic/dafny { };
-
-  groove = callPackage ../applications/science/programming/groove { };
-
-  plm = callPackage ../applications/science/programming/plm { };
-
   ### SCIENCE/LOGIC
 
-  abc-verifier = callPackage ../applications/science/logic/abc { };
-
   abella = callPackage ../applications/science/logic/abella {
     ocamlPackages = ocaml-ng.ocamlPackages_4_12;
   };
 
-  acgtk = callPackage ../applications/science/logic/acgtk { };
-
-  alt-ergo = callPackage ../applications/science/logic/alt-ergo { };
-
-  aspino = callPackage ../applications/science/logic/aspino { };
-
-  beluga = callPackage ../applications/science/logic/beluga { };
-
-  cbmc = callPackage ../applications/science/logic/cbmc { };
-
-  cadical = callPackage ../applications/science/logic/cadical { };
-
   inherit (callPackage ./coq-packages.nix {
     inherit (ocaml-ng)
       ocamlPackages_4_05
@@ -35922,14 +18059,8 @@ with pkgs;
     coqPackages      coq
   ;
 
-  coq2html = callPackage ../tools/typesetting/coq2html { };
-
   coq-kernel = callPackage ../applications/editors/jupyter-kernels/coq { };
 
-  cryptoverif = callPackage ../applications/science/logic/cryptoverif { };
-
-  crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { };
-
   cubicle = callPackage ../applications/science/logic/cubicle {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
@@ -35938,14 +18069,10 @@ with pkgs;
     gmp = lib.overrideDerivation gmp (_: { dontDisableStatic = true; });
     stdenv = gccStdenv;
   };
-  cvc4 = callPackage ../applications/science/logic/cvc4 { };
-
   cvc5 = callPackage ../applications/science/logic/cvc5 {
     cadical = pkgs.cadical.override { version = "2.0.0"; };
   };
 
-  drat-trim = callPackage ../applications/science/logic/drat-trim { };
-
   ekrhyper = callPackage ../applications/science/logic/ekrhyper {
     ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
   };
@@ -35954,38 +18081,15 @@ with pkgs;
 
   eprover-ho = callPackage ../applications/science/logic/eprover { enableHO = true; };
 
-  formula = callPackage ../applications/science/logic/formula { };
-
-  gappa = callPackage ../applications/science/logic/gappa { };
-
-  gfan = callPackage ../applications/science/math/gfan { };
-
-  giac = callPackage ../applications/science/math/giac { };
   giac-with-xcas = giac.override { enableGUI = true; };
 
-  ginac = callPackage ../applications/science/math/ginac { };
-
   glucose = callPackage ../applications/science/logic/glucose { };
   glucose-syrup = callPackage ../applications/science/logic/glucose {
     enableUnfree = true;
   };
 
-  hol = callPackage ../applications/science/logic/hol { };
-
   inherit (ocamlPackages) hol_light;
 
-  holehe = callPackage ../tools/security/holehe { };
-
-  hologram = callPackage ../tools/security/hologram { };
-
-  honeytrap = callPackage ../tools/security/honeytrap { };
-
-  kissat = callPackage ../applications/science/logic/kissat { };
-
-  tini = callPackage ../applications/virtualization/tini { };
-
-  ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { };
-
   isabelle = callPackage ../by-name/is/isabelle/package.nix {
     polyml = polyml.overrideAttrs {
       pname = "polyml-for-isabelle";
@@ -36004,19 +18108,9 @@ with pkgs;
   };
   isabelle-components = recurseIntoAttrs (callPackage ../by-name/is/isabelle/components { });
 
-  iprover = callPackage ../applications/science/logic/iprover { };
-
-  key = callPackage ../applications/science/logic/key { };
-
-  keymapviz = callPackage ../tools/misc/keymapviz { };
-
   killport = darwin.apple_sdk_11_0.callPackage ../tools/misc/killport { };
 
-  lean = callPackage ../applications/science/logic/lean { };
-  lean2 = callPackage ../applications/science/logic/lean2 { };
-  lean4 = callPackage ../applications/science/logic/lean4 { };
   lean3 = lean;
-  elan = callPackage ../applications/science/logic/elan { };
   mathlibtools = with python3Packages; toPythonApplication mathlibtools;
 
   leo2 = callPackage ../applications/science/logic/leo2
@@ -36024,48 +18118,14 @@ with pkgs;
 
   leo3-bin = callPackage ../applications/science/logic/leo3/binary.nix { };
 
-  logisim = callPackage ../applications/science/logic/logisim { };
-
-  logisim-evolution = callPackage ../applications/science/logic/logisim-evolution { };
-
-  ltl2ba = callPackage ../applications/science/logic/ltl2ba { };
-
-  metis-prover = callPackage ../applications/science/logic/metis-prover { };
-
-  mcrl2 = callPackage ../applications/science/logic/mcrl2 { };
-
-  minisat = callPackage ../applications/science/logic/minisat { };
-
-  monosat = callPackage ../applications/science/logic/monosat { };
-
-  msat = callPackage ../applications/science/logic/msat { };
-
-  nusmv = callPackage ../applications/science/logic/nusmv { };
-
-  nuXmv = callPackage ../applications/science/logic/nuXmv { };
-
-  opensmt = callPackage ../applications/science/logic/opensmt { };
-
-  ott = callPackage ../applications/science/logic/ott { };
-
-  picosat = callPackage ../applications/science/logic/picosat { };
-
-  libpoly = callPackage ../applications/science/logic/poly { };
-
   prooftree = callPackage  ../applications/science/logic/prooftree {
     ocamlPackages = ocaml-ng.ocamlPackages_4_12;
   };
 
-  prover9 = callPackage ../applications/science/logic/prover9 { };
-
-  proverif = callPackage ../applications/science/logic/proverif { };
-
   satallax = callPackage ../applications/science/logic/satallax {
     inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
   };
 
-  saw-tools = callPackage ../applications/science/logic/saw-tools { };
-
   spass = callPackage ../applications/science/logic/spass {
     stdenv = gccStdenv;
   };
@@ -36074,16 +18134,6 @@ with pkgs;
     ocaml = ocaml-ng.ocamlPackages_4_14_unsafe_string.ocaml;
   };
 
-  tptp = callPackage ../applications/science/logic/tptp { };
-
-  celf = callPackage ../applications/science/logic/celf { };
-
-  fast-downward = callPackage ../applications/science/logic/fast-downward { };
-
-  twelf = callPackage ../applications/science/logic/twelf { };
-
-  verifast = callPackage ../applications/science/logic/verifast { };
-
   veriT = callPackage ../applications/science/logic/verit {
     stdenv = gccStdenv;
   };
@@ -36092,10 +18142,6 @@ with pkgs;
     coqPackages = coqPackages_8_18;
   };
 
-  wayback-machine-archiver = callPackage ../tools/misc/wayback-machine-archiver { };
-
-  workcraft = callPackage ../applications/science/logic/workcraft { };
-
   yices = callPackage ../applications/science/logic/yices {
     gmp-static = gmp.override { withStatic = true; };
   };
@@ -36110,8 +18156,6 @@ with pkgs;
   z3 = z3_4_8;
   z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix { };
 
-  zchaff = callPackage ../applications/science/logic/zchaff { };
-
   tlaplus = callPackage ../applications/science/logic/tlaplus {
     jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
@@ -36121,36 +18165,12 @@ with pkgs;
   };
   tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix { };
 
-  aiger = callPackage ../applications/science/logic/aiger { };
-
   avy = callPackage ../applications/science/logic/avy { };
 
-  btor2tools = callPackage ../applications/science/logic/btor2tools { };
-
-  boolector = callPackage ../applications/science/logic/boolector { };
-
-  bitwuzla = callPackage ../applications/science/logic/bitwuzla { };
-
-  symfpu = callPackage ../applications/science/logic/symfpu { };
-
-  uhdm = callPackage ../applications/science/logic/uhdm { };
-
-  surelog = callPackage ../applications/science/logic/surelog { };
-
-  mcy = callPackage ../applications/science/logic/mcy { };
-
-  lingeling = callPackage ../applications/science/logic/lingeling { };
-
   ### SCIENCE / ENGINEERING
 
-  brmodelo = callPackage ../applications/science/engineering/brmodelo { };
-
-  jflap = callPackage ../applications/science/engineering/jflap { };
-
   ### SCIENCE / ELECTRONICS
 
-  adms = callPackage ../applications/science/electronics/adms { };
-
   appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { };
 
   inherit (libsForQt5.callPackage ../applications/science/electronics/simulide { })
@@ -36162,38 +18182,18 @@ with pkgs;
 
   caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { };
 
-  csxcad = callPackage ../applications/science/electronics/csxcad { };
-
   degate = libsForQt5.callPackage ../applications/science/electronics/degate { };
 
-  diylc = callPackage ../applications/science/electronics/diylc { };
-
   flatcam = python39.pkgs.callPackage ../applications/science/electronics/flatcam { };
 
-  flopoco = callPackage ../applications/science/electronics/flopoco { };
-
-  fparser = callPackage ../applications/science/electronics/fparser { };
-
   geda = callPackage ../applications/science/electronics/geda {
     guile = guile_2_2;
   };
 
-  gedit = callPackage ../applications/editors/gedit { };
-
   gerbv = callPackage ../applications/science/electronics/gerbv {
     cairo = cairo.override { x11Support = true; };
   };
 
-  gtkwave = callPackage ../applications/science/electronics/gtkwave { };
-
-  hyp2mat = callPackage ../applications/science/electronics/hyp2mat { };
-
-  fped = callPackage ../applications/science/electronics/fped { };
-
-  gaw = callPackage ../applications/science/electronics/gaw { };
-
-  horizon-eda = callPackage ../applications/science/electronics/horizon-eda { };
-
   # this is a wrapper for kicad.base and kicad.libraries
   kicad = callPackage ../applications/science/electronics/kicad { };
   # this is the same but without the (sizable) 3D models library
@@ -36231,16 +18231,8 @@ with pkgs;
 
   openroad = libsForQt5.callPackage ../applications/science/electronics/openroad { };
 
-  openboardview = callPackage ../applications/science/electronics/openboardview { };
-
-  pcb = callPackage ../applications/science/electronics/pcb { };
-
   qucs-s = qt6Packages.callPackage ../applications/science/electronics/qucs-s { };
 
-  xcircuit = callPackage ../applications/science/electronics/xcircuit { };
-
-  xoscope = callPackage ../applications/science/electronics/xoscope { };
-
   xyce = callPackage ../applications/science/electronics/xyce { };
 
   xyce-parallel = callPackage ../applications/science/electronics/xyce {
@@ -36260,18 +18252,6 @@ with pkgs;
 
   caffeWithCuda = caffe.override { cudaSupport = true; };
 
-  caffeine-ng = callPackage ../tools/X11/caffeine-ng { };
-
-  ecm = callPackage ../applications/science/math/ecm { };
-
-  eukleides = callPackage ../applications/science/math/eukleides { };
-
-  form = callPackage ../applications/science/math/form { };
-
-  fricas = callPackage ../applications/science/math/fricas { };
-
-  gap = callPackage ../applications/science/math/gap { };
-
   gap-minimal = lowPrio (gap.override { packageSet = "minimal"; });
 
   gap-full = lowPrio (gap.override { packageSet = "full"; });
@@ -36299,46 +18279,12 @@ with pkgs;
   pari = callPackage ../applications/science/math/pari { };
   gp2c = callPackage ../applications/science/math/pari/gp2c.nix { };
 
-  palp = callPackage ../applications/science/math/palp { };
-
-  ratpoints = callPackage ../applications/science/math/ratpoints { };
-
-  calc = callPackage ../applications/science/math/calc { };
-
-  pcalc = callPackage ../applications/science/math/pcalc { };
-
-  programmer-calculator = callPackage ../applications/science/math/programmer-calculator { };
-
-  bcal = callPackage ../applications/science/math/bcal { };
-
-  pagsuite = callPackage ../applications/science/math/pagsuite { };
-
-  pspp = callPackage ../applications/science/math/pspp { };
-
   raspa = callPackage ../applications/science/molecular-dynamics/raspa { };
 
   raspa-data = callPackage ../applications/science/molecular-dynamics/raspa/data.nix { };
 
-  ssw = callPackage ../applications/misc/ssw { };
-
-  pynac = callPackage ../applications/science/math/pynac { };
-
-  scalp = callPackage ../applications/science/math/scalp { };
-
-  singular = callPackage ../applications/science/math/singular { };
-
-  scilab-bin = callPackage ../applications/science/math/scilab-bin { };
-
-  scilla = callPackage ../tools/security/scilla { };
-
-  mininet = callPackage ../tools/virtualization/mininet { };
-
-  msieve = callPackage ../applications/science/math/msieve { };
-
   weka = callPackage ../applications/science/math/weka { jre = openjdk11; };
 
-  yad = callPackage ../tools/misc/yad { };
-
   yacas = libsForQt5.callPackage ../applications/science/math/yacas { };
 
   yacas-gui = yacas.override {
@@ -36373,16 +18319,8 @@ with pkgs;
     cudaSupport = true;
   };
 
-  fityk = callPackage ../applications/science/misc/fityk { };
-
-  galario = callPackage ../development/libraries/galario { };
-
-  gildas = callPackage ../applications/science/astronomy/gildas { };
-
   gplates = libsForQt5.callPackage ../applications/science/misc/gplates { };
 
-  gravit = callPackage ../applications/science/astronomy/gravit { };
-
   golly = callPackage ../applications/science/misc/golly {
     wxGTK = wxGTK32.overrideAttrs (x: {
       configureFlags = x.configureFlags ++ [
@@ -36398,8 +18336,6 @@ with pkgs;
     inherit (ocaml-ng.ocamlPackages_4_14) ocaml;
   };
 
-  netlogo = callPackage ../applications/science/misc/netlogo { };
-
   nextinspace = python3Packages.callPackage ../applications/science/misc/nextinspace { };
 
   ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
@@ -36413,75 +18349,36 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
   });
 
-  rinetd = callPackage ../servers/rinetd { };
-
   rink = callPackage ../applications/science/misc/rink {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  simgrid = callPackage ../applications/science/misc/simgrid { };
-
-  sumo = callPackage ../applications/science/networking/sumo { };
-
   spyder = with python3.pkgs; toPythonApplication spyder;
 
-  spyre = callPackage ../tools/security/spyre { };
-
-  sq = callPackage ../development/tools/sq { };
-
   stellarium = qt6Packages.callPackage ../applications/science/astronomy/stellarium { };
 
   stellarsolver = libsForQt5.callPackage ../development/libraries/science/astronomy/stellarsolver { };
 
-  astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { };
-
   tulip = libsForQt5.callPackage ../applications/science/misc/tulip { };
 
   vite = libsForQt5.callPackage ../applications/science/misc/vite { };
 
-  xearth = callPackage ../applications/science/astronomy/xearth { };
-  xplanet = callPackage ../applications/science/astronomy/xplanet { };
-
   ### SCIENCE / PHYSICS
 
-  apfelgrid = callPackage ../development/libraries/physics/apfelgrid { };
-
-  apfel = callPackage ../development/libraries/physics/apfel { };
-
   applgrid = callPackage ../development/libraries/physics/applgrid {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  hoppet = callPackage ../development/libraries/physics/hoppet { };
-
-  fastjet = callPackage ../development/libraries/physics/fastjet { };
-
-  fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { };
-
-  fastnlo-toolkit = callPackage ../development/libraries/physics/fastnlo-toolkit { };
-
   geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { };
 
-  cernlib = callPackage ../development/libraries/physics/cernlib { };
-
-  clhep = callPackage ../development/libraries/physics/clhep { };
-
-  hepmc2 = callPackage ../development/libraries/physics/hepmc2 { };
-
   hepmc3 = callPackage ../development/libraries/physics/hepmc3 {
     python = null;
   };
 
-  herwig = callPackage ../development/libraries/physics/herwig { };
-
   lhapdf = callPackage ../development/libraries/physics/lhapdf {
     python = python3;
   };
 
-  mela = callPackage ../development/libraries/physics/mela { };
-
-  nlojet = callPackage ../development/libraries/physics/nlojet { };
-
   pythia = callPackage ../development/libraries/physics/pythia {
     hepmc = hepmc2;
   };
@@ -36490,8 +18387,6 @@ with pkgs;
     imagemagick = graphicsmagick-imagemagick-compat;
   };
 
-  thepeg = callPackage ../development/libraries/physics/thepeg { };
-
   yoda = callPackage ../development/libraries/physics/yoda {
     python = python3;
   };
@@ -36499,127 +18394,42 @@ with pkgs;
     withRootSupport = true;
   });
 
-  qcdnum = callPackage ../development/libraries/physics/qcdnum { };
-
   ### SCIENCE/ROBOTICS
 
   apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { };
 
-  betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { };
-
-  emuflight-configurator = callPackage ../applications/science/robotics/emuflight-configurator { };
-
-  inav-configurator = callPackage ../applications/science/robotics/inav-configurator { };
-
-  mission-planner = callPackage ../applications/science/robotics/mission-planner { };
-
   ### MISC
 
-  acpilight = callPackage ../misc/acpilight { };
-
-  alpnpass = callPackage ../applications/networking/alpnpass { };
-
-  amdctl = callPackage ../os-specific/linux/amdctl { };
-
   android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { };
 
   antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { };
 
-  atlantis = callPackage ../applications/networking/cluster/atlantis { };
-
-  atmos = callPackage ../applications/networking/cluster/atmos { };
-
-  aiac = callPackage ../applications/networking/cluster/aiac { };
-
-  fn-cli = callPackage ../applications/networking/cluster/fn-cli { };
-
-  argononed = callPackage ../misc/drivers/argononed { };
-
   autotiling = python3Packages.callPackage ../misc/autotiling { };
 
-  autotiling-rs = callPackage ../misc/autotiling-rs { };
-
   avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { };
 
-  boatswain = callPackage ../applications/misc/boatswain { };
-
-  beep = callPackage ../misc/beep { };
-
-  bees = callPackage ../tools/filesystems/bees { };
-
-  blahaj = callPackage ../tools/misc/blahaj { };
-
-  bootil = callPackage ../development/libraries/bootil { };
-
   brgenml1lpr = pkgsi686Linux.callPackage ../misc/cups/drivers/brgenml1lpr { };
 
-  brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper { };
-
-  brightnessctl = callPackage ../misc/brightnessctl { };
-
   calaos_installer = libsForQt5.callPackage ../misc/calaos/installer { };
 
-  click = callPackage ../applications/networking/cluster/click { };
-
   clinfo = callPackage ../tools/system/clinfo {
     inherit (darwin.apple_sdk.frameworks) OpenCL;
   };
 
-  clpeak = callPackage ../tools/misc/clpeak { };
-
   cups = callPackage ../misc/cups { };
 
   cups-filters = callPackage ../misc/cups/filters.nix { };
 
   cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { };
 
-  cups-kyocera = callPackage ../misc/cups/drivers/kyocera { };
-
-  cups-kyocera-ecosys-m2x35-40-p2x35-40dnw = callPackage ../misc/cups/drivers/kyocera-ecosys-m2x35-40-p2x35-40dnw { };
-
-  cups-kyocera-ecosys-m552x-p502x = callPackage ../misc/cups/drivers/kyocera-ecosys-m552x-p502x { };
-
-  cups-kyodialog = callPackage ../misc/cups/drivers/kyodialog { };
-
-  cups-dymo = callPackage ../misc/cups/drivers/dymo { };
-
-  cups-pdf-to-pdf = callPackage ../misc/cups/drivers/cups-pdf-to-pdf { };
-
-  cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio { };
-
-  cups-zj-58 =  callPackage ../misc/cups/drivers/zj-58 { };
-
-  colort = callPackage ../applications/misc/colort { };
-
-  terminal-parrot = callPackage ../applications/misc/terminal-parrot { };
-
-  djenrandom = callPackage ../tools/misc/djenrandom { };
-
   epsonscan2 = pkgs.libsForQt5.callPackage ../misc/drivers/epsonscan2 { };
 
-  epson-alc1100 = callPackage ../misc/drivers/epson-alc1100 { };
-
-  epson-escpr = callPackage ../misc/drivers/epson-escpr { };
-  epson-escpr2 = callPackage ../misc/drivers/epson-escpr2 { };
-
-  epson_201207w = callPackage ../misc/drivers/epson_201207w { };
-
-  epson-201401w = callPackage ../misc/drivers/epson-201401w { };
-
-  epson-201106w = callPackage ../misc/drivers/epson-201106w { };
-
-  epson-workforce-635-nx625-series = callPackage ../misc/drivers/epson-workforce-635-nx625-series { };
-
   foomatic-db-ppds-withNonfreeDb = callPackage ../by-name/fo/foomatic-db-ppds/package.nix { withNonfreeDb = true; };
 
   gutenprint = callPackage ../misc/drivers/gutenprint { };
 
   gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { };
 
-  carps-cups = callPackage ../misc/cups/drivers/carps-cups { };
-
-  cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
-
   dcp375cwlpr = (pkgsi686Linux.callPackage ../misc/cups/drivers/brother/dcp375cw { }).driver;
 
   dcp375cw-cupswrapper = (callPackage ../misc/cups/drivers/brother/dcp375cw { }).cupswrapper;
@@ -36640,45 +18450,11 @@ with pkgs;
 
   cups-brother-hll3230cdw = pkgsi686Linux.callPackage  ../misc/cups/drivers/hll3230cdw { };
 
-  cups-brother-hll2350dw = callPackage  ../misc/cups/drivers/hll2350dw { };
-
-  cups-brother-mfcl2750dw = callPackage  ../misc/cups/drivers/mfcl2750dw { };
-
-  cups-drv-rastertosag-gdi = callPackage ../misc/cups/drivers/cups-drv-rastertosag-gdi { };
-
   # this driver ships with pre-compiled 32-bit binary libraries
   cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { };
 
-  cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { };
-
-  cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { };
-
   depotdownloader = callPackage ../tools/misc/depotdownloader { };
 
-  dbacl = callPackage ../tools/misc/dbacl { };
-
-  dell-530cdn = callPackage ../misc/drivers/dell-530cdn { };
-
-  dockutil = callPackage ../os-specific/darwin/dockutil { };
-
-  eiciel = callPackage ../tools/filesystems/eiciel { };
-
-  dpkg = callPackage ../tools/package-management/dpkg { };
-
-  dumb = callPackage ../misc/dumb { };
-
-  dump = callPackage ../tools/backup/dump { };
-
-  ec2stepshell = callPackage ../tools/security/ec2stepshell { };
-
-  ecdsatool = callPackage ../tools/security/ecdsatool { };
-
-  electricsheep = callPackage ../misc/screensavers/electricsheep { };
-
-  aapt = callPackage ../development/tools/aapt { };
-
-  glee = callPackage ../tools/graphics/glee { };
-
   faust = res.faust2;
 
   faust2 = callPackage ../applications/audio/faust/faust2.nix { };
@@ -36705,31 +18481,15 @@ with pkgs;
 
   faustlive = callPackage ../applications/audio/faust/faustlive.nix { };
 
-  faustPhysicalModeling = callPackage ../applications/audio/faustPhysicalModeling  { };
-
   flashprint = libsForQt5.callPackage ../applications/misc/flashprint { };
 
-  flockit = callPackage ../tools/backup/flockit { };
-
   fahclient = callPackage ../applications/science/misc/foldingathome/client.nix { };
 
-  fbmark = callPackage ../tools/misc/fbmark { };
-
-  foma = callPackage ../tools/misc/foma { };
-
-  foo2zjs = callPackage ../misc/drivers/foo2zjs { };
-
-  foomatic-filters = callPackage ../misc/drivers/foomatic-filters { };
-
   gajim = callPackage ../applications/networking/instant-messengers/gajim {
     inherit (gst_all_1) gstreamer gst-plugins-base gst-libav;
     gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
   };
 
-  gammu = callPackage ../applications/misc/gammu { };
-
-  ghostscript = callPackage ../misc/ghostscript { };
-
   ghostscriptX = ghostscript.override {
     cupsSupport = true;
     x11Support = true;
@@ -36740,17 +18500,11 @@ with pkgs;
     x11Support = false;
   };
 
-  glava = callPackage ../applications/misc/glava { };
-
   gnuk = callPackage ../misc/gnuk {
     gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
     binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
   };
 
-  go365 = callPackage ../tools/security/go365 { };
-
-  gobuster = callPackage ../tools/security/gobuster { };
-
   gotestwaf = callPackage ../tools/security/gotestwaf {
     buildGoModule = buildGo123Module;
   };
@@ -36763,34 +18517,18 @@ with pkgs;
     buildGoModule = buildGo123Module;
   };
 
-  guetzli = callPackage ../applications/graphics/guetzli { };
-
-  gummi = callPackage ../applications/misc/gummi { };
-
-  hashpump = callPackage ../tools/misc/hashpump { };
-
-  hck = callPackage ../tools/text/hck { };
-
   helmfile = callPackage ../applications/networking/cluster/helmfile { };
 
   helmfile-wrapped = callPackage ../applications/networking/cluster/helmfile {
     inherit (kubernetes-helm-wrapped.passthru) pluginsDir;
   };
 
-  helm-dashboard = callPackage ../applications/networking/cluster/helm-dashboard { };
-
-  helmsman = callPackage ../applications/networking/cluster/helmsman { };
-
-  hplip = callPackage ../misc/drivers/hplip { };
-
   hplipWithPlugin = hplip.override { withPlugin = true; };
 
   hyperfine = callPackage ../tools/misc/hyperfine {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  webcat = callPackage ../tools/misc/webcat { };
-
   websocat = callPackage ../tools/misc/websocat {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -36807,28 +18545,14 @@ with pkgs;
 
   utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { };
 
-  colima = callPackage ../applications/virtualization/colima { };
-
   lima = callPackage ../applications/virtualization/lima {
     inherit (darwin) sigtool;
   };
 
   lima-bin = callPackage ../applications/virtualization/lima/bin.nix { };
 
-  logtop = callPackage ../tools/misc/logtop { };
-
-  imaginer = callPackage ../applications/misc/imaginer { };
-
-  igraph = callPackage ../development/libraries/igraph { };
-
-  igprof = callPackage ../development/tools/misc/igprof { };
-
-  illum = callPackage ../tools/system/illum { };
-
   image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; };
 
-  infnoise = callPackage ../misc/drivers/infnoise { };
-
   itamae = callPackage ../tools/admin/itamae { };
 
   # using the new configuration style proposal which is unstable
@@ -36850,28 +18574,10 @@ with pkgs;
   jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { };
   jack_autoconnect = jack-autoconnect;
 
-  jacktrip = callPackage ../applications/audio/jacktrip { };
-
   j2cli = with python311Packages; toPythonApplication j2cli;
 
-  jq-lsp = callPackage ../development/tools/language-servers/jq-lsp { };
-
-  jquake = callPackage ../applications/misc/jquake { };
-
-  jstest-gtk = callPackage ../tools/misc/jstest-gtk { };
-
-  k40-whisperer = callPackage ../applications/misc/k40-whisperer { };
-
-  keynav = callPackage ../tools/X11/keynav { };
-
-  gnome-console = callPackage ../applications/terminal-emulators/gnome-console { };
-
-  kmon = callPackage ../tools/system/kmon { };
-
   kmonad = haskellPackages.kmonad.bin;
 
-  kompose = callPackage ../applications/networking/cluster/kompose { };
-
   kompute = callPackage ../development/libraries/kompute {
     fmt = fmt_8;
   };
@@ -36889,8 +18595,6 @@ with pkgs;
     ;
   kops = kops_1_29;
 
-  lguf-brightness = callPackage ../misc/lguf-brightness { };
-
   lighthouse = darwin.apple_sdk_11_0.callPackage ../applications/blockchains/lighthouse {
     inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security SystemConfiguration;
   };
@@ -36910,46 +18614,16 @@ with pkgs;
 
   openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
 
-  loop = callPackage ../tools/misc/loop { };
-
   mailcore2 = callPackage ../development/libraries/mailcore2 {
     icu = icu71;
   };
 
-  mamba = callPackage ../applications/audio/mamba { };
-
-  mas = callPackage ../os-specific/darwin/mas { };
-
-  micromamba = callPackage ../tools/package-management/micromamba { };
-
-  moltengamepad = callPackage ../misc/drivers/moltengamepad { };
-
-  openzwave = callPackage ../development/libraries/openzwave { };
-
   mongoc = darwin.apple_sdk_11_0.callPackage ../development/libraries/mongoc { };
 
   mongocxx = callPackage ../development/libraries/mongocxx/default.nix { };
 
-  mongoose = callPackage ../development/libraries/science/math/mongoose { };
-
-  morph = callPackage ../tools/package-management/morph { };
-
   muse = libsForQt5.callPackage ../applications/audio/muse { };
 
-  museeks = callPackage ../applications/audio/museeks { };
-
-  mynewt-newt = callPackage ../tools/package-management/mynewt-newt { };
-
-  mynewt-newtmgr = callPackage ../tools/misc/mynewt-newtmgr { };
-
-  mysides = callPackage ../os-specific/darwin/mysides { };
-
-  narrowlink = callPackage ../tools/networking/narrowlink { };
-
-  neo = callPackage ../applications/misc/neo { };
-
-  networkd-dispatcher = callPackage ../tools/networking/networkd-dispatcher { };
-
   nixVersions = recurseIntoAttrs (callPackage ../tools/package-management/nix {
     storeDir = config.nix.storeDir or "/nix/store";
     stateDir = config.nix.stateDir or "/nix/var";
@@ -37074,22 +18748,10 @@ with pkgs;
     (import ../../nixos/lib/make-options-doc)
     ({ inherit pkgs lib; } // attrs);
 
-  nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { };
-
-  nixos-render-docs = callPackage ../tools/nix/nixos-render-docs { };
-
-  nixdoc = callPackage ../tools/nix/nixdoc { };
-
-  dnadd = callPackage ../tools/nix/dnadd { };
-
   nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs {
     nix = nixVersions.nix_2_24;
   };
 
-  nix-doc = callPackage ../tools/package-management/nix-doc { };
-
-  nix-bundle = callPackage ../tools/package-management/nix-bundle { };
-
   nix-delegate = haskell.lib.compose.justStaticExecutables haskellPackages.nix-delegate;
   nix-deploy = haskell.lib.compose.justStaticExecutables haskellPackages.nix-deploy;
   nix-derivation = haskell.lib.compose.justStaticExecutables haskellPackages.nix-derivation;
@@ -37102,8 +18764,6 @@ with pkgs;
   nix-info = callPackage ../tools/nix/info { };
   nix-info-tested = nix-info.override { doCheck = true; };
 
-  nix-init = callPackage ../tools/nix/nix-init { };
-
   nix-index-unwrapped = callPackage ../tools/package-management/nix-index {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -37111,16 +18771,12 @@ with pkgs;
 
   nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter);
 
-  nix-melt = callPackage ../tools/nix/nix-melt { };
-
   nixos-option = callPackage ../tools/nix/nixos-option {
     nix = nixVersions.nix_2_18;
   };
 
   nix-pin = callPackage ../tools/package-management/nix-pin { };
 
-  nix-prefetch = callPackage ../tools/package-management/nix-prefetch { };
-
   nix-prefetch-github = with python3Packages;
     toPythonApplication nix-prefetch-github;
 
@@ -37132,84 +18788,40 @@ with pkgs;
     nix-prefetch-svn
     nix-prefetch-scripts;
 
-  nix-query-tree-viewer = callPackage ../tools/nix/nix-query-tree-viewer { };
-
   nix-update-source = callPackage ../tools/package-management/nix-update-source { };
 
-  nix-script = callPackage ../tools/nix/nix-script { };
-
   nix-tree = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-tree);
 
-  nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { };
-
-  nix-serve = callPackage ../tools/package-management/nix-serve { };
-
   nix-serve-ng = haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng;
 
   nix-visualize = python3.pkgs.callPackage ../tools/package-management/nix-visualize { };
 
-  alejandra = callPackage ../tools/nix/alejandra { };
-
   nixci = callPackage ../tools/nix/nixci {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration IOKit;
   };
 
   nixfmt-classic = haskellPackages.nixfmt.bin;
 
-  nixpkgs-hammering = callPackage ../tools/nix/nixpkgs-hammering { };
-
-  nixpkgs-lint-community = callPackage ../tools/nix/nixpkgs-lint { };
-
   nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { };
 
-  rnix-hashes = callPackage ../tools/nix/rnix-hashes { };
-
   nixos-artwork = callPackage ../data/misc/nixos-artwork { };
   nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { };
   nixos-grub2-theme = callPackage ../data/misc/nixos-artwork/grub2-theme.nix { };
 
-  nixos-bgrt-plymouth = callPackage ../data/themes/nixos-bgrt-plymouth { };
-
-  nixos-container = callPackage ../tools/virtualization/nixos-container { };
-
-  nixos-generators = callPackage ../tools/nix/nixos-generators { };
-
   nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { };
 
-  extra-container = callPackage ../tools/virtualization/extra-container { };
-
-  norwester-font = callPackage ../data/fonts/norwester  { };
-
-  nut = callPackage ../applications/misc/nut { };
-
-  nsncd = callPackage ../os-specific/linux/nsncd { };
-
-  nvd = callPackage ../tools/package-management/nvd { };
-
   disnix = callPackage ../tools/package-management/disnix { };
 
   dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {
     inherit (python3Packages) supervisor;
   });
 
-  dydisnix = callPackage ../tools/package-management/disnix/dydisnix { };
-
-  disnixos = callPackage ../tools/package-management/disnix/disnixos { };
-
   DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService {
     jdk = jdk8;
   };
 
-  i3a = callPackage ../misc/i3a { };
-
   lice = python3Packages.callPackage ../tools/misc/lice { };
 
-  m33-linux = callPackage ../misc/drivers/m33-linux { };
-
-  mnemonicode = callPackage ../misc/mnemonicode { };
-
-  moonfire-nvr = callPackage ../misc/moonfire-nvr { };
-
   mysql-workbench = callPackage ../applications/misc/mysql-workbench (let mysql = mysql80; in {
     gdal = gdal.override {
       libmysqlclient = mysql;
@@ -37218,60 +18830,24 @@ with pkgs;
     pcre = pcre-cpp;
   });
 
-  r128gain = callPackage ../applications/audio/r128gain { };
-
   resp-app = libsForQt5.callPackage ../applications/misc/resp-app { };
 
-  responder = callPackage ../tools/security/responder { };
-
-  resumed = callPackage ../applications/misc/resumed { };
-
-  robin-map = callPackage ../development/libraries/robin-map { };
-
-  robo3t = callPackage ../applications/misc/robo3t { };
-
-  rucksack = callPackage ../development/tools/rucksack { };
-
-  sam-ba = callPackage ../tools/misc/sam-ba { };
-
-  sndio = callPackage ../misc/sndio { };
-
-  sticky = callPackage ../applications/misc/sticky { };
-
   stork = darwin.apple_sdk_11_0.callPackage ../applications/misc/stork {
     inherit (darwin.apple_sdk_11_0.frameworks) Security;
   };
 
-  superd = callPackage ../misc/superd { };
-
-  oclgrind = callPackage ../development/tools/analysis/oclgrind { };
-
-  opkg = callPackage ../tools/package-management/opkg { };
-
-  opkg-utils = callPackage ../tools/package-management/opkg-utils { };
-
-  pgmanage = callPackage ../applications/misc/pgmanage { };
-
   pgadmin4 = callPackage ../tools/admin/pgadmin { };
 
   pgadmin4-desktopmode = callPackage ../tools/admin/pgadmin { server-mode = false; };
 
   pgmodeler = qt6Packages.callPackage ../applications/misc/pgmodeler { };
 
-  physlock = callPackage ../misc/screensavers/physlock { };
-
   pjsip = darwin.apple_sdk_11_0.callPackage ../applications/networking/pjsip {
     inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreFoundation Security;
   };
 
-  pounce = callPackage ../servers/pounce { };
-
   pt = callPackage ../applications/misc/pt { };
 
-  protocol = callPackage ../applications/networking/protocol { };
-
-  pykms = callPackage ../tools/networking/pykms { };
-
   pyupgrade = with python3Packages; toPythonApplication pyupgrade;
 
   pwntools = with python3Packages; toPythonApplication pwntools;
@@ -37291,82 +18867,24 @@ with pkgs;
 
   qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { };
 
-  qdl = callPackage ../tools/misc/qdl { };
-
-  qperf = callPackage ../os-specific/linux/qperf { };
-
   qzdl = libsForQt5.callPackage ../games/qzdl { };
 
   rates = callPackage ../tools/misc/rates {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  rars = callPackage ../development/tools/rars { };
-
-  rargs = callPackage ../tools/misc/rargs { };
-
-  rancher = callPackage ../applications/networking/cluster/rancher { };
-
-  rauc = callPackage ../tools/misc/rauc { };
-
   rbspy = darwin.apple_sdk_11_0.callPackage ../development/tools/rbspy { };
 
-  redprl = callPackage ../applications/science/logic/redprl { };
-
-  renderizer = callPackage ../development/tools/renderizer { };
-
-  rfc = callPackage ../tools/misc/rfc { };
-
-  rfc-bibtex = callPackage ../tools/typesetting/rfc-bibtex { };
-
   pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker {
     inherit glib gtk3 gobject-introspection wrapGAppsHook3;
   };
 
-  rpl = callPackage ../tools/text/rpl { };
-
-  ricty = callPackage ../data/fonts/ricty { };
-
-  rivalcfg = callPackage ../misc/rivalcfg { };
-
-  roadrunner = callPackage ../servers/roadrunner { };
-
-  rmfuse = callPackage ../tools/filesystems/rmfuse { };
-
-  rmount = callPackage ../tools/filesystems/rmount { };
-
   romdirfs = callPackage ../tools/filesystems/romdirfs {
     stdenv = gccStdenv;
   };
 
-  rss-glx = callPackage ../misc/screensavers/rss-glx { };
-
-  run-scaled = callPackage ../tools/X11/run-scaled { };
-
-  runiq = callPackage ../tools/text/runiq { };
-
-  runit = callPackage ../tools/system/runit { };
-
-  runitor = callPackage ../tools/system/runitor { };
-
-  refmt = callPackage ../development/tools/refmt { };
-
-  spectra = callPackage ../development/libraries/spectra { };
-
-  spectrojack = callPackage ../applications/audio/spectrojack { };
-
-  sift = callPackage ../tools/text/sift { };
-
   xdragon = lowPrio (callPackage ../tools/X11/xdragon { });
 
-  xlockmore = callPackage ../misc/screensavers/xlockmore { };
-
-  xq = callPackage ../tools/misc/xq { };
-
-  xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { };
-
-  sailsd = callPackage ../misc/sailsd { };
-
   sail-riscv-rv32 = callPackage ../applications/virtualization/sail-riscv {
     arch = "RV32";
   };
@@ -37375,50 +18893,18 @@ with pkgs;
     arch = "RV64";
   };
 
-  shc = callPackage ../tools/security/shc { };
-
-  shellz = callPackage ../tools/security/shellz { };
-
-  tableplus = callPackage ../applications/misc/tableplus { };
-
   timeloop = pkgs.darwin.apple_sdk_11_0.callPackage ../applications/science/computer-architecture/timeloop { };
 
-  canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { };
-
-  mfc465cncupswrapper = callPackage ../misc/cups/drivers/brother/mfc465cncupswrapper { };
-  mfc465cnlpr = callPackage ../misc/cups/drivers/brother/mfc465cnlpr { };
-
-  mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { };
   mfcj470dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj470dwlpr { };
 
-  mfcj6510dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj6510dwcupswrapper { };
   mfcj6510dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj6510dwlpr { };
 
-  mfcl2700dncupswrapper = callPackage ../misc/cups/drivers/mfcl2700dncupswrapper { };
   mfcl2700dnlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcl2700dnlpr { };
 
-  mfcl2720dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2720dwcupswrapper { };
-  mfcl2720dwlpr = callPackage ../misc/cups/drivers/mfcl2720dwlpr { };
-
-  mfcl2740dwcupswrapper = callPackage ../misc/cups/drivers/mfcl2740dwcupswrapper { };
-  mfcl2740dwlpr = callPackage ../misc/cups/drivers/mfcl2740dwlpr { };
-
   # This driver is only available as a 32 bit proprietary binary driver
   mfcl3770cdwlpr = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).driver;
   mfcl3770cdwcupswrapper = (callPackage ../misc/cups/drivers/brother/mfcl3770cdw { }).cupswrapper;
 
-  cups-brother-hll2375dw = callPackage ../misc/cups/drivers/brother/hll2375dw { };
-
-  mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { };
-  mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { };
-
-  mfc5890cncupswrapper = callPackage ../misc/cups/drivers/mfc5890cncupswrapper { };
-  mfc5890cnlpr = callPackage ../misc/cups/drivers/mfc5890cnlpr { };
-
-  mfc9140cdncupswrapper = callPackage ../misc/cups/drivers/mfc9140cdncupswrapper { };
-  mfc9140cdnlpr = callPackage ../misc/cups/drivers/mfc9140cdnlpr { };
-
-  samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36 { };
   samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { };
   samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { };
   samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17;
@@ -37427,28 +18913,10 @@ with pkgs;
 
   sane-drivers = callPackage ../applications/graphics/sane/drivers.nix { };
 
-  senv = callPackage ../applications/misc/senv { };
-
-  brlaser = callPackage ../misc/cups/drivers/brlaser { };
-
-  fflinuxprint = callPackage ../misc/cups/drivers/fflinuxprint { };
-
-  fxlinuxprint = callPackage ../misc/cups/drivers/fxlinuxprint { };
-
-  brscan4 = callPackage ../applications/graphics/sane/backends/brscan4 { };
-
-  brscan5 = callPackage ../applications/graphics/sane/backends/brscan5 { };
-
-  dsseries = callPackage ../applications/graphics/sane/backends/dsseries { };
-
-  sane-airscan = callPackage ../applications/graphics/sane/backends/airscan { };
-
   mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };
 
   sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { };
 
-  sanoid = callPackage ../tools/backup/sanoid { };
-
   satysfi = callPackage ../tools/typesetting/satysfi {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
@@ -37457,27 +18925,12 @@ with pkgs;
     inherit libusb1; # Shadow python.pkgs.libusb1.
   };
 
-  sct = callPackage ../tools/X11/sct { };
-
-  seafile-shared = callPackage ../misc/seafile-shared { };
-
-  ser2net = callPackage ../servers/ser2net { };
-
-  serviio = callPackage ../servers/serviio { };
-  selinux-python = callPackage ../os-specific/linux/selinux-python { };
-
   slock = callPackage ../misc/screensavers/slock {
     conf = config.slock.conf or null;
   };
 
-  smokeping = callPackage ../tools/networking/smokeping { };
-
-  snapraid = callPackage ../tools/filesystems/snapraid { };
-
   snscrape = with python3Packages; toPythonApplication snscrape;
 
-  soundmodem = callPackage ../applications/radio/soundmodem { };
-
   sourceAndTags = callPackage ../misc/source-and-tags {
     hasktags = haskellPackages.hasktags;
   };
@@ -37486,34 +18939,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  spacenav-cube-example = callPackage ../applications/misc/spacenav-cube-example { };
-
-  spnavcfg = callPackage ../applications/misc/spnavcfg { };
-
-  splix = callPackage ../misc/cups/drivers/splix { };
-
-  steamcontroller = callPackage ../misc/drivers/steamcontroller { };
-
-  stepreduce = callPackage ../applications/misc/stepreduce { };
-
-  streamripper = callPackage ../applications/audio/streamripper { };
-
-  sqsh = callPackage ../development/tools/sqsh { };
-
-  sysz = callPackage  ../tools/misc/sysz { };
-
-  go-swag = callPackage ../development/tools/go-swag { };
-
-  go-swagger = callPackage ../development/tools/go-swagger { };
-
-  jx = callPackage ../applications/networking/cluster/jx { };
-
-  tagref = callPackage ../tools/misc/tagref { };
-
-  tcat = callPackage ../tools/misc/tcat { };
-
-  tell-me-your-secrets = callPackage ../tools/security/tell-me-your-secrets { };
-
   tellico = libsForQt5.callPackage ../applications/misc/tellico { };
 
   termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py { };
@@ -37532,94 +18957,26 @@ with pkgs;
 
   terraforming = callPackage ../applications/networking/cluster/terraforming { };
 
-  terraform-backend-git = callPackage ../applications/networking/cluster/terraform-backend-git { };
-
-  terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory { };
-
   terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { };
 
-  tfautomv = callPackage ../applications/networking/cluster/tfautomv { };
-
-  terranix = callPackage ../applications/networking/cluster/terranix { };
-
   terraspace = callPackage ../applications/networking/cluster/terraspace { };
 
-  tf-summarize = callPackage ../applications/networking/cluster/tf-summarize { };
-
-  tfswitch = callPackage ../applications/networking/cluster/tfswitch { };
-
   tftui = python3Packages.callPackage ../applications/networking/cluster/tftui { };
 
-  tfupdate = callPackage ../applications/networking/cluster/tfupdate { };
-
-  tgswitch = callPackage ../applications/networking/cluster/tgswitch { };
-
-  tilt = callPackage ../applications/networking/cluster/tilt { };
-
-  timeular = callPackage ../applications/office/timeular { };
-
-  tewi-font = callPackage ../data/fonts/tewi { };
-
-  sshportal = callPackage ../servers/sshportal { };
-
-  ssh-audit = callPackage ../tools/security/ssh-audit { };
-
-  ssh-tools = callPackage ../applications/misc/ssh-tools { };
-
-  thermald = callPackage ../tools/system/thermald { };
-
-  therion = callPackage ../applications/misc/therion { };
-
-  throttled = callPackage ../tools/system/throttled { };
-
-  thinkfan = callPackage ../tools/system/thinkfan { };
-
   touchosc = callPackage ../applications/audio/touchosc { };
 
-  tp-auto-kbbl = callPackage ../tools/system/tp-auto-kbbl { };
-
-  turtle-build = callPackage ../development/tools/build-managers/turtle-build { };
-
-  tusk = callPackage ../applications/office/tusk { };
-
   trufflehog = callPackage ../tools/security/trufflehog {
     buildGoModule = buildGo123Module;
   };
 
-  tunnelx = callPackage ../applications/gis/tunnelx { };
-
-  tvbrowser = callPackage ../applications/misc/tvbrowser { };
-
-  uacme = callPackage ../tools/admin/uacme { };
-
-  ufiformat = callPackage ../tools/system/ufiformat { };
-
-  ums = callPackage ../servers/ums { };
-
   unityhub = callPackage ../development/tools/unityhub { };
 
-  upspin = callPackage ../tools/filesystems/upspin { };
-
   urbit = callPackage ../misc/urbit { };
 
-  usb-reset = callPackage ../applications/misc/usb-reset { };
-
-  utf8cpp = callPackage ../development/libraries/utf8cpp { };
-
-  utf8proc = callPackage ../development/libraries/utf8proc { };
-
-  unicode-paracode = callPackage ../tools/misc/unicode { };
-
   unixcw = libsForQt5.callPackage ../applications/radio/unixcw { };
 
-  vault-medusa = callPackage ../tools/security/vault-medusa { };
-
-  vault-ssh-plus = callPackage ../tools/security/vault-ssh-plus { };
-
   vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv;
 
-  vazir-code-font = callPackage ../data/fonts/vazir-code-font { };
-
   vaultwarden = callPackage ../tools/security/vaultwarden {
     inherit (darwin.apple_sdk.frameworks) Security CoreServices SystemConfiguration;
   };
@@ -37627,37 +18984,20 @@ with pkgs;
   vaultwarden-mysql = vaultwarden.override { dbBackend = "mysql"; };
   vaultwarden-postgresql = vaultwarden.override { dbBackend = "postgresql"; };
 
-  vazir-fonts = callPackage ../data/fonts/vazir-fonts { };
-
   veilid = darwin.apple_sdk_11_0.callPackage ../tools/networking/veilid {
     inherit (darwin.apple_sdk.frameworks) AppKit Security;
   };
 
-  vhs = callPackage ../applications/misc/vhs { };
-
-  viennarna = callPackage ../applications/science/molecular-dynamics/viennarna { };
-
-  viewnior = callPackage ../applications/graphics/viewnior { };
-
   vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix { };
 
   vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { });
 
-  vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { };
   vimb = wrapFirefox vimb-unwrapped { };
 
   vips = callPackage ../by-name/vi/vips/package.nix {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
   };
 
-  vipsdisp = callPackage ../applications/graphics/vipsdisp { };
-
-  nip2 = callPackage ../tools/graphics/nip2 { };
-
-  virglrenderer = callPackage ../development/libraries/virglrenderer { };
-
-  vivid = callPackage ../tools/misc/vivid { };
-
   vivisect = with python3Packages; toPythonApplication (vivisect.override { withGui = true; });
 
   vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen {
@@ -37668,12 +19008,6 @@ with pkgs;
     inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly;
   };
 
-  vsc-leetcode-cli = callPackage ../tools/misc/vsc-leetcode-cli { };
-
-  vsh = callPackage ../tools/misc/vsh { };
-
-  vttest = callPackage ../tools/misc/vttest { };
-
   wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { };
 
   wamr = darwin.apple_sdk_11_0.callPackage ../development/interpreters/wamr { };
@@ -37687,20 +19021,10 @@ with pkgs;
     llvmPackages = llvmPackages_12;
   };
 
-  wasm-pack = callPackage ../development/tools/wasm-pack { };
-
-  wasynth = callPackage ../development/tools/wasynth { };
-
-  wavegain = callPackage ../applications/audio/wavegain { };
-
-  wcalc = callPackage ../applications/misc/wcalc { };
-
   webkit2-sharp = callPackage ../development/libraries/webkit2-sharp {
     webkitgtk = webkitgtk_4_0;
   };
 
-  websocketd = callPackage ../applications/networking/websocketd { };
-
   wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { };
 
   wikicurses = callPackage ../applications/misc/wikicurses {
@@ -37738,16 +19062,6 @@ with pkgs;
     wineRelease = "wayland";
   });
 
-  wineasio = callPackage ../applications/emulators/wineasio { };
-
-  wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { };
-
-  wmutils-core = callPackage ../tools/X11/wmutils-core { };
-
-  wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { };
-
-  wmutils-opt = callPackage ../tools/X11/wmutils-opt { };
-
   inherit (callPackage ../servers/web-apps/wordpress {})
     wordpress wordpress_6_5 wordpress_6_6;
 
@@ -37757,8 +19071,6 @@ with pkgs;
     languages = lib.importJSON ../servers/web-apps/wordpress/packages/languages.json;
   });
 
-  wprecon = callPackage ../tools/security/wprecon { };
-
   wraith = callPackage ../applications/networking/irc/wraith {
     openssl = openssl_1_1;
   };
@@ -37775,44 +19087,12 @@ with pkgs;
     inherit (darwin.stubs) setfile;
   };
 
-  x11idle = callPackage ../tools/misc/x11idle { };
-
-  x11docker = callPackage ../applications/virtualization/x11docker { };
-
-  x2x = callPackage ../tools/X11/x2x { };
-
-  xboxdrv = callPackage ../misc/drivers/xboxdrv { };
-
-  xorex = callPackage ../tools/security/xorex { };
-
-  xbps = callPackage ../tools/package-management/xbps { };
-
-  xcftools = callPackage ../tools/graphics/xcftools { };
-
   xhyve = callPackage ../applications/virtualization/xhyve {
     inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet;
     inherit (darwin.apple_sdk.libs) xpc;
     inherit (darwin) libobjc;
   };
 
-  xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { };
-
-  xlayoutdisplay = callPackage ../tools/X11/xlayoutdisplay { };
-
-  xlibinput-calibrator = callPackage ../tools/inputmethods/xlibinput_calibrator { };
-
-  xlog = callPackage ../applications/radio/xlog { };
-
-  xmagnify = callPackage ../tools/X11/xmagnify { };
-
-  xosd = callPackage ../misc/xosd { };
-
-  xow_dongle-firmware = callPackage ../os-specific/linux/firmware/xow_dongle-firmware { };
-
-  xpad = callPackage ../applications/misc/xpad { };
-
-  xpipe = callPackage ../applications/networking/xpipe { };
-
   xsane = callPackage ../applications/graphics/sane/xsane.nix { };
 
   xsw = callPackage ../applications/misc/xsw {
@@ -37822,48 +19102,14 @@ with pkgs;
     SDL = SDL_sixel;
   };
 
-  xteddy = callPackage ../applications/misc/xteddy { };
-
-  xva-img = callPackage ../tools/virtualization/xva-img { };
-
-  xzoom = callPackage ../tools/X11/xzoom { };
-
   yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { };
 
-  yadm = callPackage ../applications/version-management/yadm { };
-
-  yai = callPackage ../tools/misc/yai { };
-
   yamale = with python3Packages; toPythonApplication yamale;
 
-  yamdi = callPackage ../tools/video/yamdi { };
-
-  yandex-browser = callPackage ../applications/networking/browsers/yandex-browser { };
-
   yandex-browser-beta = yandex-browser.override { edition = "beta"; };
 
   yandex-browser-corporate = yandex-browser.override { edition = "corporate"; };
 
-  yandex-disk = callPackage ../tools/filesystems/yandex-disk { };
-
-  yara = callPackage ../tools/security/yara { };
-
-  yaralyzer = callPackage ../tools/security/yaralyzer { };
-
-  yarGen = callPackage ../tools/security/yarGen { };
-
-  yersinia = callPackage ../tools/security/yersinia { };
-
-  yatas = callPackage ../tools/security/yatas { };
-
-  yaxg = callPackage ../tools/graphics/yaxg { };
-
-  zap = callPackage ../tools/networking/zap { };
-
-  zigbee2mqtt = callPackage ../servers/zigbee2mqtt { };
-
-  zopfli = callPackage ../tools/compression/zopfli { };
-
   myEnvFun = callPackage ../misc/my-env {
     inherit (stdenv) mkDerivation;
   };
@@ -37874,14 +19120,8 @@ with pkgs;
     callPackage ../applications/networking/znc/modules.nix { }
   );
 
-  zoneminder = callPackage ../servers/zoneminder { };
-
   zrok = callPackage ../tools/networking/zrok { };
 
-  xcp = callPackage ../tools/misc/xcp { };
-
-  zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { };
-
   bullet = callPackage ../development/libraries/bullet {
     inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
   };
@@ -37890,8 +19130,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
   };
 
-  spdlog = callPackage ../development/libraries/spdlog { };
-
   dart = callPackage ../development/compilers/dart { };
 
   pub2nix = recurseIntoAttrs (callPackage ../build-support/dart/pub2nix { });
@@ -37904,8 +19142,6 @@ with pkgs;
 
   httraqt = libsForQt5.callPackage ../tools/backup/httrack/qt.nix { };
 
-  mg = callPackage ../applications/editors/mg { };
-
   # Overriding does not work when using callPackage on discord using import instead. (https://github.com/NixOS/nixpkgs/pull/179906)
   discord = import ../applications/networking/instant-messengers/discord {
     inherit lib stdenv;
@@ -37938,74 +19174,32 @@ with pkgs;
 
   golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah { };
 
-  golden-cheetah-bin = callPackage ../applications/misc/golden-cheetah-bin {};
-
-  linkchecker = callPackage ../tools/networking/linkchecker { };
-
   tomb = callPackage ../by-name/to/tomb/package.nix {
     pinentry = pinentry-curses;
   };
 
-  sccache = callPackage ../development/tools/misc/sccache { };
-
-  scip = callPackage ../development/tools/misc/scip { };
-
-  scriptisto = callPackage ../development/tools/misc/scriptisto { };
-
-  sequeler = callPackage ../applications/misc/sequeler { };
-
-  sequelpro = callPackage ../applications/misc/sequelpro { };
-
   serial-studio = libsForQt5.callPackage ../applications/misc/serial-studio { };
 
-  snowsql = callPackage ../applications/misc/snowsql { };
-
-  sidequest = callPackage ../applications/misc/sidequest { };
-
   maphosts = callPackage ../tools/networking/maphosts { };
 
-  zimg = callPackage ../development/libraries/zimg { };
-
-  wtf = callPackage ../applications/misc/wtf { };
-
   tora = libsForQt5.callPackage ../development/tools/tora { };
 
-  xrq = callPackage ../applications/misc/xrq { };
-
   nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { };
 
   nitrokey-app2 = qt6Packages.callPackage ../tools/security/nitrokey-app2 { };
 
-  fpm2 = callPackage ../tools/security/fpm2 { };
-
   hy = with python3Packages; toPythonApplication hy;
 
-  wmic-bin = callPackage ../servers/monitoring/wmic-bin { };
-
   ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { };
 
   vdr = callPackage ../applications/video/vdr { };
   vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { });
   wrapVdr = callPackage ../applications/video/vdr/wrapper.nix { };
 
-  chrome-export = callPackage ../tools/misc/chrome-export { };
-
   chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing { };
 
   linode-cli = python3Packages.callPackage ../tools/virtualization/linode-cli { };
 
-  hss = callPackage ../tools/networking/hss { };
-
-  undaemonize = callPackage ../tools/system/undaemonize { };
-
-  houdini = callPackage ../applications/misc/houdini { };
-
-  openring = callPackage ../applications/misc/openring { };
-
-  openrisk = callPackage ../tools/security/openrisk { };
-
-  openvino = callPackage ../development/libraries/openvino { };
-
   phonetisaurus = callPackage ../development/libraries/phonetisaurus {
     # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70
     openfst = openfst.overrideAttrs rec {
@@ -38025,39 +19219,14 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
   };
 
-  dnstake = callPackage ../tools/networking/dnstake { };
-
   dnstracer = callPackage ../tools/networking/dnstracer {
     inherit (darwin) libresolv;
   };
 
-  dnstwist = callPackage ../tools/networking/dnstwist { };
-
-  dsniff = callPackage ../tools/networking/dsniff { };
-
-  wal-g = callPackage ../tools/backup/wal-g { };
-
-  tlwg = callPackage ../data/fonts/tlwg { };
-
-  tt2020 = callPackage ../data/fonts/tt2020 { };
-
-  simplehttp2server = callPackage ../servers/simplehttp2server { };
-
-  simple-http-server = callPackage ../servers/simple-http-server { };
-
   diceware = with python3Packages; toPythonApplication diceware;
 
   xml2rfc = with python3Packages; toPythonApplication xml2rfc;
 
-  mmark = callPackage ../tools/typesetting/mmark { };
-
-  wire-desktop = callPackage ../applications/networking/instant-messengers/wire-desktop { };
-
-  wireworld = callPackage ../games/wireworld { };
-
-
-  teseq = callPackage ../applications/misc/teseq {  };
-
   ape = callPackage ../applications/misc/ape { };
   attemptoClex = callPackage ../applications/misc/ape/clex.nix { };
   apeClex = callPackage ../applications/misc/ape/apeclex.nix { };
@@ -38080,28 +19249,18 @@ with pkgs;
 
   openbsd = callPackage ../os-specific/bsd/openbsd { };
 
-  powershell = callPackage ../shells/powershell { };
-
   doing = callPackage ../applications/misc/doing  { };
 
-  undervolt = callPackage ../os-specific/linux/undervolt { };
-
   alibuild = callPackage ../development/tools/build-managers/alibuild {
     python = python3;
   };
 
-  tsukae = callPackage ../applications/misc/tsukae { };
-
-  tsung = callPackage ../applications/networking/tsung { };
-
   bcompare = libsForQt5.callPackage ../applications/version-management/bcompare { };
 
   xp-pen-deco-01-v2-driver = libsForQt5.xp-pen-deco-01-v2-driver;
 
   xp-pen-g430-driver = libsForQt5.xp-pen-g430-driver;
 
-  new-session-manager = callPackage ../applications/audio/new-session-manager { };
-
   newlib = callPackage ../development/misc/newlib {
     stdenv = stdenvNoLibc;
   };
@@ -38117,92 +19276,30 @@ with pkgs;
 
   wfuzz = with python3Packages; toPythonApplication wfuzz;
 
-  wmenu = callPackage ../applications/misc/wmenu { };
-
-  bemenu = callPackage ../applications/misc/bemenu { };
-
-  dapper = callPackage ../development/tools/dapper { };
-
-  k3d = callPackage ../applications/networking/cluster/k3d { };
-
-  zfs-prune-snapshots = callPackage ../tools/backup/zfs-prune-snapshots { };
-
   zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
 
-  zfxtop = callPackage ../tools/system/zfxtop { };
-
-  zrepl = callPackage ../tools/backup/zrepl { };
-
-  uhubctl = callPackage ../tools/misc/uhubctl { };
-
   kodelife = callPackage ../applications/graphics/kodelife {
     inherit (gst_all_1) gstreamer gst-plugins-base;
   };
 
-  bunnyfetch = callPackage ../tools/misc/bunnyfetch { };
-
-  _3proxy = callPackage ../applications/networking/3proxy { };
-
   weasis = callPackage ../by-name/we/weasis/package.nix {
     jre = jdk21;
   };
 
-  webwormhole = callPackage ../tools/networking/webwormhole { };
-
-  wifi-password = callPackage ../os-specific/darwin/wifi-password { };
-
-  qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen { };
-
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
   sunshine = callPackage ../servers/sunshine { };
 
-  sentencepiece = callPackage ../development/libraries/sentencepiece { };
-
-  kaf = callPackage ../development/tools/kaf { };
-
-  kcli = callPackage ../development/tools/kcli { };
-
-  pxlib = callPackage ../development/libraries/pxlib { };
-
-  pxview = callPackage ../development/tools/pxview { };
-
-  unstick = callPackage ../os-specific/linux/unstick { };
-
-  quartus-prime-lite = callPackage ../applications/editors/quartus-prime { };
-
-  usb-blaster-udev-rules = callPackage ../os-specific/linux/usb-blaster-udev-rules { };
-
-  go-license-detector = callPackage ../development/tools/misc/go-license-detector { };
-
-  hashdeep = callPackage ../tools/security/hashdeep { };
-
-  pdf-parser = callPackage ../tools/misc/pdf-parser { };
-
-  fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher { };
-
-  btcdeb = callPackage ../applications/blockchains/btcdeb { };
-
   jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {
     # TODO: remove once `udev` is `systemdMinimal` everywhere.
     udev = systemdMinimal;
     jack = libjack2;
   };
 
-  jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { };
-
-  zenstates = callPackage ../os-specific/linux/zenstates { };
-
-  ryzenadj = callPackage ../os-specific/linux/ryzenadj { };
-
   gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { };
 
-  zalgo = callPackage ../tools/misc/zalgo { };
-
   inherit (callPackage ../applications/misc/zettlr { }) zettlr;
 
-  unpoller = callPackage ../servers/monitoring/unpoller { };
-
   fac-build = callPackage ../development/tools/build-managers/fac {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -38213,130 +19310,40 @@ with pkgs;
     wlroots = wlroots_0_17;
   };
 
-  psftools = callPackage ../os-specific/linux/psftools { };
-
-  lc3tools = callPackage ../development/tools/lc3tools { };
-
   ldid = callPackage ../development/tools/ldid {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
 
-  xcolor = callPackage ../tools/graphics/xcolor { };
-
-  xcfun = callPackage ../development/libraries/science/chemistry/xcfun { };
-
-  xsos = callPackage ../os-specific/linux/xsos { };
-
-  xmcp = callPackage ../tools/X11/xmcp { };
-
-  ymuse = callPackage ../applications/audio/ymuse { };
-
-  zeyple = callPackage ../misc/zeyple { };
-
-  zk = callPackage ../applications/office/zk { };
-
-  zktree = callPackage ../applications/misc/zktree { };
-
   zram-generator = callPackage ../tools/system/zram-generator { };
 
   zrythm = callPackage ../applications/audio/zrythm {
     inherit (plasma5Packages) breeze-icons;
   };
 
-  zthrottle = callPackage ../tools/misc/zthrottle { };
-
   honeymarker = callPackage ../servers/tracing/honeycomb/honeymarker { };
 
   honeytail = callPackage ../servers/tracing/honeycomb/honeytail { };
 
   honeyvent = callPackage ../servers/tracing/honeycomb/honeyvent { };
 
-  mictray = callPackage ../tools/audio/mictray { };
-
   swift-corelibs-libdispatch = swiftPackages.Dispatch;
 
-  swaysettings = callPackage ../applications/misc/swaysettings { };
-
   aitrack = libsForQt5.callPackage ../applications/misc/aitrack { };
 
   widevine-cdm = callPackage ../applications/networking/browsers/misc/widevine-cdm.nix { };
 
-  alsa-scarlett-gui = callPackage ../applications/audio/alsa-scarlett-gui { };
-
-  flac2all = callPackage ../applications/audio/flac2all { };
-
-  tuner = callPackage ../applications/audio/tuner { };
-
   tidal-dl = python3Packages.callPackage ../tools/audio/tidal-dl { };
 
-  locate-dominating-file = callPackage ../tools/misc/locate-dominating-file { };
-
-  jfrog-cli = callPackage ../tools/misc/jfrog-cli { };
-
-  ov = callPackage ../tools/text/ov { };
-
-  deface = callPackage ../applications/video/deface { };
-
   tubekit = callPackage ../applications/networking/cluster/tubekit/wrapper.nix { };
 
   tubekit-unwrapped = callPackage ../applications/networking/cluster/tubekit { };
 
-  tuic = callPackage ../tools/networking/tuic { };
-
-  resgate = callPackage ../servers/resgate { };
-
-  oversteer = callPackage ../applications/misc/oversteer { };
-
-  volantes-cursors = callPackage ../data/icons/volantes-cursors { };
-
-  gnss-share = callPackage ../servers/gnss-share { };
-
-  ali = callPackage ../tools/networking/ali { };
-
-  udict = callPackage ../applications/misc/udict { };
-
   duden = python3Packages.toPythonApplication python3Packages.duden;
 
-  zf = callPackage ../tools/misc/zf { };
-
-  isolate = callPackage ../tools/security/isolate { };
-
-  dtool = callPackage ../tools/misc/dtool { };
-
   tremotesf = libsForQt5.callPackage ../applications/networking/p2p/tremotesf { };
 
-  reindeer = callPackage ../development/tools/reindeer { };
-
-  charasay = callPackage ../tools/misc/charasay { };
-
-  libvoikko = callPackage ../development/libraries/libvoikko { };
-
-  hfst = callPackage ../development/libraries/hfst { };
-
-  omorfi = callPackage ../development/libraries/omorfi { };
-
-  hfst-ospell = callPackage ../development/libraries/hfst-ospell { };
-
-  waylyrics = callPackage ../applications/audio/waylyrics { };
-
-  gitrs = callPackage ../tools/misc/gitrs { };
-
-  dict-cc-py = callPackage ../applications/misc/dict-cc-py { };
-
-  wpm = callPackage ../applications/misc/wpm { };
-
-  weggli = callPackage ../tools/security/weggli { };
-
   yazi-unwrapped = callPackage ../by-name/ya/yazi-unwrapped/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation; };
 
-  ssl-proxy = callPackage ../tools/networking/ssl-proxy { };
-
-  code-maat = callPackage ../development/tools/code-maat {};
-
-  mdhtml = callPackage ../tools/text/mdhtml { };
-
-  insulator2 = callPackage ../applications/misc/insulator2 {};
-
   animdl = python3Packages.callPackage ../applications/video/animdl { };
 
   dillo = callPackage ../by-name/di/dillo/package.nix {