cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #114611 from marsam/update-grpc

Browse source 
grpc: 1.35.0 -> 1.36.1
This commit is contained in:
Mario Rodas 2021-03-08 19:31:04 -05:00 committed by GitHub
commit 122f2c72a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/libraries/grpc/default.nix
View file

@ -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 , gflags, libnsl
}: }:
stdenv.mkDerivation rec { 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"; pname = "grpc";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grpc"; owner = "grpc";
repo = "grpc"; repo = "grpc";
rev = "v${version}"; rev = "v${version}";
sha256 = "0vxgp3kqxsglavzs91ybpkkh7aaywxcryacp5z3z6dpsgmw0mscd"; sha256 = "0lb6pls9m05bvr6bvqzp6apdchhsazc5866yvmgkm979xcrzdy2z";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [ patches = [
@ -21,12 +21,13 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ cmake pkg-config ]; 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 ]; ++ lib.optionals stdenv.isLinux [ libnsl ];
cmakeFlags = cmakeFlags =
[ "-DgRPC_ZLIB_PROVIDER=package" [ "-DgRPC_ZLIB_PROVIDER=package"
"-DgRPC_CARES_PROVIDER=package" "-DgRPC_CARES_PROVIDER=package"
"-DgRPC_RE2_PROVIDER=package"
"-DgRPC_SSL_PROVIDER=package" "-DgRPC_SSL_PROVIDER=package"
"-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_GFLAGS_PROVIDER=package" "-DgRPC_GFLAGS_PROVIDER=package"

4
pkgs/development/python-modules/grpcio-tools/default.nix
View file

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "grpcio-tools"; pname = "grpcio-tools";
version = "1.35.0"; version = "1.36.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf"; sha256 = "80ef584f7b917f575e4b8f2ec59cd4a4d98c2046e801a735f3136b05742a36a6";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];