From 528e91dc10269fbdf2770caf079db0673f2a1df6 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 2 Aug 2026 22:58:24 +0100 Subject: [PATCH] nixpkgs-core: disband team --- .github/CODEOWNERS | 6 ++---- doc/github-org-owners.md | 2 -- doc/github.md | 4 +--- doc/governance.md | 2 -- doc/nixpkgs-committers.md | 2 -- doc/nixpkgs-core.md | 21 --------------------- 6 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 doc/nixpkgs-core.md diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2b3d25f..d364510 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,7 +12,6 @@ /default.nix @NixOS/org /shell.nix @NixOS/org /rulesets @NixOS/org -/rulesets/nixpkgs @NixOS/nixpkgs-core /doc/org-repo.md @NixOS/steering /doc/discourse.md @NixOS/steering @mweinelt @lassulus @jtojnar @ctheune @dpausp @@ -20,7 +19,7 @@ /doc/github-org-owners.md @NixOS/steering /doc/matrix.md @NixOS/steering /doc/moderation.md @NixOS/steering -/doc/nixos-releases.md @NixOS/nixpkgs-core +/doc/nixos-releases.md @NixOS/steering /doc/resources.md @NixOS/steering /doc/mail.md @NixOS/infra /doc/freescout.md @infinisil @@ -28,8 +27,7 @@ /doc/values.md @NixOS/steering /doc/vault.md @Mic92 @mweinelt /doc/constitution.md @NixOS/steering -/doc/nixpkgs-core.md @NixOS/nixpkgs-core -/doc/nixpkgs-committers.md @NixOS/nixpkgs-core +/doc/nixpkgs-committers.md @NixOS/steering /doc/calendar.md @tomberek @cafkafk @infinisil /doc/nixcon.md @NixOS/steering /doc/hetzner.md @NixOS/infra diff --git a/doc/github-org-owners.md b/doc/github-org-owners.md index 7751670..ec54685 100644 --- a/doc/github-org-owners.md +++ b/doc/github-org-owners.md @@ -5,11 +5,9 @@ The [NixOS GitHub enterprise](https://github.com/enterprises/nixos) and all (non - [Foundation Board](https://nixos.org/community/teams/foundation-board) representative[^2]: [@infinisil](https://github.com/infinisil) - [Steering Committee](https://nixos.org/community/teams/steering-committee) representative[^3]: [@PhilipTaron](https://github.com/PhilipTaron) - [Security Team](https://nixos.org/community/teams/security/) representative[^4]: [@mweinelt](https://github.com/mweinelt) -- [Nixpkgs Core Team](https://nixos.org/community/teams/nixpkgs-core/) representative[^4]: [@emilazy](https://github.com/emilazy) [^2]: For legal/financial matters [^3]: For elected governance -[^4]: For relevant expertise The number of org owners should be kept low to improve our security posture, while having team representatives improves the health of org owner decision-making by naturally ensuring a "two-person decisions require sign-off from multiple teams" property. diff --git a/doc/github.md b/doc/github.md index fe09206..103217d 100644 --- a/doc/github.md +++ b/doc/github.md @@ -13,15 +13,13 @@ There are many repositories, but these are some of the most important ones. The Nix package collection and NixOS. -Over 200 people have commit access, which is managed by the [Nixpkgs core team](./nixpkgs-committers.md). +Over 200 people have commit access, which is managed by the [Nixpkgs committer delegation team](./nixpkgs-committers.md). Furthermore, every [Nixpkgs maintainer](https://github.com/NixOS/nixpkgs/tree/master/maintainers) is part of the organisation, such that they can be requested as a reviewer. Being a Nixpkgs maintainer doesn't grant any permissions by itself. They can however make use of the [Nixpkgs merge bot](https://github.com/NixOS/nixpkgs-merge-bot) in certain cases. -The [Nixpkgs core team](./nixpkgs-core.md) controls this repository. - ### [nix](https://github.com/NixOS/nix) The Nix language and CLI implementation. diff --git a/doc/governance.md b/doc/governance.md index 4f32fe6..80d32bd 100644 --- a/doc/governance.md +++ b/doc/governance.md @@ -28,8 +28,6 @@ To add a new team to this list, open a PR on the [nixos-homepage repository](htt ### Nixpkgs -The [Nixpkgs core team](./nixpkgs-core.md) governs Nixpkgs and its teams. - More Nixpkgs-specific teams are declared in the [`maintainers/team-list.nix` file](https://github.com/NixOS/nixpkgs/blob/master/maintainers/team-list.nix), which can be programmatically accessed using `lib.teams`. To add a new team to this list, open a PR to change it. diff --git a/doc/nixpkgs-committers.md b/doc/nixpkgs-committers.md index 5e838be..7608746 100644 --- a/doc/nixpkgs-committers.md +++ b/doc/nixpkgs-committers.md @@ -4,8 +4,6 @@ There are [200 Nixpkgs committers](https://github.com/NixOS/nixpkgs-committers/t You can nominate yourself or another contributor to become a Nixpkgs committer. This should be done by following [these instructions](https://github.com/NixOS/nixpkgs-committers?tab=readme-ov-file#nominations). -The [Nixpkgs core team](./nixpkgs-core.md) currently fills the role of the Nixpkgs committer delegation team and is given the responsibility and authority of changing the list of [Nixpkgs committers](https://github.com/orgs/NixOS/teams/nixpkgs-committers). - ## Process - The process must be publicly documented (this document) - Any change to the process must be unanimously agreed upon by all delegation team members diff --git a/doc/nixpkgs-core.md b/doc/nixpkgs-core.md deleted file mode 100644 index 4e95b05..0000000 --- a/doc/nixpkgs-core.md +++ /dev/null @@ -1,21 +0,0 @@ -# Nixpkgs core team - -The Nixpkgs core team provides leadership for and has authority over Nixpkgs. - -The team has the following members: - -- [@alyssais](https://github.com/alyssais) -- [@emilazy](https://github.com/emilazy) - -## Procedures - -1. Team decisions are made by unanimous consensus. -2. If no more than a single team member is absent for a decision, and there is unanimous consensus among the rest that the decision is uncontroversial, the absent member is not required to reach consensus. -3. Amendments to these procedures require a team decision, and can never be considered uncontroversial. - -## How to contact the team - -You can reach the Nixpkgs core team: -- on [Discourse](https://discourse.nixos.org/g/nixpkgs-core) -- by Email at nixpkgs-core@nixos.org -- on GitHub, by pinging [@NixOS/nixpkgs-core](https://github.com/orgs/NixOS/teams/nixpkgs-core)