From 79748defd7b70924445ca08fdd8daee42d40c89c Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sun, 10 Aug 2025 13:35:15 +0200
Subject: [PATCH] modules/meta-maintainers: Refactor maintainer type merge
 function

Easily tested now.
Thank you Matt for this suggestion!

Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
---
 modules/generic/meta-maintainers.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/generic/meta-maintainers.nix b/modules/generic/meta-maintainers.nix
index e39d527764b2..fb66174cf621 100644
--- a/modules/generic/meta-maintainers.nix
+++ b/modules/generic/meta-maintainers.nix
@@ -11,9 +11,11 @@ let
   maintainer = mkOptionType {
     name = "maintainer";
     check = email: lib.elem email (lib.attrValues lib.maintainers);
-    merge =
-      loc: defs:
-      lib.listToAttrs (lib.singleton (lib.nameValuePair (lib.last defs).file (lib.last defs).value));
+    merge = loc: defs: {
+      # lib.last: Perhaps this could be merged instead, if "at most once per module"
+      # is a problem (see option description).
+      ${(lib.last defs).file} = (lib.last defs).value;
+    };
   };
 
   listOfMaintainers = types.listOf maintainer // {