From 4bbd6900f8f74dac9e4b3ebd9eb4dc52767f2279 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 23 Feb 2018 21:36:13 +0000 Subject: [PATCH] protobuf: 3.4.0 -> {3.4.1, 3.5.1.1} --- pkgs/development/libraries/protobuf/3.4.nix | 4 ++-- pkgs/development/libraries/protobuf/3.5.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/protobuf/3.5.nix diff --git a/pkgs/development/libraries/protobuf/3.4.nix b/pkgs/development/libraries/protobuf/3.4.nix index 75f1bb22c248..5a9034a56a80 100644 --- a/pkgs/development/libraries/protobuf/3.4.nix +++ b/pkgs/development/libraries/protobuf/3.4.nix @@ -1,6 +1,6 @@ { callPackage, lib, ... }: lib.overrideDerivation (callPackage ./generic-v3.nix { - version = "3.4.0"; - sha256 = "0385j54kgr71h0cxh5vqr81qs57ack2g2k9mcdbq188v4ckjacyx"; + version = "3.4.1"; + sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb"; }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) 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 5cba0bfa2029..c0a0a8b9b634 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10769,8 +10769,10 @@ with pkgs; postgis = callPackage ../development/libraries/postgis { }; - protobuf = callPackage ../development/libraries/protobuf/3.4.nix { }; + protobuf = protobuf3_5; + 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 { };