Merge staging-next into staging

2018-12-07 15:31:52 +01:00
parent 4deb04a97a 12e8ec041a
commit 747aa4cc93
225 changed files with 5366 additions and 4074 deletions
--- a/pkgs/development/python-modules/pyjwt/default.nix
+++ b/pkgs/development/python-modules/pyjwt/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi
 , cryptography, ecdsa
-, pytestrunner, pytestcov, pytest_37 }:
+, pytestrunner, pytestcov, pytest }:

 buildPythonPackage rec {
  pname = "PyJWT";
@@ -13,7 +13,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [ cryptography ecdsa ];

-  checkInputs = [ pytestrunner pytestcov pytest_37 ];
+  checkInputs = [ pytestrunner pytestcov pytest ];

  # pytest 3.9.0 changed behavior of deprecated_call, see release notes
  postPatch = ''