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

Remove support for merge function with name argument. 

svn path=/nixpkgs/trunk/; revision=13869
This commit is contained in:
Nicolas Pierron 2009-01-25 21:23:47 +00:00
parent 6c2c6d7fe4
commit c2be87e132
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/lib/default.nix
View File

@ -556,25 +556,14 @@ rec {
# function of each option to get the result.
mergeOptionSets = noOption: newMergeOptionSets; # ignore argument
newMergeOptionSets =
let
# handle merge functions with & without name argument.
mergeWrapper = merge: name: values:
let
newMerge = merge values;
oldMerge = builtins.trace
"obsolete: Merge function of ${name} option has name argument."
(merge name values);
in
if __isFunction newMerge then oldMerge else newMerge;
in
handleOptionSets {
export = opt: values:
opt.apply (
if values == [] then
if opt ? default then opt.default
else throw "Not defined."
else mergeWrapper opt.merge opt.name values
);
else opt.merge values
));
notHandle = throw "Used without option declaration.";
};