Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: aaf632bdbb70
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: af1cb9f1b5c1
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Apr 5, 2020

  1. 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.
    @primeos @FRidh
    primeos authored and FRidh committed Apr 5, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    af1cb9f View commit details
Showing with 10 additions and 13 deletions.
  1. +8 −11 pkgs/development/python-modules/cryptography/default.nix
  2. +2 −2 pkgs/development/python-modules/cryptography/vectors.nix
19 changes: 8 additions & 11 deletions pkgs/development/python-modules/cryptography/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,8 +8,6 @@
, packaging
, six
, pythonOlder
, enum34
, ipaddress
, isPyPy
, cffi
, pytest
@@ -21,11 +19,11 @@

buildPythonPackage rec {
pname = "cryptography";
version = "2.8"; # Also update the hash in vectors.nix
version = "2.9"; # Also update the hash in vectors.nix

src = fetchPypi {
inherit pname version;
sha256 = "0l8nhw14npknncxdnp7n4hpmjyscly6g7fbivyxkjwvlv071zniw";
sha256 = "0vlqy2pki0fh1h6l6cbb43z3g2n9fv0849dzb5gqwjv0bkpx7b0c";
};

outputs = [ "out" "dev" ];
@@ -35,9 +33,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
packaging
six
] ++ stdenv.lib.optional (pythonOlder "3.4") enum34
++ stdenv.lib.optional (pythonOlder "3.3") ipaddress
++ stdenv.lib.optional (!isPyPy) cffi;
] ++ stdenv.lib.optional (!isPyPy) cffi;

checkInputs = [
cryptography_vectors
@@ -48,9 +44,8 @@ buildPythonPackage rec {
pytz
];

# remove when https://github.com/pyca/cryptography/issues/4998 is fixed
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
@@ -64,9 +59,11 @@ buildPythonPackage rec {
common cryptographic algorithms such as symmetric ciphers, message
digests, and key derivation functions.
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 ];
maintainers = with maintainers; [ primeos ];
};
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/cryptography/vectors.nix
View file
Original file line number Diff line number Diff line change
@@ -7,15 +7,15 @@ buildPythonPackage rec {

src = fetchPypi {
inherit pname version;
sha256 = "05pi3shqz0fgvy0d5yazza67bbnam8fkrx2ayrrclgkaqms23lvc";
sha256 = "1h7dcgwrjxqk1bzkangbvlhhlgyqd7cfi894dv1cd5m2sp7csblc";
};

# No tests included
doCheck = false;

meta = with lib; {
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;
license = with licenses; [ asl20 bsd3 ];
maintainers = with maintainers; [ primeos ];