ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

protobuf: add 3.3

Browse Source
This commit is contained in:
Jean-Philippe Bernardy 2017-08-24 10:57:45 +02:00 committed by Frederik Rietdijk
parent 70de5af18c
commit 2489a0aca7
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,6 @@
{ callPackage, lib, ... }:
lib.overrideDerivation (callPackage ./generic-v3.nix {
version = "3.3.0";
sha256 = "1258yz9flyyaswh3izv227kwnhwcxn4nwavdz9iznqmh24qmi59w";
}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })

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

@ -9983,10 +9983,9 @@ with pkgs;
protobuf = protobuf2_6; protobuf = protobuf2_6;
protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { }); protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { });
# 3.0.0-beta-2 is only introduced for tensorflow. remove this version when tensorflow is moved to 3.0.
protobuf3_0_0b2 = lowPrio (callPackage ../development/libraries/protobuf/3.0.0-beta-2.nix { });
protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };
protobuf3_2 = callPackage ../development/libraries/protobuf/3.2.nix { }; protobuf3_2 = callPackage ../development/libraries/protobuf/3.2.nix { };
protobuf3_3 = callPackage ../development/libraries/protobuf/3.3.nix { };
protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { }; protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { };
protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };

6
pkgs/top-level/python-packages.nix
View File

@ -16478,7 +16478,11 @@ in {
}); });
protobuf = self.protobuf2_6; protobuf = self.protobuf2_6;
# only required by tensorflow protobuf3_3 = callPackage ../development/python-modules/protobuf.nix {
disabled = isPyPy;
doCheck = !isPy3k;
protobuf = pkgs.protobuf3_3;
};
protobuf3_2 = callPackage ../development/python-modules/protobuf.nix { protobuf3_2 = callPackage ../development/python-modules/protobuf.nix {
disabled = isPyPy; disabled = isPyPy;
doCheck = !isPy3k; doCheck = !isPy3k;