jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

types.loaOf: Update check function

Browse Source 
This symplifies typechecking and allows properties to be used inside the
function body. It also makes possible checking the type of the result.
This commit is contained in:
Shea Levy 2014-05-01 20:17:03 -04:00 committed by Nicolas B. Pierron
parent 8737d1783f
commit 4f5c6330c9
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/types.nix
View File

@ -159,10 +159,7 @@ in rec {
attrOnly = attrsOf elemType;
in mkOptionType {
name = "list or attribute set of ${elemType.name}s";
check = x:
if isList x then listOnly.check x
else if isAttrs x then attrOnly.check x
else false;
check = x: isList x || isAttrs x;
merge = loc: defs: attrOnly.merge loc (imap convertIfList defs);
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);
getSubModules = elemType.getSubModules;