Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,22 @@
/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
/doc/github.md @NixOS/org
/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
/doc/governance.md @NixOS/steering
/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
2 changes: 0 additions & 2 deletions doc/github-org-owners.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 1 addition & 3 deletions doc/github.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions doc/governance.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 0 additions & 2 deletions doc/nixpkgs-committers.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 0 additions & 21 deletions doc/nixpkgs-core.md

This file was deleted.

Loading