diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2017-02-26 11:03:27 +0100 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2017-02-27 10:52:21 +0100 |
| commit | a331662930f45f9ca4684dee6748696c57a68601 (patch) | |
| tree | dddd6322f9ecf4fdf5c5844dd3f7969abe27cb13 | |
| parent | 421db29915d0db88144f0de374f7f2c784c49b37 (diff) | |
pythonPackages.protobuf: add pyext dependency
| -rw-r--r-- | pkgs/development/python-modules/protobuf.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf.nix index 8b9d1ddb03c49..f2f0f5025d11d 100644 --- a/pkgs/development/python-modules/protobuf.nix +++ b/pkgs/development/python-modules/protobuf.nix @@ -1,5 +1,5 @@ { stdenv, python, buildPythonPackage -, protobuf, google_apputils +, protobuf, google_apputils, pyext , disabled, doCheck ? true }: with stdenv.lib; @@ -9,7 +9,7 @@ buildPythonPackage rec { inherit disabled doCheck; propagatedBuildInputs = [ protobuf google_apputils ]; - buildInputs = [ google_apputils ]; + buildInputs = [ google_apputils pyext ]; prePatch = '' while [ ! -d python ]; do diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acb9cd141e9fd..dbec6e2dc795d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19316,12 +19316,11 @@ in { protobuf = self.protobuf2_6; # only required by tensorflow - protobuf3_0_0b2 = callPackage ../development/python-modules/protobuf.nix { - disabled = isPyPy || isPy3k; - doCheck = isPy3k; - protobuf = pkgs.protobuf3_0_0b2; + protobuf3_2 = callPackage ../development/python-modules/protobuf.nix { + disabled = isPyPy; + doCheck = !isPy3k; + protobuf = pkgs.protobuf3_2; }; - protobuf3_0 = callPackage ../development/python-modules/protobuf.nix { disabled = isPyPy; doCheck = isPy3k; |