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: 5b1f864242ef
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: baf549433058
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 20, 2019

  1. 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.
    primeos authored and FRidh committed Oct 20, 2019
    Copy the full SHA
    baf5494 View commit details
Showing with 3 additions and 12 deletions.
  1. +2 −11 pkgs/development/python-modules/cryptography/default.nix
  2. +1 −1 pkgs/development/python-modules/cryptography/vectors.nix
13 changes: 2 additions & 11 deletions pkgs/development/python-modules/cryptography/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
, openssl
, cryptography_vectors
, darwin
, asn1crypto
, packaging
, six
, pythonOlder
@@ -22,19 +21,18 @@

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" ];

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" ];
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/cryptography/vectors.nix
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ buildPythonPackage rec {

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

# No tests included