mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 08:31:59 +00:00
Code Issues Wiki Activity

Merge pull request #47353 from orivej/protobuf

Browse source 
protobuf: default to 3.6
This commit is contained in:
Orivej Desh (NixOS) 2018-09-25 18:57:18 +00:00 committed by GitHub
parent c77e8096ee 42df4e6686
commit 39f86379c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View file

@ -11648,7 +11648,7 @@ with pkgs;
postgis = callPackage ../development/libraries/postgis { };
protobuf = protobuf3_4;
protobuf = protobuf3_6;
protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { };
protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { };
@ -20164,7 +20164,9 @@ with pkgs;
pong3d = callPackage ../games/pong3d { };
pokerth = callPackage ../games/pokerth { };
pokerth = callPackage ../games/pokerth {
protobuf = protobuf3_4;
};
pokerth-server = pokerth.server;

4
pkgs/top-level/python-packages.nix
View file

@ -1123,7 +1123,7 @@ in {
};
blessed = callPackage ../development/python-modules/blessed {};
block-io = callPackage ../development/python-modules/block-io {};
# Build boost for this specific Python version
@ -9725,7 +9725,7 @@ in {
protobuf = callPackage ../development/python-modules/protobuf {
disabled = isPyPy;
doCheck = !isPy3k;
protobuf = pkgs.protobuf3_5;
protobuf = pkgs.protobuf;
};
protobuf3_1 = callPackage ../development/python-modules/protobuf {