diff options
| -rw-r--r-- | maintainers/team-list.nix | 9 | ||||
| -rw-r--r-- | nixos/tests/oci-containers.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/jetbrains/youtrack.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/oauth2-proxy/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/admin/acme.sh/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/vault/vault-bin.nix | 2 |
6 files changed, 14 insertions, 5 deletions
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9af8d11c6f9..3ec9ad71a82 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -178,4 +178,13 @@ with lib.maintainers; { ]; scope = "Maintain SageMath and the dependencies that are likely to break it."; }; + + serokell = { + # Verify additions by checking commit signature from an already existing member of the team. + members = [ + balsoft + mkaito + ]; + scope = "Group registration for Serokell employees who collectively maintain packages."; + }; } diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix index 0dfc7ffb276..68077e3540a 100644 --- a/nixos/tests/oci-containers.nix +++ b/nixos/tests/oci-containers.nix @@ -12,7 +12,7 @@ let name = "oci-containers-${backend}"; meta = { - maintainers = with lib.maintainers; [ adisbladis benley mkaito ]; + maintainers = with lib.maintainers; [ adisbladis benley ] ++ lib.teams.serokell.members; }; nodes = { diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix index 5258a0224be..88fd5b64fa6 100644 --- a/pkgs/servers/jetbrains/youtrack.nix +++ b/pkgs/servers/jetbrains/youtrack.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Issue tracking and project management tool for developers"; - maintainers = with maintainers; [ yorickvp ]; + maintainers = with maintainers; teams.serokell.members; # https://www.jetbrains.com/youtrack/buy/license.html license = licenses.unfree; }; diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index 7c2bcbe4740..fe4335a7411 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { description = "A reverse proxy that provides authentication with Google, Github, or other providers"; homepage = "https://github.com/oauth2-proxy/oauth2-proxy/"; license = licenses.mit; - maintainers = with maintainers; [ yorickvp knl ]; + maintainers = with maintainers; teams.serokell.members ++ [ knl ]; }; } diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 63ca45452e6..ae85a5ab687 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "A pure Unix shell script implementing ACME client protocol"; homepage = "https://acme.sh/"; license = licenses.gpl3; - maintainers = [ maintainers.yorickvp ]; + maintainers = teams.serokell.members; }; } diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 40ce05331f9..44755db2d33 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -49,6 +49,6 @@ in stdenv.mkDerivation { description = "A tool for managing secrets, this binary includes the UI"; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; license = licenses.mpl20; - maintainers = with maintainers; [ offline psyanticy mkaito Chili-Man ]; + maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man ]; }; } |