From 64df085b20918d1ed3d09641a29bc30c4094c66f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 7 Apr 2026 09:05:55 -0500
Subject: [PATCH 1/5] kuma: migrate to by-name, preserve isFull override

---
 .../cluster/kuma/default.nix => by-name/ku/kuma/package.nix}    | 2 +-
 pkgs/top-level/all-packages.nix                                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{applications/networking/cluster/kuma/default.nix => by-name/ku/kuma/package.nix} (98%)

diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/by-name/ku/kuma/package.nix
similarity index 98%
rename from pkgs/applications/networking/cluster/kuma/default.nix
rename to pkgs/by-name/ku/kuma/package.nix
index a2d3ff4d459e..38458ff7813a 100644
--- a/pkgs/applications/networking/cluster/kuma/default.nix
+++ b/pkgs/by-name/ku/kuma/package.nix
@@ -5,7 +5,7 @@
   buildGoModule,
   coredns,
   installShellFiles,
-  isFull ? false,
+  isFull ? true,
   enableGateway ? false,
   pname ? "kuma",
   components ? lib.optionals isFull [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4240a5f43969..bf76d05630dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9605,7 +9605,6 @@ with pkgs;
   linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { };
   linkerd_stable = linkerd;
 
-  kuma = callPackage ../applications/networking/cluster/kuma { isFull = true; };
   kuma-experimental = callPackage ../applications/networking/cluster/kuma {
     isFull = true;
     enableGateway = true;

From e7981edd82203d2d5e04d87526a93f27269d354a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 7 Apr 2026 09:14:02 -0500
Subject: [PATCH 2/5] kuma-experimental: migrate to by-name, preserve override
 behavior

---
 pkgs/by-name/ku/kuma-experimental/package.nix | 14 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 -----
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/ku/kuma-experimental/package.nix

diff --git a/pkgs/by-name/ku/kuma-experimental/package.nix b/pkgs/by-name/ku/kuma-experimental/package.nix
new file mode 100644
index 000000000000..ce40b14f9fd2
--- /dev/null
+++ b/pkgs/by-name/ku/kuma-experimental/package.nix
@@ -0,0 +1,14 @@
+{
+  kuma,
+  ...
+}@args:
+
+kuma.override (
+  {
+    pname = "kuma-experimental";
+    isFull = true;
+    enableGateway = true;
+
+  }
+  // removeAttrs args [ "kuma" ]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf76d05630dd..30fcb148078c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9605,11 +9605,6 @@ with pkgs;
   linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { };
   linkerd_stable = linkerd;
 
-  kuma-experimental = callPackage ../applications/networking/cluster/kuma {
-    isFull = true;
-    enableGateway = true;
-    pname = "kuma-experimental";
-  };
   kumactl = callPackage ../applications/networking/cluster/kuma {
     components = [ "kumactl" ];
     pname = "kumactl";

From 7a650d019610864fb1de019783eecf9164b6af64 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 7 Apr 2026 09:33:37 -0500
Subject: [PATCH 3/5] kumactl: migrate to by-name, preserve override behavior

---
 pkgs/by-name/ku/kumactl/package.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix     |  4 ----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/ku/kumactl/package.nix

diff --git a/pkgs/by-name/ku/kumactl/package.nix b/pkgs/by-name/ku/kumactl/package.nix
new file mode 100644
index 000000000000..72943688219c
--- /dev/null
+++ b/pkgs/by-name/ku/kumactl/package.nix
@@ -0,0 +1,13 @@
+{
+  kuma,
+  ...
+}@args:
+
+kuma.override (
+  {
+    pname = "kumactl";
+    isFull = false;
+    components = [ "kumactl" ];
+  }
+  // removeAttrs args [ "kuma" ]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30fcb148078c..4aaeaf3b5c80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9605,10 +9605,6 @@ with pkgs;
   linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { };
   linkerd_stable = linkerd;
 
-  kumactl = callPackage ../applications/networking/cluster/kuma {
-    components = [ "kumactl" ];
-    pname = "kumactl";
-  };
   kuma-cp = callPackage ../applications/networking/cluster/kuma {
     components = [ "kuma-cp" ];
     pname = "kuma-cp";

From eaa9da0b5f0ae060d0556c1377826ad3f44e1151 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 7 Apr 2026 09:38:36 -0500
Subject: [PATCH 4/5] kuma-cp: migrate to by-name, preserve override behavior

---
 pkgs/by-name/ku/kuma-cp/package.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix     |  4 ----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/ku/kuma-cp/package.nix

diff --git a/pkgs/by-name/ku/kuma-cp/package.nix b/pkgs/by-name/ku/kuma-cp/package.nix
new file mode 100644
index 000000000000..72943688219c
--- /dev/null
+++ b/pkgs/by-name/ku/kuma-cp/package.nix
@@ -0,0 +1,13 @@
+{
+  kuma,
+  ...
+}@args:
+
+kuma.override (
+  {
+    pname = "kumactl";
+    isFull = false;
+    components = [ "kumactl" ];
+  }
+  // removeAttrs args [ "kuma" ]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4aaeaf3b5c80..df7b4e6de963 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9605,10 +9605,6 @@ with pkgs;
   linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { };
   linkerd_stable = linkerd;
 
-  kuma-cp = callPackage ../applications/networking/cluster/kuma {
-    components = [ "kuma-cp" ];
-    pname = "kuma-cp";
-  };
   kuma-dp = callPackage ../applications/networking/cluster/kuma {
     components = [ "kuma-dp" ];
     pname = "kuma-dp";

From 910f5141a5947e4c71cec6269666ccf57f2f526d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 7 Apr 2026 09:41:01 -0500
Subject: [PATCH 5/5] kuma-dp: migrate to by-name, preserve override behavior

---
 pkgs/by-name/ku/kuma-dp/package.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix     |  5 -----
 2 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/ku/kuma-dp/package.nix

diff --git a/pkgs/by-name/ku/kuma-dp/package.nix b/pkgs/by-name/ku/kuma-dp/package.nix
new file mode 100644
index 000000000000..fc21766a6aff
--- /dev/null
+++ b/pkgs/by-name/ku/kuma-dp/package.nix
@@ -0,0 +1,13 @@
+{
+  kuma,
+  ...
+}@args:
+
+kuma.override (
+  {
+    pname = "kuma-dp";
+    isFull = false;
+    components = [ "kuma-dp" ];
+  }
+  // removeAttrs args [ "kuma" ]
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df7b4e6de963..ce47db94f8a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9605,11 +9605,6 @@ with pkgs;
   linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { };
   linkerd_stable = linkerd;
 
-  kuma-dp = callPackage ../applications/networking/cluster/kuma {
-    components = [ "kuma-dp" ];
-    pname = "kuma-dp";
-  };
-
   kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
 
   wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { };