lib/types: use elemTypeFunctor for types.listOf

NixOS · Jan 6, 2025 · 66be74f · 66be74f
1 parent 3aae1bf
commit 66be74f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/types.nix b/lib/types.nix
@@ -600,7 +600,9 @@ rec {
       getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: listOf (elemType.substSubModules m);
-      functor = (defaultFunctor name) // { wrapped = elemType; };
+      functor = (elemTypeFunctor name { inherit elemType; }) // {
+        type = payload: types.listOf payload.elemType;
+      };
       nestedTypes.elemType = elemType;
     };
 
@@ -686,7 +688,8 @@ rec {
       substSubModules = m: attrsWith { elemType = elemType.substSubModules m; inherit lazy placeholder; };
       functor = (elemTypeFunctor "attrsWith" {
           inherit elemType lazy placeholder;
-        };
+      }) // {
+        # Custom type merging required because of the "placeholder" attribute
         inherit binOp;
       };
       nestedTypes.elemType = elemType;