diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-01-10 20:09:37 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-01-10 20:09:37 +0000 |
| commit | 45431c078bf8f54aef7c9fae2e5913395ec82c31 (patch) | |
| tree | fd8ff1346a963ddd72e782421f05b623f9759e2a /nixpkgs/pkgs/development/python-modules/cryptography | |
| parent | c86fea6086c212ea489cfb023a5f5c9c8f188810 (diff) | |
| parent | 3ccbc8d89153ecf13f3eae7d9c106d91cd4ab9e5 (diff) | |
Merge commit '3ccbc8d89153ecf13f3eae7d9c106d91cd4ab9e5' into fuckthisshit
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/cryptography')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/cryptography/default.nix | 13 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix | 2 |
2 files changed, 3 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index 2a5d4fa4757..82d0b43bc35 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix index ea24ed90801..86cc195b05b 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix +++ b/nixpkgs/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 |