diff options
| author | lassulus <lassulus@lassul.us> | 2020-10-18 19:25:11 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-10-18 19:25:11 +0200 |
| commit | 9ac104267009988ae2ae5c254984e256bd9a6957 (patch) | |
| tree | 594aa3e871a5d465bf62a4604128ea27fd2a0ed2 /lib | |
| parent | 258365a1bad616440f08d6b505779a5dfb04f160 (diff) | |
| parent | c5222bc188414a753fe8e8260c6dac26f05ac2e9 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/default.nix | 6 | ||||
| -rw-r--r-- | lib/types.nix | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/default.nix b/lib/default.nix index f02959b..be9f60f 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -60,13 +60,17 @@ let }.${typeOf x}; mapNixDir1 = f: dirPath: + let + toPackageName = name: + if test "^[0-9].*" name then "_${name}" else name; + in listToAttrs (map (relPath: let name = removeSuffix ".nix" relPath; path = dirPath + "/${relPath}"; in - nameValuePair name (f path)) + nameValuePair (toPackageName name) (f path)) (filter (name: name != "default.nix" && !hasPrefix "." name) (attrNames (readDir dirPath)))); diff --git a/lib/types.nix b/lib/types.nix index 3eda226..689a2c8 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -116,6 +116,10 @@ rec { type = listOf hostname; default = []; }; + mac = mkOption { + type = nullOr str; + default = null; + }; ip4 = mkOption { type = nullOr (submodule { options = { |