From 0520de52437c276b304d622fbf5f4a421033c682 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 10 Jan 2026 22:50:43 +0100 Subject: [PATCH 1/2] maintainers: drop eelco Has not reacted to maintainer pings since July 2025. Dropping according to maintainer guidelines. --- maintainers/maintainer-list.nix | 6 ------ maintainers/scripts/nix-generate-from-cpan.nix | 1 - maintainers/scripts/nixpkgs-lint.nix | 1 - maintainers/team-list.nix | 1 - modules/generic/meta-maintainers/test.nix | 13 ++++++++++--- nixos/tests/misc.nix | 1 - pkgs/by-name/ni/nix-serve/package.nix | 1 - pkgs/by-name/va/valgrind/package.nix | 1 - 8 files changed, 10 insertions(+), 15 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 29df4d5cdc6d..6b68029f9bd8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7533,12 +7533,6 @@ githubId = 8173116; name = "Dean Eckert"; }; - eelco = { - email = "edolstra+nixpkgs@gmail.com"; - github = "edolstra"; - githubId = 1148549; - name = "Eelco Dolstra"; - }; ehegnes = { email = "eric.hegnes@gmail.com"; github = "ehegnes"; diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index c05dedc205df..b362b2d16c7b 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation { ''; meta = { - maintainers = with lib.maintainers; [ eelco ]; description = "Utility to generate a Nix expression for a Perl package from CPAN"; mainProgram = "nix-generate-from-cpan"; platforms = lib.platforms.unix; diff --git a/maintainers/scripts/nixpkgs-lint.nix b/maintainers/scripts/nixpkgs-lint.nix index fe9c77408915..1cfd2913ef35 100644 --- a/maintainers/scripts/nixpkgs-lint.nix +++ b/maintainers/scripts/nixpkgs-lint.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation { ''; meta = { - maintainers = [ lib.maintainers.eelco ]; description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors"; mainProgram = "nixpkgs-lint"; platforms = lib.platforms.unix; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7b95a1030df9..990c83da2687 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -745,7 +745,6 @@ with lib.maintainers; # same as https://github.com/orgs/NixOS/teams/nix-team nix = { members = [ - eelco mic92 tomberek roberth diff --git a/modules/generic/meta-maintainers/test.nix b/modules/generic/meta-maintainers/test.nix index 73a431c34327..e4b37780ca83 100644 --- a/modules/generic/meta-maintainers/test.nix +++ b/modules/generic/meta-maintainers/test.nix @@ -6,6 +6,13 @@ # # Debugging: # drop .test from the end of this file, then use nix repl on it +let + ghost = { + github = "ghost"; + githubId = 0; + name = "ghost"; + }; +in rec { lib = import ../../../lib; @@ -13,8 +20,8 @@ rec { modules = [ ../meta-maintainers.nix { - _file = "eelco.nix"; - meta.maintainers = [ lib.maintainers.eelco ]; + _file = "ghost.nix"; + meta.maintainers = [ ghost ]; } ]; }; @@ -26,7 +33,7 @@ rec { lib.maintainers.pierron lib.maintainers.roberth ]; - "eelco.nix" = [ lib.maintainers.eelco ]; + "ghost.nix" = [ ghost ]; }; { }; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 50efcbd28999..9164f57eb74a 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -6,7 +6,6 @@ let in { name = "misc"; - meta.maintainers = with lib.maintainers; [ eelco ]; nodes.machine = { lib, ... }: diff --git a/pkgs/by-name/ni/nix-serve/package.nix b/pkgs/by-name/ni/nix-serve/package.nix index 41d79d116f50..57c0894af5d5 100644 --- a/pkgs/by-name/ni/nix-serve/package.nix +++ b/pkgs/by-name/ni/nix-serve/package.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/edolstra/nix-serve"; description = "Utility for sharing a Nix store as a binary cache"; - maintainers = [ lib.maintainers.eelco ]; license = lib.licenses.lgpl21; # See https://github.com/edolstra/nix-serve/issues/57 broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/va/valgrind/package.nix b/pkgs/by-name/va/valgrind/package.nix index bb420e060fac..8c3a2ca3db1e 100644 --- a/pkgs/by-name/va/valgrind/package.nix +++ b/pkgs/by-name/va/valgrind/package.nix @@ -112,7 +112,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.eelco ]; platforms = with lib.platforms; lib.intersectLists (x86 ++ power ++ s390x ++ armv7 ++ aarch64 ++ mips ++ riscv64) ( From d4a597194f7270a8524d88ff7fce860bbad28a80 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 10 Jan 2026 22:54:51 +0100 Subject: [PATCH 2/2] teams/nix: clarify relation to Nix team The Nix team is not the same as the Nixpkgs Nix team, at least in practice. Now we reflect that in metadata as well. --- ci/OWNERS | 5 +++-- maintainers/team-list.nix | 16 ++++++++++------ .../package-management/nix/common-meson.nix | 7 +------ pkgs/tools/package-management/nix/default.nix | 13 ++++--------- .../package-management/nix/modular/packages.nix | 2 -- .../nix/modular/packaging/components.nix | 3 --- .../nix/modular/packaging/everything.nix | 2 -- 7 files changed, 18 insertions(+), 30 deletions(-) diff --git a/ci/OWNERS b/ci/OWNERS index 255a43d5e097..364f759d8e4f 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -83,8 +83,9 @@ # @raitobezarius is not "code owner", but is listed here to be notified of changes # pertaining to the Nix package manager. # i.e. no authority over those files. -pkgs/tools/package-management/nix/ @NixOS/nix-team @raitobezarius -nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobezarius +# Otherwise keep in-sync with lib.teams.nix. +pkgs/tools/package-management/nix/ @Artturin @Ericson2314 @lovesegfault @Mic92 @philiptaron @roberth @tomberek @xokdvium @raitobezarius +nixos/modules/installer/tools/nix-fallback-paths.nix @Artturin @Ericson2314 @lovesegfault @Mic92 @philiptaron @roberth @tomberek @xokdvium @raitobezarius # Nixpkgs documentation /maintainers/scripts/db-to-md.sh @jtojnar @ryantm diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 990c83da2687..049dfa2f86f4 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -742,16 +742,20 @@ with lib.maintainers; enableFeatureFreezePing = true; }; - # same as https://github.com/orgs/NixOS/teams/nix-team + # keep in-sync with ci/OWNERS nix = { members = [ - mic92 - tomberek - roberth + artturin ericson2314 + lovesegfault + mic92 + philiptaron + roberth + tomberek + xokdvium ]; - scope = "Maintain the Nix package manager."; - shortName = "Nix/nix-cli ecosystem"; + scope = "Maintain the packaging for the Nix package manager itself."; + shortName = "Nix packaging"; enableFeatureFreezePing = true; }; diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix index 19d3f30fc654..87351e481677 100644 --- a/pkgs/tools/package-management/nix/common-meson.nix +++ b/pkgs/tools/package-management/nix/common-meson.nix @@ -11,11 +11,6 @@ inherit hash; }, patches ? [ ], - maintainers ? [ - lib.maintainers.artturin - lib.maintainers.philiptaron - lib.maintainers.lovesegfault - ], teams ? [ lib.teams.nix ], self_attribute_name, }@args: @@ -272,7 +267,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://nixos.org/"; license = lib.licenses.lgpl21Plus; - inherit maintainers teams; + inherit teams; platforms = lib.platforms.unix; # Gets stuck in functional-tests in cross-trunk jobset and doesn't timeout # https://hydra.nixos.org/build/298175022 diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 18fd13dc550b..b63f6d4d33d0 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -120,11 +120,6 @@ let nixComponentsAttributeName ]; - maintainers = [ - lib.maintainers.artturin - lib.maintainers.philiptaron - lib.maintainers.lovesegfault - ]; teams = [ lib.teams.nix ]; # FIXME: https://github.com/NixOS/nixpkgs/issues/476794 @@ -150,7 +145,7 @@ lib.makeExtensible ( nixComponents_2_30 = (nixDependencies.callPackage ./modular/packages.nix rec { version = "2.30.3"; - inherit maintainers teams; + inherit teams; otherSplices = generateSplicesForNixComponents "nixComponents_2_30"; src = fetchFromGitHub { owner = "NixOS"; @@ -175,7 +170,7 @@ lib.makeExtensible ( nixComponents_2_31 = (nixDependencies.callPackage ./modular/packages.nix rec { version = "2.31.2"; - inherit (self.nix_2_30.meta) maintainers teams; + inherit (self.nix_2_30.meta) teams; otherSplices = generateSplicesForNixComponents "nixComponents_2_31"; src = fetchFromGitHub { owner = "NixOS"; @@ -206,7 +201,7 @@ lib.makeExtensible ( nixComponents_2_32 = (nixDependencies.callPackage ./modular/packages.nix rec { version = "2.32.5"; - inherit (self.nix_2_31.meta) maintainers teams; + inherit (self.nix_2_31.meta) teams; otherSplices = generateSplicesForNixComponents "nixComponents_2_32"; src = fetchFromGitHub { owner = "NixOS"; @@ -221,7 +216,7 @@ lib.makeExtensible ( nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec { version = "2.34pre20251217_${lib.substring 0 8 src.rev}"; - inherit maintainers teams; + inherit teams; otherSplices = generateSplicesForNixComponents "nixComponents_git"; src = fetchFromGitHub { owner = "NixOS"; diff --git a/pkgs/tools/package-management/nix/modular/packages.nix b/pkgs/tools/package-management/nix/modular/packages.nix index d557120f2560..c4706cb1f212 100644 --- a/pkgs/tools/package-management/nix/modular/packages.nix +++ b/pkgs/tools/package-management/nix/modular/packages.nix @@ -3,7 +3,6 @@ splicePackages, nixDependencies, pkgs, - maintainers, teams, otherSplices, version, @@ -27,7 +26,6 @@ let f = import ./packaging/components.nix { inherit lib - maintainers teams officialRelease pkgs diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix index 38da049618b1..02b927df5a23 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/components.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix @@ -3,7 +3,6 @@ pkgs, src, officialRelease, - maintainers, teams, version, }: @@ -200,7 +199,6 @@ let environments. ''; license = prevAttrs.meta.license or lib.licenses.lgpl21Plus; - maintainers = prevAttrs.meta.maintainers or [ ] ++ scope.maintainers; teams = prevAttrs.meta.teams or [ ] ++ scope.teams; platforms = prevAttrs.meta.platforms or (lib.platforms.unix ++ lib.platforms.windows); }; @@ -224,7 +222,6 @@ in # This becomes the pkgs.nixComponents attribute set { inherit version; - inherit maintainers; inherit teams; inherit filesetToSource; diff --git a/pkgs/tools/package-management/nix/modular/packaging/everything.nix b/pkgs/tools/package-management/nix/modular/packaging/everything.nix index d1b9134c4450..62873710bcf3 100644 --- a/pkgs/tools/package-management/nix/modular/packaging/everything.nix +++ b/pkgs/tools/package-management/nix/modular/packaging/everything.nix @@ -4,7 +4,6 @@ lndir, buildEnv, - maintainers, teams, version, @@ -228,7 +227,6 @@ stdenv.mkDerivation (finalAttrs: { longDescription = nix-cli.meta.longDescription; homepage = nix-cli.meta.homepage; license = nix-cli.meta.license; - maintainers = maintainers; teams = teams; platforms = nix-cli.meta.platforms; outputsToInstall = [