lib.teams: Remove .githubTeams in favor of singular .github (#449986)

This commit is contained in:
Wolfgang Walther
2025-10-09 09:09:12 +00:00
committed by GitHub
3 changed files with 47 additions and 51 deletions

View File

@@ -27,9 +27,9 @@ let
type = types.listOf (types.submodule (import ./maintainer-module.nix { inherit lib; })); type = types.listOf (types.submodule (import ./maintainer-module.nix { inherit lib; }));
default = [ ]; default = [ ];
}; };
githubTeams = lib.mkOption { github = lib.mkOption {
type = types.listOf types.str; type = types.str;
default = [ ]; default = "";
}; };
}; };
}; };

View File

@@ -74,11 +74,9 @@ while (my ($team_nix_key, $team_config) = each %{$data}) {
print {*STDERR} "$team_config->{shortName}:"; print {*STDERR} "$team_config->{shortName}:";
# GitHub Teams # GitHub Teams
my @github_members; my @github_members;
if (defined $team_config->{githubTeams}) { if (defined $team_config->{github}) {
foreach (@{$team_config->{githubTeams}}) { print {*STDERR} " \@NixOS/$team_config->{github}";
print {*STDERR} " \@NixOS/${_}"; push @github_members, @{github_team_members($team_config->{github}, $github_user, $github_token)};
push @github_members, @{github_team_members($_, $github_user, $github_token)};
}
} }
my %github_members = map { $_ => 1 } @github_members; my %github_members = map { $_ => 1 } @github_members;
# Members # Members

View File

@@ -7,7 +7,7 @@
shortName = "foo"; shortName = "foo";
# Optional # Optional
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
githubTeams = [ "my-subsystem" ]; github = "my-subsystem";
}; };
where where
@@ -18,7 +18,7 @@
- `enableFeatureFreezePing` will ping this team during the Feature Freeze announcements on releases - `enableFeatureFreezePing` will ping this team during the Feature Freeze announcements on releases
- There is limited mention capacity in a single post, so this should be reserved for critical components - There is limited mention capacity in a single post, so this should be reserved for critical components
or larger ecosystems within nixpkgs. or larger ecosystems within nixpkgs.
- `githubTeams` will ping specified GitHub teams as well - `github` will ping the specified GitHub team as well
More fields may be added in the future. More fields may be added in the future.
@@ -65,7 +65,7 @@ with lib.maintainers;
RossComputerGuy RossComputerGuy
]; ];
scope = "Maintain Android-related tooling in nixpkgs."; scope = "Maintain Android-related tooling in nixpkgs.";
githubTeams = [ "android" ]; github = "android";
shortName = "Android"; shortName = "Android";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
}; };
@@ -117,7 +117,7 @@ with lib.maintainers;
minijackson minijackson
yurrriq yurrriq
]; ];
githubTeams = [ "beam" ]; github = "beam";
scope = "Maintain BEAM-related packages and modules."; scope = "Maintain BEAM-related packages and modules.";
shortName = "BEAM"; shortName = "BEAM";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -205,7 +205,7 @@ with lib.maintainers;
sigmasquadron sigmasquadron
tomodachi94 tomodachi94
]; ];
githubTeams = [ "categorization" ]; github = "categorization";
scope = "Maintain the categorization system in Nixpkgs, per RFC 146. This team has authority over all categorization issues in Nixpkgs."; scope = "Maintain the categorization system in Nixpkgs, per RFC 146. This team has authority over all categorization issues in Nixpkgs.";
shortName = "Categorization"; shortName = "Categorization";
}; };
@@ -218,7 +218,7 @@ with lib.maintainers;
wolfgangwalther wolfgangwalther
zowoq zowoq
]; ];
githubTeams = [ "nixpkgs-ci" ]; github = "nixpkgs-ci";
scope = "Maintain Nixpkgs' in-tree Continuous Integration, including GitHub Actions."; scope = "Maintain Nixpkgs' in-tree Continuous Integration, including GitHub Actions.";
shortName = "CI"; shortName = "CI";
}; };
@@ -237,7 +237,7 @@ with lib.maintainers;
members = [ floriansanderscc ]; members = [ floriansanderscc ];
scope = "Maintain Clever Cloud related packages."; scope = "Maintain Clever Cloud related packages.";
shortName = "CleverCloud"; shortName = "CleverCloud";
githubTeams = [ "CleverCloud" ]; github = "CleverCloud";
}; };
cloudposse = { cloudposse = {
@@ -275,7 +275,7 @@ with lib.maintainers;
thefossguy thefossguy
michaelBelsanti michaelBelsanti
]; ];
githubTeams = [ "cosmic" ]; github = "cosmic";
shortName = "cosmic"; shortName = "cosmic";
scope = "Maintain the COSMIC DE and related packages."; scope = "Maintain the COSMIC DE and related packages.";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -300,7 +300,7 @@ with lib.maintainers;
]; ];
scope = "Maintain CUDA-enabled packages"; scope = "Maintain CUDA-enabled packages";
shortName = "Cuda"; shortName = "Cuda";
githubTeams = [ "cuda-maintainers" ]; github = "cuda-maintainers";
}; };
cyberus = { cyberus = {
@@ -320,7 +320,7 @@ with lib.maintainers;
reckenrode reckenrode
toonn toonn
]; ];
githubTeams = [ "darwin-core" ]; github = "darwin-core";
scope = "Maintain core platform support and packages for macOS and other Apple platforms."; scope = "Maintain core platform support and packages for macOS and other Apple platforms.";
shortName = "Darwin"; shortName = "Darwin";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -367,7 +367,7 @@ with lib.maintainers;
docs = { docs = {
members = [ ]; members = [ ];
githubTeams = [ "documentation-team" ]; github = "documentation-team";
scope = "Maintain nixpkgs/NixOS documentation and tools for building it."; scope = "Maintain nixpkgs/NixOS documentation and tools for building it.";
shortName = "Docs"; shortName = "Docs";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -400,7 +400,7 @@ with lib.maintainers;
enlightenment = { enlightenment = {
members = [ romildo ]; members = [ romildo ];
githubTeams = [ "enlightenment" ]; github = "enlightenment";
scope = "Maintain Enlightenment desktop environment and related packages."; scope = "Maintain Enlightenment desktop environment and related packages.";
shortName = "Enlightenment"; shortName = "Enlightenment";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -409,9 +409,7 @@ with lib.maintainers;
# Dummy group for the "everyone else" section # Dummy group for the "everyone else" section
feature-freeze-everyone-else = { feature-freeze-everyone-else = {
members = [ ]; members = [ ];
githubTeams = [ github = "nixpkgs-committers";
"nixpkgs-committers"
];
scope = "Dummy team for the #everyone else' section during feture freezes, not to be used as package maintainers!"; scope = "Dummy team for the #everyone else' section during feture freezes, not to be used as package maintainers!";
shortName = "Everyone else"; shortName = "Everyone else";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -427,7 +425,7 @@ with lib.maintainers;
scope = "Maintain Flutter and Dart-related packages and build tools"; scope = "Maintain Flutter and Dart-related packages and build tools";
shortName = "flutter"; shortName = "flutter";
enableFeatureFreezePing = false; enableFeatureFreezePing = false;
githubTeams = [ "flutter" ]; github = "flutter";
}; };
flyingcircus = { flyingcircus = {
@@ -495,7 +493,7 @@ with lib.maintainers;
sikmir sikmir
willcohen willcohen
]; ];
githubTeams = [ "geospatial" ]; github = "geospatial";
scope = "Maintain geospatial, remote sensing and OpenStreetMap software."; scope = "Maintain geospatial, remote sensing and OpenStreetMap software.";
shortName = "Geospatial"; shortName = "Geospatial";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -520,7 +518,7 @@ with lib.maintainers;
jtojnar jtojnar
dasj19 dasj19
]; ];
githubTeams = [ "gnome" ]; github = "gnome";
scope = "Maintain GNOME desktop environment and platform."; scope = "Maintain GNOME desktop environment and platform.";
shortName = "GNOME"; shortName = "GNOME";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -545,7 +543,7 @@ with lib.maintainers;
qbit qbit
mfrw mfrw
]; ];
githubTeams = [ "golang" ]; github = "golang";
scope = "Maintain Golang compilers."; scope = "Maintain Golang compilers.";
shortName = "Go"; shortName = "Go";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -569,7 +567,7 @@ with lib.maintainers;
sternenseemann sternenseemann
wolfgangwalther wolfgangwalther
]; ];
githubTeams = [ "haskell" ]; github = "haskell";
scope = "Maintain Haskell packages and infrastructure."; scope = "Maintain Haskell packages and infrastructure.";
shortName = "Haskell"; shortName = "Haskell";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -604,7 +602,7 @@ with lib.maintainers;
khaneliman khaneliman
NotAShelf NotAShelf
]; ];
githubTeams = [ "hyprland" ]; github = "hyprland";
scope = "Maintain Hyprland compositor and ecosystem"; scope = "Maintain Hyprland compositor and ecosystem";
shortName = "Hyprland"; shortName = "Hyprland";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -627,7 +625,7 @@ with lib.maintainers;
}; };
java = { java = {
githubTeams = [ "java" ]; github = "java";
members = [ members = [
chayleaf chayleaf
fliegendewurst fliegendewurst
@@ -674,7 +672,7 @@ with lib.maintainers;
}; };
k3s = { k3s = {
githubTeams = [ "k3s" ]; github = "k3s";
members = [ members = [
euank euank
frederictobiasc frederictobiasc
@@ -744,7 +742,7 @@ with lib.maintainers;
uthar uthar
hraban hraban
]; ];
githubTeams = [ "lisp" ]; github = "lisp";
scope = "Maintain the Lisp ecosystem."; scope = "Maintain the Lisp ecosystem.";
shortName = "lisp"; shortName = "lisp";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -774,7 +772,7 @@ with lib.maintainers;
rrbutani rrbutani
sternenseemann sternenseemann
]; ];
githubTeams = [ "llvm" ]; github = "llvm";
scope = "Maintain LLVM package sets and related packages"; scope = "Maintain LLVM package sets and related packages";
shortName = "LLVM"; shortName = "LLVM";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -795,14 +793,14 @@ with lib.maintainers;
dramforever dramforever
wegank wegank
]; ];
githubTeams = [ "loongarch64" ]; github = "loongarch64";
scope = "Maintain LoongArch64 related packages and code"; scope = "Maintain LoongArch64 related packages and code";
shortName = "LoongArch64"; shortName = "LoongArch64";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
}; };
lua = { lua = {
githubTeams = [ "lua" ]; github = "lua";
scope = "Maintain the lua ecosystem."; scope = "Maintain the lua ecosystem.";
shortName = "lua"; shortName = "lua";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -820,7 +818,7 @@ with lib.maintainers;
lumina = { lumina = {
members = [ romildo ]; members = [ romildo ];
githubTeams = [ "lumina" ]; github = "lumina";
scope = "Maintain lumina desktop environment and related packages."; scope = "Maintain lumina desktop environment and related packages.";
shortName = "Lumina"; shortName = "Lumina";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -839,7 +837,7 @@ with lib.maintainers;
lxqt = { lxqt = {
members = [ romildo ]; members = [ romildo ];
githubTeams = [ "lxqt" ]; github = "lxqt";
scope = "Maintain LXQt desktop environment and related packages."; scope = "Maintain LXQt desktop environment and related packages.";
shortName = "LXQt"; shortName = "LXQt";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -852,7 +850,7 @@ with lib.maintainers;
thilobillerbeck thilobillerbeck
tomberek tomberek
]; ];
githubTeams = [ "marketing-team" ]; github = "marketing-team";
scope = "Marketing of Nix/NixOS/nixpkgs."; scope = "Marketing of Nix/NixOS/nixpkgs.";
shortName = "Marketing"; shortName = "Marketing";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -924,7 +922,7 @@ with lib.maintainers;
mrcjkb mrcjkb
perchun perchun
]; ];
githubTeams = [ "neovim" ]; github = "neovim";
scope = "Maintain the vim and neovim text editors and related packages."; scope = "Maintain the vim and neovim text editors and related packages.";
shortName = "Vim/Neovim"; shortName = "Vim/Neovim";
}; };
@@ -985,7 +983,7 @@ with lib.maintainers;
ocaml = { ocaml = {
members = [ alizter ]; members = [ alizter ];
githubTeams = [ "ocaml" ]; github = "ocaml";
scope = "Maintain the OCaml compiler and package set."; scope = "Maintain the OCaml compiler and package set.";
shortName = "OCaml"; shortName = "OCaml";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -1023,7 +1021,7 @@ with lib.maintainers;
davidak davidak
bobby285271 bobby285271
]; ];
githubTeams = [ "pantheon" ]; github = "pantheon";
scope = "Maintain Pantheon desktop environment and platform."; scope = "Maintain Pantheon desktop environment and platform.";
shortName = "Pantheon"; shortName = "Pantheon";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -1047,7 +1045,7 @@ with lib.maintainers;
piotrkwiecinski piotrkwiecinski
talyz talyz
]; ];
githubTeams = [ "php" ]; github = "php";
scope = "Maintain PHP related packages and extensions."; scope = "Maintain PHP related packages and extensions.";
shortName = "PHP"; shortName = "PHP";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -1058,7 +1056,7 @@ with lib.maintainers;
saschagrunert saschagrunert
vdemeester vdemeester
]; ];
githubTeams = [ "podman" ]; github = "podman";
scope = "Maintain Podman and CRI-O related packages and modules."; scope = "Maintain Podman and CRI-O related packages and modules.";
shortName = "Podman"; shortName = "Podman";
}; };
@@ -1094,7 +1092,7 @@ with lib.maintainers;
SuperSandro2000 SuperSandro2000
ttuegel ttuegel
]; ];
githubTeams = [ "qt-kde" ]; github = "qt-kde";
scope = "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects."; scope = "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects.";
shortName = "Qt / KDE"; shortName = "Qt / KDE";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -1124,7 +1122,7 @@ with lib.maintainers;
release = { release = {
members = [ ]; members = [ ];
githubTeams = [ "nixos-release-managers" ]; github = "nixos-release-managers";
scope = "Manage the current nixpkgs/NixOS release."; scope = "Manage the current nixpkgs/NixOS release.";
shortName = "Release"; shortName = "Release";
}; };
@@ -1136,7 +1134,7 @@ with lib.maintainers;
LunNova LunNova
mschwaig mschwaig
]; ];
githubTeams = [ "rocm" ]; github = "rocm";
scope = "Maintain ROCm and related packages."; scope = "Maintain ROCm and related packages.";
shortName = "ROCm"; shortName = "ROCm";
}; };
@@ -1156,7 +1154,7 @@ with lib.maintainers;
winter winter
zowoq zowoq
]; ];
githubTeams = [ "rust" ]; github = "rust";
scope = "Maintain the Rust compiler toolchain and nixpkgs integration."; scope = "Maintain the Rust compiler toolchain and nixpkgs integration.";
shortName = "Rust"; shortName = "Rust";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -1180,7 +1178,7 @@ with lib.maintainers;
marcin-serwin marcin-serwin
pbsds pbsds
]; ];
githubTeams = [ "SDL" ]; github = "SDL";
scope = "Maintain core SDL libraries."; scope = "Maintain core SDL libraries.";
shortName = "SDL"; shortName = "SDL";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -1220,7 +1218,7 @@ with lib.maintainers;
scope = "Maintain the standard environment and its surrounding logic."; scope = "Maintain the standard environment and its surrounding logic.";
shortName = "stdenv"; shortName = "stdenv";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
githubTeams = [ "stdenv" ]; github = "stdenv";
}; };
steam = { steam = {
@@ -1261,7 +1259,7 @@ with lib.maintainers;
aanderse aanderse
grimmauld grimmauld
]; ];
githubTeams = [ "systemd" ]; github = "systemd";
scope = "Maintain systemd for NixOS."; scope = "Maintain systemd for NixOS.";
shortName = "systemd"; shortName = "systemd";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
@@ -1322,7 +1320,7 @@ with lib.maintainers;
scope = "Maintain the Xen Project Hypervisor and the related tooling ecosystem."; scope = "Maintain the Xen Project Hypervisor and the related tooling ecosystem.";
shortName = "Xen Project Hypervisor"; shortName = "Xen Project Hypervisor";
enableFeatureFreezePing = true; enableFeatureFreezePing = true;
githubTeams = [ "xen-project" ]; github = "xen-project";
}; };
xfce = { xfce = {