Merge staging into staging-next

2020-04-25 21:53:27 +02:00
parent 89a34c1cce 7280b5eef9
commit 57cfb787ef
35 changed files with 254 additions and 131 deletions
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -22,11 +22,11 @@

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

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0vlqy2pki0fh1h6l6cbb43z3g2n9fv0849dzb5gqwjv0bkpx7b0c";
+    sha256 = "13inbbc3vqv0vpfww65f8pj3isghbcrd3m63xfyd8swl9f5xc2yf";
  };

  outputs = [ "out" "dev" ];
--- 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 = "1h7dcgwrjxqk1bzkangbvlhhlgyqd7cfi894dv1cd5m2sp7csblc";
+    sha256 = "1ydkrj67jf26ys8v5qflqsnlj3hd4494ym44120dpvk7b7v037ci";
  };

  # No tests included