diff options
| author | Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com> | 2017-08-24 10:57:45 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-07 09:28:03 +0200 |
| commit | 2489a0aca7efde1f2c983cf7a0cab81c01f6cda6 (patch) | |
| tree | 69e2907d287da314d18d283ca938d3ae120c2c56 /pkgs | |
| parent | 70de5af18cfc8c5c9a9f63e0316ca29fbf881440 (diff) | |
| download | nixpkgs-2489a0aca7efde1f2c983cf7a0cab81c01f6cda6.tar nixpkgs-2489a0aca7efde1f2c983cf7a0cab81c01f6cda6.tar.gz nixpkgs-2489a0aca7efde1f2c983cf7a0cab81c01f6cda6.tar.bz2 nixpkgs-2489a0aca7efde1f2c983cf7a0cab81c01f6cda6.tar.lz nixpkgs-2489a0aca7efde1f2c983cf7a0cab81c01f6cda6.tar.xz nixpkgs-2489a0aca7efde1f2c983cf7a0cab81c01f6cda6.tar.zst nixpkgs-2489a0aca7efde1f2c983cf7a0cab81c01f6cda6.zip | |
protobuf: add 3.3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/protobuf/3.3.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/development/libraries/protobuf/3.3.nix b/pkgs/development/libraries/protobuf/3.3.nix new file mode 100644 index 00000000000..e6a8f05cc18 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.3.nix @@ -0,0 +1,6 @@ +{ callPackage, lib, ... }: + +lib.overrideDerivation (callPackage ./generic-v3.nix { + version = "3.3.0"; + sha256 = "1258yz9flyyaswh3izv227kwnhwcxn4nwavdz9iznqmh24qmi59w"; +}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d30e7f1fab..3f8f8793db1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9983,10 +9983,9 @@ with pkgs; protobuf = protobuf2_6; 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_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_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 796bd1cb428..69a1e4200b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16478,7 +16478,11 @@ in { }); 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 { disabled = isPyPy; doCheck = !isPy3k; |