From 6640ae7c7e7a517ed1decab6a9bd13361fd3c63e Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 28 Jan 2025 13:11:09 +0100 Subject: [PATCH 1/7] cocogitto: move to by-name --- .../cocogitto/default.nix => by-name/co/cocogitto/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/cocogitto/default.nix => by-name/co/cocogitto/package.nix} (100%) diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/by-name/co/cocogitto/package.nix similarity index 100% rename from pkgs/development/tools/cocogitto/default.nix rename to pkgs/by-name/co/cocogitto/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66284adf1c94..8d1a10599bb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -293,8 +293,6 @@ with pkgs; perlPackages = perl538Packages; }; - cocogitto = callPackage ../development/tools/cocogitto { }; - coldsnap = callPackage ../tools/admin/coldsnap { }; collision = callPackage ../applications/misc/collision { }; From eb61570b4ac1e01ac53cc6ea3d32df1e93e647e1 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 28 Jan 2025 13:17:16 +0100 Subject: [PATCH 2/7] cewl: move to by-name --- pkgs/{tools/security => by-name/ce}/cewl/Gemfile | 0 pkgs/{tools/security => by-name/ce}/cewl/Gemfile.lock | 0 pkgs/{tools/security => by-name/ce}/cewl/gemset.nix | 0 .../security/cewl/default.nix => by-name/ce/cewl/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{tools/security => by-name/ce}/cewl/Gemfile (100%) rename pkgs/{tools/security => by-name/ce}/cewl/Gemfile.lock (100%) rename pkgs/{tools/security => by-name/ce}/cewl/gemset.nix (100%) rename pkgs/{tools/security/cewl/default.nix => by-name/ce/cewl/package.nix} (100%) diff --git a/pkgs/tools/security/cewl/Gemfile b/pkgs/by-name/ce/cewl/Gemfile similarity index 100% rename from pkgs/tools/security/cewl/Gemfile rename to pkgs/by-name/ce/cewl/Gemfile diff --git a/pkgs/tools/security/cewl/Gemfile.lock b/pkgs/by-name/ce/cewl/Gemfile.lock similarity index 100% rename from pkgs/tools/security/cewl/Gemfile.lock rename to pkgs/by-name/ce/cewl/Gemfile.lock diff --git a/pkgs/tools/security/cewl/gemset.nix b/pkgs/by-name/ce/cewl/gemset.nix similarity index 100% rename from pkgs/tools/security/cewl/gemset.nix rename to pkgs/by-name/ce/cewl/gemset.nix diff --git a/pkgs/tools/security/cewl/default.nix b/pkgs/by-name/ce/cewl/package.nix similarity index 100% rename from pkgs/tools/security/cewl/default.nix rename to pkgs/by-name/ce/cewl/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d1a10599bb3..110d56ef084c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -278,8 +278,6 @@ with pkgs; cereal = cereal_1_3_0; - cewl = callPackage ../tools/security/cewl { }; - chef-cli = callPackage ../tools/misc/chef-cli { }; checkov = callPackage ../development/tools/analysis/checkov { }; From ba49ecec4e360be76bdc9c043a105d2d73064343 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 28 Jan 2025 13:19:48 +0100 Subject: [PATCH 3/7] coldsnap: move to by-name --- .../coldsnap/default.nix => by-name/co/coldsnap/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/admin/coldsnap/default.nix => by-name/co/coldsnap/package.nix} (100%) diff --git a/pkgs/tools/admin/coldsnap/default.nix b/pkgs/by-name/co/coldsnap/package.nix similarity index 100% rename from pkgs/tools/admin/coldsnap/default.nix rename to pkgs/by-name/co/coldsnap/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 110d56ef084c..7317c512e796 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -291,8 +291,6 @@ with pkgs; perlPackages = perl538Packages; }; - coldsnap = callPackage ../tools/admin/coldsnap { }; - collision = callPackage ../applications/misc/collision { }; coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); From 0141c8403951cbe4da6523898c69dd8964a997f3 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 28 Jan 2025 13:21:50 +0100 Subject: [PATCH 4/7] eludris: move to by-name --- .../misc/eludris/default.nix => by-name/el/eludris/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/eludris/default.nix => by-name/el/eludris/package.nix} (100%) diff --git a/pkgs/tools/misc/eludris/default.nix b/pkgs/by-name/el/eludris/package.nix similarity index 100% rename from pkgs/tools/misc/eludris/default.nix rename to pkgs/by-name/el/eludris/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7317c512e796..8fc4e9e35310 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -325,8 +325,6 @@ with pkgs; catch2 = catch2_3; }; - eludris = callPackage ../tools/misc/eludris { }; - enochecker-test = with python3Packages; callPackage ../development/tools/enochecker-test { }; inherit (gridlock) nyarr; From 4f78d44f9b7370b37c5427ff635b203915e3eeec Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 28 Jan 2025 13:27:42 +0100 Subject: [PATCH 5/7] zrok: move to by-name --- .../networking/zrok/default.nix => by-name/zr/zrok/package.nix} | 0 pkgs/{tools/networking => by-name/zr}/zrok/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{tools/networking/zrok/default.nix => by-name/zr/zrok/package.nix} (100%) rename pkgs/{tools/networking => by-name/zr}/zrok/update.sh (100%) diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/by-name/zr/zrok/package.nix similarity index 100% rename from pkgs/tools/networking/zrok/default.nix rename to pkgs/by-name/zr/zrok/package.nix diff --git a/pkgs/tools/networking/zrok/update.sh b/pkgs/by-name/zr/zrok/update.sh similarity index 100% rename from pkgs/tools/networking/zrok/update.sh rename to pkgs/by-name/zr/zrok/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fc4e9e35310..9b937bd1207a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18125,8 +18125,6 @@ with pkgs; callPackage ../applications/networking/znc/modules.nix { } ); - zrok = callPackage ../tools/networking/zrok { }; - bullet = callPackage ../development/libraries/bullet { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; From 81794a2efd68c014cf276451e562e22ac5e16ef3 Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 28 Jan 2025 13:33:50 +0100 Subject: [PATCH 6/7] urbit: move to by-name --- pkgs/{misc/urbit/default.nix => by-name/ur/urbit/package.nix} | 0 pkgs/{misc => by-name/ur}/urbit/update-bin.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{misc/urbit/default.nix => by-name/ur/urbit/package.nix} (100%) rename pkgs/{misc => by-name/ur}/urbit/update-bin.sh (100%) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/by-name/ur/urbit/package.nix similarity index 100% rename from pkgs/misc/urbit/default.nix rename to pkgs/by-name/ur/urbit/package.nix diff --git a/pkgs/misc/urbit/update-bin.sh b/pkgs/by-name/ur/urbit/update-bin.sh similarity index 100% rename from pkgs/misc/urbit/update-bin.sh rename to pkgs/by-name/ur/urbit/update-bin.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b937bd1207a..26e2ed6b7fe7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17991,8 +17991,6 @@ with pkgs; unityhub = callPackage ../development/tools/unityhub { }; - urbit = callPackage ../misc/urbit { }; - unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; vaultenv = haskell.lib.justStaticExecutables haskellPackages.vaultenv; From 2ad2fce9df1d8d010926b1af883ef1cdaf9f0c3f Mon Sep 17 00:00:00 2001 From: liberodark Date: Tue, 28 Jan 2025 13:36:53 +0100 Subject: [PATCH 7/7] terraspace: move to by-name --- .../networking/cluster => by-name/te}/terraspace/Gemfile | 0 .../networking/cluster => by-name/te}/terraspace/Gemfile.lock | 0 .../networking/cluster => by-name/te}/terraspace/gemset.nix | 0 .../default.nix => by-name/te/terraspace/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{applications/networking/cluster => by-name/te}/terraspace/Gemfile (100%) rename pkgs/{applications/networking/cluster => by-name/te}/terraspace/Gemfile.lock (100%) rename pkgs/{applications/networking/cluster => by-name/te}/terraspace/gemset.nix (100%) rename pkgs/{applications/networking/cluster/terraspace/default.nix => by-name/te/terraspace/package.nix} (100%) diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile b/pkgs/by-name/te/terraspace/Gemfile similarity index 100% rename from pkgs/applications/networking/cluster/terraspace/Gemfile rename to pkgs/by-name/te/terraspace/Gemfile diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile.lock b/pkgs/by-name/te/terraspace/Gemfile.lock similarity index 100% rename from pkgs/applications/networking/cluster/terraspace/Gemfile.lock rename to pkgs/by-name/te/terraspace/Gemfile.lock diff --git a/pkgs/applications/networking/cluster/terraspace/gemset.nix b/pkgs/by-name/te/terraspace/gemset.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraspace/gemset.nix rename to pkgs/by-name/te/terraspace/gemset.nix diff --git a/pkgs/applications/networking/cluster/terraspace/default.nix b/pkgs/by-name/te/terraspace/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/terraspace/default.nix rename to pkgs/by-name/te/terraspace/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26e2ed6b7fe7..ce0c73134123 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17979,8 +17979,6 @@ with pkgs; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { }; - terraspace = callPackage ../applications/networking/cluster/terraspace { }; - tftui = python3Packages.callPackage ../applications/networking/cluster/tftui { }; touchosc = callPackage ../applications/audio/touchosc { };