about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/atheros
diff options
context:
space:
mode:
authorMarc Weber <marco-oweber@gmx.de>2009-05-24 10:57:41 +0000
committerMarc Weber <marco-oweber@gmx.de>2009-05-24 10:57:41 +0000
commitf7f938a1d15277fa11a2cbf75fe9c7d4344f25c3 (patch)
tree7f0728120b23ae097a4259c62839037bd84aebad /pkgs/os-specific/linux/atheros
parent62620f0411b4ada733ae4e701416997140053762 (diff)
downloadnixlib-f7f938a1d15277fa11a2cbf75fe9c7d4344f25c3.tar
nixlib-f7f938a1d15277fa11a2cbf75fe9c7d4344f25c3.tar.gz
nixlib-f7f938a1d15277fa11a2cbf75fe9c7d4344f25c3.tar.bz2
nixlib-f7f938a1d15277fa11a2cbf75fe9c7d4344f25c3.tar.lz
nixlib-f7f938a1d15277fa11a2cbf75fe9c7d4344f25c3.tar.xz
nixlib-f7f938a1d15277fa11a2cbf75fe9c7d4344f25c3.tar.zst
nixlib-f7f938a1d15277fa11a2cbf75fe9c7d4344f25c3.zip
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
Diffstat (limited to 'pkgs/os-specific/linux/atheros')
-rw-r--r--pkgs/os-specific/linux/atheros/r3693.nix2
-rw-r--r--pkgs/os-specific/linux/atheros/r3837.nix4
-rw-r--r--pkgs/os-specific/linux/atheros/r3867.nix4
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/atheros/r3693.nix b/pkgs/os-specific/linux/atheros/r3693.nix
index 676298e59948..b6144f81f8d3 100644
--- a/pkgs/os-specific/linux/atheros/r3693.nix
+++ b/pkgs/os-specific/linux/atheros/r3693.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			((lib.optional 
-				(lib.getAttr ["freshHAL"] false args)
+				(lib.attrByPath ["freshHAL"] false args)
 				preBuild)
 			++ [doMakeInstall postInstall
 			doForceShare doPropagate]));
diff --git a/pkgs/os-specific/linux/atheros/r3837.nix b/pkgs/os-specific/linux/atheros/r3837.nix
index 3bc887e07176..39f5488ba6cd 100644
--- a/pkgs/os-specific/linux/atheros/r3837.nix
+++ b/pkgs/os-specific/linux/atheros/r3837.nix
@@ -29,12 +29,12 @@ in
 stdenv.mkDerivation rec {
 	name = "atheros-"+version;
 	patches = lib.optional
-		(lib.getAttr ["injectionPatch"] false args)
+		(lib.attrByPath ["injectionPatch"] false args)
 		injectionPatchFile;
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			((lib.optional 
-				(lib.getAttr ["freshHAL"] false args)
+				(lib.attrByPath ["freshHAL"] false args)
 				preBuild)
 			++ [doPatch doMakeInstall postInstall
 			doForceShare doPropagate]));
diff --git a/pkgs/os-specific/linux/atheros/r3867.nix b/pkgs/os-specific/linux/atheros/r3867.nix
index 435981768957..95a834dd67aa 100644
--- a/pkgs/os-specific/linux/atheros/r3867.nix
+++ b/pkgs/os-specific/linux/atheros/r3867.nix
@@ -29,12 +29,12 @@ in
 stdenv.mkDerivation rec {
 	name = "atheros-"+version;
 	patches = lib.optional
-		(lib.getAttr ["injectionPatch"] false args)
+		(lib.attrByPath ["injectionPatch"] false args)
 		injectionPatchFile;
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			((lib.optional 
-				(lib.getAttr ["freshHAL"] false args)
+				(lib.attrByPath ["freshHAL"] false args)
 				preBuild)
 			++ [doPatch doMakeInstall postInstall
 			doForceShare doPropagate]));