Merge pull request #56690 from primeos/python-cryptography

python37Packages.cryptography: 2.5 -> 2.6.1

pkgs/development/python-modules/cryptography/default.nix

@@ -20,18 +20,17 @@
 }:
 
 buildPythonPackage rec {
-  # also bump cryptography_vectors
   pname = "cryptography";
-  version = "2.5";
+  version = "2.6.1"; # Also update the hash in vectors.nix
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00c4d7gvsymlaw0r13zrm32dcnarmpayjyrh65yymlmr6mrbcij9";
+    sha256 = "19iwz5avym5zl6jrrrkym1rdaa9h61j20ph4cswsqgv8xg5j3j16";
   };
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ openssl cryptography_vectors ]
+  buildInputs = [ openssl ]
              ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
   propagatedBuildInputs = [
     asn1crypto
@@ -42,11 +41,12 @@ buildPythonPackage rec {
   ++ stdenv.lib.optional (!isPyPy) cffi;
 
   checkInputs = [
-    pytest
+    cryptography_vectors
-    pretend
-    iso8601
-    pytz
     hypothesis
+    iso8601
+    pretend
+    pytest
+    pytz
   ];
 
   checkPhase = ''

pkgs/development/python-modules/cryptography/vectors.nix

@@ -1,13 +1,13 @@
-{ buildPythonPackage, fetchPypi, lib }:
+{ buildPythonPackage, fetchPypi, lib, cryptography }:
 
 buildPythonPackage rec {
-  # also bump cryptography
   pname = "cryptography_vectors";
-  version = "2.5";
+  # The test vectors must have the same version as the cryptography package:
+  version = cryptography.version;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik";
+    sha256 = "1bsqcv3h49dzqnyn29ijq8r7k1ra8ikl1y9qcpcns9nbvhaq3wq3";
   };
 
   # No tests included

pkgs/top-level/python-packages.nix

@@ -1488,7 +1488,7 @@ in {
 
   cryptography = callPackage ../development/python-modules/cryptography { };
 
-  cryptography_vectors = callPackage ../development/python-modules/cryptography_vectors { };
+  cryptography_vectors = callPackage ../development/python-modules/cryptography/vectors.nix { };
 
   curtsies = callPackage ../development/python-modules/curtsies { };