From 5bb6317349abfe7569cc5a3831e63a5f6c054787 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel.dionne-riel@cyberus-technology.de>
Date: Mon, 26 Jan 2026 16:23:39 -0500
Subject: [PATCH 1/2] =?UTF-8?q?nixos/modules:=20Fix=20=E2=80=9Cdanklinux?=
 =?UTF-8?q?=E2=80=9D=20team=20members=20reference?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These evaluation errors were introduced in #470576:

 - e60e3f9ded96318fdf6a1c079541b1013536e7f4
 - 0de2873a44048f045695efb58ec198c74f7d1bf6
---
 nixos/modules/programs/dsearch.nix                      | 2 +-
 nixos/modules/programs/wayland/dms-shell.nix            | 2 +-
 nixos/modules/services/display-managers/dms-greeter.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/dsearch.nix b/nixos/modules/programs/dsearch.nix
index a719631312be..f1597189fa38 100644
--- a/nixos/modules/programs/dsearch.nix
+++ b/nixos/modules/programs/dsearch.nix
@@ -49,5 +49,5 @@ in
     systemd.user.services.dsearch.wantedBy = mkIf cfg.systemd.enable [ cfg.systemd.target ];
   };
 
-  meta.maintainers = lib.teams.danklinux.maintainers;
+  meta.maintainers = lib.teams.danklinux.members;
 }
diff --git a/nixos/modules/programs/wayland/dms-shell.nix b/nixos/modules/programs/wayland/dms-shell.nix
index 233590bcf3ec..53f84c1a41b1 100644
--- a/nixos/modules/programs/wayland/dms-shell.nix
+++ b/nixos/modules/programs/wayland/dms-shell.nix
@@ -226,5 +226,5 @@ in
     hardware.graphics.enable = lib.mkDefault true;
   };
 
-  meta.maintainers = lib.teams.danklinux.maintainers;
+  meta.maintainers = lib.teams.danklinux.members;
 }
diff --git a/nixos/modules/services/display-managers/dms-greeter.nix b/nixos/modules/services/display-managers/dms-greeter.nix
index 246a02ea414f..94b79bd19a5f 100644
--- a/nixos/modules/services/display-managers/dms-greeter.nix
+++ b/nixos/modules/services/display-managers/dms-greeter.nix
@@ -294,5 +294,5 @@ in
     services.libinput.enable = mkDefault true;
   };
 
-  meta.maintainers = lib.teams.danklinux.maintainers;
+  meta.maintainers = lib.teams.danklinux.members;
 }

From 43eca5c08d72437a4caf90fdc89dc509f6621981 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel.dionne-riel@cyberus-technology.de>
Date: Mon, 26 Jan 2026 19:55:35 -0500
Subject: [PATCH 2/2] maintainer-list: Fix M0ustach3 maintainer entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two different PRs, two different issues.

The first PR, chronologically-merged-in, #426687 introduced a new
module, and while reviewers “reviewed” the `meta.maintainers` entry,
they did not notice the maintainer was not in the maintainers list file.

 - https://github.com/NixOS/nixpkgs/pull/426687#discussion_r2311053832

Then, in #437310, merged a few days later, another new module was added
with M0ustach3 as a maintainer. At the very least, an attempt was made
in de66c73a1938d53625e552ab8e1cdfa62ae4fb1f to add the maintainer to the
list, but an unfortunate typo (or two?) in the maintainers list entry
means the two intended usage of the new entry still don't work.

The issue here is not from the contributors. The reviewers and
committers could have done better, but it's not even truly their fault.
The issue is the meta information in NixOS modules was never checked. In
any way AFAICT. Otherwise this would have been caught immediately, and
not four months later.

Anyway, the intent clearly is that the entry should matche the GitHub
username.
---
 maintainers/maintainer-list.nix              | 2 +-
 nixos/modules/services/misc/memos.nix        | 2 +-
 nixos/modules/services/security/crowdsec.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a12f4cc9b4f1..5f12252b83c5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15729,7 +15729,7 @@
     github = "M0streng0";
     githubId = 85799811;
   };
-  m0ustache3 = {
+  M0ustach3 = {
     name = "M0ustach3";
     github = "M0ustach3";
     githubId = 37956764;
diff --git a/nixos/modules/services/misc/memos.nix b/nixos/modules/services/misc/memos.nix
index 5847e90c9c06..5e74931c579f 100644
--- a/nixos/modules/services/misc/memos.nix
+++ b/nixos/modules/services/misc/memos.nix
@@ -195,5 +195,5 @@ in
     };
   };
 
-  meta.maintainers = [ lib.maintainers.m0ustach3 ];
+  meta.maintainers = [ lib.maintainers.M0ustach3 ];
 }
diff --git a/nixos/modules/services/security/crowdsec.nix b/nixos/modules/services/security/crowdsec.nix
index 9a1e255441c7..5fe3b495bc50 100644
--- a/nixos/modules/services/security/crowdsec.nix
+++ b/nixos/modules/services/security/crowdsec.nix
@@ -984,7 +984,7 @@ in
 
   meta = {
     maintainers = with lib.maintainers; [
-      m0ustach3
+      M0ustach3
       tornax
       jk
     ];