public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118808 from marsam/update-grpc

Browse Source
This commit is contained in:
Sandro 2021-04-08 21:22:50 +02:00 committed by GitHub
commit 34a8f3d68d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 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, re2, openssl, protobuf { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf
, gflags, abseil-cpp, libnsl , abseil-cpp, libnsl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.36.4"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too version = "1.37.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 = "1zxvdg5vgjgkq5wmzwbxj2zydaj90ja074axs26yzd9x08j0bjxz"; sha256 = "0q3hcnq351j0qm0gsbaxbsnz1gd9w3bk4cazkvq4l2lfmmiw7z56";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [ patches = [
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
propagatedBuildInputs = [ c-ares re2 zlib abseil-cpp ]; propagatedBuildInputs = [ c-ares re2 zlib abseil-cpp ];
buildInputs = [ c-ares.cmake-config openssl protobuf gflags ] buildInputs = [ c-ares.cmake-config openssl protobuf ]
++ lib.optionals stdenv.isLinux [ libnsl ]; ++ lib.optionals stdenv.isLinux [ libnsl ];
cmakeFlags = cmakeFlags =
@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
"-DgRPC_RE2_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_ABSL_PROVIDER=package" "-DgRPC_ABSL_PROVIDER=package"
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DCMAKE_SKIP_BUILD_RPATH=OFF"

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.36.1"; version = "1.37.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "80ef584f7b917f575e4b8f2ec59cd4a4d98c2046e801a735f3136b05742a36a6"; sha256 = "3ec510c1b6bfc32effc639acf9a055e72dab7a7b6757bf72f2132790d6a7cf1c";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];