diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dc243490f1a1..44ffa4066a20 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22866,6 +22866,13 @@ githubId = 96694484; name = "Sandeep Patel"; }; + sandydoo = { + name = "Sander"; + github = "sandydoo"; + githubId = 7572407; + email = "hey@sandydoo.me"; + matrix = "@sandydoo:matrix.org"; + }; Sanskarzz = { email = "sanskar.gur@gmail.com"; github = "Sanskarzz"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 21dcf14b5368..5a24b6c82e27 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -170,6 +170,16 @@ 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 = { members = [ aleksana diff --git a/nixos/modules/services/system/cachix-agent/default.nix b/nixos/modules/services/system/cachix-agent/default.nix index b7da56d08981..e8fe84adfcf0 100644 --- a/nixos/modules/services/system/cachix-agent/default.nix +++ b/nixos/modules/services/system/cachix-agent/default.nix @@ -8,7 +8,7 @@ let cfg = config.services.cachix-agent; in { - meta.maintainers = [ lib.maintainers.domenkozar ]; + meta.maintainers = lib.teams.cachix.members; options.services.cachix-agent = { enable = lib.mkEnableOption "Cachix Deploy Agent: "; diff --git a/nixos/modules/services/system/cachix-watch-store.nix b/nixos/modules/services/system/cachix-watch-store.nix index d9bd417d5d60..0df74b927afa 100644 --- a/nixos/modules/services/system/cachix-watch-store.nix +++ b/nixos/modules/services/system/cachix-watch-store.nix @@ -8,10 +8,9 @@ let cfg = config.services.cachix-watch-store; in { - meta.maintainers = [ - lib.maintainers.jfroche - lib.maintainers.domenkozar - ]; + meta = { + maintainers = lib.teams.cachix.members ++ [ lib.maintainers.jfroche ]; + }; options.services.cachix-watch-store = { enable = lib.mkEnableOption "Cachix Watch Store: "; diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 5304121eaa18..ce11bfa06258 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -101,6 +101,6 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/cachix/devenv"; license = lib.licenses.asl20; mainProgram = "devenv"; - maintainers = with lib.maintainers; [ domenkozar ]; + teams = [ lib.teams.cachix ]; }; } diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix index fe25907c5b31..5ff4debea656 100644 --- a/pkgs/by-name/se/secretspec/package.nix +++ b/pkgs/by-name/se/secretspec/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Declarative secrets, every environment, any provider"; homepage = "https://secretspec.dev"; license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ domenkozar ]; + teams = [ lib.teams.cachix ]; mainProgram = "secretspec"; }; })