From f772ed2cace0b1e47ea510a4e0c34639548af68a Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 30 Jul 2024 12:32:25 +0200 Subject: [PATCH 1/8] maintainers/team-list: add cyberus team --- maintainers/team-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 8ce7e4273feb..5715cfcb0bc6 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -183,6 +183,16 @@ with lib.maintainers; githubTeams = [ "cuda-maintainers" ]; }; + cyberus = { + # Verify additions by approval of an already existing member of the team. + members = [ + xanderio + blitz + ]; + scope = "Team for Cyberus Technology employees who collectively maintain packages."; + shortName = "Cyberus Technology employees"; + }; + darwin = { members = [ toonn ]; githubTeams = [ "darwin-maintainers" ]; From 7237f14f6cd2ef389d3c0d9f570c66201f94af33 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 30 Jul 2024 12:34:13 +0200 Subject: [PATCH 2/8] cyclonedx-python: add cyberus team as maintainer --- pkgs/tools/misc/cyclonedx-python/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/cyclonedx-python/default.nix b/pkgs/tools/misc/cyclonedx-python/default.nix index b3439723aaff..102151e2d70f 100644 --- a/pkgs/tools/misc/cyclonedx-python/default.nix +++ b/pkgs/tools/misc/cyclonedx-python/default.nix @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/CycloneDX/cyclonedx-python"; changelog = "https://github.com/CycloneDX/cyclonedx-python/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ xanderio ]; + maintainers = lib.teams.cyberus.members; mainProgram = "cyclonedx-py"; }; } From 31b9891df87c10fb16972ad2a4c8d5134eb2a4ca Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 30 Jul 2024 12:35:01 +0200 Subject: [PATCH 3/8] tailscale-gitops-pusher: add cyberus team as maintainer --- pkgs/by-name/ta/tailscale-gitops-pusher/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix index f0ddde526f0b..a927ec609fb2 100644 --- a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix +++ b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix @@ -23,6 +23,6 @@ buildGoModule { description = "Allows users to use a GitOps flow for managing Tailscale ACLs"; license = licenses.bsd3; mainProgram = "gitops-pusher"; - maintainers = with maintainers; [ xanderio ]; + maintainers = teams.cyberus.members; }; } From 38c7d204e63f07d86b43a020404faaecb201af4f Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 30 Jul 2024 12:35:47 +0200 Subject: [PATCH 4/8] gitlab-container-registry: add cyberus team as maintainer --- .../gitlab/gitlab-container-registry/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index b13c9a12706d..87f77c74d393 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { meta = with lib; { description = "GitLab Docker toolset to pack, ship, store, and deliver content"; license = licenses.asl20; - maintainers = with maintainers; [ yayayayaka xanderio ]; + maintainers = with maintainers; [ yayayayaka ] ++ teams.cyberus.members; platforms = platforms.unix; }; } From 682bee28da45bfc3f441673e3060ba55b4e7f723 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 30 Jul 2024 12:36:34 +0200 Subject: [PATCH 5/8] gitlab-elasticsearch-indexer: add cyberus team as maintainer --- .../gitlab/gitlab-elasticsearch-indexer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index 463231b67fd0..e04809a59a83 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Indexes Git repositories into Elasticsearch for GitLab"; mainProgram = "gitlab-elasticsearch-indexer"; license = licenses.mit; - maintainers = with maintainers; [ xanderio yayayayaka ]; + maintainers = with maintainers; [ yayayayaka ] ++ teams.cyberus.members; }; } From 20b3a5458d7d1edcd39ff14c90400a11e3f37f76 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 30 Jul 2024 12:37:45 +0200 Subject: [PATCH 6/8] nixos/outline: add cyberus team as maintainer --- nixos/modules/services/web-apps/plausible.nix | 2 +- nixos/tests/outline.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 1f909bbd67a3..188b80ca43a1 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -329,6 +329,6 @@ in { ]; }; - meta.maintainers = with maintainers; [ xanderio ]; + meta.maintainers = teams.cyberus.members; meta.doc = ./plausible.md; } diff --git a/nixos/tests/outline.nix b/nixos/tests/outline.nix index e45be37f5d3b..c7a34c5d6f85 100644 --- a/nixos/tests/outline.nix +++ b/nixos/tests/outline.nix @@ -13,7 +13,7 @@ in { name = "outline"; - meta.maintainers = with lib.maintainers; [ xanderio ]; + meta.maintainers = lib.teams.cyberus.members; nodes = { outline = { pkgs, config, ... }: { From 06b7e94988f32fbb31594d56ed612a6400a6bba1 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 30 Jul 2024 12:38:21 +0200 Subject: [PATCH 7/8] outline: add cyberus team as maintainer --- pkgs/servers/web-apps/outline/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index fa66487758f8..b0fd1b399314 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { homepage = "https://www.getoutline.com/"; changelog = "https://github.com/outline/outline/releases"; license = licenses.bsl11; - maintainers = with maintainers; [ cab404 yrd xanderio ]; + maintainers = with maintainers; [ cab404 yrd ] ++ teams.cyberus.members; platforms = platforms.linux; }; } From 6b129e29421627031526bbf068a888f6c0620d46 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 30 Jul 2024 12:38:59 +0200 Subject: [PATCH 8/8] plausible: add cyberus team as maintainer --- pkgs/servers/web-apps/plausible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index 257fb6818e26..5a5918c6f815 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -89,7 +89,7 @@ beamPackages.mixRelease { changelog = "https://github.com/plausible/analytics/blob/${src.rev}/CHANGELOG.md"; description = " Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics"; mainProgram = "plausible"; - maintainers = with maintainers; [ xanderio ]; + maintainers = teams.cyberus.members; platforms = platforms.unix; }; }