3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #9011 from eduarrrd/master

Add current alpha of protobuf 3
This commit is contained in:
William A. Kennington III 2015-07-27 18:05:10 -04:00
commit e4956ba0ca
2 changed files with 13 additions and 0 deletions

View file

@ -0,0 +1,12 @@
{ callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.0.0-alpha-3.1";
# make sure you test also -A pythonPackages.protobuf
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
rev = "v${version}";
sha256 = "0vzw20ymjmjrrmg84f822qslclsb2q0wf0qdj2da198gmkkbrw45";
};
})

View file

@ -7845,6 +7845,7 @@ let
postgis = callPackage ../development/libraries/postgis { };
protobuf = protobuf2_6;
protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { });
protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { };
protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };