From 5cae05ecf8ca4979b299e41a11195e9d4df5748f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 3 Aug 2019 16:20:00 -0500
Subject: [PATCH] pythonPackages.grpcio: 1.18.0 -> 1.22.0

---
 .../python-modules/grpcio/default.nix          | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index 9d8814e65313..5c85dd343578 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -1,32 +1,30 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, lib, darwin
-, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig
+{ stdenv, buildPythonPackage, fetchFromGitHub, darwin
+, six, protobuf, enum34, futures, isPy27, pkgconfig
 , cython}:
 
-with stdenv.lib;
 buildPythonPackage rec {
   pname = "grpcio";
-  version = "1.18.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "0cilbhk35gv46mk40jl5f3iqa94x14qyxbavpfq0kh0rld82nx4m";
+    sha256 = "093w8mgvl8ylqlqnfz06ijkmlnkxcjszf9zg6k5ybjw7dwal0jhz";
   };
 
   nativeBuildInputs = [ cython pkgconfig ]
-                    ++ optional stdenv.isDarwin darwin.cctools;
+                    ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
 
   propagatedBuildInputs = [ six protobuf ]
-                        ++ lib.optionals (isPy27 || isPy34) [ enum34 ]
-                        ++ lib.optionals (isPy27) [ futures ];
+                        ++ stdenv.lib.optionals (isPy27) [ enum34 futures ];
 
-  preBuild = optionalString stdenv.isDarwin "unset AR";
+  preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR";
 
   meta = with stdenv.lib; {
     description = "HTTP/2-based RPC framework";
-    license = lib.licenses.asl20;
+    license = licenses.asl20;
     homepage = "https://grpc.io/grpc/python/";
     maintainers = with maintainers; [ vanschelven ];
   };