From 0d8ecc86c55cce7804271d1c6c43b56ba3087bf8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 19 Mar 2026 15:12:45 -0500 Subject: [PATCH] lib: extend lib to include hm maintainers Upstream change is validating all maintainers against lib.maintainers, need to merge our maintainer list in to pass doc building. Signed-off-by: Austin Horstman (cherry picked from commit c4ab19c91933f1621966b4c7de04bd847f317101) --- modules/lib/stdlib-extended.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/lib/stdlib-extended.nix b/modules/lib/stdlib-extended.nix index 6e8eee5e..d820d58f 100644 --- a/modules/lib/stdlib-extended.nix +++ b/modules/lib/stdlib-extended.nix @@ -7,7 +7,16 @@ let mkHmLib = import ./.; in nixpkgsLib.extend ( - self: super: { - hm = mkHmLib { lib = self; }; + self: super: + let + hmLib = mkHmLib { lib = self; }; + in + { + hm = hmLib; + + # Nixpkgs now validates meta.maintainers against lib.maintainers. + # Mirror Home Manager-only maintainers there so existing lib.hm.maintainers + # references continue to satisfy the upstream type check. + maintainers = super.maintainers // hmLib.maintainers; } )