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

Replace "finalReference" prefix by "fix".

Browse Source 
svn path=/nixpkgs/trunk/; revision=12740
This commit is contained in:
Nicolas Pierron 2008-08-27 13:58:36 +00:00
parent 649ccdd2db
commit ae163f596e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/lib/default.nix
View File

@ -324,9 +324,11 @@ rec {
) { right = []; wrong = []; }; ) { right = []; wrong = []; };
# Take a function and evaluate it with its own returned value. # Take a function and evaluate it with its own returned value.
finalReference = f: fix = f:
(rec { result = f result; }).result; (rec { result = f result; }).result;
finalReference = fix; # bad name
# flatten a list of sets returned by 'f'. # flatten a list of sets returned by 'f'.
# f : function to evaluate each set. # f : function to evaluate each set.
# attr : name of the attribute which contains more values. # attr : name of the attribute which contains more values.
@ -427,7 +429,7 @@ rec {
# Evaluate a list of option sets that would be merged with the # Evaluate a list of option sets that would be merged with the
# function "merge" which expects two arguments. The attribute named # function "merge" which expects two arguments. The attribute named
# "require" is used to imports option declarations and bindings. # "require" is used to imports option declarations and bindings.
finalOptionSetsFun = merge: pkgs: opts: fixOptionSetsFun = merge: pkgs: opts:
let optionSet = final: configFun: let optionSet = final: configFun:
if __isFunction configFun then configFun pkgs final if __isFunction configFun then configFun pkgs final
else configFun; # backward compatibility. else configFun; # backward compatibility.
@ -437,8 +439,11 @@ rec {
(uniqFlattenAttr (optionSet final) "require" [] (toList opts)) (uniqFlattenAttr (optionSet final) "require" [] (toList opts))
); );
finalReferenceOptionSets = merge: pkgs: opts: fixOptionSets = merge: pkgs: opts:
finalReference (finalOptionSetsFun merge pkgs opts); fix (fixOptionSetsFun merge pkgs opts);
finalOptionSetsFun = fixOptionSetsFun;
finalReferenceOptionSets = fixOptionSets;
optionAttrSetToDocList = (l: attrs: optionAttrSetToDocList = (l: attrs:
(if (getAttr ["_type"] "" attrs) == "option" then (if (getAttr ["_type"] "" attrs) == "option" then