From e20c391ca59473f358af65c9509a7750cc24eabc Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 10 Jan 2026 20:42:38 +0100 Subject: [PATCH] teams/cyberus: drop --- maintainers/team-list.nix | 11 ----------- nixos/modules/services/web-apps/dependency-track.nix | 5 ++++- nixos/modules/services/web-apps/plausible.nix | 5 ++++- nixos/tests/dependency-track.nix | 5 ++++- nixos/tests/outline.nix | 5 ++++- nixos/tests/plausible.nix | 5 ++++- pkgs/by-name/de/dependency-track/package.nix | 5 ++++- pkgs/by-name/gi/gitlab-container-registry/package.nix | 6 ++---- .../gi/gitlab-elasticsearch-indexer/package.nix | 7 +++++-- pkgs/by-name/la/lavacli/package.nix | 2 +- pkgs/by-name/pl/plausible/package.nix | 5 ++++- pkgs/by-name/ta/tailscale-gitops-pusher/package.nix | 5 ++++- .../mkdocs-include-markdown-plugin/default.nix | 5 ++++- pkgs/servers/web-apps/outline/default.nix | 3 ++- 14 files changed, 46 insertions(+), 28 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7b95a1030df9..450158a75523 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -240,17 +240,6 @@ with lib.maintainers; github = "cuda-maintainers"; }; - cyberus = { - # Verify additions by approval of an already existing member of the team. - members = [ - xanderio - snu - e1mo - ]; - scope = "Team for Cyberus Technology employees who collectively maintain packages."; - shortName = "Cyberus Technology employees"; - }; - danklinux = { members = [ luckshiba diff --git a/nixos/modules/services/web-apps/dependency-track.nix b/nixos/modules/services/web-apps/dependency-track.nix index b19e3064c363..3da1e866e5df 100644 --- a/nixos/modules/services/web-apps/dependency-track.nix +++ b/nixos/modules/services/web-apps/dependency-track.nix @@ -629,6 +629,9 @@ in }; meta = { - maintainers = lib.teams.cyberus.members; + maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; }; } diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 8e9f6aace6ab..23510534a24d 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -330,6 +330,9 @@ in ]; }; - meta.maintainers = teams.cyberus.members; + meta.maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; meta.doc = ./plausible.md; } diff --git a/nixos/tests/dependency-track.nix b/nixos/tests/dependency-track.nix index c0d56707ac3c..053b9d244a72 100644 --- a/nixos/tests/dependency-track.nix +++ b/nixos/tests/dependency-track.nix @@ -5,7 +5,10 @@ in { name = "dependency-track"; meta = { - maintainers = pkgs.lib.teams.cyberus.members; + maintainers = with pkgs.lib.maintainers; [ + e1mo + xanderio + ]; }; nodes = { diff --git a/nixos/tests/outline.nix b/nixos/tests/outline.nix index 1085db6bf5b7..15abc22270d4 100644 --- a/nixos/tests/outline.nix +++ b/nixos/tests/outline.nix @@ -2,7 +2,10 @@ { name = "outline"; - meta.maintainers = lib.teams.cyberus.members; + meta.maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; node.pkgsReadOnly = false; diff --git a/nixos/tests/plausible.nix b/nixos/tests/plausible.nix index 5253b521c99e..b7da2eb4bbb9 100644 --- a/nixos/tests/plausible.nix +++ b/nixos/tests/plausible.nix @@ -2,7 +2,10 @@ { name = "plausible"; meta = { - maintainers = lib.teams.cyberus.members; + maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; }; nodes.machine = diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix index 5b6596206277..9d59601292d7 100644 --- a/pkgs/by-name/de/dependency-track/package.nix +++ b/pkgs/by-name/de/dependency-track/package.nix @@ -120,7 +120,10 @@ maven.buildMavenPackage rec { description = "Intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain"; homepage = "https://github.com/DependencyTrack/dependency-track"; license = lib.licenses.asl20; - teams = [ lib.teams.cyberus ]; + maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; mainProgram = "dependency-track"; inherit (jre_headless.meta) platforms; }; diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix index 191e02385fda..9f20e9bd65df 100644 --- a/pkgs/by-name/gi/gitlab-container-registry/package.nix +++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix @@ -37,10 +37,8 @@ buildGo124Module rec { meta = { description = "GitLab Docker toolset to pack, ship, store, and deliver content"; license = lib.licenses.asl20; - teams = with lib.teams; [ - gitlab - cyberus - ]; + maintainers = with lib.maintainers; [ e1mo ]; + teams = with lib.teams; [ gitlab ]; platforms = lib.platforms.unix; mainProgram = "registry"; }; diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix index da15d43018aa..b8027fbdd3ee 100644 --- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix +++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix @@ -54,7 +54,10 @@ buildGoModule rec { description = "Indexes Git repositories into Elasticsearch for GitLab"; mainProgram = "gitlab-elasticsearch-indexer"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ yayayayaka ]; - teams = [ lib.teams.cyberus ]; + maintainers = with lib.maintainers; [ + e1mo + xanderio + yayayayaka + ]; }; } diff --git a/pkgs/by-name/la/lavacli/package.nix b/pkgs/by-name/la/lavacli/package.nix index b505b4ebf8a3..02c46ed95105 100644 --- a/pkgs/by-name/la/lavacli/package.nix +++ b/pkgs/by-name/la/lavacli/package.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://lava.gitlab.io/lavacli/"; changelog = "https://gitlab.com/lava/lavacli/-/commits/v${version}?ref_type=tags"; license = lib.licenses.agpl3Only; - teams = [ lib.teams.cyberus ]; + maintainers = with lib.maintainers; [ snu ]; mainProgram = "lavacli"; }; } diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix index b1acaae50a50..75fdf91ad317 100644 --- a/pkgs/by-name/pl/plausible/package.nix +++ b/pkgs/by-name/pl/plausible/package.nix @@ -182,7 +182,10 @@ beamPackages.mixRelease rec { 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"; - teams = with lib.teams; [ cyberus ]; + maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix index dbb0c637efe2..e8821359fff2 100644 --- a/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix +++ b/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix @@ -31,6 +31,9 @@ buildGoModule { description = "Allows users to use a GitOps flow for managing Tailscale ACLs"; license = lib.licenses.bsd3; mainProgram = "gitops-pusher"; - teams = [ lib.teams.cyberus ]; + maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; }; } diff --git a/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix b/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix index f634c44c9983..94afb210b6d3 100644 --- a/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix @@ -42,6 +42,9 @@ buildPythonPackage rec { description = "Mkdocs Markdown includer plugin"; homepage = "https://pypi.org/project/mkdocs-include-markdown-plugin/"; license = lib.licenses.asl20; - teams = [ lib.teams.cyberus ]; + maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; }; } diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 1cd32fd1152a..6d68de1b1096 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -95,9 +95,10 @@ stdenv.mkDerivation rec { license = lib.licenses.bsl11; maintainers = with lib.maintainers; [ cab404 + e1mo + xanderio yrd ]; - teams = [ lib.teams.cyberus ]; platforms = lib.platforms.linux; }; }