From 5d48f441192a6eb67fa9b7da13f8278192737029 Mon Sep 17 00:00:00 2001 From: phaer Date: Sun, 23 Mar 2025 12:39:57 +0100 Subject: [PATCH 1/3] treewide: drop copumpkin from maintainers Their last commit is from March 28th 2019, about 6 years ago. This PR is in no way intended to diminish Daniels's accomplishments, and they're welcome to just say so if they'd prefer this PR not to be merged. Also, even if it's merged, of course they're always welcome to return to activity and be added back. The intent of this PR is to give more realistic expectations around the maintainership of these packages, and to invite others to step up for maintainership if they rely on those packages. If this is merged, they should probably also be removed from the list of committers for the time being. --- maintainers/maintainer-list.nix | 6 ------ nixos/lib/make-disk-image.nix | 3 +-- pkgs/applications/networking/cluster/minikube/default.nix | 1 - pkgs/applications/virtualization/lkl/default.nix | 1 - pkgs/by-name/am/amazon-ssm-agent/package.nix | 1 - pkgs/by-name/co/commonsBcel/package.nix | 2 +- pkgs/by-name/co/commonsCompress/package.nix | 2 +- pkgs/by-name/co/commonsFileUpload/package.nix | 2 +- pkgs/by-name/co/commonsIo/package.nix | 2 +- pkgs/by-name/co/commonsLang/package.nix | 2 +- pkgs/by-name/co/commonsMath/package.nix | 2 +- pkgs/by-name/cr/createrepo_c/package.nix | 2 +- pkgs/by-name/ec/ecs-agent/package.nix | 2 +- pkgs/by-name/js/jsonnet/package.nix | 1 - pkgs/by-name/li/libsolv/package.nix | 2 +- pkgs/by-name/mi/micro-httpd/package.nix | 2 +- pkgs/by-name/os/ostree/package.nix | 2 +- pkgs/by-name/pa/paxtest/package.nix | 1 - pkgs/by-name/rp/rpm-ostree/package.nix | 2 +- pkgs/by-name/so/souffle/package.nix | 1 - pkgs/by-name/xa/xar/package.nix | 4 +--- pkgs/development/python-modules/ansicolors/default.nix | 2 +- pkgs/development/python-modules/lmdb/default.nix | 1 - pkgs/development/python-modules/pathspec/default.nix | 2 +- pkgs/development/python-modules/pex/default.nix | 4 +--- pkgs/development/python-modules/python-gnupg/default.nix | 2 +- pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix | 2 +- pkgs/tools/package-management/librepo/default.nix | 2 +- pkgs/tools/package-management/rpm/default.nix | 2 +- 29 files changed, 21 insertions(+), 39 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 282deb45d653..d81bee8da823 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4869,12 +4869,6 @@ githubId = 32609395; name = "B YI"; }; - copumpkin = { - email = "pumpkingod@gmail.com"; - github = "copumpkin"; - githubId = 2623; - name = "Dan Peebles"; - }; corbanr = { email = "corban@raunco.co"; github = "CorbanR"; diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index cc9a667ccccd..25d801a0ea1c 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -447,8 +447,7 @@ let mkdir -p $root # Copy arbitrary other files into the image - # Semi-shamelessly copied from make-etc.sh. I (@copumpkin) shall factor this stuff out as part of - # https://github.com/NixOS/nixpkgs/issues/23052. + # Semi-shamelessly copied from make-etc.sh. set -f sources_=(${lib.concatStringsSep " " sources}) targets_=(${lib.concatStringsSep " " targets}) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 438fb2cfde49..a9638bd40ffe 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -80,7 +80,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ ebzzry - copumpkin vdemeester atkinschang Chili-Man diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index cff5da08d3aa..deaefb7db927 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -116,7 +116,6 @@ stdenv.mkDerivation { platforms = platforms.linux; # Darwin probably works too but I haven't tested it license = licenses.gpl2; maintainers = with maintainers; [ - copumpkin raitobezarius ]; }; diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 7d87fa200942..00e67db4ca06 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -176,7 +176,6 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ - copumpkin manveru anthonyroussel arianvp diff --git a/pkgs/by-name/co/commonsBcel/package.nix b/pkgs/by-name/co/commonsBcel/package.nix index 3be849e9332e..68f15b6bdd7b 100644 --- a/pkgs/by-name/co/commonsBcel/package.nix +++ b/pkgs/by-name/co/commonsBcel/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://commons.apache.org/proper/commons-bcel/"; description = "Gives users a convenient way to analyze, create, and manipulate (binary) Java class files"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; }; diff --git a/pkgs/by-name/co/commonsCompress/package.nix b/pkgs/by-name/co/commonsCompress/package.nix index 73ca1feda9b8..eba0861bb8bb 100644 --- a/pkgs/by-name/co/commonsCompress/package.nix +++ b/pkgs/by-name/co/commonsCompress/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-compress"; description = "Allows manipulation of ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE and Z files"; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/co/commonsFileUpload/package.nix b/pkgs/by-name/co/commonsFileUpload/package.nix index e21b8078c2a2..506ebdc09124 100644 --- a/pkgs/by-name/co/commonsFileUpload/package.nix +++ b/pkgs/by-name/co/commonsFileUpload/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-fileupload"; description = "Makes it easy to add robust, high-performance, file upload capability to your servlets and web applications"; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/co/commonsIo/package.nix b/pkgs/by-name/co/commonsIo/package.nix index 92156099c103..022887316b5f 100644 --- a/pkgs/by-name/co/commonsIo/package.nix +++ b/pkgs/by-name/co/commonsIo/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-io"; description = "Library of utilities to assist with developing IO functionality"; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/co/commonsLang/package.nix b/pkgs/by-name/co/commonsLang/package.nix index 44850f72f064..a3077e666774 100644 --- a/pkgs/by-name/co/commonsLang/package.nix +++ b/pkgs/by-name/co/commonsLang/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Provides additional methods to manipulate standard Java library classes"; homepage = "https://commons.apache.org/proper/commons-lang"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; platforms = with lib.platforms; unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; diff --git a/pkgs/by-name/co/commonsMath/package.nix b/pkgs/by-name/co/commonsMath/package.nix index 0353b1dc682b..6254ce20ce4d 100644 --- a/pkgs/by-name/co/commonsMath/package.nix +++ b/pkgs/by-name/co/commonsMath/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-math/"; description = "Library of lightweight, self-contained mathematics and statistics components"; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/cr/createrepo_c/package.nix b/pkgs/by-name/cr/createrepo_c/package.nix index dca06c3efc40..f81fb02fbb2b 100644 --- a/pkgs/by-name/cr/createrepo_c/package.nix +++ b/pkgs/by-name/cr/createrepo_c/package.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://rpm-software-management.github.io/createrepo_c/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix index 147c5435d67e..01eacd4c1049 100644 --- a/pkgs/by-name/ec/ecs-agent/package.nix +++ b/pkgs/by-name/ec/ecs-agent/package.nix @@ -25,7 +25,7 @@ buildGoModule rec { changelog = "https://github.com/aws/amazon-ecs-agent/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; mainProgram = "agent"; }; } diff --git a/pkgs/by-name/js/jsonnet/package.nix b/pkgs/by-name/js/jsonnet/package.nix index 498cf26dadf2..5d844ade98af 100644 --- a/pkgs/by-name/js/jsonnet/package.nix +++ b/pkgs/by-name/js/jsonnet/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { description = "Purely-functional configuration language that helps you define JSON data"; maintainers = with lib.maintainers; [ benley - copumpkin ]; license = lib.licenses.asl20; homepage = "https://github.com/google/jsonnet"; diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix index 619024aee749..fcb7b4f9a687 100644 --- a/pkgs/by-name/li/libsolv/package.nix +++ b/pkgs/by-name/li/libsolv/package.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/openSUSE/libsolv"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/mi/micro-httpd/package.nix b/pkgs/by-name/mi/micro-httpd/package.nix index 8a47f8eff38e..918d29d45514 100644 --- a/pkgs/by-name/mi/micro-httpd/package.nix +++ b/pkgs/by-name/mi/micro-httpd/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "Really small HTTP server"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; mainProgram = "micro_httpd"; }; } diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index f07e757d659d..2def42d9b9a7 100644 --- a/pkgs/by-name/os/ostree/package.nix +++ b/pkgs/by-name/os/ostree/package.nix @@ -161,6 +161,6 @@ in stdenv.mkDerivation rec { homepage = "https://ostreedev.github.io/ostree/"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/pa/paxtest/package.nix b/pkgs/by-name/pa/paxtest/package.nix index 149c334e891b..85aefd59fa36 100644 --- a/pkgs/by-name/pa/paxtest/package.nix +++ b/pkgs/by-name/pa/paxtest/package.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ - copumpkin joachifm ]; }; diff --git a/pkgs/by-name/rp/rpm-ostree/package.nix b/pkgs/by-name/rp/rpm-ostree/package.nix index 63b14942e5de..964b66a2da4b 100644 --- a/pkgs/by-name/rp/rpm-ostree/package.nix +++ b/pkgs/by-name/rp/rpm-ostree/package.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { description = "Hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; homepage = "https://coreos.github.io/rpm-ostree/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "rpm-ostree"; }; diff --git a/pkgs/by-name/so/souffle/package.nix b/pkgs/by-name/so/souffle/package.nix index d0f8a16c7342..8f359360ebf4 100644 --- a/pkgs/by-name/so/souffle/package.nix +++ b/pkgs/by-name/so/souffle/package.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice - copumpkin wchresta markusscherer ]; diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix index 801dcd2cc3da..4d86f136a434 100644 --- a/pkgs/by-name/xa/xar/package.nix +++ b/pkgs/by-name/xa/xar/package.nix @@ -183,9 +183,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/apple-oss-distributions/xar"; description = "An easily extensible archive format"; license = lib.licenses.bsd3; - maintainers = - lib.teams.darwin.members - ++ lib.attrValues { inherit (lib.maintainers) copumpkin tie; }; + maintainers = lib.teams.darwin.members ++ lib.attrValues { inherit (lib.maintainers) tie; }; platforms = lib.platforms.unix; mainProgram = "xar"; }; diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix index bf07d4c883d7..2d58ba770a89 100644 --- a/pkgs/development/python-modules/ansicolors/default.nix +++ b/pkgs/development/python-modules/ansicolors/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/verigak/colors/"; description = "ANSI colors for Python"; license = licenses.isc; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index d298f53e4015..f78b3fe2cf11 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -40,7 +40,6 @@ buildPythonPackage rec { changelog = "https://github.com/jnwatson/py-lmdb/blob/py-lmdb_${version}/ChangeLog"; license = lib.licenses.openldap; maintainers = with lib.maintainers; [ - copumpkin ivan ]; }; diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index c340d74ac58a..b3bc489c0b13 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/cpburnz/python-path-specification"; changelog = "https://github.com/cpburnz/python-pathspec/blob/v${version}/CHANGES.rst"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ copumpkin ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 45e18e7b56fc..201d7b26f023 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -64,8 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/pantsbuild/pex"; changelog = "https://github.com/pantsbuild/pex/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ - copumpkin - ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 532a45a4c360..8fb7866efbd0 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -41,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/vsajip/python-gnupg"; changelog = "https://github.com/vsajip/python-gnupg/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; }; } diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index a45291072abd..75c2af510d54 100644 --- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -292,6 +292,6 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - maintainers = [ lib.maintainers.copumpkin ]; + maintainers = [ ]; }; }) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index ffb6053cd0a3..6b9cb5a6b34f 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { homepage = "https://rpm-software-management.github.io/librepo/"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index dbf483500adf..4cd1d518868e 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { lgpl21Plus ]; description = "RPM Package Manager"; - maintainers = with maintainers; [ copumpkin ]; + maintainers = [ ]; platforms = platforms.linux ++ platforms.darwin; }; } From 02b79838afe19006be7710f053dac58d1430a02d Mon Sep 17 00:00:00 2001 From: phaer Date: Sun, 23 Mar 2025 13:37:27 +0100 Subject: [PATCH 2/3] stdenv: add darwin team to darwin bootstrap-tools maintainers --- pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index 75c2af510d54..c8bc46e56c62 100644 --- a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix @@ -292,6 +292,6 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - maintainers = [ ]; + maintainers = lib.teams.darwin.members; }; }) From 7ef7b9244402d49d6b6985b2ac279db6b8ba0b4b Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 23 Mar 2025 16:41:35 +0100 Subject: [PATCH 3/3] Undo todo removal --- nixos/lib/make-disk-image.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 25d801a0ea1c..cc9a667ccccd 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -447,7 +447,8 @@ let mkdir -p $root # Copy arbitrary other files into the image - # Semi-shamelessly copied from make-etc.sh. + # Semi-shamelessly copied from make-etc.sh. I (@copumpkin) shall factor this stuff out as part of + # https://github.com/NixOS/nixpkgs/issues/23052. set -f sources_=(${lib.concatStringsSep " " sources}) targets_=(${lib.concatStringsSep " " targets})