python.pkgs.astroid: 1.4.9: 1.5.2

1 files changed, 33 insertions, 28 deletions

diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index a690399118d..52f7fdf039c 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -1,34 +1,39 @@
-{ stdenv, fetchurl, buildPythonPackage, python, logilab_common, six,
-  lazy-object-proxy, wrapt }:
+{ lib, fetchurl, buildPythonPackage, python, logilab_common, six
+, lazy-object-proxy, wrapt, singledispatch, enum34, pythonOlder
+, backports_functools_lru_cache
+}:
 
-  buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "astroid";
-    version = "1.4.9";
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "astroid";
+  version = "1.5.2";
 
-    src = fetchurl {
-      url = "mirror://pypi/a/${pname}/${name}.tar.gz";
-      sha256 = "1mw5q20b80j55vbpcdfl824sbb1q15dhkfbczjnnv8733j4yg0x4";
-    };
+  src = fetchurl {
+    url = "mirror://pypi/a/${pname}/${name}.tar.gz";
+    sha256 = "271f1c9ad6519a5dde2a7f0c9b62c2923b55e16569bdd888f9f9055cc5be37ed";
+  };
 
-    propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ];
+  propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]
+    ++ lib.optionals (pythonOlder "3.4") [ enum34 singledispatch]
+    ++ lib.optionals (pythonOlder "3.3") [ backports_functools_lru_cache ];
 
-    postPatch = ''
-      cd astroid/tests
-      for i in $(ls unittest*); do mv -v $i test_$i; done 
-      cd ../..
-      rm -vf astroid/tests/test_unittest_inference.py
-    '';
+  postPatch = ''
+    cd astroid/tests
+    for i in $(ls unittest*); do mv -v $i test_$i; done
+    cd ../..
+    rm -vf astroid/tests/test_unittest_inference.py
+    rm -vf astroid/tests/test_unittest_manager.py
+  '';
 
-    checkPhase = ''
-      ${python.interpreter} -m unittest discover
-    '';
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover
+  '';
 
-    meta = with stdenv.lib; {
-      description = "A abstract syntax tree for Python with inference support";
-      homepage = http://bitbucket.org/logilab/astroid;
-      license = licenses.lgpl2;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ nand0p ]; 
-    };
-  }
+  meta = with lib; {
+    description = "A abstract syntax tree for Python with inference support";
+    homepage = http://bitbucket.org/logilab/astroid;
+    license = licenses.lgpl2;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ nand0p ];
+  };
+}