From 52ec421a000b621f2097e89944f07f1260c760bb Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:28:52 +0200 Subject: [PATCH 1/8] bazecor: move to by-name --- pkgs/{applications/misc => by-name/ba}/bazecor/10-dygma.rules | 0 .../misc/bazecor/default.nix => by-name/ba/bazecor/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/misc => by-name/ba}/bazecor/10-dygma.rules (100%) rename pkgs/{applications/misc/bazecor/default.nix => by-name/ba/bazecor/package.nix} (100%) diff --git a/pkgs/applications/misc/bazecor/10-dygma.rules b/pkgs/by-name/ba/bazecor/10-dygma.rules similarity index 100% rename from pkgs/applications/misc/bazecor/10-dygma.rules rename to pkgs/by-name/ba/bazecor/10-dygma.rules diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/by-name/ba/bazecor/package.nix similarity index 100% rename from pkgs/applications/misc/bazecor/default.nix rename to pkgs/by-name/ba/bazecor/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c1fc93249ff..09ec5802f303 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -334,8 +334,6 @@ with pkgs; bakelite = callPackage ../tools/backup/bakelite { }; - bazecor = callPackage ../applications/misc/bazecor { }; - bearer = callPackage ../development/tools/bearer { }; benthos = callPackage ../development/tools/benthos { }; From 13a894ff1ced5e49359bff45b46e368b05dfd299 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:29:10 +0200 Subject: [PATCH 2/8] cddl: move to by-name --- pkgs/{development/tools => by-name/cd}/cddl/Gemfile | 0 pkgs/{development/tools => by-name/cd}/cddl/Gemfile.lock | 0 pkgs/{development/tools => by-name/cd}/cddl/gemset.nix | 0 .../tools/cddl/default.nix => by-name/cd/cddl/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{development/tools => by-name/cd}/cddl/Gemfile (100%) rename pkgs/{development/tools => by-name/cd}/cddl/Gemfile.lock (100%) rename pkgs/{development/tools => by-name/cd}/cddl/gemset.nix (100%) rename pkgs/{development/tools/cddl/default.nix => by-name/cd/cddl/package.nix} (100%) diff --git a/pkgs/development/tools/cddl/Gemfile b/pkgs/by-name/cd/cddl/Gemfile similarity index 100% rename from pkgs/development/tools/cddl/Gemfile rename to pkgs/by-name/cd/cddl/Gemfile diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/by-name/cd/cddl/Gemfile.lock similarity index 100% rename from pkgs/development/tools/cddl/Gemfile.lock rename to pkgs/by-name/cd/cddl/Gemfile.lock diff --git a/pkgs/development/tools/cddl/gemset.nix b/pkgs/by-name/cd/cddl/gemset.nix similarity index 100% rename from pkgs/development/tools/cddl/gemset.nix rename to pkgs/by-name/cd/cddl/gemset.nix diff --git a/pkgs/development/tools/cddl/default.nix b/pkgs/by-name/cd/cddl/package.nix similarity index 100% rename from pkgs/development/tools/cddl/default.nix rename to pkgs/by-name/cd/cddl/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09ec5802f303..04fdab284479 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4460,8 +4460,6 @@ with pkgs; cbftp = callPackage ../tools/networking/cbftp { }; - cddl = callPackage ../development/tools/cddl { }; - cedille = callPackage ../applications/science/logic/cedille { inherit (haskellPackages) alex happy Agda ghcWithPackages; }; From 9ca37768272983b28ee60cd4815b3a6fe55c3825 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:29:18 +0200 Subject: [PATCH 3/8] gh-actions-cache: move to by-name --- .../default.nix => by-name/gh/gh-actions-cache/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/gh-actions-cache/default.nix => by-name/gh/gh-actions-cache/package.nix} (100%) diff --git a/pkgs/tools/misc/gh-actions-cache/default.nix b/pkgs/by-name/gh/gh-actions-cache/package.nix similarity index 100% rename from pkgs/tools/misc/gh-actions-cache/default.nix rename to pkgs/by-name/gh/gh-actions-cache/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04fdab284479..43aa1cedfbcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1783,8 +1783,6 @@ with pkgs; gfshare = callPackage ../tools/security/gfshare { }; - gh-actions-cache = callPackage ../tools/misc/gh-actions-cache { }; - gh-cal = callPackage ../tools/misc/gh-cal { inherit (darwin.apple_sdk.frameworks) Security; }; From 5781e6b0049bf47e5d46196147842f3fcfa26c72 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:29:31 +0200 Subject: [PATCH 4/8] gh-dash: move to by-name --- .../misc/gh-dash/default.nix => by-name/gh/gh-dash/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/gh-dash/default.nix => by-name/gh/gh-dash/package.nix} (100%) diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/by-name/gh/gh-dash/package.nix similarity index 100% rename from pkgs/tools/misc/gh-dash/default.nix rename to pkgs/by-name/gh/gh-dash/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43aa1cedfbcc..7045414b4b86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1787,8 +1787,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - gh-dash = callPackage ../tools/misc/gh-dash { }; - gh-markdown-preview = callPackage ../tools/misc/gh-markdown-preview { }; ghostie = callPackage ../tools/misc/ghostie { }; From 0f05f31b4dea7ee3461c162fbe6dde2f5b035027 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:29:49 +0200 Subject: [PATCH 5/8] gh-markdown-preview: move to by-name --- .../default.nix => by-name/gh/gh-markdown-preview/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/gh-markdown-preview/default.nix => by-name/gh/gh-markdown-preview/package.nix} (100%) diff --git a/pkgs/tools/misc/gh-markdown-preview/default.nix b/pkgs/by-name/gh/gh-markdown-preview/package.nix similarity index 100% rename from pkgs/tools/misc/gh-markdown-preview/default.nix rename to pkgs/by-name/gh/gh-markdown-preview/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7045414b4b86..95edf6d6994c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1787,8 +1787,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - gh-markdown-preview = callPackage ../tools/misc/gh-markdown-preview { }; - ghostie = callPackage ../tools/misc/ghostie { }; glooctl = callPackage ../applications/networking/cluster/glooctl { }; From 444a6ef6616838c19a9ac728eccb7f8ef48241bd Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:29:57 +0200 Subject: [PATCH 6/8] latte-integrale: move to by-name --- .../default.nix => by-name/la/latte-integrale/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/science/math/latte-integrale/default.nix => by-name/la/latte-integrale/package.nix} (100%) diff --git a/pkgs/development/libraries/science/math/latte-integrale/default.nix b/pkgs/by-name/la/latte-integrale/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/latte-integrale/default.nix rename to pkgs/by-name/la/latte-integrale/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95edf6d6994c..c47365e3d0a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37404,8 +37404,6 @@ with pkgs; rankwidth = callPackage ../development/libraries/science/math/rankwidth { }; - latte-integrale = callPackage ../development/libraries/science/math/latte-integrale { }; - lcalc = callPackage ../development/libraries/science/math/lcalc { }; lrcalc = callPackage ../applications/science/math/lrcalc { }; From a2a6e797ac0a5b136b93eb4437fd4f3ce4c787c0 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:30:04 +0200 Subject: [PATCH 7/8] scriv: move to by-name --- .../scriv/default.nix => by-name/sc/scriv/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/version-management/scriv/default.nix => by-name/sc/scriv/package.nix} (100%) diff --git a/pkgs/applications/version-management/scriv/default.nix b/pkgs/by-name/sc/scriv/package.nix similarity index 100% rename from pkgs/applications/version-management/scriv/default.nix rename to pkgs/by-name/sc/scriv/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c47365e3d0a8..794f5f2be7c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2983,8 +2983,6 @@ with pkgs; sakura = callPackage ../applications/terminal-emulators/sakura { }; - scriv = callPackage ../applications/version-management/scriv { }; - st = callPackage ../applications/terminal-emulators/st { conf = config.st.conf or null; patches = config.st.patches or []; From dd2019b0c0d3e2be73e386171886442c1b0fe456 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 31 Jul 2024 22:30:31 +0200 Subject: [PATCH 8/8] tandem-aligner: move to by-name --- .../default.nix => by-name/ta/tandem-aligner/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/science/biology/tandem-aligner/default.nix => by-name/ta/tandem-aligner/package.nix} (100%) diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/by-name/ta/tandem-aligner/package.nix similarity index 100% rename from pkgs/applications/science/biology/tandem-aligner/default.nix rename to pkgs/by-name/ta/tandem-aligner/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 794f5f2be7c8..f9ba016f03b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37266,8 +37266,6 @@ with pkgs; svaba = callPackage ../applications/science/biology/svaba { }; - tandem-aligner = callPackage ../applications/science/biology/tandem-aligner { }; - tebreak = callPackage ../applications/science/biology/tebreak { }; treemix = callPackage ../applications/science/biology/treemix { };