summary refs log tree commit diff
path: root/pkgs/development/python-modules/cryptography
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2019-10-18 13:13:01 +0200
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-10-20 11:07:41 +0200
commitbaf549433058e844ac3b8a402c1255f67c014ccb (patch)
tree4293e281b4bd1b48bec26a127e02adba7a5ab075 /pkgs/development/python-modules/cryptography
parent5b1f864242efefad0b91f1026283768d3c316bb2 (diff)
downloadnixpkgs-baf549433058e844ac3b8a402c1255f67c014ccb.tar
nixpkgs-baf549433058e844ac3b8a402c1255f67c014ccb.tar.gz
nixpkgs-baf549433058e844ac3b8a402c1255f67c014ccb.tar.bz2
nixpkgs-baf549433058e844ac3b8a402c1255f67c014ccb.tar.lz
nixpkgs-baf549433058e844ac3b8a402c1255f67c014ccb.tar.xz
nixpkgs-baf549433058e844ac3b8a402c1255f67c014ccb.tar.zst
nixpkgs-baf549433058e844ac3b8a402c1255f67c014ccb.zip
python37Packages.cryptography: 2.7 -> 2.8
Changelog:
https://cryptography.io/en/latest/changelog/#v2-8

Important changes:
- Deprecated support for OpenSSL 1.0.1. Support will be removed in
  cryptography 2.9.
- cryptography no longer depends on asn1crypto.
- Added support for Python 3.8.
Diffstat (limited to 'pkgs/development/python-modules/cryptography')
-rw-r--r--pkgs/development/python-modules/cryptography/default.nix13
-rw-r--r--pkgs/development/python-modules/cryptography/vectors.nix2
2 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 2a5d4fa4757..82d0b43bc35 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -5,7 +5,6 @@
 , openssl
 , cryptography_vectors
 , darwin
-, asn1crypto
 , packaging
 , six
 , pythonOlder
@@ -22,11 +21,11 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "2.7"; # Also update the hash in vectors.nix
+  version = "2.8"; # Also update the hash in vectors.nix
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1inlnr36kl36551c9rcad99jmhk81v33by3glkadwdcgmi17fd76";
+    sha256 = "0l8nhw14npknncxdnp7n4hpmjyscly6g7fbivyxkjwvlv071zniw";
   };
 
   outputs = [ "out" "dev" ];
@@ -34,7 +33,6 @@ buildPythonPackage rec {
   buildInputs = [ openssl ]
              ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
   propagatedBuildInputs = [
-    asn1crypto
     packaging
     six
   ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34
@@ -55,13 +53,6 @@ buildPythonPackage rec {
     py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve'
   '';
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/pyca/cryptography/commit/e575e3d482f976c4a1f3203d63ea0f5007a49a2a.patch";
-      sha256 = "0vg9prqsizd6gzh5j7lscsfxzxlhz7pacvzhgqmj1vhdhjwbblcp";
-    })
-  ];
-
   # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
   # can do until nix 1.11's release
   __impureHostDeps = [ "/usr/lib" ];
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index ea24ed90801..86cc195b05b 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1g38zw90510azyfrj6mxbslx2gp9yrnv5dac0w2819k9ssdznbgi";
+    sha256 = "05pi3shqz0fgvy0d5yazza67bbnam8fkrx2ayrrclgkaqms23lvc";
   };
 
   # No tests included