diff --git a/pkgs/applications/emulators/86box/darwin.patch b/pkgs/by-name/_8/_86Box/darwin.patch similarity index 100% rename from pkgs/applications/emulators/86box/darwin.patch rename to pkgs/by-name/_8/_86Box/darwin.patch diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/by-name/_8/_86Box/package.nix similarity index 100% rename from pkgs/applications/emulators/86box/default.nix rename to pkgs/by-name/_8/_86Box/package.nix diff --git a/pkgs/applications/emulators/86box/update.sh b/pkgs/by-name/_8/_86Box/update.sh similarity index 100% rename from pkgs/applications/emulators/86box/update.sh rename to pkgs/by-name/_8/_86Box/update.sh diff --git a/pkgs/tools/filesystems/afsctool/default.nix b/pkgs/by-name/af/afsctool/package.nix similarity index 100% rename from pkgs/tools/filesystems/afsctool/default.nix rename to pkgs/by-name/af/afsctool/package.nix diff --git a/pkgs/applications/video/anime-downloader/default.nix b/pkgs/by-name/an/anime-downloader/package.nix similarity index 100% rename from pkgs/applications/video/anime-downloader/default.nix rename to pkgs/by-name/an/anime-downloader/package.nix diff --git a/pkgs/applications/video/anime-downloader/update.sh b/pkgs/by-name/an/anime-downloader/update.sh similarity index 100% rename from pkgs/applications/video/anime-downloader/update.sh rename to pkgs/by-name/an/anime-downloader/update.sh diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/by-name/aw/awsbck/package.nix similarity index 100% rename from pkgs/tools/backup/awsbck/default.nix rename to pkgs/by-name/aw/awsbck/package.nix diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/by-name/az/azure-static-sites-client/package.nix similarity index 100% rename from pkgs/development/tools/azure-static-sites-client/default.nix rename to pkgs/by-name/az/azure-static-sites-client/package.nix diff --git a/pkgs/development/tools/azure-static-sites-client/update.sh b/pkgs/by-name/az/azure-static-sites-client/update.sh similarity index 100% rename from pkgs/development/tools/azure-static-sites-client/update.sh rename to pkgs/by-name/az/azure-static-sites-client/update.sh diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/by-name/az/azure-static-sites-client/versions.json similarity index 100% rename from pkgs/development/tools/azure-static-sites-client/versions.json rename to pkgs/by-name/az/azure-static-sites-client/versions.json diff --git a/pkgs/servers/binserve/Cargo.lock b/pkgs/by-name/bi/binserve/Cargo.lock similarity index 100% rename from pkgs/servers/binserve/Cargo.lock rename to pkgs/by-name/bi/binserve/Cargo.lock diff --git a/pkgs/servers/binserve/default.nix b/pkgs/by-name/bi/binserve/package.nix similarity index 100% rename from pkgs/servers/binserve/default.nix rename to pkgs/by-name/bi/binserve/package.nix diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/by-name/ca/cacert/package.nix similarity index 100% rename from pkgs/data/misc/cacert/default.nix rename to pkgs/by-name/ca/cacert/package.nix diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/by-name/ca/cacert/setup-hook.sh similarity index 100% rename from pkgs/data/misc/cacert/setup-hook.sh rename to pkgs/by-name/ca/cacert/setup-hook.sh diff --git a/pkgs/data/misc/cacert/test-cert-file.crt b/pkgs/by-name/ca/cacert/test-cert-file.crt similarity index 100% rename from pkgs/data/misc/cacert/test-cert-file.crt rename to pkgs/by-name/ca/cacert/test-cert-file.crt diff --git a/pkgs/data/misc/cacert/update.sh b/pkgs/by-name/ca/cacert/update.sh similarity index 100% rename from pkgs/data/misc/cacert/update.sh rename to pkgs/by-name/ca/cacert/update.sh diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/by-name/ca/cargo-cache/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-cache/default.nix rename to pkgs/by-name/ca/cargo-cache/package.nix diff --git a/pkgs/development/tools/rust/cargo-outdated/default.nix b/pkgs/by-name/ca/cargo-outdated/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-outdated/default.nix rename to pkgs/by-name/ca/cargo-outdated/package.nix diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-zigbuild/default.nix rename to pkgs/by-name/ca/cargo-zigbuild/package.nix diff --git a/pkgs/development/tools/language-servers/ccls/default.nix b/pkgs/by-name/cc/ccls/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/ccls/default.nix rename to pkgs/by-name/cc/ccls/package.nix diff --git a/pkgs/development/tools/language-servers/ccls/wrapper b/pkgs/by-name/cc/ccls/wrapper similarity index 100% rename from pkgs/development/tools/language-servers/ccls/wrapper rename to pkgs/by-name/cc/ccls/wrapper diff --git a/pkgs/applications/audio/cdparanoia/configure.patch b/pkgs/by-name/cd/cdparanoiaIII/configure.patch similarity index 100% rename from pkgs/applications/audio/cdparanoia/configure.patch rename to pkgs/by-name/cd/cdparanoiaIII/configure.patch diff --git a/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch b/pkgs/by-name/cd/cdparanoiaIII/fix_private_keyword.patch similarity index 100% rename from pkgs/applications/audio/cdparanoia/fix_private_keyword.patch rename to pkgs/by-name/cd/cdparanoiaIII/fix_private_keyword.patch diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/by-name/cd/cdparanoiaIII/package.nix similarity index 100% rename from pkgs/applications/audio/cdparanoia/default.nix rename to pkgs/by-name/cd/cdparanoiaIII/package.nix diff --git a/pkgs/applications/audio/cdparanoia/utils.patch b/pkgs/by-name/cd/cdparanoiaIII/utils.patch similarity index 100% rename from pkgs/applications/audio/cdparanoia/utils.patch rename to pkgs/by-name/cd/cdparanoiaIII/utils.patch diff --git a/pkgs/development/libraries/CGAL/cgal_path.patch b/pkgs/by-name/cg/cgal/cgal_path.patch similarity index 100% rename from pkgs/development/libraries/CGAL/cgal_path.patch rename to pkgs/by-name/cg/cgal/cgal_path.patch diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/by-name/cg/cgal/package.nix similarity index 100% rename from pkgs/development/libraries/CGAL/default.nix rename to pkgs/by-name/cg/cgal/package.nix diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/by-name/cr/crosvm/package.nix similarity index 100% rename from pkgs/applications/virtualization/crosvm/default.nix rename to pkgs/by-name/cr/crosvm/package.nix diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/by-name/cy/cypress/package.nix similarity index 100% rename from pkgs/development/web/cypress/default.nix rename to pkgs/by-name/cy/cypress/package.nix diff --git a/pkgs/development/web/cypress/update.sh b/pkgs/by-name/cy/cypress/update.sh similarity index 100% rename from pkgs/development/web/cypress/update.sh rename to pkgs/by-name/cy/cypress/update.sh diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/by-name/di/didyoumean/package.nix similarity index 100% rename from pkgs/tools/misc/didyoumean/default.nix rename to pkgs/by-name/di/didyoumean/package.nix diff --git a/pkgs/servers/mail/dovecot/load-extended-modules.patch b/pkgs/by-name/do/dovecot/load-extended-modules.patch similarity index 100% rename from pkgs/servers/mail/dovecot/load-extended-modules.patch rename to pkgs/by-name/do/dovecot/load-extended-modules.patch diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/by-name/do/dovecot/package.nix similarity index 100% rename from pkgs/servers/mail/dovecot/default.nix rename to pkgs/by-name/do/dovecot/package.nix diff --git a/pkgs/servers/mail/dovecot/timespec.patch b/pkgs/by-name/do/dovecot/timespec.patch similarity index 100% rename from pkgs/servers/mail/dovecot/timespec.patch rename to pkgs/by-name/do/dovecot/timespec.patch diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/by-name/du/duckdb/package.nix similarity index 100% rename from pkgs/development/libraries/duckdb/default.nix rename to pkgs/by-name/du/duckdb/package.nix diff --git a/pkgs/development/libraries/duckdb/update.sh b/pkgs/by-name/du/duckdb/update.sh similarity index 100% rename from pkgs/development/libraries/duckdb/update.sh rename to pkgs/by-name/du/duckdb/update.sh diff --git a/pkgs/development/libraries/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json similarity index 100% rename from pkgs/development/libraries/duckdb/versions.json rename to pkgs/by-name/du/duckdb/versions.json diff --git a/pkgs/os-specific/darwin/duti/buildConfigure.patch b/pkgs/by-name/du/duti/buildConfigure.patch similarity index 100% rename from pkgs/os-specific/darwin/duti/buildConfigure.patch rename to pkgs/by-name/du/duti/buildConfigure.patch diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/by-name/du/duti/package.nix similarity index 100% rename from pkgs/os-specific/darwin/duti/default.nix rename to pkgs/by-name/du/duti/package.nix diff --git a/pkgs/development/tools/database/dynein/default.nix b/pkgs/by-name/dy/dynein/package.nix similarity index 100% rename from pkgs/development/tools/database/dynein/default.nix rename to pkgs/by-name/dy/dynein/package.nix diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix similarity index 100% rename from pkgs/tools/misc/esphome/dashboard.nix rename to pkgs/by-name/es/esphome/dashboard.nix diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/by-name/es/esphome/package.nix similarity index 100% rename from pkgs/tools/misc/esphome/default.nix rename to pkgs/by-name/es/esphome/package.nix diff --git a/pkgs/tools/misc/esphome/update.nix b/pkgs/by-name/es/esphome/update.nix similarity index 100% rename from pkgs/tools/misc/esphome/update.nix rename to pkgs/by-name/es/esphome/update.nix diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch similarity index 100% rename from pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch rename to pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/by-name/ev/evolution-ews/package.nix similarity index 100% rename from pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix rename to pkgs/by-name/ev/evolution-ews/package.nix diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/by-name/fa/fable/package.nix similarity index 100% rename from pkgs/development/tools/fable/default.nix rename to pkgs/by-name/fa/fable/package.nix diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/by-name/fn/fnm/package.nix similarity index 100% rename from pkgs/development/tools/fnm/default.nix rename to pkgs/by-name/fn/fnm/package.nix diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/by-name/ge/genpass/package.nix similarity index 100% rename from pkgs/tools/security/genpass/default.nix rename to pkgs/by-name/ge/genpass/package.nix diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/by-name/gf/gfold/package.nix similarity index 100% rename from pkgs/applications/version-management/gfold/default.nix rename to pkgs/by-name/gf/gfold/package.nix diff --git a/pkgs/tools/misc/gh-cal/default.nix b/pkgs/by-name/gh/gh-cal/package.nix similarity index 100% rename from pkgs/tools/misc/gh-cal/default.nix rename to pkgs/by-name/gh/gh-cal/package.nix diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/by-name/gi/git-absorb/package.nix similarity index 100% rename from pkgs/applications/version-management/git-absorb/default.nix rename to pkgs/by-name/gi/git-absorb/package.nix diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/by-name/gi/git-branchless/package.nix similarity index 100% rename from pkgs/applications/version-management/git-branchless/default.nix rename to pkgs/by-name/gi/git-branchless/package.nix diff --git a/pkgs/applications/version-management/git-cinnabar/default.nix b/pkgs/by-name/gi/git-cinnabar/package.nix similarity index 100% rename from pkgs/applications/version-management/git-cinnabar/default.nix rename to pkgs/by-name/gi/git-cinnabar/package.nix diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/by-name/gi/git-cliff/package.nix similarity index 100% rename from pkgs/applications/version-management/git-cliff/default.nix rename to pkgs/by-name/gi/git-cliff/package.nix diff --git a/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/pkgs/by-name/gi/git-credential-keepassxc/package.nix similarity index 100% rename from pkgs/applications/version-management/git-credential-keepassxc/default.nix rename to pkgs/by-name/gi/git-credential-keepassxc/package.nix diff --git a/pkgs/applications/version-management/git-remote-codecommit/default.nix b/pkgs/by-name/gi/git-remote-codecommit/package.nix similarity index 100% rename from pkgs/applications/version-management/git-remote-codecommit/default.nix rename to pkgs/by-name/gi/git-remote-codecommit/package.nix diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/by-name/gi/git-trim/package.nix similarity index 100% rename from pkgs/applications/version-management/git-trim/default.nix rename to pkgs/by-name/gi/git-trim/package.nix diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/by-name/gi/gitoxide/package.nix similarity index 100% rename from pkgs/applications/version-management/gitoxide/default.nix rename to pkgs/by-name/gi/gitoxide/package.nix diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/by-name/gp/gpac/package.nix similarity index 100% rename from pkgs/applications/video/gpac/default.nix rename to pkgs/by-name/gp/gpac/package.nix diff --git a/pkgs/tools/text/gpt2tc/0001-add-python-shebang.patch b/pkgs/by-name/gp/gpt2tc/0001-add-python-shebang.patch similarity index 100% rename from pkgs/tools/text/gpt2tc/0001-add-python-shebang.patch rename to pkgs/by-name/gp/gpt2tc/0001-add-python-shebang.patch diff --git a/pkgs/tools/text/gpt2tc/default.nix b/pkgs/by-name/gp/gpt2tc/package.nix similarity index 100% rename from pkgs/tools/text/gpt2tc/default.nix rename to pkgs/by-name/gp/gpt2tc/package.nix diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/by-name/gr/gretl/package.nix similarity index 100% rename from pkgs/applications/science/math/gretl/default.nix rename to pkgs/by-name/gr/gretl/package.nix diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/by-name/gx/gx/package.nix similarity index 100% rename from pkgs/tools/package-management/gx/default.nix rename to pkgs/by-name/gx/gx/package.nix diff --git a/pkgs/applications/video/gyroflow/gyroflow-mime.xml b/pkgs/by-name/gy/gyroflow/gyroflow-mime.xml similarity index 100% rename from pkgs/applications/video/gyroflow/gyroflow-mime.xml rename to pkgs/by-name/gy/gyroflow/gyroflow-mime.xml diff --git a/pkgs/applications/video/gyroflow/gyroflow-open.sh b/pkgs/by-name/gy/gyroflow/gyroflow-open.sh similarity index 100% rename from pkgs/applications/video/gyroflow/gyroflow-open.sh rename to pkgs/by-name/gy/gyroflow/gyroflow-open.sh diff --git a/pkgs/applications/video/gyroflow/default.nix b/pkgs/by-name/gy/gyroflow/package.nix similarity index 100% rename from pkgs/applications/video/gyroflow/default.nix rename to pkgs/by-name/gy/gyroflow/package.nix diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/by-name/ho/honggfuzz/package.nix similarity index 100% rename from pkgs/tools/security/honggfuzz/default.nix rename to pkgs/by-name/ho/honggfuzz/package.nix diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/by-name/hp/hpx/package.nix similarity index 100% rename from pkgs/development/libraries/hpx/default.nix rename to pkgs/by-name/hp/hpx/package.nix diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/by-name/ht/http-prompt/package.nix similarity index 100% rename from pkgs/tools/networking/http-prompt/default.nix rename to pkgs/by-name/ht/http-prompt/package.nix diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/by-name/ir/irssi/package.nix similarity index 100% rename from pkgs/applications/networking/irc/irssi/default.nix rename to pkgs/by-name/ir/irssi/package.nix diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/by-name/is/ispc/package.nix similarity index 100% rename from pkgs/development/compilers/ispc/default.nix rename to pkgs/by-name/is/ispc/package.nix diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/by-name/jb/jboss/package.nix similarity index 100% rename from pkgs/servers/http/jboss/default.nix rename to pkgs/by-name/jb/jboss/package.nix diff --git a/pkgs/servers/jibri/default.nix b/pkgs/by-name/ji/jibri/package.nix similarity index 100% rename from pkgs/servers/jibri/default.nix rename to pkgs/by-name/ji/jibri/package.nix diff --git a/pkgs/servers/jibri/update.sh b/pkgs/by-name/ji/jibri/update.sh similarity index 100% rename from pkgs/servers/jibri/update.sh rename to pkgs/by-name/ji/jibri/update.sh diff --git a/pkgs/servers/jicofo/logging.properties-journal b/pkgs/by-name/ji/jicofo/logging.properties-journal similarity index 100% rename from pkgs/servers/jicofo/logging.properties-journal rename to pkgs/by-name/ji/jicofo/logging.properties-journal diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/by-name/ji/jicofo/package.nix similarity index 100% rename from pkgs/servers/jicofo/default.nix rename to pkgs/by-name/ji/jicofo/package.nix diff --git a/pkgs/servers/jicofo/update.sh b/pkgs/by-name/ji/jicofo/update.sh similarity index 100% rename from pkgs/servers/jicofo/update.sh rename to pkgs/by-name/ji/jicofo/update.sh diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/by-name/ji/jitsi-meet-prosody/package.nix similarity index 100% rename from pkgs/misc/jitsi-meet-prosody/default.nix rename to pkgs/by-name/ji/jitsi-meet-prosody/package.nix diff --git a/pkgs/misc/jitsi-meet-prosody/update.sh b/pkgs/by-name/ji/jitsi-meet-prosody/update.sh similarity index 100% rename from pkgs/misc/jitsi-meet-prosody/update.sh rename to pkgs/by-name/ji/jitsi-meet-prosody/update.sh diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/by-name/ji/jitsi-meet/package.nix similarity index 100% rename from pkgs/servers/web-apps/jitsi-meet/default.nix rename to pkgs/by-name/ji/jitsi-meet/package.nix diff --git a/pkgs/servers/web-apps/jitsi-meet/update.sh b/pkgs/by-name/ji/jitsi-meet/update.sh similarity index 100% rename from pkgs/servers/web-apps/jitsi-meet/update.sh rename to pkgs/by-name/ji/jitsi-meet/update.sh diff --git a/pkgs/servers/jitsi-videobridge/logging.properties-journal b/pkgs/by-name/ji/jitsi-videobridge/logging.properties-journal similarity index 100% rename from pkgs/servers/jitsi-videobridge/logging.properties-journal rename to pkgs/by-name/ji/jitsi-videobridge/logging.properties-journal diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/by-name/ji/jitsi-videobridge/package.nix similarity index 100% rename from pkgs/servers/jitsi-videobridge/default.nix rename to pkgs/by-name/ji/jitsi-videobridge/package.nix diff --git a/pkgs/servers/jitsi-videobridge/update.sh b/pkgs/by-name/ji/jitsi-videobridge/update.sh similarity index 100% rename from pkgs/servers/jitsi-videobridge/update.sh rename to pkgs/by-name/ji/jitsi-videobridge/update.sh diff --git a/pkgs/tools/misc/jsonwatch/default.nix b/pkgs/by-name/js/jsonwatch/package.nix similarity index 100% rename from pkgs/tools/misc/jsonwatch/default.nix rename to pkgs/by-name/js/jsonwatch/package.nix diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/by-name/li/libgcrypt/package.nix similarity index 100% rename from pkgs/development/libraries/libgcrypt/default.nix rename to pkgs/by-name/li/libgcrypt/package.nix diff --git a/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch b/pkgs/by-name/li/libnma/hardcode-gsettings.patch similarity index 100% rename from pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch rename to pkgs/by-name/li/libnma/hardcode-gsettings.patch diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/by-name/li/libnma/package.nix similarity index 100% rename from pkgs/tools/networking/networkmanager/libnma/default.nix rename to pkgs/by-name/li/libnma/package.nix diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/by-name/li/libopenmpt/package.nix similarity index 100% rename from pkgs/development/libraries/audio/libopenmpt/default.nix rename to pkgs/by-name/li/libopenmpt/package.nix diff --git a/pkgs/development/libraries/audio/libopenmpt/update.sh b/pkgs/by-name/li/libopenmpt/update.sh similarity index 100% rename from pkgs/development/libraries/audio/libopenmpt/update.sh rename to pkgs/by-name/li/libopenmpt/update.sh diff --git a/pkgs/development/libraries/libproxy/hardcode-gsettings.patch b/pkgs/by-name/li/libproxy/hardcode-gsettings.patch similarity index 100% rename from pkgs/development/libraries/libproxy/hardcode-gsettings.patch rename to pkgs/by-name/li/libproxy/hardcode-gsettings.patch diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/by-name/li/libproxy/package.nix similarity index 100% rename from pkgs/development/libraries/libproxy/default.nix rename to pkgs/by-name/li/libproxy/package.nix diff --git a/pkgs/development/libraries/libproxy/skip-gsettings-detection.patch b/pkgs/by-name/li/libproxy/skip-gsettings-detection.patch similarity index 100% rename from pkgs/development/libraries/libproxy/skip-gsettings-detection.patch rename to pkgs/by-name/li/libproxy/skip-gsettings-detection.patch diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/by-name/li/lightburn/package.nix similarity index 100% rename from pkgs/applications/graphics/lightburn/default.nix rename to pkgs/by-name/li/lightburn/package.nix diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/by-name/li/linux-firmware/package.nix similarity index 100% rename from pkgs/os-specific/linux/firmware/linux-firmware/default.nix rename to pkgs/by-name/li/linux-firmware/package.nix diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/update.sh b/pkgs/by-name/li/linux-firmware/update.sh similarity index 100% rename from pkgs/os-specific/linux/firmware/linux-firmware/update.sh rename to pkgs/by-name/li/linux-firmware/update.sh diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/by-name/ly/lychee/package.nix similarity index 100% rename from pkgs/tools/networking/lychee/default.nix rename to pkgs/by-name/ly/lychee/package.nix diff --git a/pkgs/tools/networking/lychee/tests/fail-emptyDirectory.nix b/pkgs/by-name/ly/lychee/tests/fail-emptyDirectory.nix similarity index 100% rename from pkgs/tools/networking/lychee/tests/fail-emptyDirectory.nix rename to pkgs/by-name/ly/lychee/tests/fail-emptyDirectory.nix diff --git a/pkgs/tools/networking/lychee/tests/fail.nix b/pkgs/by-name/ly/lychee/tests/fail.nix similarity index 100% rename from pkgs/tools/networking/lychee/tests/fail.nix rename to pkgs/by-name/ly/lychee/tests/fail.nix diff --git a/pkgs/tools/networking/lychee/tests/network.nix b/pkgs/by-name/ly/lychee/tests/network.nix similarity index 100% rename from pkgs/tools/networking/lychee/tests/network.nix rename to pkgs/by-name/ly/lychee/tests/network.nix diff --git a/pkgs/tools/networking/lychee/tests/ok.nix b/pkgs/by-name/ly/lychee/tests/ok.nix similarity index 100% rename from pkgs/tools/networking/lychee/tests/ok.nix rename to pkgs/by-name/ly/lychee/tests/ok.nix diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/by-name/ma/maigret/package.nix similarity index 100% rename from pkgs/tools/security/maigret/default.nix rename to pkgs/by-name/ma/maigret/package.nix diff --git a/pkgs/development/tools/marksman/deps.json b/pkgs/by-name/ma/marksman/deps.json similarity index 100% rename from pkgs/development/tools/marksman/deps.json rename to pkgs/by-name/ma/marksman/deps.json diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/by-name/ma/marksman/package.nix similarity index 100% rename from pkgs/development/tools/marksman/default.nix rename to pkgs/by-name/ma/marksman/package.nix diff --git a/pkgs/development/tools/marksman/update.sh b/pkgs/by-name/ma/marksman/update.sh similarity index 100% rename from pkgs/development/tools/marksman/update.sh rename to pkgs/by-name/ma/marksman/update.sh diff --git a/pkgs/servers/matrix-appservice-discord/package.json b/pkgs/by-name/ma/matrix-appservice-discord/package.json similarity index 100% rename from pkgs/servers/matrix-appservice-discord/package.json rename to pkgs/by-name/ma/matrix-appservice-discord/package.json diff --git a/pkgs/servers/matrix-appservice-discord/default.nix b/pkgs/by-name/ma/matrix-appservice-discord/package.nix similarity index 100% rename from pkgs/servers/matrix-appservice-discord/default.nix rename to pkgs/by-name/ma/matrix-appservice-discord/package.nix diff --git a/pkgs/servers/matrix-appservice-discord/pin.json b/pkgs/by-name/ma/matrix-appservice-discord/pin.json similarity index 100% rename from pkgs/servers/matrix-appservice-discord/pin.json rename to pkgs/by-name/ma/matrix-appservice-discord/pin.json diff --git a/pkgs/servers/matrix-appservice-discord/update.sh b/pkgs/by-name/ma/matrix-appservice-discord/update.sh similarity index 100% rename from pkgs/servers/matrix-appservice-discord/update.sh rename to pkgs/by-name/ma/matrix-appservice-discord/update.sh diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/Cargo.lock similarity index 100% rename from pkgs/development/libraries/matrix-sdk-crypto-nodejs/Cargo.lock rename to pkgs/by-name/ma/matrix-sdk-crypto-nodejs/Cargo.lock diff --git a/pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix similarity index 100% rename from pkgs/development/libraries/matrix-sdk-crypto-nodejs/default.nix rename to pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/by-name/me/meilisearch/Cargo.lock similarity index 100% rename from pkgs/servers/search/meilisearch/Cargo.lock rename to pkgs/by-name/me/meilisearch/Cargo.lock diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/by-name/me/meilisearch/package.nix similarity index 100% rename from pkgs/servers/search/meilisearch/default.nix rename to pkgs/by-name/me/meilisearch/package.nix diff --git a/pkgs/games/minecraft/default.nix b/pkgs/by-name/mi/minecraft/package.nix similarity index 100% rename from pkgs/games/minecraft/default.nix rename to pkgs/by-name/mi/minecraft/package.nix diff --git a/pkgs/games/minecraft/update.sh b/pkgs/by-name/mi/minecraft/update.sh similarity index 100% rename from pkgs/games/minecraft/update.sh rename to pkgs/by-name/mi/minecraft/update.sh diff --git a/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch b/pkgs/by-name/mt/mtools/UNUSED-darwin.patch similarity index 100% rename from pkgs/tools/filesystems/mtools/UNUSED-darwin.patch rename to pkgs/by-name/mt/mtools/UNUSED-darwin.patch diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/by-name/mt/mtools/package.nix similarity index 100% rename from pkgs/tools/filesystems/mtools/default.nix rename to pkgs/by-name/mt/mtools/package.nix diff --git a/pkgs/tools/filesystems/mtools/update.sh b/pkgs/by-name/mt/mtools/update.sh similarity index 100% rename from pkgs/tools/filesystems/mtools/update.sh rename to pkgs/by-name/mt/mtools/update.sh diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/by-name/mx/mxnet/package.nix similarity index 100% rename from pkgs/applications/science/math/mxnet/default.nix rename to pkgs/by-name/mx/mxnet/package.nix diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/by-name/na/nano/package.nix similarity index 100% rename from pkgs/applications/editors/nano/default.nix rename to pkgs/by-name/na/nano/package.nix diff --git a/pkgs/applications/editors/nano/test-with-expect.nix b/pkgs/by-name/na/nano/test-with-expect.nix similarity index 100% rename from pkgs/applications/editors/nano/test-with-expect.nix rename to pkgs/by-name/na/nano/test-with-expect.nix diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/by-name/nb/nbstripout/package.nix similarity index 100% rename from pkgs/applications/version-management/nbstripout/default.nix rename to pkgs/by-name/nb/nbstripout/package.nix diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/by-name/nd/ndi/package.nix similarity index 100% rename from pkgs/development/libraries/ndi/default.nix rename to pkgs/by-name/nd/ndi/package.nix diff --git a/pkgs/development/libraries/ndi/update.py b/pkgs/by-name/nd/ndi/update.py similarity index 100% rename from pkgs/development/libraries/ndi/update.py rename to pkgs/by-name/nd/ndi/update.py diff --git a/pkgs/development/libraries/ndi/version.json b/pkgs/by-name/nd/ndi/version.json similarity index 100% rename from pkgs/development/libraries/ndi/version.json rename to pkgs/by-name/nd/ndi/version.json diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/by-name/ne/netpbm/package.nix similarity index 100% rename from pkgs/tools/graphics/netpbm/default.nix rename to pkgs/by-name/ne/netpbm/package.nix diff --git a/pkgs/tools/graphics/netpbm/update.sh b/pkgs/by-name/ne/netpbm/update.sh similarity index 100% rename from pkgs/tools/graphics/netpbm/update.sh rename to pkgs/by-name/ne/netpbm/update.sh diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/by-name/ni/nix-output-monitor/generated-package.nix similarity index 100% rename from pkgs/tools/nix/nix-output-monitor/generated-package.nix rename to pkgs/by-name/ni/nix-output-monitor/generated-package.nix diff --git a/pkgs/tools/nix/nix-output-monitor/default.nix b/pkgs/by-name/ni/nix-output-monitor/package.nix similarity index 100% rename from pkgs/tools/nix/nix-output-monitor/default.nix rename to pkgs/by-name/ni/nix-output-monitor/package.nix diff --git a/pkgs/tools/nix/nix-output-monitor/update.sh b/pkgs/by-name/ni/nix-output-monitor/update.sh similarity index 100% rename from pkgs/tools/nix/nix-output-monitor/update.sh rename to pkgs/by-name/ni/nix-output-monitor/update.sh diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/by-name/no/nominatim/package.nix similarity index 100% rename from pkgs/servers/nominatim/default.nix rename to pkgs/by-name/no/nominatim/package.nix diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/by-name/nt/ntfy/package.nix similarity index 100% rename from pkgs/tools/misc/ntfy/default.nix rename to pkgs/by-name/nt/ntfy/package.nix diff --git a/pkgs/tools/misc/ntfy/webpush.nix b/pkgs/by-name/nt/ntfy/webpush.nix similarity index 100% rename from pkgs/tools/misc/ntfy/webpush.nix rename to pkgs/by-name/nt/ntfy/webpush.nix diff --git a/pkgs/tools/networking/onetun/default.nix b/pkgs/by-name/on/onetun/package.nix similarity index 100% rename from pkgs/tools/networking/onetun/default.nix rename to pkgs/by-name/on/onetun/package.nix diff --git a/pkgs/applications/audio/openutau/deps.json b/pkgs/by-name/op/openutau/deps.json similarity index 100% rename from pkgs/applications/audio/openutau/deps.json rename to pkgs/by-name/op/openutau/deps.json diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/by-name/op/openutau/package.nix similarity index 100% rename from pkgs/applications/audio/openutau/default.nix rename to pkgs/by-name/op/openutau/package.nix diff --git a/pkgs/applications/audio/openutau/update.sh b/pkgs/by-name/op/openutau/update.sh similarity index 100% rename from pkgs/applications/audio/openutau/update.sh rename to pkgs/by-name/op/openutau/update.sh diff --git a/pkgs/tools/system/osquery/Remove-git-reset.patch b/pkgs/by-name/os/osquery/Remove-git-reset.patch similarity index 100% rename from pkgs/tools/system/osquery/Remove-git-reset.patch rename to pkgs/by-name/os/osquery/Remove-git-reset.patch diff --git a/pkgs/tools/system/osquery/info.json b/pkgs/by-name/os/osquery/info.json similarity index 100% rename from pkgs/tools/system/osquery/info.json rename to pkgs/by-name/os/osquery/info.json diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/by-name/os/osquery/package.nix similarity index 100% rename from pkgs/tools/system/osquery/default.nix rename to pkgs/by-name/os/osquery/package.nix diff --git a/pkgs/tools/system/osquery/toolchain-bin.nix b/pkgs/by-name/os/osquery/toolchain-bin.nix similarity index 100% rename from pkgs/tools/system/osquery/toolchain-bin.nix rename to pkgs/by-name/os/osquery/toolchain-bin.nix diff --git a/pkgs/tools/system/osquery/update.py b/pkgs/by-name/os/osquery/update.py similarity index 100% rename from pkgs/tools/system/osquery/update.py rename to pkgs/by-name/os/osquery/update.py diff --git a/pkgs/development/tools/perseus-cli/default.nix b/pkgs/by-name/pe/perseus-cli/package.nix similarity index 100% rename from pkgs/development/tools/perseus-cli/default.nix rename to pkgs/by-name/pe/perseus-cli/package.nix diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/by-name/po/portaudio/package.nix similarity index 100% rename from pkgs/development/libraries/portaudio/default.nix rename to pkgs/by-name/po/portaudio/package.nix diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/by-name/pr/prisma-engines/package.nix similarity index 100% rename from pkgs/development/tools/database/prisma-engines/default.nix rename to pkgs/by-name/pr/prisma-engines/package.nix diff --git a/pkgs/development/tools/protoc-gen-dart/default.nix b/pkgs/by-name/pr/protoc-gen-dart/package.nix similarity index 100% rename from pkgs/development/tools/protoc-gen-dart/default.nix rename to pkgs/by-name/pr/protoc-gen-dart/package.nix diff --git a/pkgs/development/tools/protoc-gen-dart/pubspec.lock.json b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json similarity index 100% rename from pkgs/development/tools/protoc-gen-dart/pubspec.lock.json rename to pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json diff --git a/pkgs/development/tools/protoc-gen-dart/update.sh b/pkgs/by-name/pr/protoc-gen-dart/update.sh similarity index 100% rename from pkgs/development/tools/protoc-gen-dart/update.sh rename to pkgs/by-name/pr/protoc-gen-dart/update.sh diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/by-name/py/pymol/package.nix similarity index 100% rename from pkgs/applications/science/chemistry/pymol/default.nix rename to pkgs/by-name/py/pymol/package.nix diff --git a/pkgs/applications/science/chemistry/pymol/script-already-exists.patch b/pkgs/by-name/py/pymol/script-already-exists.patch similarity index 100% rename from pkgs/applications/science/chemistry/pymol/script-already-exists.patch rename to pkgs/by-name/py/pymol/script-already-exists.patch diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/by-name/qt/qtox/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/qtox/default.nix rename to pkgs/by-name/qt/qtox/package.nix diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/by-name/ru/ruplacer/package.nix similarity index 100% rename from pkgs/tools/text/ruplacer/default.nix rename to pkgs/by-name/ru/ruplacer/package.nix diff --git a/pkgs/development/libraries/rure/Cargo.lock b/pkgs/by-name/ru/rure/Cargo.lock similarity index 100% rename from pkgs/development/libraries/rure/Cargo.lock rename to pkgs/by-name/ru/rure/Cargo.lock diff --git a/pkgs/development/libraries/rure/default.nix b/pkgs/by-name/ru/rure/package.nix similarity index 100% rename from pkgs/development/libraries/rure/default.nix rename to pkgs/by-name/ru/rure/package.nix diff --git a/pkgs/development/libraries/rure/pin.json b/pkgs/by-name/ru/rure/pin.json similarity index 100% rename from pkgs/development/libraries/rure/pin.json rename to pkgs/by-name/ru/rure/pin.json diff --git a/pkgs/development/libraries/rure/update.sh b/pkgs/by-name/ru/rure/update.sh similarity index 100% rename from pkgs/development/libraries/rure/update.sh rename to pkgs/by-name/ru/rure/update.sh diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/by-name/sa/sauce-connect/package.nix similarity index 100% rename from pkgs/development/tools/sauce-connect/default.nix rename to pkgs/by-name/sa/sauce-connect/package.nix diff --git a/pkgs/development/tools/sauce-connect/update.sh b/pkgs/by-name/sa/sauce-connect/update.sh similarity index 100% rename from pkgs/development/tools/sauce-connect/update.sh rename to pkgs/by-name/sa/sauce-connect/update.sh diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/by-name/sc/scala-cli/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/scala-cli/default.nix rename to pkgs/by-name/sc/scala-cli/package.nix diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json similarity index 100% rename from pkgs/development/tools/build-managers/scala-cli/sources.json rename to pkgs/by-name/sc/scala-cli/sources.json diff --git a/pkgs/development/tools/build-managers/scala-cli/update.nix b/pkgs/by-name/sc/scala-cli/update.nix similarity index 100% rename from pkgs/development/tools/build-managers/scala-cli/update.nix rename to pkgs/by-name/sc/scala-cli/update.nix diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/by-name/sh/shadowsocks-rust/package.nix similarity index 100% rename from pkgs/tools/networking/shadowsocks-rust/default.nix rename to pkgs/by-name/sh/shadowsocks-rust/package.nix diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/by-name/sh/sharedown/package.nix similarity index 100% rename from pkgs/tools/misc/sharedown/default.nix rename to pkgs/by-name/sh/sharedown/package.nix diff --git a/pkgs/tools/misc/sharedown/update.sh b/pkgs/by-name/sh/sharedown/update.sh similarity index 100% rename from pkgs/tools/misc/sharedown/update.sh rename to pkgs/by-name/sh/sharedown/update.sh diff --git a/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/by-name/sh/sharedown/yarn.lock similarity index 100% rename from pkgs/tools/misc/sharedown/yarn.lock rename to pkgs/by-name/sh/sharedown/yarn.lock diff --git a/pkgs/games/space-station-14-launcher/deps.json b/pkgs/by-name/sp/space-station-14-launcher/deps.json similarity index 100% rename from pkgs/games/space-station-14-launcher/deps.json rename to pkgs/by-name/sp/space-station-14-launcher/deps.json diff --git a/pkgs/games/space-station-14-launcher/default.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix similarity index 100% rename from pkgs/games/space-station-14-launcher/default.nix rename to pkgs/by-name/sp/space-station-14-launcher/package.nix diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix similarity index 100% rename from pkgs/games/space-station-14-launcher/space-station-14-launcher.nix rename to pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix diff --git a/pkgs/games/space-station-14-launcher/update.sh b/pkgs/by-name/sp/space-station-14-launcher/update.sh similarity index 100% rename from pkgs/games/space-station-14-launcher/update.sh rename to pkgs/by-name/sp/space-station-14-launcher/update.sh diff --git a/pkgs/tools/filesystems/ssdfs-utils/default.nix b/pkgs/by-name/ss/ssdfs-utils/package.nix similarity index 100% rename from pkgs/tools/filesystems/ssdfs-utils/default.nix rename to pkgs/by-name/ss/ssdfs-utils/package.nix diff --git a/pkgs/tools/filesystems/ssdfs-utils/update.sh b/pkgs/by-name/ss/ssdfs-utils/update.sh similarity index 100% rename from pkgs/tools/filesystems/ssdfs-utils/update.sh rename to pkgs/by-name/ss/ssdfs-utils/update.sh diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/by-name/st/standardnotes/package.nix similarity index 100% rename from pkgs/applications/editors/standardnotes/default.nix rename to pkgs/by-name/st/standardnotes/package.nix diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/by-name/st/standardnotes/src.json similarity index 100% rename from pkgs/applications/editors/standardnotes/src.json rename to pkgs/by-name/st/standardnotes/src.json diff --git a/pkgs/applications/editors/standardnotes/update.nix b/pkgs/by-name/st/standardnotes/update.nix similarity index 100% rename from pkgs/applications/editors/standardnotes/update.nix rename to pkgs/by-name/st/standardnotes/update.nix diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/by-name/st/stargazer/package.nix similarity index 100% rename from pkgs/servers/gemini/stargazer/default.nix rename to pkgs/by-name/st/stargazer/package.nix diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/by-name/ta/tabnine/package.nix similarity index 100% rename from pkgs/development/tools/tabnine/default.nix rename to pkgs/by-name/ta/tabnine/package.nix diff --git a/pkgs/development/tools/tabnine/sources.json b/pkgs/by-name/ta/tabnine/sources.json similarity index 100% rename from pkgs/development/tools/tabnine/sources.json rename to pkgs/by-name/ta/tabnine/sources.json diff --git a/pkgs/development/tools/tabnine/update.sh b/pkgs/by-name/ta/tabnine/update.sh similarity index 100% rename from pkgs/development/tools/tabnine/update.sh rename to pkgs/by-name/ta/tabnine/update.sh diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/by-name/ta/tandoor-recipes/common.nix similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/common.nix rename to pkgs/by-name/ta/tandoor-recipes/common.nix diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/by-name/ta/tandoor-recipes/frontend.nix similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/frontend.nix rename to pkgs/by-name/ta/tandoor-recipes/frontend.nix diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/by-name/ta/tandoor-recipes/package.nix similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/default.nix rename to pkgs/by-name/ta/tandoor-recipes/package.nix diff --git a/pkgs/applications/misc/tandoor-recipes/pytest-xdist.patch b/pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/pytest-xdist.patch rename to pkgs/by-name/ta/tandoor-recipes/pytest-xdist.patch diff --git a/pkgs/applications/misc/tandoor-recipes/update.sh b/pkgs/by-name/ta/tandoor-recipes/update.sh similarity index 100% rename from pkgs/applications/misc/tandoor-recipes/update.sh rename to pkgs/by-name/ta/tandoor-recipes/update.sh diff --git a/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch b/pkgs/by-name/ti/tinygo/0001-GNUmakefile.patch similarity index 100% rename from pkgs/development/compilers/tinygo/0001-GNUmakefile.patch rename to pkgs/by-name/ti/tinygo/0001-GNUmakefile.patch diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/by-name/ti/tinygo/package.nix similarity index 100% rename from pkgs/development/compilers/tinygo/default.nix rename to pkgs/by-name/ti/tinygo/package.nix diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/by-name/to/touchosc/package.nix similarity index 100% rename from pkgs/applications/audio/touchosc/default.nix rename to pkgs/by-name/to/touchosc/package.nix diff --git a/pkgs/applications/audio/touchosc/update.sh b/pkgs/by-name/to/touchosc/update.sh similarity index 100% rename from pkgs/applications/audio/touchosc/update.sh rename to pkgs/by-name/to/touchosc/update.sh diff --git a/pkgs/tools/misc/trackma/default.nix b/pkgs/by-name/tr/trackma/package.nix similarity index 100% rename from pkgs/tools/misc/trackma/default.nix rename to pkgs/by-name/tr/trackma/package.nix diff --git a/pkgs/tools/misc/trackma/update.sh b/pkgs/by-name/tr/trackma/update.sh similarity index 100% rename from pkgs/tools/misc/trackma/update.sh rename to pkgs/by-name/tr/trackma/update.sh diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/by-name/tr/treesheets/package.nix similarity index 100% rename from pkgs/applications/office/treesheets/default.nix rename to pkgs/by-name/tr/treesheets/package.nix diff --git a/pkgs/applications/networking/p2p/tremotesf/default.nix b/pkgs/by-name/tr/tremotesf/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/tremotesf/default.nix rename to pkgs/by-name/tr/tremotesf/package.nix diff --git a/pkgs/applications/misc/trenchbroom/default.nix b/pkgs/by-name/tr/trenchbroom/package.nix similarity index 100% rename from pkgs/applications/misc/trenchbroom/default.nix rename to pkgs/by-name/tr/trenchbroom/package.nix diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/by-name/tt/tt-rss/package.nix similarity index 100% rename from pkgs/servers/tt-rss/default.nix rename to pkgs/by-name/tt/tt-rss/package.nix diff --git a/pkgs/servers/search/typesense/default.nix b/pkgs/by-name/ty/typesense/package.nix similarity index 100% rename from pkgs/servers/search/typesense/default.nix rename to pkgs/by-name/ty/typesense/package.nix diff --git a/pkgs/servers/search/typesense/sources.json b/pkgs/by-name/ty/typesense/sources.json similarity index 100% rename from pkgs/servers/search/typesense/sources.json rename to pkgs/by-name/ty/typesense/sources.json diff --git a/pkgs/servers/search/typesense/update.sh b/pkgs/by-name/ty/typesense/update.sh similarity index 100% rename from pkgs/servers/search/typesense/update.sh rename to pkgs/by-name/ty/typesense/update.sh diff --git a/pkgs/applications/radio/uhd/no-adapter-tests.patch b/pkgs/by-name/uh/uhd/no-adapter-tests.patch similarity index 100% rename from pkgs/applications/radio/uhd/no-adapter-tests.patch rename to pkgs/by-name/uh/uhd/no-adapter-tests.patch diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/by-name/uh/uhd/package.nix similarity index 100% rename from pkgs/applications/radio/uhd/default.nix rename to pkgs/by-name/uh/uhd/package.nix diff --git a/pkgs/applications/radio/uhd/update.sh b/pkgs/by-name/uh/uhd/update.sh similarity index 100% rename from pkgs/applications/radio/uhd/update.sh rename to pkgs/by-name/uh/uhd/update.sh diff --git a/pkgs/servers/unstructured-api/default.nix b/pkgs/by-name/un/unstructured-api/package.nix similarity index 100% rename from pkgs/servers/unstructured-api/default.nix rename to pkgs/by-name/un/unstructured-api/package.nix diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/by-name/vm/vmware-horizon-client/package.nix similarity index 100% rename from pkgs/applications/networking/remote/vmware-horizon-client/default.nix rename to pkgs/by-name/vm/vmware-horizon-client/package.nix diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/update.sh b/pkgs/by-name/vm/vmware-horizon-client/update.sh similarity index 100% rename from pkgs/applications/networking/remote/vmware-horizon-client/update.sh rename to pkgs/by-name/vm/vmware-horizon-client/update.sh diff --git a/pkgs/tools/misc/vrc-get/default.nix b/pkgs/by-name/vr/vrc-get/package.nix similarity index 100% rename from pkgs/tools/misc/vrc-get/default.nix rename to pkgs/by-name/vr/vrc-get/package.nix diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/by-name/vu/vulkan-cts/package.nix similarity index 100% rename from pkgs/tools/graphics/vulkan-cts/default.nix rename to pkgs/by-name/vu/vulkan-cts/package.nix diff --git a/pkgs/tools/graphics/vulkan-cts/sources.nix b/pkgs/by-name/vu/vulkan-cts/sources.nix similarity index 100% rename from pkgs/tools/graphics/vulkan-cts/sources.nix rename to pkgs/by-name/vu/vulkan-cts/sources.nix diff --git a/pkgs/tools/graphics/vulkan-cts/update.sh b/pkgs/by-name/vu/vulkan-cts/update.sh similarity index 100% rename from pkgs/tools/graphics/vulkan-cts/update.sh rename to pkgs/by-name/vu/vulkan-cts/update.sh diff --git a/pkgs/tools/graphics/vulkan-cts/vk-cts-sources.py b/pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py similarity index 100% rename from pkgs/tools/graphics/vulkan-cts/vk-cts-sources.py rename to pkgs/by-name/vu/vulkan-cts/vk-cts-sources.py diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/by-name/vu/vulkan-headers/package.nix similarity index 100% rename from pkgs/development/libraries/vulkan-headers/default.nix rename to pkgs/by-name/vu/vulkan-headers/package.nix diff --git a/pkgs/development/libraries/vulkan-headers/update.sh b/pkgs/by-name/vu/vulkan-headers/update.sh similarity index 100% rename from pkgs/development/libraries/vulkan-headers/update.sh rename to pkgs/by-name/vu/vulkan-headers/update.sh diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/by-name/wi/wiki-js/package.nix similarity index 100% rename from pkgs/servers/web-apps/wiki-js/default.nix rename to pkgs/by-name/wi/wiki-js/package.nix diff --git a/pkgs/servers/web-apps/wiki-js/update.sh b/pkgs/by-name/wi/wiki-js/update.sh similarity index 100% rename from pkgs/servers/web-apps/wiki-js/update.sh rename to pkgs/by-name/wi/wiki-js/update.sh diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/by-name/wi/wireguard-tools/package.nix similarity index 100% rename from pkgs/tools/networking/wireguard-tools/default.nix rename to pkgs/by-name/wi/wireguard-tools/package.nix diff --git a/pkgs/tools/networking/wireguard-tools/update.sh b/pkgs/by-name/wi/wireguard-tools/update.sh similarity index 100% rename from pkgs/tools/networking/wireguard-tools/update.sh rename to pkgs/by-name/wi/wireguard-tools/update.sh diff --git a/pkgs/development/tools/worker-build/default.nix b/pkgs/by-name/wo/worker-build/package.nix similarity index 100% rename from pkgs/development/tools/worker-build/default.nix rename to pkgs/by-name/wo/worker-build/package.nix diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/by-name/xa/xaos/package.nix similarity index 100% rename from pkgs/applications/graphics/xaos/default.nix rename to pkgs/by-name/xa/xaos/package.nix diff --git a/pkgs/tools/networking/xdp-tools/emacs-30.patch b/pkgs/by-name/xd/xdp-tools/emacs-30.patch similarity index 100% rename from pkgs/tools/networking/xdp-tools/emacs-30.patch rename to pkgs/by-name/xd/xdp-tools/emacs-30.patch diff --git a/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/by-name/xd/xdp-tools/package.nix similarity index 100% rename from pkgs/tools/networking/xdp-tools/default.nix rename to pkgs/by-name/xd/xdp-tools/package.nix diff --git a/pkgs/applications/networking/remote/xrdp/dynamic_config.patch b/pkgs/by-name/xr/xrdp/dynamic_config.patch similarity index 100% rename from pkgs/applications/networking/remote/xrdp/dynamic_config.patch rename to pkgs/by-name/xr/xrdp/dynamic_config.patch diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/by-name/xr/xrdp/package.nix similarity index 100% rename from pkgs/applications/networking/remote/xrdp/default.nix rename to pkgs/by-name/xr/xrdp/package.nix diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/by-name/xt/xtreemfs/package.nix similarity index 100% rename from pkgs/tools/filesystems/xtreemfs/default.nix rename to pkgs/by-name/xt/xtreemfs/package.nix diff --git a/pkgs/tools/package-management/yarn-lock-converter/package-lock.json b/pkgs/by-name/ya/yarn-lock-converter/package-lock.json similarity index 100% rename from pkgs/tools/package-management/yarn-lock-converter/package-lock.json rename to pkgs/by-name/ya/yarn-lock-converter/package-lock.json diff --git a/pkgs/tools/package-management/yarn-lock-converter/default.nix b/pkgs/by-name/ya/yarn-lock-converter/package.nix similarity index 100% rename from pkgs/tools/package-management/yarn-lock-converter/default.nix rename to pkgs/by-name/ya/yarn-lock-converter/package.nix diff --git a/pkgs/tools/package-management/yarn-lock-converter/source.json b/pkgs/by-name/ya/yarn-lock-converter/source.json similarity index 100% rename from pkgs/tools/package-management/yarn-lock-converter/source.json rename to pkgs/by-name/ya/yarn-lock-converter/source.json diff --git a/pkgs/tools/package-management/yarn-lock-converter/update.sh b/pkgs/by-name/ya/yarn-lock-converter/update.sh similarity index 100% rename from pkgs/tools/package-management/yarn-lock-converter/update.sh rename to pkgs/by-name/ya/yarn-lock-converter/update.sh diff --git a/pkgs/shells/zsh/default.nix b/pkgs/by-name/zs/zsh/package.nix similarity index 100% rename from pkgs/shells/zsh/default.nix rename to pkgs/by-name/zs/zsh/package.nix diff --git a/pkgs/shells/zsh/tz_completion.patch b/pkgs/by-name/zs/zsh/tz_completion.patch similarity index 100% rename from pkgs/shells/zsh/tz_completion.patch rename to pkgs/by-name/zs/zsh/tz_completion.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5abb40e15acb..e40fe12a25a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -220,8 +220,6 @@ with pkgs; # addDriverRunpath is the preferred package name, as this enables # many more scenarios than just opengl now. - anime-downloader = callPackage ../applications/video/anime-downloader { }; - aocd = with python3Packages; toPythonApplication aocd; archipelago-minecraft = callPackage ../by-name/ar/archipelago/package.nix { extraPackages = [jdk17]; }; @@ -242,8 +240,6 @@ with pkgs; beebeep = libsForQt5.callPackage ../applications/office/beebeep { }; - binserve = callPackage ../servers/binserve { }; - bloodhound-py = with python3Packages; toPythonApplication bloodhound-py; # Zip file format only allows times after year 1980, which makes e.g. Python @@ -326,8 +322,6 @@ with pkgs; dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { }; - dynein = callPackage ../development/tools/database/dynein { }; - ebpf-verifier = callPackage ../tools/networking/ebpf-verifier { catch2 = catch2_3; }; @@ -348,10 +342,6 @@ with pkgs; mumps_par = callPackage ../by-name/mu/mumps/package.nix { mpiSupport = true; }; - prisma-engines = callPackage ../development/tools/database/prisma-engines { }; - - protoc-gen-dart = callPackage ../development/tools/protoc-gen-dart { }; - protoc-gen-grpc-web = callPackage ../development/tools/protoc-gen-grpc-web { protobuf = protobuf_21; }; @@ -381,8 +371,6 @@ with pkgs; device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix { }; - didyoumean = callPackage ../tools/misc/didyoumean { }; - diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook { @@ -393,8 +381,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - gretl = callPackage ../applications/science/math/gretl { }; - devShellTools = callPackage ../build-support/dev-shell-tools { }; dockerTools = callPackage ../build-support/docker { @@ -435,8 +421,6 @@ with pkgs; inherit (dotnetCorePackages) buildDotnetModule buildDotnetGlobalTool mkNugetSource mkNugetDeps; - fable = callPackage ../development/tools/fable { }; - dotnetenv = callPackage ../build-support/dotnet/dotnetenv { dotnetfx = dotnetfx40; }; @@ -496,8 +480,6 @@ with pkgs; opendrop = python3Packages.callPackage ../tools/networking/opendrop { }; - perseus-cli = callPackage ../development/tools/perseus-cli { }; - pe-bear = libsForQt5.callPackage ../applications/misc/pe-bear { }; magika = with python3Packages; toPythonApplication magika; @@ -939,14 +921,10 @@ with pkgs; stdenv = gccStdenv; }; - honggfuzz = callPackage ../tools/security/honggfuzz { }; - aflplusplus = callPackage ../tools/security/aflplusplus { wine = null; }; libdislocator = callPackage ../tools/security/aflplusplus/libdislocator.nix { }; - afsctool = callPackage ../tools/filesystems/afsctool { }; - aioblescan = with python3Packages; toPythonApplication aioblescan; inherit (recurseIntoAttrs (callPackage ../tools/package-management/akku { })) @@ -962,8 +940,6 @@ with pkgs; auditwheel = with python3Packages; toPythonApplication auditwheel; - awsbck = callPackage ../tools/backup/awsbck { }; - bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { }; davinci-resolve-studio = callPackage ../by-name/da/davinci-resolve/package.nix { studioVariant = true; }; @@ -1006,8 +982,6 @@ with pkgs; python3Packages = python311Packages; }); - gh-cal = callPackage ../tools/misc/gh-cal { }; - gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { }; fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; @@ -1044,8 +1018,6 @@ with pkgs; systemd = pkgs.systemd; }; - nominatim = callPackage ../servers/nominatim { }; - ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; @@ -1055,8 +1027,6 @@ with pkgs; withUsdView = true; }; - osquery = callPackage ../tools/system/osquery { }; - pricehist = python3Packages.callPackage ../tools/misc/pricehist { }; py7zr = with python3Packages; toPythonApplication py7zr; @@ -1079,8 +1049,6 @@ with pkgs; jdk = jdk8; }; - stargazer = callPackage ../servers/gemini/stargazer { }; - supermin = callPackage ../tools/virtualization/supermin { ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; @@ -1108,8 +1076,6 @@ with pkgs; vprof = with python3Packages; toPythonApplication vprof; - vrc-get = callPackage ../tools/misc/vrc-get { }; - winbox = winbox3; winbox3 = callPackage ../tools/admin/winbox { wine = wineWowPackages.stable; @@ -1127,8 +1093,6 @@ with pkgs; stdenv = clangStdenv; }; - yarn-lock-converter = callPackage ../tools/package-management/yarn-lock-converter { }; - breitbandmessung = callPackage ../applications/networking/breitbandmessung { electron = electron_34; }; @@ -1189,16 +1153,10 @@ with pkgs; forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { }; - gfold = callPackage ../applications/version-management/gfold { }; - gita = python3Packages.callPackage ../applications/version-management/gita { }; - gitoxide = callPackage ../applications/version-management/gitoxide { }; - github-cli = gh; - git-absorb = callPackage ../applications/version-management/git-absorb { }; - git-annex-metadata-gui = libsForQt5.callPackage ../applications/version-management/git-annex-metadata-gui { inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; }; @@ -1215,14 +1173,6 @@ with pkgs; git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { }; - git-branchless = callPackage ../applications/version-management/git-branchless { }; - - git-cinnabar = callPackage ../applications/version-management/git-cinnabar { }; - - git-cliff = callPackage ../applications/version-management/git-cliff { }; - - git-credential-keepassxc = callPackage ../applications/version-management/git-credential-keepassxc { }; - git-credential-manager = callPackage ../applications/version-management/git-credential-manager { }; git-fame = callPackage ../applications/version-management/git-fame { }; @@ -1249,8 +1199,6 @@ with pkgs; util-linux = if stdenv.hostPlatform.isLinux then util-linuxMinimal else util-linux; }; - git-remote-codecommit = callPackage ../applications/version-management/git-remote-codecommit { }; - gitRepo = git-repo; git-repo-updater = python3Packages.callPackage ../applications/version-management/git-repo-updater { }; @@ -1260,8 +1208,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-trim = callPackage ../applications/version-management/git-trim { }; - git-up = callPackage ../applications/version-management/git-up { pythonPackages = python3Packages; }; @@ -1306,8 +1252,6 @@ with pkgs; ### APPLICATIONS/EMULATORS - _86Box = callPackage ../applications/emulators/86box { }; - _86Box-with-roms = _86Box.override { unfreeEnableRoms = true; unfreeEnableDiscord = true; @@ -1634,8 +1578,6 @@ with pkgs; azure-cli-extensions = recurseIntoAttrs azure-cli.extensions; - azure-static-sites-client = callPackage ../development/tools/azure-static-sites-client { }; - binocle = callPackage ../applications/misc/binocle { inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreVideo Foundation Metal QuartzCore; }; @@ -1764,8 +1706,6 @@ with pkgs; fluffychat-web = fluffychat.override { targetFlutterPlatform = "web"; }; - genpass = callPackage ../tools/security/genpass { }; - gammaray = qt6Packages.callPackage ../development/tools/gammaray { }; gams = callPackage ../tools/misc/gams (config.gams or {}); @@ -1982,8 +1922,6 @@ with pkgs; brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { }; - ssdfs-utils = callPackage ../tools/filesystems/ssdfs-utils { }; - btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; bsh = fetchurl { @@ -2128,8 +2066,6 @@ with pkgs; cot = with python3Packages; toPythonApplication cot; - crosvm = callPackage ../applications/virtualization/crosvm { }; - crossplane = with python3Packages; toPythonApplication crossplane; csv2md = with python3Packages; toPythonApplication csv2md; @@ -2223,8 +2159,6 @@ with pkgs; espanso = espanso-wayland; }; - esphome = callPackage ../tools/misc/esphome { }; - fastly = callPackage ../misc/fastly { # If buildGoModule is overridden, provide a matching version of the go attribute }; @@ -2402,8 +2336,6 @@ with pkgs; kaggle = with python3Packages; toPythonApplication kaggle; - maigret = callPackage ../tools/security/maigret { }; - maliit-framework = libsForQt5.callPackage ../applications/misc/maliit-framework { }; maliit-keyboard = libsForQt5.callPackage ../applications/misc/maliit-keyboard { }; @@ -2455,8 +2387,6 @@ with pkgs; mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { }; - nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; - nix-template = callPackage ../tools/package-management/nix-template { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -3058,8 +2988,6 @@ with pkgs; kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; - lychee = callPackage ../tools/networking/lychee { }; - mozwire = callPackage ../tools/networking/mozwire { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -3100,8 +3028,6 @@ with pkgs; vorta = qt6Packages.callPackage ../applications/backup/vorta { }; - worker-build = callPackage ../development/tools/worker-build { }; - wrangler_1 = callPackage ../development/tools/wrangler_1 { inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security; }; @@ -3445,8 +3371,6 @@ with pkgs; cudaSupport = true; }; - gpt2tc = callPackage ../tools/text/gpt2tc { }; - gptcommit = callPackage ../development/tools/gptcommit { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; @@ -3506,7 +3430,6 @@ with pkgs; gruut-ipa = with python3.pkgs; toPythonApplication gruut-ipa; - gx = callPackage ../tools/package-management/gx { }; gsmlib = callPackage ../development/libraries/gsmlib { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -3526,8 +3449,6 @@ with pkgs; gvm-tools = with python3.pkgs; toPythonApplication gvm-tools; - gyroflow = callPackage ../applications/video/gyroflow { }; - gzip = callPackage ../tools/compression/gzip { }; plplot = callPackage ../development/libraries/plplot { @@ -3618,8 +3539,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - http-prompt = callPackage ../tools/networking/http-prompt { }; - httpie = with python3Packages; toPythonApplication httpie; hue-plus = libsForQt5.callPackage ../applications/misc/hue-plus { }; @@ -3742,8 +3661,6 @@ with pkgs; json-schema-for-humans = with python3Packages; toPythonApplication json-schema-for-humans; - jsonwatch = callPackage ../tools/misc/jsonwatch { }; - jupyter = callPackage ../applications/editors/jupyter { }; jupyter-all = jupyter.override { @@ -3899,8 +3816,6 @@ with pkgs; matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins; - matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { }; - maubot = with python3Packages; toPythonApplication maubot; mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { }); @@ -3926,8 +3841,6 @@ with pkgs; hdf5 = hdf5.override { usev110Api = true; }; }; - meilisearch = callPackage ../servers/search/meilisearch { }; - mhonarc = perlPackages.MHonArc; mujmap = callPackage ../applications/networking/mujmap { @@ -4109,8 +4022,6 @@ with pkgs; sasl = gsasl; }; - matrix-sdk-crypto-nodejs = callPackage ../development/libraries/matrix-sdk-crypto-nodejs { }; - man = man-db; mangohud = callPackage ../tools/graphics/mangohud { @@ -4171,8 +4082,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - mtools = callPackage ../tools/filesystems/mtools { }; - mtr = callPackage ../tools/networking/mtr { }; mtr-gui = callPackage ../tools/networking/mtr { withGtk = true; }; @@ -4220,12 +4129,8 @@ with pkgs; nodejs = nodejs_20; }; - netpbm = callPackage ../tools/graphics/netpbm { }; - networkmanager = callPackage ../tools/networking/networkmanager { }; - libnma = callPackage ../tools/networking/networkmanager/libnma { }; - libnma-gtk4 = libnma.override { withGtk4 = true; }; nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; @@ -4311,8 +4216,6 @@ with pkgs; # ntfsprogs are merged into ntfs-3g ntfsprogs = pkgs.ntfs3g; - ntfy = callPackage ../tools/misc/ntfy { }; - ntfy-sh = callPackage ../tools/misc/ntfy-sh { }; nvfancontrol = callPackage ../tools/misc/nvfancontrol { @@ -4327,8 +4230,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - onetun = callPackage ../tools/networking/onetun { }; - ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { }; ola = callPackage ../applications/misc/ola { @@ -4810,8 +4711,6 @@ with pkgs; ruby-lsp = rubyPackages.ruby-lsp; - ruplacer = callPackage ../tools/text/ruplacer { }; - rust-motd = callPackage ../tools/misc/rust-motd { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4859,12 +4758,8 @@ with pkgs; seqdiag = with python3Packages; toPythonApplication seqdiag; - shadowsocks-rust = callPackage ../tools/networking/shadowsocks-rust { }; - shellify = haskellPackages.shellify.bin; - sharedown = callPackage ../tools/misc/sharedown { }; - shiv = with python3Packages; toPythonApplication shiv; sigil = qt6.callPackage ../applications/editors/sigil { }; @@ -5002,14 +4897,10 @@ with pkgs; t = callPackage ../tools/misc/t { }; - tabnine = callPackage ../development/tools/tabnine { }; - tab-rs = callPackage ../tools/misc/tab-rs { inherit (darwin.apple_sdk.frameworks) IOKit; }; - tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { }; - tartube = callPackage ../applications/video/tartube { }; tartube-yt-dlp = callPackage ../applications/video/tartube { @@ -5086,8 +4977,6 @@ with pkgs; toybox = darwin.apple_sdk_11_0.callPackage ../tools/misc/toybox { }; - trackma = callPackage ../tools/misc/trackma { }; - trackma-curses = trackma.override { withCurses = true; }; trackma-gtk = trackma.override { withGTK = true; }; @@ -5122,8 +5011,6 @@ with pkgs; translatepy = with python3.pkgs; toPythonApplication translatepy; - trenchbroom = callPackage ../applications/misc/trenchbroom { }; - inherit (callPackage ../applications/office/trilium {}) trilium-desktop trilium-server @@ -5154,8 +5041,6 @@ with pkgs; twurl = callPackage ../tools/misc/twurl { }; - typesense = callPackage ../servers/search/typesense { }; - ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { }; ubpm = libsForQt5.callPackage ../applications/misc/ubpm { }; @@ -5241,8 +5126,6 @@ with pkgs; whatweb = callPackage ../tools/security/whatweb { }; - wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; - wg-netmanager = callPackage ../tools/networking/wg-netmanager { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -5311,8 +5194,6 @@ with pkgs; unrar-wrapper = python3Packages.callPackage ../tools/archivers/unrar-wrapper { }; - xdp-tools = callPackage ../tools/networking/xdp-tools { }; - ugarit = callPackage ../tools/backup/ugarit { inherit (chickenPackages_4) eggDerivation fetchegg; }; @@ -5407,8 +5288,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - xtreemfs = callPackage ../tools/filesystems/xtreemfs { }; - xorriso = libisoburn; xvfb-run = callPackage ../tools/misc/xvfb-run { @@ -5483,8 +5362,6 @@ with pkgs; fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { }); - zsh = callPackage ../shells/zsh { }; - powerline = with python3Packages; toPythonApplication powerline; ### DEVELOPMENT / COMPILERS @@ -5672,8 +5549,6 @@ with pkgs; flutter326 = flutterPackages.v3_26; flutter324 = flutterPackages.v3_24; - fnm = callPackage ../development/tools/fnm { }; - fpc = callPackage ../development/compilers/fpc { }; gambit = callPackage ../development/compilers/gambit { }; @@ -6541,7 +6416,6 @@ with pkgs; cargo-edit = callPackage ../development/tools/rust/cargo-edit { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { }; inherit (callPackages ../development/tools/rust/cargo-pgrx { }) cargo-pgrx_0_12_0_alpha_1 cargo-pgrx_0_12_5 @@ -6558,7 +6432,6 @@ with pkgs; cargo-bazel = callPackage ../development/tools/rust/cargo-bazel { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-cache = callPackage ../development/tools/rust/cargo-cache { }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; }; @@ -6588,8 +6461,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { }; - opensmalltalk-vm = callPackage ../development/compilers/opensmalltalk-vm { }; rustfmt = rustPackages.rustfmt; @@ -6667,8 +6538,6 @@ with pkgs; tinycc = darwin.apple_sdk_11_0.callPackage ../development/compilers/tinycc { }; - tinygo = callPackage ../development/compilers/tinygo { }; - urweb = callPackage ../development/compilers/urweb { icu = icu67; }; @@ -7370,8 +7239,6 @@ with pkgs; ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS - ccls = callPackage ../development/tools/language-servers/ccls { }; - fortls = python3.pkgs.callPackage ../development/tools/language-servers/fortls { }; fortran-language-server = python3.pkgs.callPackage ../development/tools/language-servers/fortran-language-server { }; @@ -7916,8 +7783,6 @@ with pkgs; lttng-ust_2_12 = callPackage ../development/tools/misc/lttng-ust/2.12.nix { }; - marksman = callPackage ../development/tools/marksman { }; - massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; maven3 = maven; @@ -8110,8 +7975,6 @@ with pkgs; buildDocs = false; }; - sauce-connect = callPackage ../development/tools/sauce-connect { }; - sbomnix = python3.pkgs.callPackage ../tools/security/sbomnix { }; seer = libsForQt5.callPackage ../development/tools/misc/seer { }; @@ -8122,8 +7985,6 @@ with pkgs; sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { }; simpleBuildTool = sbt; - scala-cli = callPackage ../development/tools/build-managers/scala-cli { }; - scss-lint = callPackage ../development/tools/scss-lint { }; shadowenv = callPackage ../tools/misc/shadowenv { @@ -8227,7 +8088,6 @@ with pkgs; tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars; - uhd = callPackage ../applications/radio/uhd { }; uhdMinimal = uhd.override { enableUtils = false; enablePythonApi = false; @@ -8499,8 +8359,6 @@ with pkgs; certbot-dns-route53 ]); - cgal = callPackage ../development/libraries/CGAL { }; - check = callPackage ../development/libraries/check { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -8540,8 +8398,6 @@ with pkgs; cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { }; - cypress = callPackage ../development/web/cypress { }; - # Make bdb5 the default as it is the last release under the custom # bsd-like license db = db5; @@ -8587,8 +8443,6 @@ with pkgs; vdpauinfo; }; - duckdb = callPackage ../development/libraries/duckdb { }; - eccodes = callPackage ../development/libraries/eccodes { pythonPackages = python3Packages; stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv; @@ -8958,8 +8812,6 @@ with pkgs; autoconf = buildPackages.autoconf269; }; - gpac = callPackage ../applications/video/gpac { }; - gpgme = callPackage ../development/libraries/gpgme { }; grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; @@ -9109,8 +8961,6 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - hpx = callPackage ../development/libraries/hpx { }; - hspell = callPackage ../development/libraries/hspell { }; hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; @@ -9193,8 +9043,6 @@ with pkgs; isort = with python3Packages; toPythonApplication isort; - ispc = callPackage ../development/compilers/ispc { }; - isso = callPackage ../servers/isso { nodejs = nodejs_20; }; @@ -9423,8 +9271,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit Security; }; - libgcrypt = callPackage ../development/libraries/libgcrypt { }; - libgdiplus = callPackage ../development/libraries/libgdiplus { inherit (darwin.apple_sdk.frameworks) Carbon; }; @@ -9587,8 +9433,6 @@ with pkgs; stdenv = gccStdenv; # Required for darwin }) libprom libpromhttp; - libproxy = callPackage ../development/libraries/libproxy { }; - libpulsar = callPackage ../development/libraries/libpulsar { protobuf = protobuf_21; }; @@ -9894,8 +9738,6 @@ with pkgs; stdenv; }; - ndi = callPackage ../development/libraries/ndi { }; - nettle = import ../development/libraries/nettle { inherit callPackage fetchurl; }; newt = callPackage ../development/libraries/newt { python = python3; }; @@ -10131,8 +9973,6 @@ with pkgs; utils = true; }; - portaudio = callPackage ../development/libraries/portaudio { }; - portmidi = callPackage ../development/libraries/portmidi { inherit (darwin.apple_sdk.frameworks) Carbon CoreAudio CoreFoundation CoreMIDI CoreServices; }; @@ -10339,8 +10179,6 @@ with pkgs; rshell = python3.pkgs.callPackage ../development/embedded/rshell { }; - rure = callPackage ../development/libraries/rure { }; - schroedinger = callPackage ../development/libraries/schroedinger { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -10508,8 +10346,6 @@ with pkgs; sqlite-interactive = (sqlite.override { interactive = true; }).bin; - standardnotes = callPackage ../applications/editors/standardnotes { }; - stlink = callPackage ../development/tools/misc/stlink { }; stlink-gui = callPackage ../development/tools/misc/stlink { withGUI = true; }; @@ -10608,9 +10444,6 @@ with pkgs; vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; - vulkan-cts = callPackage ../tools/graphics/vulkan-cts { }; - - vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -11112,7 +10945,6 @@ with pkgs; dodgy = with python3Packages; toPythonApplication dodgy; - dovecot = callPackage ../servers/mail/dovecot { }; envoy = callPackage ../by-name/en/envoy/package.nix { jdk = openjdk11_headless; }; @@ -11193,22 +11025,10 @@ with pkgs; inspircdMinimal = inspircd.override { extraModules = []; }; - jboss = callPackage ../servers/http/jboss { }; - jetty = jetty_12; jetty_12 = callPackage ../servers/http/jetty/12.x.nix { }; jetty_11 = callPackage ../servers/http/jetty/11.x.nix { }; - jibri = callPackage ../servers/jibri { }; - - jicofo = callPackage ../servers/jicofo { }; - - jitsi-meet = callPackage ../servers/web-apps/jitsi-meet { }; - - jitsi-meet-prosody = callPackage ../misc/jitsi-meet-prosody { }; - - jitsi-videobridge = callPackage ../servers/jitsi-videobridge { }; - kanidm_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { }; kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { }; @@ -11674,14 +11494,10 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - tt-rss = callPackage ../servers/tt-rss { }; - unpackerr = callPackage ../servers/unpackerr { inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; }; - unstructured-api = callPackage ../servers/unstructured-api { }; - virtualenv = with python3Packages; toPythonApplication virtualenv; virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; @@ -12131,8 +11947,6 @@ with pkgs; qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); - linux-firmware = callPackage ../os-specific/linux/firmware/linux-firmware { }; - raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi { }; raspberrypi-armstubs = callPackage ../os-specific/linux/firmware/raspberrypi/armstubs.nix { }; @@ -12386,8 +12200,6 @@ with pkgs; breath-theme = libsForQt5.callPackage ../data/themes/breath-theme { }; - cacert = callPackage ../data/misc/cacert { }; - cnspec = callPackage ../tools/security/cnspec { buildGoModule = buildGo123Module; }; @@ -12874,8 +12686,6 @@ with pkgs; cdparanoia = cdparanoiaIII; - cdparanoiaIII = callPackage ../applications/audio/cdparanoia { }; - brotab = callPackage ../tools/misc/brotab { python = python3; }; @@ -13122,7 +12932,6 @@ with pkgs; }; 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 ]; }; @@ -13375,8 +13184,6 @@ with pkgs; inherit (xorg) xlsfonts; - xrdp = callPackage ../applications/networking/remote/xrdp { }; - inherit ({ freerdp = callPackage ../applications/networking/remote/freerdp { @@ -13462,8 +13269,6 @@ with pkgs; molsketch = libsForQt5.callPackage ../applications/editors/molsketch { }; - openutau = callPackage ../applications/audio/openutau { }; - pattypan = callPackage ../applications/misc/pattypan { jdk = jdk.override { enableJavaFX = true; }; }; @@ -13780,8 +13585,6 @@ with pkgs; lua5 = lua5_3; }; - irssi = callPackage ../applications/networking/irc/irssi { }; - ir.lv2 = callPackage ../applications/audio/ir.lv2 { }; jabcode = callPackage ../development/libraries/jabcode { }; @@ -14019,8 +13822,6 @@ with pkgs; ledger-web = callPackage ../applications/office/ledger-web { }; - lightburn = callPackage ../applications/graphics/lightburn { }; - lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -14211,8 +14012,6 @@ with pkgs; withConplay = false; }; - nbstripout = callPackage ../applications/version-management/nbstripout { }; - pragha = libsForQt5.callPackage ../applications/audio/pragha { }; rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3; @@ -14410,8 +14209,6 @@ with pkgs; mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; - nano = callPackage ../applications/editors/nano { }; - ncdu = callPackage ../tools/misc/ncdu { }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; @@ -14498,8 +14295,6 @@ with pkgs; vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix { }; - libopenmpt = callPackage ../development/libraries/audio/libopenmpt { }; - openrazer-daemon = python3Packages.toPythonApplication python3Packages.openrazer-daemon; orpie = callPackage ../applications/misc/orpie { @@ -14690,8 +14485,6 @@ with pkgs; qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { }; - qtox = callPackage ../applications/networking/instant-messengers/qtox { }; - qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { }; @@ -15182,8 +14975,6 @@ with pkgs; wlroots = wlroots_0_18; }; - treesheets = callPackage ../applications/office/treesheets { }; - trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; tunefish = callPackage ../applications/audio/tunefish { @@ -15374,8 +15165,6 @@ with pkgs; onlyLibVLC = true; }; - vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { }; - vorbis-tools = callPackage ../applications/audio/vorbis-tools { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -15526,8 +15315,6 @@ with pkgs; x32edit = callPackage ../applications/audio/midas/x32edit.nix { }; - xaos = callPackage ../applications/graphics/xaos { }; - xbindkeys-config = callPackage ../tools/X11/xbindkeys-config { gtk = gtk2; }; @@ -16172,8 +15959,6 @@ with pkgs; enableServer = true; }; - minecraft = callPackage ../games/minecraft { }; - minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; }; minecraft-server = minecraftServers.vanilla; # backwards compatibility @@ -16347,8 +16132,6 @@ with pkgs; solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. - space-station-14-launcher = callPackage ../games/space-station-14-launcher { }; - spring = callPackage ../games/spring { asciidoc = asciidoc-full; }; springLobby = callPackage ../games/spring/springlobby.nix { }; @@ -16603,8 +16386,6 @@ with pkgs; pdb2pqr = with python3Packages; toPythonApplication pdb2pqr; - pymol = callPackage ../applications/science/chemistry/pymol { }; - quantum-espresso = callPackage ../applications/science/chemistry/quantum-espresso { hdf5 = hdf5-fortran; }; @@ -17103,8 +16884,6 @@ with pkgs; lisp-compiler = ecl; }; - mxnet = callPackage ../applications/science/math/mxnet { }; - wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK32.override { withWebKit = true; @@ -17738,8 +17517,6 @@ with pkgs; tftui = python3Packages.callPackage ../applications/networking/cluster/tftui { }; - touchosc = callPackage ../applications/audio/touchosc { }; - trufflehog = callPackage ../tools/security/trufflehog { buildGoModule = buildGo123Module; }; @@ -17797,8 +17574,6 @@ with pkgs; pythonPackages = python3Packages; }; - wiki-js = callPackage ../servers/web-apps/wiki-js { }; - wiki-tui = callPackage ../misc/wiki-tui { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -17964,8 +17739,6 @@ with pkgs; compressDrvWeb = callPackage ../build-support/compress-drv/web.nix { }; - duti = callPackage ../os-specific/darwin/duti { }; - dnstracer = callPackage ../tools/networking/dnstracer { inherit (darwin) libresolv; }; @@ -18071,8 +17844,6 @@ with pkgs; duden = python3Packages.toPythonApplication python3Packages.duden; - tremotesf = callPackage ../applications/networking/p2p/tremotesf { }; - yazi-unwrapped = callPackage ../by-name/ya/yazi-unwrapped/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation; }; animdl = python3Packages.callPackage ../applications/video/animdl { };