From 16c2a2499eee9ebff7d13eb5eb8dc7c66eb858dc Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 20:14:43 +0100
Subject: [PATCH] teams/cachix: drop

---
 maintainers/team-list.nix                              | 10 ----------
 nixos/modules/services/system/cachix-agent/default.nix |  5 ++++-
 nixos/modules/services/system/cachix-watch-store.nix   |  6 +++++-
 pkgs/by-name/de/devenv/package.nix                     |  5 ++++-
 pkgs/by-name/se/secretspec/package.nix                 |  5 ++++-
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7b95a1030df9..9a3b9e99b617 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -154,16 +154,6 @@ with lib.maintainers;
     shortName = "c3d2";
   };
 
-  cachix = {
-    # Verify additions to this team with at least one existing member of the team.
-    members = [
-      domenkozar
-      sandydoo
-    ];
-    scope = "Group registration for packages maintained by Cachix.";
-    shortName = "Cachix employees";
-  };
-
   categorization = {
     github = "categorization";
   };
diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix
index e8fe84adfcf0..d578ff99c174 100644
--- a/nixos/modules/services/system/cachix-agent/default.nix
+++ b/nixos/modules/services/system/cachix-agent/default.nix
@@ -8,7 +8,10 @@ let
   cfg = config.services.cachix-agent;
 in
 {
-  meta.maintainers = lib.teams.cachix.members;
+  meta.maintainers = with lib.maintainers; [
+    domenkozar
+    sandydoo
+  ];
 
   options.services.cachix-agent = {
     enable = lib.mkEnableOption "Cachix Deploy Agent: <https://docs.cachix.org/deploy/>";
diff --git a/nixos/modules/services/system/cachix-watch-store.nix b/nixos/modules/services/system/cachix-watch-store.nix
index b30a57cd4926..ca7119f813be 100644
--- a/nixos/modules/services/system/cachix-watch-store.nix
+++ b/nixos/modules/services/system/cachix-watch-store.nix
@@ -9,7 +9,11 @@ let
 in
 {
   meta = {
-    maintainers = lib.teams.cachix.members ++ [ lib.maintainers.jfroche ];
+    maintainers = with lib.maintainers; [
+      domenkozar
+      jfroche
+      sandydoo
+    ];
   };
 
   options.services.cachix-watch-store = {
diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index 6fe3cacc41ca..374bc1eea425 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -128,6 +128,9 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/cachix/devenv";
     license = lib.licenses.asl20;
     mainProgram = "devenv";
-    teams = [ lib.teams.cachix ];
+    maintainers = with lib.maintainers; [
+      domenkozar
+      sandydoo
+    ];
   };
 }
diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix
index 1cb08c47a9d0..3b0f2b279223 100644
--- a/pkgs/by-name/se/secretspec/package.nix
+++ b/pkgs/by-name/se/secretspec/package.nix
@@ -27,7 +27,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Declarative secrets, every environment, any provider";
     homepage = "https://secretspec.dev";
     license = with lib.licenses; [ asl20 ];
-    teams = [ lib.teams.cachix ];
+    maintainers = with lib.maintainers; [
+      domenkozar
+      sandydoo
+    ];
     mainProgram = "secretspec";
   };
 })