diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/by-name/aw/aws-vault/package.nix similarity index 100% rename from pkgs/tools/admin/aws-vault/default.nix rename to pkgs/by-name/aw/aws-vault/package.nix diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/by-name/be/beanstalkd/package.nix similarity index 100% rename from pkgs/servers/beanstalkd/default.nix rename to pkgs/by-name/be/beanstalkd/package.nix diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/by-name/bu/buildkite-agent/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/buildkite-agent/default.nix rename to pkgs/by-name/bu/buildkite-agent/package.nix diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/by-name/bu/bundix/package.nix similarity index 100% rename from pkgs/development/ruby-modules/bundix/default.nix rename to pkgs/by-name/bu/bundix/package.nix diff --git a/pkgs/development/compilers/bupc/default.nix b/pkgs/by-name/bu/bupc/package.nix similarity index 100% rename from pkgs/development/compilers/bupc/default.nix rename to pkgs/by-name/bu/bupc/package.nix diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/by-name/co/confd/package.nix similarity index 100% rename from pkgs/tools/system/confd/default.nix rename to pkgs/by-name/co/confd/package.nix diff --git a/pkgs/development/tools/analysis/coz/default.nix b/pkgs/by-name/co/coz/package.nix similarity index 100% rename from pkgs/development/tools/analysis/coz/default.nix rename to pkgs/by-name/co/coz/package.nix diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/by-name/di/direnv/package.nix similarity index 100% rename from pkgs/tools/misc/direnv/default.nix rename to pkgs/by-name/di/direnv/package.nix diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/by-name/di/dispad/package.nix similarity index 100% rename from pkgs/tools/X11/dispad/default.nix rename to pkgs/by-name/di/dispad/package.nix diff --git a/pkgs/tools/system/foreman/Gemfile b/pkgs/by-name/fo/foreman/Gemfile similarity index 100% rename from pkgs/tools/system/foreman/Gemfile rename to pkgs/by-name/fo/foreman/Gemfile diff --git a/pkgs/tools/system/foreman/Gemfile.lock b/pkgs/by-name/fo/foreman/Gemfile.lock similarity index 100% rename from pkgs/tools/system/foreman/Gemfile.lock rename to pkgs/by-name/fo/foreman/Gemfile.lock diff --git a/pkgs/tools/system/foreman/gemset.nix b/pkgs/by-name/fo/foreman/gemset.nix similarity index 100% rename from pkgs/tools/system/foreman/gemset.nix rename to pkgs/by-name/fo/foreman/gemset.nix diff --git a/pkgs/tools/system/foreman/default.nix b/pkgs/by-name/fo/foreman/package.nix similarity index 100% rename from pkgs/tools/system/foreman/default.nix rename to pkgs/by-name/fo/foreman/package.nix diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/by-name/ge/gerrit/package.nix similarity index 100% rename from pkgs/applications/version-management/gerrit/default.nix rename to pkgs/by-name/ge/gerrit/package.nix diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/by-name/gi/gifsicle/package.nix similarity index 100% rename from pkgs/tools/graphics/gifsicle/default.nix rename to pkgs/by-name/gi/gifsicle/package.nix diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/by-name/gi/gist/package.nix similarity index 100% rename from pkgs/tools/text/gist/default.nix rename to pkgs/by-name/gi/gist/package.nix diff --git a/pkgs/applications/version-management/git-codeowners/default.nix b/pkgs/by-name/gi/git-codeowners/package.nix similarity index 100% rename from pkgs/applications/version-management/git-codeowners/default.nix rename to pkgs/by-name/gi/git-codeowners/package.nix diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/pkgs/by-name/gi/gitlab-runner/fix-shell-path.patch similarity index 100% rename from pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch rename to pkgs/by-name/gi/gitlab-runner/fix-shell-path.patch diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/by-name/gi/gitlab-runner/package.nix similarity index 100% rename from pkgs/development/tools/continuous-integration/gitlab-runner/default.nix rename to pkgs/by-name/gi/gitlab-runner/package.nix diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch b/pkgs/by-name/gi/gitlab-runner/remove-bash-test.patch similarity index 100% rename from pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch rename to pkgs/by-name/gi/gitlab-runner/remove-bash-test.patch diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/by-name/go/gopls/package.nix similarity index 100% rename from pkgs/development/tools/language-servers/gopls/default.nix rename to pkgs/by-name/go/gopls/package.nix diff --git a/pkgs/tools/system/goreman/default.nix b/pkgs/by-name/go/goreman/package.nix similarity index 100% rename from pkgs/tools/system/goreman/default.nix rename to pkgs/by-name/go/goreman/package.nix diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/by-name/hc/hclfmt/package.nix similarity index 100% rename from pkgs/development/tools/hclfmt/default.nix rename to pkgs/by-name/hc/hclfmt/package.nix diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/by-name/ke/keycard-cli/package.nix similarity index 100% rename from pkgs/tools/security/keycard-cli/default.nix rename to pkgs/by-name/ke/keycard-cli/package.nix diff --git a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/pkgs/by-name/ku/kubectl-doctor/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-doctor/default.nix rename to pkgs/by-name/ku/kubectl-doctor/package.nix diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/by-name/na/nar-serve/package.nix similarity index 100% rename from pkgs/tools/nix/nar-serve/default.nix rename to pkgs/by-name/na/nar-serve/package.nix diff --git a/pkgs/tools/nix/nix-store-gcs-proxy/default.nix b/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix similarity index 100% rename from pkgs/tools/nix/nix-store-gcs-proxy/default.nix rename to pkgs/by-name/ni/nix-store-gcs-proxy/package.nix diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/by-name/ni/nixpkgs-fmt/package.nix similarity index 100% rename from pkgs/tools/nix/nixpkgs-fmt/default.nix rename to pkgs/by-name/ni/nixpkgs-fmt/package.nix diff --git a/pkgs/tools/misc/ovh-ttyrec/default.nix b/pkgs/by-name/ov/ovh-ttyrec/package.nix similarity index 100% rename from pkgs/tools/misc/ovh-ttyrec/default.nix rename to pkgs/by-name/ov/ovh-ttyrec/package.nix diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/by-name/pa/packer/package.nix similarity index 100% rename from pkgs/development/tools/packer/default.nix rename to pkgs/by-name/pa/packer/package.nix diff --git a/pkgs/development/tools/pigeon/default.nix b/pkgs/by-name/pi/pigeon/package.nix similarity index 100% rename from pkgs/development/tools/pigeon/default.nix rename to pkgs/by-name/pi/pigeon/package.nix diff --git a/pkgs/development/tools/ronn/Gemfile b/pkgs/by-name/ro/ronn/Gemfile similarity index 100% rename from pkgs/development/tools/ronn/Gemfile rename to pkgs/by-name/ro/ronn/Gemfile diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/pkgs/by-name/ro/ronn/Gemfile.lock similarity index 100% rename from pkgs/development/tools/ronn/Gemfile.lock rename to pkgs/by-name/ro/ronn/Gemfile.lock diff --git a/pkgs/development/tools/ronn/gemset.nix b/pkgs/by-name/ro/ronn/gemset.nix similarity index 100% rename from pkgs/development/tools/ronn/gemset.nix rename to pkgs/by-name/ro/ronn/gemset.nix diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/by-name/ro/ronn/package.nix similarity index 100% rename from pkgs/development/tools/ronn/default.nix rename to pkgs/by-name/ro/ronn/package.nix diff --git a/pkgs/development/tools/ronn/test-reproducible-html.nix b/pkgs/by-name/ro/ronn/test-reproducible-html.nix similarity index 100% rename from pkgs/development/tools/ronn/test-reproducible-html.nix rename to pkgs/by-name/ro/ronn/test-reproducible-html.nix diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/by-name/sh/shab/package.nix similarity index 100% rename from pkgs/tools/text/shab/default.nix rename to pkgs/by-name/sh/shab/package.nix diff --git a/pkgs/tools/security/su-exec/default.nix b/pkgs/by-name/su/su-exec/package.nix similarity index 100% rename from pkgs/tools/security/su-exec/default.nix rename to pkgs/by-name/su/su-exec/package.nix diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/by-name/te/terraform-docs/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraform-docs/default.nix rename to pkgs/by-name/te/terraform-docs/package.nix diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/pkgs/by-name/tm/tmux-cssh/package.nix similarity index 100% rename from pkgs/tools/misc/tmux-cssh/default.nix rename to pkgs/by-name/tm/tmux-cssh/package.nix diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/by-name/ve/verifpal/package.nix similarity index 100% rename from pkgs/tools/security/verifpal/default.nix rename to pkgs/by-name/ve/verifpal/package.nix diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile b/pkgs/by-name/vp/vpsfree-client/Gemfile similarity index 100% rename from pkgs/tools/virtualization/vpsfree-client/Gemfile rename to pkgs/by-name/vp/vpsfree-client/Gemfile diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock b/pkgs/by-name/vp/vpsfree-client/Gemfile.lock similarity index 100% rename from pkgs/tools/virtualization/vpsfree-client/Gemfile.lock rename to pkgs/by-name/vp/vpsfree-client/Gemfile.lock diff --git a/pkgs/tools/virtualization/vpsfree-client/gemset.nix b/pkgs/by-name/vp/vpsfree-client/gemset.nix similarity index 100% rename from pkgs/tools/virtualization/vpsfree-client/gemset.nix rename to pkgs/by-name/vp/vpsfree-client/gemset.nix diff --git a/pkgs/tools/virtualization/vpsfree-client/default.nix b/pkgs/by-name/vp/vpsfree-client/package.nix similarity index 100% rename from pkgs/tools/virtualization/vpsfree-client/default.nix rename to pkgs/by-name/vp/vpsfree-client/package.nix diff --git a/pkgs/servers/http/webfs/ls.c.patch b/pkgs/by-name/we/webfs/ls.c.patch similarity index 100% rename from pkgs/servers/http/webfs/ls.c.patch rename to pkgs/by-name/we/webfs/ls.c.patch diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/by-name/we/webfs/package.nix similarity index 100% rename from pkgs/servers/http/webfs/default.nix rename to pkgs/by-name/we/webfs/package.nix diff --git a/pkgs/tools/networking/zerotierone/0001-darwin-disable-link-time-optimization.patch b/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch similarity index 100% rename from pkgs/tools/networking/zerotierone/0001-darwin-disable-link-time-optimization.patch rename to pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch diff --git a/pkgs/tools/networking/zerotierone/Cargo.lock b/pkgs/by-name/ze/zerotierone/Cargo.lock similarity index 100% rename from pkgs/tools/networking/zerotierone/Cargo.lock rename to pkgs/by-name/ze/zerotierone/Cargo.lock diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/by-name/ze/zerotierone/package.nix similarity index 100% rename from pkgs/tools/networking/zerotierone/default.nix rename to pkgs/by-name/ze/zerotierone/package.nix diff --git a/pkgs/tools/networking/zerotierone/update.sh b/pkgs/by-name/ze/zerotierone/update.sh similarity index 100% rename from pkgs/tools/networking/zerotierone/update.sh rename to pkgs/by-name/ze/zerotierone/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 112606260c3d..ed2192dd8e0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -915,8 +915,6 @@ with pkgs; dippi = callPackage ../tools/graphics/dippi { }; - dispad = callPackage ../tools/X11/dispad { }; - diswall = callPackage ../applications/networking/diswall { }; dupeguru = callPackage ../applications/misc/dupeguru { @@ -1017,8 +1015,6 @@ with pkgs; packcc = callPackage ../development/tools/packcc { }; - packer = callPackage ../development/tools/packer { }; - packr = callPackage ../development/libraries/packr { }; pacup = callPackage ../tools/package-management/pacup { }; @@ -2282,8 +2278,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - git-codeowners = callPackage ../applications/version-management/git-codeowners { }; - git-codereview = callPackage ../applications/version-management/git-codereview { }; git-cola = callPackage ../applications/version-management/git-cola { }; @@ -3308,8 +3302,6 @@ with pkgs; aws-sso-creds = callPackage ../tools/admin/aws-sso-creds { }; - aws-vault = callPackage ../tools/admin/aws-vault { }; - iamy = callPackage ../tools/admin/iamy { }; iam-policy-json-to-terraform = callPackage ../tools/misc/iam-policy-json-to-terraform { }; @@ -4869,8 +4861,6 @@ with pkgs; dirb = callPackage ../tools/networking/dirb { }; - direnv = callPackage ../tools/misc/direnv { }; - dirstalk = callPackage ../tools/security/dirstalk { }; h = callPackage ../tools/misc/h { }; @@ -5331,8 +5321,6 @@ with pkgs; girsh = callPackage ../tools/networking/girsh { }; - gist = callPackage ../tools/text/gist { }; - gitjacker = callPackage ../tools/security/gitjacker { }; gixy = callPackage ../tools/admin/gixy { }; @@ -6088,8 +6076,6 @@ with pkgs; sgp4 = callPackage ../development/libraries/sgp4 { }; - shab = callPackage ../tools/text/shab { }; - sheldon = callPackage ../tools/misc/sheldon { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -6351,8 +6337,6 @@ with pkgs; usePoppler = true; }; - beanstalkd = callPackage ../servers/beanstalkd { }; - beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { }); inherit (beetsPackages) beets beets-unstable; @@ -8155,8 +8139,6 @@ with pkgs; geonkick = callPackage ../applications/audio/geonkick { }; - gerrit = callPackage ../applications/version-management/gerrit { }; - geteltorito = callPackage ../tools/misc/geteltorito { }; getopt = callPackage ../tools/misc/getopt { }; @@ -8189,8 +8171,6 @@ with pkgs; gibo = callPackage ../tools/misc/gibo { }; - gifsicle = callPackage ../tools/graphics/gifsicle { }; - gifski = callPackage ../tools/graphics/gifski { ffmpeg = ffmpeg_6; }; @@ -8214,8 +8194,6 @@ with pkgs; gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { }; - gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; - gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; gitlab-triage = callPackage ../applications/version-management/gitlab-triage { }; @@ -11318,8 +11296,6 @@ with pkgs; oxlint = callPackage ../development/tools/oxlint { }; - ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { }; - ovito = libsForQt5.callPackage ../applications/graphics/ovito { inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration; }; @@ -13003,8 +12979,6 @@ with pkgs; structorizer = callPackage ../applications/graphics/structorizer { }; - su-exec = callPackage ../tools/security/su-exec { }; - subberthehut = callPackage ../tools/misc/subberthehut { }; subedit = callPackage ../tools/text/subedit { }; @@ -13396,8 +13370,6 @@ with pkgs; tmux = callPackage ../tools/misc/tmux { }; - tmux-cssh = callPackage ../tools/misc/tmux-cssh { }; - tmuxp = callPackage ../tools/misc/tmuxp { }; tmuxinator = callPackage ../tools/misc/tmuxinator { }; @@ -14605,8 +14577,6 @@ with pkgs; nvidiaSupport = true; }; - zerotierone = callPackage ../tools/networking/zerotierone { }; - zerofree = callPackage ../tools/filesystems/zerofree { }; zet = callPackage ../tools/text/zet { }; @@ -16614,8 +16584,6 @@ with pkgs; typescript = callPackage ../development/compilers/typescript { }; - bupc = callPackage ../development/compilers/bupc { }; - ubports-click = python3Packages.callPackage ../development/tools/click { }; uasm = callPackage ../development/compilers/uasm { }; @@ -17254,7 +17222,6 @@ with pkgs; inherit (darwin) DarwinTools autoSignDarwinBinariesHook; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - bundix = callPackage ../development/ruby-modules/bundix { }; bundler = callPackage ../development/ruby-modules/bundler { }; bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; @@ -17575,8 +17542,6 @@ with pkgs; glslls = callPackage ../development/tools/language-servers/glslls { }; - gopls = callPackage ../development/tools/language-servers/gopls { }; - helm-ls = callPackage ../development/tools/language-servers/helm-ls { }; javascript-typescript-langserver = callPackage ../development/tools/language-servers/javascript-typescript-langserver { }; @@ -17932,8 +17897,6 @@ with pkgs; bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { }; - buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; - buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { }; buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; @@ -18355,9 +18318,6 @@ with pkgs; fly = callPackage ../development/tools/continuous-integration/fly { }; - foreman = callPackage ../tools/system/foreman { }; - goreman = callPackage ../tools/system/goreman { }; - fprettify = callPackage ../development/tools/fprettify { }; framac = callPackage ../development/tools/analysis/frama-c { }; @@ -18523,8 +18483,6 @@ with pkgs; hcloud = callPackage ../development/tools/hcloud { }; - hclfmt = callPackage ../development/tools/hclfmt { }; - help2man = callPackage ../development/tools/misc/help2man { }; heroku = callPackage ../development/tools/heroku { }; @@ -23822,8 +23780,6 @@ with pkgs; round = callPackage ../applications/graphics/round { }; - ronn = callPackage ../development/tools/ronn { }; - router = callPackage ../servers/http/router { }; rover = callPackage ../development/tools/rover { }; @@ -31740,8 +31696,6 @@ with pkgs; kubectl-cnpg = callPackage ../applications/networking/cluster/kubectl-cnpg { }; - kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; - kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { }; kubectl-explore = callPackage ../applications/networking/cluster/kubectl-explore { }; @@ -35601,8 +35555,6 @@ with pkgs; conceal = callPackage ../applications/misc/conceal { }; - confd = callPackage ../tools/system/confd { }; - conmon = callPackage ../applications/virtualization/conmon { }; conmon-rs = callPackage ../applications/virtualization/conmon-rs { }; @@ -38869,8 +38821,6 @@ with pkgs; narrowlink = callPackage ../tools/networking/narrowlink { }; - nar-serve = callPackage ../tools/nix/nar-serve { }; - neo = callPackage ../applications/misc/neo { }; networkd-dispatcher = callPackage ../tools/networking/networkd-dispatcher { }; @@ -39085,8 +39035,6 @@ with pkgs; nixfmt-classic = haskellPackages.nixfmt.bin; - nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; - nixpkgs-hammering = callPackage ../tools/nix/nixpkgs-hammering { }; nixpkgs-lint-community = callPackage ../tools/nix/nixpkgs-lint { }; @@ -39483,8 +39431,6 @@ with pkgs; terraform-backend-git = callPackage ../applications/networking/cluster/terraform-backend-git { }; - terraform-docs = callPackage ../applications/networking/cluster/terraform-docs { }; - terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory { }; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { }; @@ -39662,8 +39608,6 @@ with pkgs; wcalc = callPackage ../applications/misc/wcalc { }; - webfs = callPackage ../servers/http/webfs { }; - webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { }; websocketd = callPackage ../applications/networking/websocketd { }; @@ -40141,12 +40085,6 @@ with pkgs; _3proxy = callPackage ../applications/networking/3proxy { }; - pigeon = callPackage ../development/tools/pigeon { }; - - verifpal = callPackage ../tools/security/verifpal { }; - - nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy { }; - weasis = callPackage ../by-name/we/weasis/package.nix { jre = jdk21; }; @@ -40159,10 +40097,6 @@ with pkgs; qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen { }; - coz = callPackage ../development/tools/analysis/coz { }; - - keycard-cli = callPackage ../tools/security/keycard-cli { }; - sieveshell = with python3.pkgs; toPythonApplication managesieve; gortr = callPackage ../servers/gortr { }; @@ -40209,8 +40143,6 @@ with pkgs; ryzenadj = callPackage ../os-specific/linux/ryzenadj { }; - vpsfree-client = callPackage ../tools/virtualization/vpsfree-client { }; - gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; zalgo = callPackage ../tools/misc/zalgo { };