summary refs log tree commit diff
diff options
context:
space:
mode:
authorEdward Tjörnhammar <ed@cflags.cc>2017-02-26 11:03:27 +0100
committerEdward Tjörnhammar <ed@cflags.cc>2017-02-27 10:52:21 +0100
commit5e44b5e2997925ab4c5d9ba1e5880115370107c1 (patch)
tree00ffbd8ef3578e16f61fcfdfd4f5a8a32932a46b
parentfa367c2d028a4f63c4fba9fe498f55288c98cea5 (diff)
downloadnixpkgs-5e44b5e2997925ab4c5d9ba1e5880115370107c1.tar
nixpkgs-5e44b5e2997925ab4c5d9ba1e5880115370107c1.tar.gz
nixpkgs-5e44b5e2997925ab4c5d9ba1e5880115370107c1.tar.bz2
nixpkgs-5e44b5e2997925ab4c5d9ba1e5880115370107c1.tar.lz
nixpkgs-5e44b5e2997925ab4c5d9ba1e5880115370107c1.tar.xz
nixpkgs-5e44b5e2997925ab4c5d9ba1e5880115370107c1.tar.zst
nixpkgs-5e44b5e2997925ab4c5d9ba1e5880115370107c1.zip
protobuf3_2: init at 3.2
-rw-r--r--pkgs/development/libraries/protobuf/3.2.nix6
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/libraries/protobuf/3.2.nix b/pkgs/development/libraries/protobuf/3.2.nix
new file mode 100644
index 00000000000..338156bbdf9
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.2.nix
@@ -0,0 +1,6 @@
+{ callPackage, lib, ... }:
+
+lib.overrideDerivation (callPackage ./generic-v3.nix {
+  version = "3.2.0";
+  sha256 = "120g0bg7ichry74allgmqnh7k0z2sdnrrfklb58b7szzn4zcdz14";
+}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2fe4d47947..6de7c892d87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9229,6 +9229,7 @@ with pkgs;
   # 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 { };
   protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { };
   protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };