Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cd/master'

Browse Source
This commit is contained in:
makefu 2016-04-07 20:38:54 +02:00
commit 5ba9bc516a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
krebs/4lib/types.nix
View File

@ -186,10 +186,16 @@ types // rec {
}; };
}); });
# TODO addr = either addr4 addr6;
addr = str; addr4 = mkOptionType {
addr4 = str; name = "IPv4 address";
addr6 = str; check = let
IPv4address = let d = "([1-9]?[0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])"; in
concatMapStringsSep "." (const d) (range 1 4);
in x: match IPv4address != null;
merge = mergeOneOption;
};
addr6 = str; # TODO
pgp-pubkey = str; pgp-pubkey = str;