From f7f938a1d15277fa11a2cbf75fe9c7d4344f25c3 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 24 May 2009 10:57:41 +0000
Subject: 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
---
 pkgs/applications/networking/browsers/midori/default.nix                | 2 +-
 .../networking/browsers/mozilla-plugins/mozplugger/default.nix          | 2 +-
 pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix       | 2 +-
 pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix       | 2 +-
 pkgs/applications/networking/instant-messengers/gajim/default.nix       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkgs/applications/networking')

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index fd2b90805f5f5..24ba853f058d8 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -5,7 +5,7 @@ let
   doPatchShebangs = args.doPatchShebangs;
   makeManyWrappers = args.makeManyWrappers;
 
-  version = lib.getAttr ["version"] "0.0.21" args; 
+  version = lib.attrByPath ["version"] "0.0.21" args; 
   buildInputs = with args; [
     intltool python imagemagick gtk glib webkit libxml2 
     gtksourceview pkgconfig which gettext makeWrapper 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
index ee8ff18bd5da0..890021b33d6e1 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.getAttr ["version"] "1.12.0" a; 
+  version = a.lib.attrByPath ["version"] "1.12.0" a; 
   buildInputs = with a; [
     firefox libX11 xproto
   ];
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
index b6d8c7feecb20..7728f7abcfc52 100644
--- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
@@ -5,7 +5,7 @@ args : with args;
     (to use a fresher pidgin build)
 */
 let 
-  externalPurple2 = (lib.getAttr ["purple2Source"] null args) != null; 
+  externalPurple2 = lib.attrByPath ["purple2Source"] null args) != null; 
 in
 rec {
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
index 848045d4a24de..257d3d09f71b2 100644
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
@@ -5,7 +5,7 @@ args : with args;
     (to use a fresher pidgin build)
 */
 let 
-  externalPurple2 = (lib.getAttr ["purple2Source"] null args) != null; 
+  externalPurple2 = (lib.attrByPath ["purple2Source"] null args) != null; 
 in
 rec {
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index b8263ff0b1538..f5b1d344574b3 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -2,7 +2,7 @@ a :
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.getAttr ["version"] "0.12.1" a; 
+  version = a.lib.attrByPath ["version"] "0.12.1" a; 
   buildInputs = with a; [
     python pyGtkGlade gtk perl intltool dbus gettext
     pkgconfig makeWrapper libglade pyopenssl libXScrnSaver
-- 
cgit 1.4.1