dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 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
commit 90d166dc7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/protobuf/3.6.nix
View File

@ -1,6 +1,6 @@
{ callPackage, ... }: { callPackage, ... }:
callPackage ./generic-v3.nix { callPackage ./generic-v3.nix {
version = "3.6.1"; version = "3.6.1.3";
sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq"; sha256 = "1spj0d4flx6h3phxx3sg9r00yv734hina3365avkcz9brnm089c1";
} }

6
pkgs/development/libraries/protobuf/3.7.nix Normal file
View File

@ -0,0 +1,6 @@
{ callPackage, ... }:
callPackage ./generic-v3.nix {
version = "3.7.0";
sha256 = "0nlxif4cajqllsj2vdh7zp14ag48fb8lsa64zmq8625q9m2lcmdh";
}

8
pkgs/development/python-modules/protobuf/default.nix
View File

@ -18,8 +18,8 @@ buildPythonPackage rec {
nativeBuildInputs = [ google_apputils pyext ]; nativeBuildInputs = [ google_apputils pyext ];
buildInputs = [ protobuf ]; buildInputs = [ protobuf ];
patches = optional isPy37 patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2"))
# Python 3.7 compatibility (remove when protobuf 3.7 is released) # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2)
(fetchpatch { (fetchpatch {
url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch"; url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";
sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1"; sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1";
@ -41,9 +41,9 @@ buildPythonPackage rec {
preBuild = '' preBuild = ''
# Workaround for https://github.com/google/protobuf/issues/2895 # 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") '' '' + 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") installFlags = optional (versionAtLeast protobuf.version "2.6.0")

3
pkgs/top-level/all-packages.nix
View File

@ -12298,8 +12298,9 @@ in
buildPythonApplication click future six; buildPythonApplication click future six;
}; };
protobuf = protobuf3_6; protobuf = protobuf3_7;
protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { };
protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { };
protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { }; protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { };
protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { }; protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { };