diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-02-26 04:20:00 +0000 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2021-02-26 04:20:00 +0000 |
| commit | a526d49118f9fd29c996672920fe0d48c7c72732 (patch) | |
| tree | 99db1a86da94bdf3d36d6cc8f7960a5bf6e7c021 /pkgs/development/libraries/grpc | |
| parent | 1006509a7396eeeb8d3283d9525ac15597f89887 (diff) | |
grpc: 1.35.0 -> 1.36.1
https://github.com/grpc/grpc/releases/tag/v1.36.0 https://github.com/grpc/grpc/releases/tag/v1.36.1
Diffstat (limited to 'pkgs/development/libraries/grpc')
| -rw-r--r-- | pkgs/development/libraries/grpc/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index d6a1b44fe4264..5374dc75e1a86 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, openssl, protobuf +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf , gflags, libnsl }: stdenv.mkDerivation rec { - version = "1.35.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.36.1"; # 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 = "0vxgp3kqxsglavzs91ybpkkh7aaywxcryacp5z3z6dpsgmw0mscd"; + sha256 = "0lb6pls9m05bvr6bvqzp6apdchhsazc5866yvmgkm979xcrzdy2z"; fetchSubmodules = true; }; patches = [ @@ -21,12 +21,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ] + buildInputs = [ zlib c-ares c-ares.cmake-config re2 openssl protobuf gflags ] ++ lib.optionals stdenv.isLinux [ libnsl ]; cmakeFlags = [ "-DgRPC_ZLIB_PROVIDER=package" "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_RE2_PROVIDER=package" "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package" |