diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-04-08 00:04:44 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 11:36:07 +0200 |
| commit | 35b38b021b47064e973c948b5377753a57150cf2 (patch) | |
| tree | 4dda7475e2f337ed2209b76a6cfbb05c1898c553 /pkgs/development/python-modules | |
| parent | b1c6c0af87f6a32a33e017290938d89fa75bf53f (diff) | |
| download | nixlib-35b38b021b47064e973c948b5377753a57150cf2.tar nixlib-35b38b021b47064e973c948b5377753a57150cf2.tar.gz nixlib-35b38b021b47064e973c948b5377753a57150cf2.tar.bz2 nixlib-35b38b021b47064e973c948b5377753a57150cf2.tar.lz nixlib-35b38b021b47064e973c948b5377753a57150cf2.tar.xz nixlib-35b38b021b47064e973c948b5377753a57150cf2.tar.zst nixlib-35b38b021b47064e973c948b5377753a57150cf2.zip | |
python.pkgs.protobuf: use 3.5 by default
Diffstat (limited to 'pkgs/development/python-modules')
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index abd4b886478a..baf590f99572 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, google_auth, protobuf3_5, googleapis_common_protos, requests, grpcio, futures, mock, pytest }: +, google_auth, protobuf, googleapis_common_protos, requests, grpcio, futures, mock, pytest }: buildPythonPackage rec { pname = "google-api-core"; @@ -11,7 +11,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - googleapis_common_protos protobuf3_5 + googleapis_common_protos protobuf google_auth requests grpcio ] ++ lib.optional (pythonOlder "3.2") futures; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/google_gax/default.nix b/pkgs/development/python-modules/google_gax/default.nix index 7de42bf8ec8c..daabba6c390a 100644 --- a/pkgs/development/python-modules/google_gax/default.nix +++ b/pkgs/development/python-modules/google_gax/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, google_auth, ply, protobuf3_5, grpcio, requests +, google_auth, ply, protobuf, grpcio, requests , googleapis_common_protos, dill, future, pytest, mock, unittest2 }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1d844c56f942d98f12a1b0ecabe8a17d69bef41ff513edd97253bcde02ffd929"; }; - propagatedBuildInputs = [ google_auth ply protobuf3_5 grpcio requests googleapis_common_protos dill future ]; + propagatedBuildInputs = [ google_auth ply protobuf grpcio requests googleapis_common_protos dill future ]; checkInputs = [ pytest mock unittest2 ]; # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 7427e590c0ca..28e84f4846e7 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, protobuf3_5, pytest }: +, protobuf, pytest }: buildPythonPackage rec { pname = "googleapis-common-protos"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1whfjl44gy15ha6palpwa2m0xi36dsvpaz8vw0cvb2k2lbdfsxf0"; }; - propagatedBuildInputs = [ protobuf3_5 ]; + propagatedBuildInputs = [ protobuf ]; checkInputs = [ pytest ]; doCheck = false; # there are no tests diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 47e9d179eea7..d1f0903238c7 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, lib -, six, protobuf3_5, enum34, futures, isPy26, isPy27, isPy34 }: +, six, protobuf, enum34, futures, isPy26, isPy27, isPy34 }: buildPythonPackage rec { pname = "grpcio"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "e7c43b5619deff48cc177c1b0618c4beeb2797f910f160e3c2035d5baf790a5d"; }; - propagatedBuildInputs = [ six protobuf3_5 ] + propagatedBuildInputs = [ six protobuf ] ++ lib.optionals (isPy26 || isPy27 || isPy34) [ enum34 ] ++ lib.optionals (isPy26 || isPy27) [ futures ]; |