python3Packages.cryptography: 2.8 -> 2.9

Backwards incompatible changes:
- Support for Python 3.4 has been removed due to low usage and
  maintenance burden.
- Support for OpenSSL 1.0.1 has been removed. Users on older version of
  OpenSSL will need to upgrade.
- Support for LibreSSL 2.6.x has been removed.
- Reversed the order in which rfc4514_string() returns the RDNs as
  required by RFC 4514.

Note: The first three changes should have no impact on Nixpkgs as we
already removed Python 3.4 and OpenSSL 1.0.1. Additionally we don't
support LibreSSL for this package.
This commit is contained in:
Michael Weiss 2020-04-03 15:36:19 +02:00 committed by Frederik Rietdijk
parent aaf632bdbb
commit af1cb9f1b5
2 changed files with 10 additions and 13 deletions

View File

@ -8,8 +8,6 @@
, packaging , packaging
, six , six
, pythonOlder , pythonOlder
, enum34
, ipaddress
, isPyPy , isPyPy
, cffi , cffi
, pytest , pytest
@ -21,11 +19,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cryptography"; pname = "cryptography";
version = "2.8"; # Also update the hash in vectors.nix version = "2.9"; # Also update the hash in vectors.nix
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0l8nhw14npknncxdnp7n4hpmjyscly6g7fbivyxkjwvlv071zniw"; sha256 = "0vlqy2pki0fh1h6l6cbb43z3g2n9fv0849dzb5gqwjv0bkpx7b0c";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -35,9 +33,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
packaging packaging
six six
] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 ] ++ stdenv.lib.optional (!isPyPy) cffi;
++ stdenv.lib.optional (pythonOlder "3.3") ipaddress
++ stdenv.lib.optional (!isPyPy) cffi;
checkInputs = [ checkInputs = [
cryptography_vectors cryptography_vectors
@ -48,9 +44,8 @@ buildPythonPackage rec {
pytz pytz
]; ];
# remove when https://github.com/pyca/cryptography/issues/4998 is fixed
checkPhase = '' checkPhase = ''
py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve' py.test --disable-pytest-warnings tests
''; '';
# IOKit's dependencies are inconsistent between OSX versions, so this is the best we # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
@ -64,9 +59,11 @@ buildPythonPackage rec {
common cryptographic algorithms such as symmetric ciphers, message common cryptographic algorithms such as symmetric ciphers, message
digests, and key derivation functions. digests, and key derivation functions.
Our goal is for it to be your "cryptographic standard library". It Our goal is for it to be your "cryptographic standard library". It
supports Python 2.7, Python 3.4+, and PyPy 5.3+. supports Python 2.7, Python 3.5+, and PyPy 5.4+.
''; '';
homepage = https://github.com/pyca/cryptography; homepage = "https://github.com/pyca/cryptography";
changelog = "https://cryptography.io/en/latest/changelog/#v"
+ replaceStrings [ "." ] [ "-" ] version;
license = with licenses; [ asl20 bsd3 psfl ]; license = with licenses; [ asl20 bsd3 psfl ];
maintainers = with maintainers; [ primeos ]; maintainers = with maintainers; [ primeos ];
}; };

View File

@ -7,7 +7,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "05pi3shqz0fgvy0d5yazza67bbnam8fkrx2ayrrclgkaqms23lvc"; sha256 = "1h7dcgwrjxqk1bzkangbvlhhlgyqd7cfi894dv1cd5m2sp7csblc";
}; };
# No tests included # No tests included
@ -15,7 +15,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Test vectors for the cryptography package"; description = "Test vectors for the cryptography package";
homepage = https://cryptography.io/en/latest/development/test-vectors/; homepage = "https://cryptography.io/en/latest/development/test-vectors/";
# Source: https://github.com/pyca/cryptography/tree/master/vectors; # Source: https://github.com/pyca/cryptography/tree/master/vectors;
license = with licenses; [ asl20 bsd3 ]; license = with licenses; [ asl20 bsd3 ];
maintainers = with maintainers; [ primeos ]; maintainers = with maintainers; [ primeos ];