Commit 9b27f279 authored by Emily's avatar Emily
Browse files

Revert "treewide: drop copumpkin from maintainers" 

Unjustified premature merge that goes against our guidelines and the
decision of another committer.

This reverts commit 5d48f441.
parent fa8dfdf9

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -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";

nixos/lib/make-disk-image.nix

+2 −1
Original line number Diff line number Diff line
@@ -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})

pkgs/applications/networking/cluster/minikube/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ buildGoModule rec { 
    license = licenses.asl20;

    maintainers = with maintainers; [

      ebzzry

      copumpkin

      vdemeester

      atkinschang

      Chili-Man

pkgs/applications/virtualization/lkl/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -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

    ];

  };

pkgs/by-name/am/amazon-ssm-agent/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ buildGoModule rec { 
    license = licenses.asl20;

    platforms = platforms.unix;

    maintainers = with maintainers; [

      copumpkin

      manveru

      anthonyroussel

      arianvp