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

Merge pull request #57181 from FlorianFranzen/protobuf

Browse Source 
protobuf: 3.6 -> 3.7
This commit is contained in:
Robert Schütz
2019-04-14 14:44:55 +02:00
committed by GitHub
parent 96b2ddf0df 905cdeecac
commit 90d166dc7d
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/protobuf/default.nix
+4 -4
View File
@@ -18,8 +18,8 @@ buildPythonPackage rec {
nativeBuildInputs = [ google_apputils pyext ];
buildInputs = [ protobuf ];
patches = optional isPy37
# Python 3.7 compatibility (remove when protobuf 3.7 is released)
patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2"))
# Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2)
(fetchpatch {
url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";
sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1";
@@ -41,9 +41,9 @@ buildPythonPackage rec {
preBuild = ''
# Workaround for https://github.com/google/protobuf/issues/2895
${python}/bin/${python.executable} setup.py build
${python.interpreter} setup.py build
'' + optionalString (versionAtLeast protobuf.version "2.6.0") ''
${python}/bin/${python.executable} setup.py build_ext --cpp_implementation
${python.interpreter} setup.py build_ext --cpp_implementation
'';
installFlags = optional (versionAtLeast protobuf.version "2.6.0")