NixOS · Nov 24, 2018 · Nov 24, 2018 · Nov 24, 2018 · Nov 24, 2018
Showing with 19 additions and 12 deletions.

+2 −2 pkgs/development/python-modules/cytoolz/default.nix

+4 −1 pkgs/development/python-modules/flask-restplus/default.nix

+7 −3 pkgs/development/python-modules/m2crypto/default.nix

+6 −6 pkgs/tools/admin/awscli/default.nix
diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix
@@ -22,9 +22,9 @@ buildPythonPackage rec {
   checkInputs = [ nose ];
   propagatedBuildInputs = [ toolz ];
 
-  # Disable failing test https://github.com/pytoolz/cytoolz/issues/97
+  # Failing test https://github.com/pytoolz/cytoolz/issues/122
   checkPhase = ''
-    NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages}
+    NOSE_EXCLUDE=test_introspect_builtin_modules nosetests -v $out/${python.sitePackages}
   '';
 
   meta = {

diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix
@@ -12,6 +12,8 @@
 , pytz
 , aniso8601
 , flask-restful
+, isPy27
+, enum34
 }:
 
 buildPythonPackage rec {
@@ -24,7 +26,8 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ nose blinker tzlocal mock rednose ];
-  propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ];
+  propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ]
+   ++ lib.optional isPy27 enum34;
 
   # RuntimeError: Working outside of application context.
   doCheck = false;

diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix
@@ -1,7 +1,9 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, pkgs
+, swig2
+, openssl
+, typing
 }:
 
 
@@ -14,10 +16,12 @@ buildPythonPackage rec {
     sha256 = "a1b2751cdadc6afac3df8a5799676b7b7c67a6ad144bb62d38563062e7cd3fc6";
   };
 
-  buildInputs = [ pkgs.swig2 pkgs.openssl ];
+  buildInputs = [ swig2 openssl ];
+
+  propagatedBuildInputs = [ typing ];
 
   preConfigure = ''
-    substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${pkgs.openssl.dev}'"
+    substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${openssl.dev}'"
   '';
 
   doCheck = false; # another test that depends on the network.

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
@@ -7,23 +7,23 @@
 let
   py = python.override {
     packageOverrides = self: super: {
-      colorama = super.colorama.overridePythonAttrs (oldAttrs: rec {
-        version = "0.3.7";
+      rsa = super.rsa.overridePythonAttrs (oldAttrs: rec {
+        version = "3.4.2";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
+          sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5";
         };
       });
     };
   };
 
 in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
-  version = "1.15.66";
+  version = "1.16.60";
 
   src = py.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "004fbd3bb8932465205675a7de94460b5c2d45ddd6916138a2c867e4d0f2a4c4";
+    sha256 = "25bcc6cf2304356a78429671999857ff33f88761d81bcee63463a86a6780dcdc";
   };
 
   # No tests included
@@ -44,7 +44,7 @@ in py.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     for i in {py,cfg}; do
-      substituteInPlace setup.$i --replace "botocore==1.10.65" "botocore>=1.10.9,<=1.11"
+      substituteInPlace setup.$i --replace "botocore==1.12.50" "botocore>=1.11,<1.13"
     done
   '';