diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-05-16 04:20:00 -0500 |
---|---|---|
committer | Mario Rodas <marsam@users.noreply.github.com> | 2020-05-16 04:20:00 -0500 |
commit | 625cb1794a060c7ec383f0c6daed15a55464ed57 (patch) | |
tree | 10c10737d995e47ad8a8a5f4af590777937af42a /pkgs/development/libraries/grpc | |
parent | 5b82ec90ca511198116dc371bf4b3ea0f71ae1b0 (diff) | |
download | nixpkgs-625cb1794a060c7ec383f0c6daed15a55464ed57.tar nixpkgs-625cb1794a060c7ec383f0c6daed15a55464ed57.tar.gz nixpkgs-625cb1794a060c7ec383f0c6daed15a55464ed57.tar.bz2 nixpkgs-625cb1794a060c7ec383f0c6daed15a55464ed57.tar.lz nixpkgs-625cb1794a060c7ec383f0c6daed15a55464ed57.tar.xz nixpkgs-625cb1794a060c7ec383f0c6daed15a55464ed57.tar.zst nixpkgs-625cb1794a060c7ec383f0c6daed15a55464ed57.zip |
grpc: 1.28.1 -> 1.29.0
Diffstat (limited to 'pkgs/development/libraries/grpc')
-rw-r--r-- | pkgs/development/libraries/grpc/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 8549eeffde6..ab497eadb6d 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags, abseil-cpp }: stdenv.mkDerivation rec { - version = "1.28.1"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too + version = "1.29.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "17p3xwz5izlqg5ijnim4asl40pr8yhg9wrrmws4g0dk37nkn1x6p"; + sha256 = "1n604grkf2amzrmwcz6am0rpbp3yfb062lpgmhv943hj8wk7xw27"; fetchSubmodules = true; }; patches = [ # Fix build on armv6l (https://github.com/grpc/grpc/pull/21341) (fetchpatch { - url = "https://github.com/grpc/grpc/commit/198d221e775cf73455eeb863672e7a6274d217f1.patch"; - sha256 = "11k35w6ffvl192rgzzj2hzyzjhizdgk7i56zdkx6v60zxnyfn7yq"; + url = "https://github.com/grpc/grpc/commit/2f4cf1d9265c8e10fb834f0794d0e4f3ec5ae10e.patch"; + sha256 = "0ams3jmgh9yzwmxcg4ifb34znamr7pb4qm0609kvil9xqvkqz963"; }) ]; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; + buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" + "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; |