public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-10-18 12:27:41 +02:00
parent 4c798ff62f c51c2f79b2
commit 1b5c537f45
102 changed files with 7075 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/google_api_core/default.nix
View File

@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27
, google_auth, protobuf, googleapis_common_protos, requests, grpcio, futures, mock, pytest }:
, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio, futures, mock, pytest }:
buildPythonPackage rec {
pname = "google-api-core";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
googleapis_common_protos protobuf
google_auth requests grpcio
google_auth requests setuptools grpcio
] ++ lib.optional (pythonOlder "3.2") futures;
checkInputs = [ mock pytest ];