summary refs log tree commit diff
path: root/pkgs/os-specific/linux
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/os-specific/linux')
-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
-rw-r--r--pkgs/os-specific/linux/btrfsprogs/default.nix2
-rw-r--r--pkgs/os-specific/linux/fbterm/default.nix2
5 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/atheros/r3693.nix b/pkgs/os-specific/linux/atheros/r3693.nix
index 676298e5994..b6144f81f8d 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 3bc887e0717..39f5488ba6c 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 43598176895..95a834dd67a 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]));
diff --git a/pkgs/os-specific/linux/btrfsprogs/default.nix b/pkgs/os-specific/linux/btrfsprogs/default.nix
index a8f2c7ea46f..62d3b130ca5 100644
--- a/pkgs/os-specific/linux/btrfsprogs/default.nix
+++ b/pkgs/os-specific/linux/btrfsprogs/default.nix
@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.getAttr ["version"] "0.18" a; 
+  version = a.lib.attrByPath ["version"] "0.18" a; 
   buildInputs = with a; [
     zlib e2fsprogs acl 
   ];
diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix
index 8ded70dd44b..7d6778bca88 100644
--- a/pkgs/os-specific/linux/fbterm/default.nix
+++ b/pkgs/os-specific/linux/fbterm/default.nix
@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
   
-  version = a.lib.getAttr ["version"] "1.2" a; 
+  version = a.lib.attrByPath ["version"] "1.2" a; 
   buildInputs = with a; [
     gpm fontconfig freetype pkgconfig
   ];