From 644f1d2b7931459bba107a4ecbdde7c12b7e5cf3 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 23 Mar 2025 16:41:13 +0000 Subject: [PATCH 1/3] Revert "Undo todo removal" Unjustified premature merge that goes against our guidelines and the decision of another committer. This revert commit 7ef7b9244402d49d6b6985b2ac279db6b8ba0b4b. --- nixos/lib/make-disk-image.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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}) From fa8dfdf9aeaa4cde0923bd27feb01e954b5353ce Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 23 Mar 2025 16:41:13 +0000 Subject: [PATCH 2/3] Revert "stdenv: add darwin team to darwin bootstrap-tools maintainers" Unjustified premature merge that goes against our guidelines and the decision of another committer. This reverts commit 02b79838afe19006be7710f053dac58d1430a02d. --- 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 c8bc46e56c62..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.teams.darwin.members; + maintainers = [ ]; }; }) From 9b27f27924e207aa60621d0c4397ff2bdf75bf9b Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 23 Mar 2025 16:41:14 +0000 Subject: [PATCH 3/3] Revert "treewide: drop copumpkin from maintainers" Unjustified premature merge that goes against our guidelines and the decision of another committer. This reverts commit 5d48f441192a6eb67fa9b7da13f8278192737029. --- 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, 39 insertions(+), 21 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d81bee8da823..282deb45d653 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4869,6 +4869,12 @@ 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 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}) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index a9638bd40ffe..438fb2cfde49 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -80,6 +80,7 @@ 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 deaefb7db927..cff5da08d3aa 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -116,6 +116,7 @@ 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 00e67db4ca06..7d87fa200942 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -176,6 +176,7 @@ 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 68f15b6bdd7b..3be849e9332e 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 = [ ]; + maintainers = with lib.maintainers; [ copumpkin ]; 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 eba0861bb8bb..73ca1feda9b8 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 = [ ]; + maintainers = with lib.maintainers; [ copumpkin ]; 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 506ebdc09124..e21b8078c2a2 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 = [ ]; + maintainers = with lib.maintainers; [ copumpkin ]; 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 022887316b5f..92156099c103 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 = [ ]; + maintainers = with lib.maintainers; [ copumpkin ]; 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 a3077e666774..44850f72f064 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 = [ ]; + maintainers = with lib.maintainers; [ copumpkin ]; 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 6254ce20ce4d..0353b1dc682b 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 = [ ]; + maintainers = with lib.maintainers; [ copumpkin ]; 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 f81fb02fbb2b..dca06c3efc40 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 = [ ]; + maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix index 01eacd4c1049..147c5435d67e 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 = [ ]; + maintainers = with maintainers; [ copumpkin ]; mainProgram = "agent"; }; } diff --git a/pkgs/by-name/js/jsonnet/package.nix b/pkgs/by-name/js/jsonnet/package.nix index 5d844ade98af..498cf26dadf2 100644 --- a/pkgs/by-name/js/jsonnet/package.nix +++ b/pkgs/by-name/js/jsonnet/package.nix @@ -59,6 +59,7 @@ 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 fcb7b4f9a687..619024aee749 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 = [ ]; + maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/by-name/mi/micro-httpd/package.nix b/pkgs/by-name/mi/micro-httpd/package.nix index 918d29d45514..8a47f8eff38e 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 = [ ]; + maintainers = with maintainers; [ copumpkin ]; mainProgram = "micro_httpd"; }; } diff --git a/pkgs/by-name/os/ostree/package.nix b/pkgs/by-name/os/ostree/package.nix index 2def42d9b9a7..f07e757d659d 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 = [ ]; + maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/by-name/pa/paxtest/package.nix b/pkgs/by-name/pa/paxtest/package.nix index 85aefd59fa36..149c334e891b 100644 --- a/pkgs/by-name/pa/paxtest/package.nix +++ b/pkgs/by-name/pa/paxtest/package.nix @@ -30,6 +30,7 @@ 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 964b66a2da4b..63b14942e5de 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 = [ ]; + maintainers = with maintainers; [ copumpkin ]; 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 8f359360ebf4..d0f8a16c7342 100644 --- a/pkgs/by-name/so/souffle/package.nix +++ b/pkgs/by-name/so/souffle/package.nix @@ -97,6 +97,7 @@ 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 42238c51e37f..a89b8104b8f8 100644 --- a/pkgs/by-name/xa/xar/package.nix +++ b/pkgs/by-name/xa/xar/package.nix @@ -183,7 +183,9 @@ 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) tie; }; + maintainers = + lib.teams.darwin.members + ++ lib.attrValues { inherit (lib.maintainers) copumpkin 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 2d58ba770a89..bf07d4c883d7 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 = [ ]; + maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index f78b3fe2cf11..d298f53e4015 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -40,6 +40,7 @@ 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 b3bc489c0b13..c340d74ac58a 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 = [ ]; + maintainers = with lib.maintainers; [ copumpkin ]; }; } diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 201d7b26f023..45e18e7b56fc 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -64,6 +64,8 @@ buildPythonPackage rec { homepage = "https://github.com/pantsbuild/pex"; changelog = "https://github.com/pantsbuild/pex/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ + copumpkin + ]; }; } diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 8fb7866efbd0..532a45a4c360 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 = [ ]; + maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix b/pkgs/stdenv/darwin/stdenv-bootstrap-tools.nix index 75c2af510d54..a45291072abd 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.maintainers.copumpkin ]; }; }) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 6b9cb5a6b34f..ffb6053cd0a3 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 = [ ]; + maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 4cd1d518868e..dbf483500adf 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 = [ ]; + maintainers = with maintainers; [ copumpkin ]; platforms = platforms.linux ++ platforms.darwin; }; }