Merge staging-next into staging

2019-10-18 12:27:41 +02:00
parent 4c798ff62f c51c2f79b2
commit 1b5c537f45
102 changed files with 7075 additions and 1248 deletions
--- a/pkgs/development/python-modules/google_resumable_media/default.nix
+++ b/pkgs/development/python-modules/google_resumable_media/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , six
 , requests
+, setuptools
 , pytest
 , mock
 }:
@@ -17,7 +18,7 @@ buildPythonPackage rec {
  };

  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ six requests ];
+  propagatedBuildInputs = [ requests setuptools six ];

  checkPhase = ''
    py.test tests/unit