summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2019-12-18 21:11:48 -0500
committerJon <jonringer@users.noreply.github.com>2019-12-29 20:08:09 -0800
commitd0a5c6030efa8b30b055c9570bb694060d46d657 (patch)
treee178d9977840fec63e3c0d6cdfa786e0e612063b /pkgs/development
parent975a6b7b1dbcbd9bba2b0a2d3d2d38bb605ababa (diff)
downloadnixpkgs-d0a5c6030efa8b30b055c9570bb694060d46d657.tar
nixpkgs-d0a5c6030efa8b30b055c9570bb694060d46d657.tar.gz
nixpkgs-d0a5c6030efa8b30b055c9570bb694060d46d657.tar.bz2
nixpkgs-d0a5c6030efa8b30b055c9570bb694060d46d657.tar.lz
nixpkgs-d0a5c6030efa8b30b055c9570bb694060d46d657.tar.xz
nixpkgs-d0a5c6030efa8b30b055c9570bb694060d46d657.tar.zst
nixpkgs-d0a5c6030efa8b30b055c9570bb694060d46d657.zip
grpc: 1.25.0 -> 1.26.0
Changelog: https://github.com/grpc/grpc/releases/tag/v1.26.0
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/grpc/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 2fa76b2e085..abcd3abaf30 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
 
 stdenv.mkDerivation rec {
-  version = "1.25.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
+  version = "1.26.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
   pname = "grpc";
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    sha256 = "02nbmbk1xpibjzvbhi8xpazmwry46ki24vks1sh2p0aqwy4hv6yb";
+    sha256 = "1fxydarl00vbhd9q153qn4ax1yc6xrd8wij6bfy9j8chipw1bgir";
     fetchSubmodules = true;
   };
   patches = [
     # Fix build on armv6l (https://github.com/grpc/grpc/pull/21341)
     (fetchpatch {
-      url = "https://github.com/grpc/grpc/commit/ffb8a278389c8e3403b23a9897b65a7390c34645.patch";
-      sha256 = "1lc12a3gccg9wxqhnwgldlj3zmlm6lxg8dssvvj1x7hf655kw3w3";
+      url = "https://github.com/grpc/grpc/commit/198d221e775cf73455eeb863672e7a6274d217f1.patch";
+      sha256 = "11k35w6ffvl192rgzzj2hzyzjhizdgk7i56zdkx6v60zxnyfn7yq";
     })
   ];