From 85d5fdce26a6219c191dd13ce9be87b8780ddb71 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 24 Mar 2018 19:41:38 +0100 Subject: [PATCH] protobuf3_5: init at 3.5.1.1 partly cherry-picked from 4bbd6900f8f74dac9e4b3ebd9eb4dc52767f2279 --- pkgs/development/libraries/protobuf/3.5.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/protobuf/3.5.nix diff --git a/pkgs/development/libraries/protobuf/3.5.nix b/pkgs/development/libraries/protobuf/3.5.nix new file mode 100644 index 000000000000..db9cb6f0371b --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.5.nix @@ -0,0 +1,6 @@ +{ callPackage, lib, ... }: + +lib.overrideDerivation (callPackage ./generic-v3.nix { + version = "3.5.1.1"; + sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk"; +}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef7a669305e2..ac998d123c1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10935,8 +10935,10 @@ with pkgs; postgis = callPackage ../development/libraries/postgis { }; postgis_2_3 = callPackage ../development/libraries/postgis/2.3.nix { }; - protobuf = callPackage ../development/libraries/protobuf/3.4.nix { }; + protobuf = protobuf3_4; + protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { }; + protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { }; protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };