alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Use "abort" instead of "throw" when option values cannot be merged.

Browse source 
Fix mergeListOption.
Add error support in mergeEnableOption.

svn path=/nixpkgs/trunk/; revision=12522
This commit is contained in:
Nicolas Pierron 2008-08-06 19:24:36 +00:00
parent 0ce4cafd88
commit 692c5a62a4
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/lib/default.nix
View file

@ -364,13 +364,16 @@ rec {
else if all __isFunction list then x: mergeDefaultOption (map (f: f x) list)
else if all __isList list then concatLists list
else if all __isAttrs list then mergeAttrs list
else throw "Default merge method does not work on '${name}'.";
else abort "${name}: Cannot merge values.";
mergeEnableOption = name: fold logicalOR false;
mergeEnableOption = name: list:
if all (x: true == x || false == x) list
then fold logicalOR false list
else abort "${name}: Expect a boolean value.";
mergeListOption = name: list:
if all __isList list then list
else throw "${name}: Expect a list.";
if all __isList list then concatLists list
else abort "${name}: Expect a list.";
# Merge sets of options and bindings.
# noOption: function to call if no option is declared.