diff options
author | Marc Weber <marco-oweber@gmx.de> | 2009-05-24 10:57:41 +0000 |
---|---|---|
committer | Marc Weber <marco-oweber@gmx.de> | 2009-05-24 10:57:41 +0000 |
commit | f7f938a1d15277fa11a2cbf75fe9c7d4344f25c3 (patch) | |
tree | 7f0728120b23ae097a4259c62839037bd84aebad /pkgs/development | |
parent | 62620f0411b4ada733ae4e701416997140053762 (diff) |
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/development')
15 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 953d47e6b91c2..3277d0145f94f 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -5,7 +5,7 @@ let fullDepEntry = args.fullDepEntry; doPatchShebangs = args.doPatchShebangs; - version = lib.getAttr ["version"] "2008.03.30" args; + version = lib.attrByPath ["version"] "2008.03.30" args; buildInputs = with args; [ zlib sqlite gmp libffi cairo ncurses freetype mesa libpng libtiff libjpeg readline libsndfile libxml2 diff --git a/pkgs/development/interpreters/plt-scheme/default.nix b/pkgs/development/interpreters/plt-scheme/default.nix index 94b5969216024..79f76d6d2a80c 100644 --- a/pkgs/development/interpreters/plt-scheme/default.nix +++ b/pkgs/development/interpreters/plt-scheme/default.nix @@ -1,5 +1,5 @@ args: with args; -let version = lib.getAttr ["version"] "4.0.1" args; in +let version = lib.attrByPath ["version"] "4.0.1" args; in rec { src = fetchurl { url = "ftp://infogroep.be/pub/plt/bundles/${version}/plt/plt-${version}-src-unix.tgz"; diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index ed4cb09ebc77a..10fd49b5d18ce 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "1.8.1" a; + version = a.lib.attrByPath ["version"] "1.8.1" a; buildInputs = with a; [ perl ]; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index c54877946aafd..f0613834364f3 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -4,7 +4,7 @@ let fetchurl = args.fetchurl; fullDepEntry = args.fullDepEntry; - version = lib.getAttr ["version"] "4.1.0" args; + version = lib.attrByPath ["version"] "4.1.0" args; buildInputs = with args; [ cmake freeglut mesa libX11 xproto inputproto libXi libXmu diff --git a/pkgs/development/libraries/cl-ppcre/default.nix b/pkgs/development/libraries/cl-ppcre/default.nix index 28c7ee0475bcf..c17fb3f4064c9 100644 --- a/pkgs/development/libraries/cl-ppcre/default.nix +++ b/pkgs/development/libraries/cl-ppcre/default.nix @@ -4,7 +4,7 @@ let fetchurl = args.fetchurl; simplyShare = args.simplyShare; - version = lib.getAttr ["version"] "2.0.0" args; + version = lib.attrByPath ["version"] "2.0.0" args; buildInputs = with args; [ ]; in rec { diff --git a/pkgs/development/libraries/libcv/default.nix b/pkgs/development/libraries/libcv/default.nix index 55e235e180bd8..a2035b4cb4069 100644 --- a/pkgs/development/libraries/libcv/default.nix +++ b/pkgs/development/libraries/libcv/default.nix @@ -4,7 +4,7 @@ let fetchurl = args.fetchurl; fullDepEntry = args.fullDepEntry; - version = lib.getAttr ["version"] "" args; + version = lib.attrByPath ["version"] "" args; buildInputs = with args; [ libtiff libpng libjpeg pkgconfig gtk glib diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index 6f3fbd2df56db..755ae1dfca5a2 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -3,7 +3,7 @@ let lib = args.lib; fetchurl = args.fetchurl; - version = lib.getAttr ["version"] "0.9.1" args; + version = lib.attrByPath ["version"] "0.9.1" args; buildInputs = with args; [ libtool libjpeg openssl libX11 libXdamage xproto damageproto xextproto libXext fixesproto libXfixes xineramaproto libXinerama diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index 35264f2cdf6c1..2cc240c7ec345 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -3,7 +3,7 @@ let lib = args.lib; fetchurl = args.fetchurl; - version = lib.getAttr ["version"] "0.10.1" args; + version = lib.attrByPath ["version"] "0.10.1" args; buildInputs = with args; [ ]; diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index 07412d89ab683..687c179c3d047 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -1,5 +1,5 @@ args : with args; -let version = lib.getAttr ["version"] "r34824" args; in +let version = lib.attrByPath ["version"] "r34824" args; in rec { src = fetchurl { url = "http://nightly.webkit.org/files/trunk/src/WebKit-${version}.tar.bz2"; diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 167f1f471ee18..fa8b88d083440 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.83.0" a; + version = a.lib.attrByPath ["version"] "0.83.0" a; buildInputs = with a; [ pkgconfig ]; diff --git a/pkgs/development/python-modules/irclib/default.nix b/pkgs/development/python-modules/irclib/default.nix index c709308b7af45..c840e0a100357 100644 --- a/pkgs/development/python-modules/irclib/default.nix +++ b/pkgs/development/python-modules/irclib/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.4.8" a; + version = a.lib.attrByPath ["version"] "0.4.8" a; buildInputs = with a; [ python ]; diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index b94d6d6979725..fa00a7040a032 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.1.9" a; + version = a.lib.attrByPath ["version"] "0.1.9" a; buildInputs = with a; [ pkgconfig pygtk ]; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index b2aedf7c50821..86a79f1070e9a 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.8" a; + version = a.lib.attrByPath ["version"] "0.8" a; propagatedBuildInputs = with a; [ openssl python ]; diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index e888161ded9bf..3fc8058dfb2a3 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.5.0rc1" a; + version = a.lib.attrByPath ["version"] "0.5.0rc1" a; buildInputs = with a; [ python setuptools ]; diff --git a/pkgs/development/tools/documentation/docutils/default.nix b/pkgs/development/tools/documentation/docutils/default.nix index f032a94b153a9..1630b0f4072fe 100644 --- a/pkgs/development/tools/documentation/docutils/default.nix +++ b/pkgs/development/tools/documentation/docutils/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.5" a; + version = a.lib.attrByPath ["version"] "0.5" a; buildInputs = with a; [ python pil makeWrapper ]; |