big breaking change: renaming lib.getAttr to lib.attrByPath

getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
This commit is contained in:
Marc Weber
2009-05-24 10:57:41 +00:00
parent 62620f0411
commit f7f938a1d1
65 changed files with 153 additions and 140 deletions

View File

@@ -193,7 +193,7 @@ rec {
cfg3 = noImportConditions cfg2;
in cfg3;
getRequire = x: toList (getAttr ["require"] [] (preprocess x));
getRequire = x: toList (attrByPath ["require"] [] (preprocess x));
getRecusiveRequire = x:
fold (cfg: l:
if isPath cfg then
@@ -221,7 +221,7 @@ rec {
lib.fix (fixOptionSetsFun merge pkgs opts);
optionAttrSetToDocList = l: attrs:
if (getAttr ["_type"] "" attrs) == "option" then
if (attrByPath ["_type"] "" attrs) == "option" then
[({
#inherit (attrs) description;
description = if attrs ? description then attrs.description else
@@ -582,4 +582,4 @@ rec {
mkNotdef
) prioValList;
}
}