services/apache: use a listOf which accepts non-list things

Signed-off-by: magic_rb <[email protected]>
nix-community · Dec 17, 2024 · 908919e · 908919e
1 parent e825ea7
commit 908919e
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/modules/services/nginx.nix b/modules/services/nginx.nix
@@ -44,8 +44,23 @@ in
         type =
           with lib.types;
           let
+            optionalListOf = elemType:
+              let list = (types.listOf elemType);
+              in list // {
+                merge = loc: defs:
+                  list.merge loc
+                    (map
+                      (def:
+                        if lib.isList def.value then
+                          def
+                        else
+                          def // { value = lib.singleton def.value; }
+                      )
+                      defs);
+                check = lib.const true;
+              };
             self =
-              (listOf (oneOf [
+              (optionalListOf (oneOf [
                 str
                 (attrsOf (oneOf [
                   str