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

options: Use the built-in type predicates.

Browse Source 
svn path=/nixpkgs/trunk/; revision=20580
This commit is contained in:
Ludovic Courtès 2010-03-11 22:03:45 +00:00
parent 2c44e4313c
commit 529e1900ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/lib/options.nix
View File

@ -193,8 +193,8 @@ rec {
else if all builtins.isFunction list then x: mergeDefaultOption (map (f: f x) list) else if all builtins.isFunction list then x: mergeDefaultOption (map (f: f x) list)
else if all isList list then concatLists list else if all isList list then concatLists list
else if all isAttrs list then fold lib.mergeAttrs {} list else if all isAttrs list then fold lib.mergeAttrs {} list
else if all (x: true == x || false == x) list then fold lib.or false list else if all builtins.isBool list then fold lib.or false list
else if all (x: x == toString x) list then lib.concatStrings list else if all builtins.isString list then lib.concatStrings list
else throw "Cannot merge values."; else throw "Cannot merge values.";
mergeTypedOption = typeName: predicate: merge: list: mergeTypedOption = typeName: predicate: merge: list: