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

Signed-off-by: magic_rb <[email protected]>
nix-community · Dec 17, 2024 · 8d952b2 · 8d952b2
1 parent e825ea7
commit 8d952b2
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/modules/services/nginx.nix b/modules/services/nginx.nix
@@ -44,8 +44,22 @@ in
         type =
           with lib.types;
           let
-            self =
-              (listOf (oneOf [
+            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 = (
+              optionalListOf (oneOf [
                 str
                 (attrsOf (oneOf [
                   str
@@ -60,7 +74,8 @@ in
                   ]))
                   (attrsOf self)
                 ]))
-              ]));
+              ])
+            );
           in
           self // { description = "loop breaker"; };
       };