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:
@@ -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;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user