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

python.pkgs.protobuf: use 3.5 by default

Browse Source
This commit is contained in:
Robert Schütz 2018-04-08 00:04:44 +02:00 committed by Frederik Rietdijk
parent b1c6c0af87
commit 35b38b021b
5 changed files with 9 additions and 15 deletions
Show Stats 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 { 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 { buildPythonPackage rec {
pname = "google-api-core"; pname = "google-api-core";
@ -11,7 +11,7 @@ buildPythonPackage rec {
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
googleapis_common_protos protobuf3_5 googleapis_common_protos protobuf
google_auth requests grpcio google_auth requests grpcio
] ++ lib.optional (pythonOlder "3.2") futures; ] ++ lib.optional (pythonOlder "3.2") futures;
checkInputs = [ mock pytest ]; checkInputs = [ mock pytest ];

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

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi { stdenv, buildPythonPackage, fetchPypi
, google_auth, ply, protobuf3_5, grpcio, requests , google_auth, ply, protobuf, grpcio, requests
, googleapis_common_protos, dill, future, pytest, mock, unittest2 }: , googleapis_common_protos, dill, future, pytest, mock, unittest2 }:
buildPythonPackage rec { buildPythonPackage rec {
@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "1d844c56f942d98f12a1b0ecabe8a17d69bef41ff513edd97253bcde02ffd929"; 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 ]; checkInputs = [ pytest mock unittest2 ];
# Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where # Importing test__grpc_google_auth fails with "ModuleNotFoundError: No module named 'google_auth_httplib2'", where

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

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi { stdenv, buildPythonPackage, fetchPypi
, protobuf3_5, pytest }: , protobuf, pytest }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "googleapis-common-protos"; pname = "googleapis-common-protos";
@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "1whfjl44gy15ha6palpwa2m0xi36dsvpaz8vw0cvb2k2lbdfsxf0"; sha256 = "1whfjl44gy15ha6palpwa2m0xi36dsvpaz8vw0cvb2k2lbdfsxf0";
}; };
propagatedBuildInputs = [ protobuf3_5 ]; propagatedBuildInputs = [ protobuf ];
checkInputs = [ pytest ]; checkInputs = [ pytest ];
doCheck = false; # there are no tests doCheck = false; # there are no tests

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

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi, lib { stdenv, buildPythonPackage, fetchPypi, lib
, six, protobuf3_5, enum34, futures, isPy26, isPy27, isPy34 }: , six, protobuf, enum34, futures, isPy26, isPy27, isPy34 }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "grpcio"; pname = "grpcio";
@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "e7c43b5619deff48cc177c1b0618c4beeb2797f910f160e3c2035d5baf790a5d"; sha256 = "e7c43b5619deff48cc177c1b0618c4beeb2797f910f160e3c2035d5baf790a5d";
}; };
propagatedBuildInputs = [ six protobuf3_5 ] propagatedBuildInputs = [ six protobuf ]
++ lib.optionals (isPy26 || isPy27 || isPy34) [ enum34 ] ++ lib.optionals (isPy26 || isPy27 || isPy34) [ enum34 ]
++ lib.optionals (isPy26 || isPy27) [ futures ]; ++ lib.optionals (isPy26 || isPy27) [ futures ];

8
pkgs/top-level/python-packages.nix
View File

@ -10320,7 +10320,7 @@ in {
protobuf = callPackage ../development/python-modules/protobuf { protobuf = callPackage ../development/python-modules/protobuf {
disabled = isPyPy; disabled = isPyPy;
doCheck = !isPy3k; doCheck = !isPy3k;
protobuf = pkgs.protobuf; protobuf = pkgs.protobuf3_5;
}; };
protobuf3_1 = callPackage ../development/python-modules/protobuf { protobuf3_1 = callPackage ../development/python-modules/protobuf {
@ -10329,12 +10329,6 @@ in {
protobuf = pkgs.protobuf3_1; protobuf = pkgs.protobuf3_1;
}; };
protobuf3_5 = callPackage ../development/python-modules/protobuf {
disabled = isPyPy;
doCheck = !isPy3k;
protobuf = pkgs.protobuf3_5;
};
psd-tools = callPackage ../development/python-modules/psd-tools { }; psd-tools = callPackage ../development/python-modules/psd-tools { };
psutil = callPackage ../development/python-modules/psutil { }; psutil = callPackage ../development/python-modules/psutil { };