Merge pull request #112708 from marsam/update-grpc
grpc: 1.34.1 -> 1.35.0
This commit is contained in:
commit
675cb499bd
|
@ -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, openssl, protobuf
|
||||||
, gflags, abseil-cpp, libnsl
|
, gflags, libnsl
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.34.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too
|
version = "1.35.0"; # 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 = "0p6si9i0gg885ag2x87a7jyzhgd5lhx2bh2vjj2ra1jn6y3vg6qk";
|
sha256 = "0vxgp3kqxsglavzs91ybpkkh7aaywxcryacp5z3z6dpsgmw0mscd";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]
|
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]
|
||||||
++ lib.optionals stdenv.isLinux [ libnsl ];
|
++ lib.optionals stdenv.isLinux [ libnsl ];
|
||||||
|
|
||||||
cmakeFlags =
|
cmakeFlags =
|
||||||
|
@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
|
||||||
"-DgRPC_SSL_PROVIDER=package"
|
"-DgRPC_SSL_PROVIDER=package"
|
||||||
"-DgRPC_PROTOBUF_PROVIDER=package"
|
"-DgRPC_PROTOBUF_PROVIDER=package"
|
||||||
"-DgRPC_GFLAGS_PROVIDER=package"
|
"-DgRPC_GFLAGS_PROVIDER=package"
|
||||||
"-DgRPC_ABSL_PROVIDER=package"
|
|
||||||
"-DBUILD_SHARED_LIBS=ON"
|
"-DBUILD_SHARED_LIBS=ON"
|
||||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
|
||||||
];
|
];
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "grpcio-tools";
|
pname = "grpcio-tools";
|
||||||
version = "1.34.1";
|
version = "1.35.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "b411f36748f4ead33411544d785e37825598bbb8abbe79eca422e395be5a3d08";
|
sha256 = "9e2a41cba9c5a20ae299d0fdd377fe231434fa04cbfbfb3807293c6ec10b03cf";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
Loading…
Reference in a new issue