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

Merge pull request #102316 from marsam/update-grpc

Browse Source 
grpc: 1.32.0 -> 1.33.2
This commit is contained in:
Mario Rodas
2020-11-02 21:18:15 -05:00
committed by GitHub
parent f6d2d10bef 4346b1a276
commit 34ad166a83
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/grpc/default.nix
+4 -3
View File
@@ -3,13 +3,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.32.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too version = "1.33.2"; # 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 = "0v48h0j0gxcp9s63z1ibwgz4416qd6iq728la80y6gl8rklrqf0c"; sha256 = "0cc7yfa37ngrr0q9k3lm2yi4i57bfsyxwbblwc0f801k6wvgavcy";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [ patches = [
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp libnsl ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags abseil-cpp ]
++ stdenv.lib.optionals stdenv.isLinux [ libnsl ];
cmakeFlags = cmakeFlags =
[ "-DgRPC_ZLIB_PROVIDER=package" [ "-DgRPC_ZLIB_PROVIDER=package"
pkgs/development/python-modules/grpcio-tools/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "grpcio-tools"; pname = "grpcio-tools";
version = "1.32.0"; version = "1.33.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "28547272c51e1d2d343685b9f531e85bb90ad7bd93e726ba646b5627173cbc47"; sha256 = "af40774c0275f5465f49fd92bfcd9831b19b013de4cc77b8fb38aea76fa6dce3";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;