python.pkgs.protobuf: build with the default protobuf
This commit is contained in:
parent
616c30af9f
commit
9eb751496c
|
@ -1123,7 +1123,7 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
blessed = callPackage ../development/python-modules/blessed {};
|
blessed = callPackage ../development/python-modules/blessed {};
|
||||||
|
|
||||||
block-io = callPackage ../development/python-modules/block-io {};
|
block-io = callPackage ../development/python-modules/block-io {};
|
||||||
|
|
||||||
# Build boost for this specific Python version
|
# Build boost for this specific Python version
|
||||||
|
@ -9725,7 +9725,7 @@ in {
|
||||||
protobuf = callPackage ../development/python-modules/protobuf {
|
protobuf = callPackage ../development/python-modules/protobuf {
|
||||||
disabled = isPyPy;
|
disabled = isPyPy;
|
||||||
doCheck = !isPy3k;
|
doCheck = !isPy3k;
|
||||||
protobuf = pkgs.protobuf3_5;
|
protobuf = pkgs.protobuf;
|
||||||
};
|
};
|
||||||
|
|
||||||
protobuf3_1 = callPackage ../development/python-modules/protobuf {
|
protobuf3_1 = callPackage ../development/python-modules/protobuf {
|
||||||
|
|
Loading…
Reference in New Issue