diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/default.nix | 2 | ||||
| -rw-r--r-- | lib/types.nix | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/default.nix b/lib/default.nix index 14e6e27a3..5a948bbf3 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -49,6 +49,8 @@ let indent = replaceChars ["\n"] ["\n "]; + stripAttr = converge (filterAttrsRecursive (n: v: v != {} && v != null)); + mapNixDir = f: x: { list = foldl' mergeAttrs {} (map (mapNixDir1 f) x); path = mapNixDir1 f x; diff --git a/lib/types.nix b/lib/types.nix index ffae8c7bc..16ccb145e 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -7,7 +7,7 @@ let mkOptionType optional optionalAttrs optionals range splitString stringLength substring test testString typeOf; inherit (lib.types) - attrsOf bool either enum int listOf nullOr path str string submodule; + attrsOf bool either enum int listOf nullOr path str submodule; in rec { @@ -65,7 +65,7 @@ rec { extraZones = mkOption { default = {}; # TODO: string is either MX, NS, A or AAAA - type = attrsOf string; + type = attrsOf str; }; secure = mkOption { @@ -182,7 +182,7 @@ rec { extraConfig = mkOption { description = "Extra Configuration to be appended to the hosts file"; default = ""; - type = string; + type = str; }; port = mkOption { type = int; |