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

1 files changed, 3 insertions, 3 deletions

diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix
index bd42b1dcf34..2e867cf44d7 100644
--- a/pkgs/lib/options.nix
+++ b/pkgs/lib/options.nix
@@ -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;
 
-}
\ No newline at end of file
+}