Re-Revert "Merge branch 'staging-next'"

This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
parent 415b29939b
commit 22a216849b
90 changed files with 428 additions and 367 deletions
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -9,6 +9,7 @@
 , pretend
 , flaky
 , glibcLocales
+, six
 }:

 with stdenv.lib;
@@ -84,7 +85,7 @@ buildPythonPackage rec {
  doCheck = !stdenv.isDarwin;

  nativeBuildInputs = [ openssl ];
-  propagatedBuildInputs = [ cryptography pyasn1 idna ];
+  propagatedBuildInputs = [ cryptography pyasn1 idna six ];

  checkInputs = [ pytest pretend flaky glibcLocales ];
 }