about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2020-11-02 21:18:15 -0500
committerGitHub <noreply@github.com>2020-11-02 21:18:15 -0500
commit34ad166a830d3ac1541dcce571c52231f2f0865a (patch)
tree6a607e5c1c1c0c09ad496d69c7fc9d2d41b9fb36 /pkgs
parentf6d2d10bef52b186cc491a39b19b6591ef815eb8 (diff)
parent4346b1a27612d867d442d7759cd90160480a623f (diff)
Merge pull request #102316 from marsam/update-grpc
grpc: 1.32.0 -> 1.33.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/grpc/default.nix7
-rw-r--r--pkgs/development/python-modules/grpcio-tools/default.nix4
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index e7d1aa4bf92ba..98117c7ae4102 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -3,13 +3,13 @@
 }:
 
 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";
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    sha256 = "0v48h0j0gxcp9s63z1ibwgz4416qd6iq728la80y6gl8rklrqf0c";
+    sha256 = "0cc7yfa37ngrr0q9k3lm2yi4i57bfsyxwbblwc0f801k6wvgavcy";
     fetchSubmodules = true;
   };
   patches = [
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
   ];
 
   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 =
     [ "-DgRPC_ZLIB_PROVIDER=package"
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index c60acb2d1f161..fe0fc9d3f8ead 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.32.0";
+  version = "1.33.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "28547272c51e1d2d343685b9f531e85bb90ad7bd93e726ba646b5627173cbc47";
+    sha256 = "af40774c0275f5465f49fd92bfcd9831b19b013de4cc77b8fb38aea76fa6dce3";
   };
 
   enableParallelBuilding = true;