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

Handle apply attribute for each option declared with MkOption. 

This is similar to the new-proposal in upstart-jobs except that the default value is also processed with this function. (the existing merge function acts only on extra values).

svn path=/nixpkgs/trunk/; revision=13308
This commit is contained in:
Nicolas Pierron 2008-11-16 19:22:47 +00:00
parent ed57af85a7
commit 08b583682a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/lib/default.nix
View File

@ -407,13 +407,13 @@ rec {
zip (attr: opts:
let
name = if path == "" then attr else path + "." + attr;
defaultOpt = { merge = mergeDefaultOption; };
test = partition isOption opts;
opt = ({ merge = mergeDefaultOption; apply = id; } // head test.right);
in
if test.right == [] then mergeOptionSets noOption name test.wrong
else if tail test.right != [] then throw "Multiple options for '${name}'."
else if test.wrong == [] then (head test.right).default
else (defaultOpt // head test.right).merge name test.wrong
else if test.wrong == [] then opt.apply opt.default
else opt.apply (opt.merge name test.wrong)
) opts
else noOption path opts;