From 0520de52437c276b304d622fbf5f4a421033c682 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 10 Jan 2026 22:50:43 +0100
Subject: [PATCH] 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) (