Merge pull request #10658 from FRidh/python

python: several fixes

1 files changed, 17 insertions, 5 deletions

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a535c3297dc52..2ab6c604aad84 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1036,6 +1036,9 @@ let
       license = licenses.mit;
       maintainers = with maintainers; [ iElectric ];
     };
+
+    disabled = isPy3k;
+
   });
 
   beaker = buildPythonPackage rec {
@@ -2976,7 +2979,8 @@ let
       url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz";
       sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278";
     };
-
+    
+    buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
 
     meta = {
@@ -2988,11 +2992,12 @@ let
   };
 
   dateutil = buildPythonPackage (rec {
-    name = "dateutil-2.2";
+    name = "dateutil-${version}";
+    version = "2.4.2";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz";
-      sha256 = "0s74ad6r789810s10dxgvaf48ni6adac2icrdad34zxygqq6bj7f";
+      sha256 = "3e95445c1db500a344079a47b171c45ef18f57d188dffdb0e4165c71bea8eb3d";
     };
 
     propagatedBuildInputs = with self; [ self.six ];
@@ -6149,6 +6154,8 @@ let
       description = "Add options to doctest examples while they are running";
       homepage = http://pypi.python.org/pypi/dtopt;
     };
+    # Test contain Python 2 print
+    disabled = isPy3k;
   };
 
 
@@ -7700,6 +7707,8 @@ let
       sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6";
     };
 
+    buildInputs = with self; [ pytest ];
+
     meta = {
       description = "Vestigial utilities from IPython";
       homepage = http://ipython.org/;
@@ -11767,6 +11776,7 @@ let
       url = "https://github.com/GreenSteam/pep257/archive/${version}.tar.gz";
       sha256 = "0v8aq0xzsa7clazszxl42904c3jpq69lg8a5hg754bqcqf72hfrn";
     };
+    buildInputs = with self; [ pytest ];
 
     meta = {
       homepage = https://github.com/GreenSteam/pep257/;
@@ -13144,7 +13154,7 @@ let
       md5 = "861664f8be3bed44820356539f2ea5b6";
     };
 
-    propagatedBuildInputs = with pythonPackages; [  ];
+    buildInputs = with self; [ nose ];
 
     meta = {
       description = "Pure Python GeoIP API";
@@ -14040,6 +14050,8 @@ let
       md5 = "c57cba33626ac4b1e3d1974923d59232";
     };
 
+    disabled = isPy3k;
+
     meta = {
       homepage    = "https://code.google.com/p/pysphere/";
       license     = "BSD";
@@ -16881,7 +16893,7 @@ let
       sha256 = "0skzrvhjnnacrz52jml4i050vdx5lfcd3np172srxjaghdgfxg9k";
     };
 
-    propagatedBuildInputs = with self; [ six ];
+    propagatedBuildInputs = with self; [ six pillow ];
 
     meta = {
       description = "Quick Response code generation for Python";