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_cloud_storage/default.nix
+++ b/pkgs/development/python-modules/google_cloud_storage/default.nix
@@ -6,6 +6,7 @@
 , google_cloud_core
 , pytest
 , mock
+, setuptools
 }:

 buildPythonPackage rec {
@@ -17,8 +18,13 @@ buildPythonPackage rec {
    sha256 = "23e3d09f44f86128b754518c81492fac673ea39f7230356c126140f877c231c8";
  };

+  propagatedBuildInputs = [
+    google_resumable_media
+    google_api_core
+    google_cloud_core
+    setuptools
+  ];
  checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core ];

  checkPhase = ''
   pytest tests/unit