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

pythonPackages.protobuf: add pyext dependency

Browse Source
This commit is contained in:
Edward Tjörnhammar 2017-02-26 11:03:27 +01:00
parent 421db29915
commit a331662930
No known key found for this signature in database
GPG Key ID: 7B82CE4A866B6845
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/protobuf.nix
View File

@ -1,5 +1,5 @@
{ stdenv, python, buildPythonPackage { stdenv, python, buildPythonPackage
, protobuf, google_apputils , protobuf, google_apputils, pyext
, disabled, doCheck ? true }: , disabled, doCheck ? true }:
with stdenv.lib; with stdenv.lib;
@ -9,7 +9,7 @@ buildPythonPackage rec {
inherit disabled doCheck; inherit disabled doCheck;
propagatedBuildInputs = [ protobuf google_apputils ]; propagatedBuildInputs = [ protobuf google_apputils ];
buildInputs = [ google_apputils ]; buildInputs = [ google_apputils pyext ];
prePatch = '' prePatch = ''
while [ ! -d python ]; do while [ ! -d python ]; do

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

@ -19316,12 +19316,11 @@ in {
protobuf = self.protobuf2_6; protobuf = self.protobuf2_6;
# only required by tensorflow # only required by tensorflow
protobuf3_0_0b2 = callPackage ../development/python-modules/protobuf.nix { protobuf3_2 = callPackage ../development/python-modules/protobuf.nix {
disabled = isPyPy || isPy3k; disabled = isPyPy;
doCheck = isPy3k; doCheck = !isPy3k;
protobuf = pkgs.protobuf3_0_0b2; protobuf = pkgs.protobuf3_2;
}; };
protobuf3_0 = callPackage ../development/python-modules/protobuf.nix { protobuf3_0 = callPackage ../development/python-modules/protobuf.nix {
disabled = isPyPy; disabled = isPyPy;
doCheck = isPy3k; doCheck = isPy3k;