From 2bd7cf6cca82d777f715949b84120a682b82398b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 20:55:34 +0200 Subject: [PATCH 01/35] vpsfree-client: move to by-name --- .../{tools/virtualization => by-name/vp}/vpsfree-client/Gemfile | 0 .../virtualization => by-name/vp}/vpsfree-client/Gemfile.lock | 0 .../virtualization => by-name/vp}/vpsfree-client/gemset.nix | 0 .../default.nix => by-name/vp/vpsfree-client/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/virtualization => by-name/vp}/vpsfree-client/Gemfile (100%) rename pkgs/{tools/virtualization => by-name/vp}/vpsfree-client/Gemfile.lock (100%) rename pkgs/{tools/virtualization => by-name/vp}/vpsfree-client/gemset.nix (100%) rename pkgs/{tools/virtualization/vpsfree-client/default.nix => by-name/vp/vpsfree-client/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 112606260c3d..f211ae64da57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40209,8 +40209,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 { }; From 8b6aed7ed3df0a720fa58d2ba3287505f9ca048c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 20:57:48 +0200 Subject: [PATCH 02/35] webfs: move to by-name --- pkgs/{servers/http => by-name/we}/webfs/ls.c.patch | 0 .../http/webfs/default.nix => by-name/we/webfs/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{servers/http => by-name/we}/webfs/ls.c.patch (100%) rename pkgs/{servers/http/webfs/default.nix => by-name/we/webfs/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f211ae64da57..ce4831c4b39d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39662,8 +39662,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 { }; From 99dc6c2efa30ba13bd24321fb47fb33c19fd0467 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 20:59:13 +0200 Subject: [PATCH 03/35] nixpkgs-fmt: move to by-name --- .../default.nix => by-name/ni/nixpkgs-fmt/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/nix/nixpkgs-fmt/default.nix => by-name/ni/nixpkgs-fmt/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce4831c4b39d..5cac9bed5564 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39085,8 +39085,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 { }; From 31e5e88a9334a2e180ca0369bf481c8a1709f94e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:00:55 +0200 Subject: [PATCH 04/35] nix-store-gcs-proxy: move to by-name --- .../default.nix => by-name/ni/nix-store-gcs-proxy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/nix/nix-store-gcs-proxy/default.nix => by-name/ni/nix-store-gcs-proxy/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cac9bed5564..6ccc8e840321 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40141,8 +40141,6 @@ with pkgs; 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; }; From 7266ad59cea0683d4e336bc9b3e7b9460d664d55 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:01:57 +0200 Subject: [PATCH 05/35] nar-serve: move to by-name --- .../nar-serve/default.nix => by-name/na/nar-serve/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/nix/nar-serve/default.nix => by-name/na/nar-serve/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ccc8e840321..7f747384b2c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38869,8 +38869,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 { }; From 06e0eef0f743a587aa74ff778729ae230d8198a8 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:04:38 +0200 Subject: [PATCH 06/35] gist: move to by-name --- .../text/gist/default.nix => by-name/gi/gist/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/text/gist/default.nix => by-name/gi/gist/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f747384b2c1..d638859738fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5331,8 +5331,6 @@ with pkgs; girsh = callPackage ../tools/networking/girsh { }; - gist = callPackage ../tools/text/gist { }; - gitjacker = callPackage ../tools/security/gitjacker { }; gixy = callPackage ../tools/admin/gixy { }; From ebed8837b50e7ecdf3d009ba1ed9063b713d9233 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:05:17 +0200 Subject: [PATCH 07/35] shab: move to by-name --- .../text/shab/default.nix => by-name/sh/shab/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/text/shab/default.nix => by-name/sh/shab/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d638859738fb..81840eb63c67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6086,8 +6086,6 @@ with pkgs; sgp4 = callPackage ../development/libraries/sgp4 { }; - shab = callPackage ../tools/text/shab { }; - sheldon = callPackage ../tools/misc/sheldon { inherit (darwin.apple_sdk.frameworks) Security; }; From 4cfef992fa857e2a5f56b89f574016e981085950 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:06:16 +0200 Subject: [PATCH 08/35] goreman: move to by-name --- .../goreman/default.nix => by-name/go/goreman/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{tools/system/goreman/default.nix => by-name/go/goreman/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81840eb63c67..bee49333e0b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18352,7 +18352,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 { }; From 1629c2eac051952a09d87e5a0174dc83d1ed3382 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:06:56 +0200 Subject: [PATCH 09/35] foreman: move to by-name --- pkgs/{tools/system => by-name/fo}/foreman/Gemfile | 0 pkgs/{tools/system => by-name/fo}/foreman/Gemfile.lock | 0 pkgs/{tools/system => by-name/fo}/foreman/gemset.nix | 0 .../foreman/default.nix => by-name/fo/foreman/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/system => by-name/fo}/foreman/Gemfile (100%) rename pkgs/{tools/system => by-name/fo}/foreman/Gemfile.lock (100%) rename pkgs/{tools/system => by-name/fo}/foreman/gemset.nix (100%) rename pkgs/{tools/system/foreman/default.nix => by-name/fo/foreman/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bee49333e0b8..7bb2f69881c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18351,8 +18351,6 @@ with pkgs; fly = callPackage ../development/tools/continuous-integration/fly { }; - foreman = callPackage ../tools/system/foreman { }; - fprettify = callPackage ../development/tools/fprettify { }; framac = callPackage ../development/tools/analysis/frama-c { }; From feb8a6f0517dab497934ac029475d4191735467e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:07:33 +0200 Subject: [PATCH 10/35] confd: move to by-name --- .../system/confd/default.nix => by-name/co/confd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/system/confd/default.nix => by-name/co/confd/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bb2f69881c2..9701cc5e7951 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35594,8 +35594,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 { }; From dd69ea8ebd5866a71beed304aa34283d4e88c49c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:08:25 +0200 Subject: [PATCH 11/35] gerrit: move to by-name --- .../gerrit/default.nix => by-name/ge/gerrit/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/version-management/gerrit/default.nix => by-name/ge/gerrit/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9701cc5e7951..c14f6c1d706f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8151,8 +8151,6 @@ with pkgs; geonkick = callPackage ../applications/audio/geonkick { }; - gerrit = callPackage ../applications/version-management/gerrit { }; - geteltorito = callPackage ../tools/misc/geteltorito { }; getopt = callPackage ../tools/misc/getopt { }; From 159042ff69e64df4c0e99581e2ff82332d469537 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:09:34 +0200 Subject: [PATCH 12/35] verifpal: move to by-name --- .../verifpal/default.nix => by-name/ve/verifpal/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/verifpal/default.nix => by-name/ve/verifpal/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c14f6c1d706f..a668a42d1277 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40126,8 +40126,6 @@ with pkgs; pigeon = callPackage ../development/tools/pigeon { }; - verifpal = callPackage ../tools/security/verifpal { }; - weasis = callPackage ../by-name/we/weasis/package.nix { jre = jdk21; }; From 7b8adc065a9c17d1204008df1371c0905ba69bd2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:10:19 +0200 Subject: [PATCH 13/35] su-exec: move to by-name --- .../su-exec/default.nix => by-name/su/su-exec/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/su-exec/default.nix => by-name/su/su-exec/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a668a42d1277..c5aeaf70140e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12997,8 +12997,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 { }; From 65a6b8edc6a5b62dd0eea5a8c2416e19ca694d62 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:11:37 +0200 Subject: [PATCH 14/35] git-codeowners: move to by-name --- .../default.nix => by-name/gi/git-codeowners/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/version-management/git-codeowners/default.nix => by-name/gi/git-codeowners/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5aeaf70140e..5af21cfed20b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2282,8 +2282,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 { }; From e6717ef35b7bf4d67865a388c60b28b642a3853b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:15:35 +0200 Subject: [PATCH 15/35] terraform-docs: move to by-name --- .../default.nix => by-name/te/terraform-docs/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/cluster/terraform-docs/default.nix => by-name/te/terraform-docs/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5af21cfed20b..afe943669609 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39464,8 +39464,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 { }; From 7724b648cf2c6b4cf379dcaab1fe63f190d9c813 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:17:24 +0200 Subject: [PATCH 16/35] kubectl-doctor: move to by-name --- .../default.nix => by-name/ku/kubectl-doctor/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/cluster/kubectl-doctor/default.nix => by-name/ku/kubectl-doctor/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afe943669609..63a6b335b0a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31727,8 +31727,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 { }; From caa12efaf425a4b5fd083daf96401e002e10869a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:19:35 +0200 Subject: [PATCH 17/35] keycard-cli: move to by-name --- .../default.nix => by-name/ke/keycard-cli/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/keycard-cli/default.nix => by-name/ke/keycard-cli/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63a6b335b0a6..21d42b0dff17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40132,8 +40132,6 @@ with pkgs; coz = callPackage ../development/tools/analysis/coz { }; - keycard-cli = callPackage ../tools/security/keycard-cli { }; - sieveshell = with python3.pkgs; toPythonApplication managesieve; gortr = callPackage ../servers/gortr { }; From ec7188d73d959d4cad5342db6114d5ac176b7adc Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:20:23 +0200 Subject: [PATCH 18/35] bundix: move to by-name --- .../bundix/default.nix => by-name/bu/bundix/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{development/ruby-modules/bundix/default.nix => by-name/bu/bundix/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21d42b0dff17..4b3e3d7218db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17244,7 +17244,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 { }; From 840dc890e9a3bba40e5a963c318ea4961c2b97f9 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:21:03 +0200 Subject: [PATCH 19/35] zerotierone: move to by-name --- .../0001-darwin-disable-link-time-optimization.patch | 0 pkgs/{tools/networking => by-name/ze}/zerotierone/Cargo.lock | 0 .../default.nix => by-name/ze/zerotierone/package.nix} | 0 pkgs/{tools/networking => by-name/ze}/zerotierone/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/networking => by-name/ze}/zerotierone/0001-darwin-disable-link-time-optimization.patch (100%) rename pkgs/{tools/networking => by-name/ze}/zerotierone/Cargo.lock (100%) rename pkgs/{tools/networking/zerotierone/default.nix => by-name/ze/zerotierone/package.nix} (100%) rename pkgs/{tools/networking => by-name/ze}/zerotierone/update.sh (100%) 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 4b3e3d7218db..87e686496455 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14595,8 +14595,6 @@ with pkgs; nvidiaSupport = true; }; - zerotierone = callPackage ../tools/networking/zerotierone { }; - zerofree = callPackage ../tools/filesystems/zerofree { }; zet = callPackage ../tools/text/zet { }; From 3d2cee1c04d420572c81abe4e32c86e3dcf7e1aa Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:22:56 +0200 Subject: [PATCH 20/35] direnv: move to by-name --- .../misc/direnv/default.nix => by-name/di/direnv/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/direnv/default.nix => by-name/di/direnv/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87e686496455..12e67bb2de6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4867,8 +4867,6 @@ with pkgs; dirb = callPackage ../tools/networking/dirb { }; - direnv = callPackage ../tools/misc/direnv { }; - dirstalk = callPackage ../tools/security/dirstalk { }; h = callPackage ../tools/misc/h { }; From 66194de349468815f3e4f5fcdcdd1f20e9dd4335 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:25:02 +0200 Subject: [PATCH 21/35] gifsicle: move to by-name --- .../gifsicle/default.nix => by-name/gi/gifsicle/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/graphics/gifsicle/default.nix => by-name/gi/gifsicle/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12e67bb2de6a..5b806424ec9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8179,8 +8179,6 @@ with pkgs; gibo = callPackage ../tools/misc/gibo { }; - gifsicle = callPackage ../tools/graphics/gifsicle { }; - gifski = callPackage ../tools/graphics/gifski { ffmpeg = ffmpeg_6; }; From 43ab2b48b3d1268e049d61d676a16afd8a9ebd17 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:26:09 +0200 Subject: [PATCH 22/35] ovh-ttyrec: move to by-name --- .../default.nix => by-name/ov/ovh-ttyrec/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/ovh-ttyrec/default.nix => by-name/ov/ovh-ttyrec/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b806424ec9c..ac1db94acc31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11306,8 +11306,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; }; From 1ccc99fe9e1b5b916c2f98600098cb16169730ad Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:26:41 +0200 Subject: [PATCH 23/35] dispad: move to by-name --- .../X11/dispad/default.nix => by-name/di/dispad/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/X11/dispad/default.nix => by-name/di/dispad/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac1db94acc31..bc868ba3f413 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 { From 1efdf8162a7393d05cdc778a8d2ab39551cc20d4 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:27:14 +0200 Subject: [PATCH 24/35] tmux-cssh: move to by-name --- .../tmux-cssh/default.nix => by-name/tm/tmux-cssh/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/tmux-cssh/default.nix => by-name/tm/tmux-cssh/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc868ba3f413..742e1e94c996 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13378,8 +13378,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 { }; From e1681750202da216f47b9dd95a2a605a6d8f2b03 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:27:45 +0200 Subject: [PATCH 25/35] gopls: move to by-name --- .../gopls/default.nix => by-name/go/gopls/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/language-servers/gopls/default.nix => by-name/go/gopls/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 742e1e94c996..ae048313aa50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17552,8 +17552,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 { }; From 15c4b52a8e5582b9fe8f9ab10808838c1e412ecf Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:28:43 +0200 Subject: [PATCH 26/35] hclfmt: move to by-name --- .../tools/hclfmt/default.nix => by-name/hc/hclfmt/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/hclfmt/default.nix => by-name/hc/hclfmt/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae048313aa50..99d8d8250a7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18495,8 +18495,6 @@ with pkgs; hcloud = callPackage ../development/tools/hcloud { }; - hclfmt = callPackage ../development/tools/hclfmt { }; - help2man = callPackage ../development/tools/misc/help2man { }; heroku = callPackage ../development/tools/heroku { }; From 009f33ce925c530ae0d42a9d4dc57cc4e0b0f954 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 21:29:40 +0200 Subject: [PATCH 27/35] gitlab-runner: move to by-name --- .../gi}/gitlab-runner/fix-shell-path.patch | 0 .../default.nix => by-name/gi/gitlab-runner/package.nix} | 0 .../gi}/gitlab-runner/remove-bash-test.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 deletions(-) rename pkgs/{development/tools/continuous-integration => by-name/gi}/gitlab-runner/fix-shell-path.patch (100%) rename pkgs/{development/tools/continuous-integration/gitlab-runner/default.nix => by-name/gi/gitlab-runner/package.nix} (100%) rename pkgs/{development/tools/continuous-integration => by-name/gi}/gitlab-runner/remove-bash-test.patch (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99d8d8250a7b..a7212c7bbb7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8200,8 +8200,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 { }; From f3edb08a2880a070401df9f9285ec03de6f4f1a7 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:05:04 +0200 Subject: [PATCH 28/35] aws-vault: move to by-name --- .../aws-vault/default.nix => by-name/aw/aws-vault/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/admin/aws-vault/default.nix => by-name/aw/aws-vault/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7212c7bbb7e..f4f4d7e61394 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3304,8 +3304,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 { }; From 5d61acb71b48a794caa327c82f4f781352d1134c Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:06:48 +0200 Subject: [PATCH 29/35] packer: move to by-name --- .../tools/packer/default.nix => by-name/pa/packer/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/packer/default.nix => by-name/pa/packer/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4f4d7e61394..7de06696d9a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1015,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 { }; From af16288ebb02b9053d9e083343129bd9f61c8006 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:07:32 +0200 Subject: [PATCH 30/35] coz: move to by-name --- .../analysis/coz/default.nix => by-name/co/coz/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/analysis/coz/default.nix => by-name/co/coz/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7de06696d9a7..000a2fd498da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40107,8 +40107,6 @@ with pkgs; qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen { }; - coz = callPackage ../development/tools/analysis/coz { }; - sieveshell = with python3.pkgs; toPythonApplication managesieve; gortr = callPackage ../servers/gortr { }; From 7d7fd84248b387be5f21e07b3db0548e0d021505 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:08:47 +0200 Subject: [PATCH 31/35] buildkite-agent: move to by-name --- .../default.nix => by-name/bu/buildkite-agent/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/continuous-integration/buildkite-agent/default.nix => by-name/bu/buildkite-agent/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 000a2fd498da..14f294ed04f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17901,8 +17901,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 { }; From 13cd4d68642dcf85295dbd991f5ce1fb5815abdd Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:09:50 +0200 Subject: [PATCH 32/35] pigeon: move to by-name --- .../tools/pigeon/default.nix => by-name/pi/pigeon/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/pigeon/default.nix => by-name/pi/pigeon/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14f294ed04f8..b9c935753dfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40091,8 +40091,6 @@ with pkgs; _3proxy = callPackage ../applications/networking/3proxy { }; - pigeon = callPackage ../development/tools/pigeon { }; - weasis = callPackage ../by-name/we/weasis/package.nix { jre = jdk21; }; From 3a7201a0f6fc78276f570dd0ba8c5008b00294b0 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:10:37 +0200 Subject: [PATCH 33/35] ronn: move to by-name --- pkgs/{development/tools => by-name/ro}/ronn/Gemfile | 0 pkgs/{development/tools => by-name/ro}/ronn/Gemfile.lock | 0 pkgs/{development/tools => by-name/ro}/ronn/gemset.nix | 0 .../tools/ronn/default.nix => by-name/ro/ronn/package.nix} | 0 .../tools => by-name/ro}/ronn/test-reproducible-html.nix | 0 pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 2 deletions(-) rename pkgs/{development/tools => by-name/ro}/ronn/Gemfile (100%) rename pkgs/{development/tools => by-name/ro}/ronn/Gemfile.lock (100%) rename pkgs/{development/tools => by-name/ro}/ronn/gemset.nix (100%) rename pkgs/{development/tools/ronn/default.nix => by-name/ro/ronn/package.nix} (100%) rename pkgs/{development/tools => by-name/ro}/ronn/test-reproducible-html.nix (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9c935753dfe..85ad47e9d2c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23784,8 +23784,6 @@ with pkgs; round = callPackage ../applications/graphics/round { }; - ronn = callPackage ../development/tools/ronn { }; - router = callPackage ../servers/http/router { }; rover = callPackage ../development/tools/rover { }; From 62ace478a658b4c7c7d53ede4d1d099f5366f0f2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:16:39 +0200 Subject: [PATCH 34/35] bupc: move to by-name --- .../compilers/bupc/default.nix => by-name/bu/bupc/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/compilers/bupc/default.nix => by-name/bu/bupc/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85ad47e9d2c4..ebbb9b62760d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16586,8 +16586,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 { }; From e7d212886b54420a5ea94ce2be88071124838c38 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 25 Jul 2024 22:17:37 +0200 Subject: [PATCH 35/35] beanstalkd: move to by-name --- .../default.nix => by-name/be/beanstalkd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/beanstalkd/default.nix => by-name/be/beanstalkd/package.nix} (100%) 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebbb9b62760d..ed2192dd8e0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6337,8 +6337,6 @@ with pkgs; usePoppler = true; }; - beanstalkd = callPackage ../servers/beanstalkd { }; - beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { }); inherit (beetsPackages) beets beets-unstable;