From e90d7e7a623659bff27808bea86f1e03c5f75d59 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 23 Oct 2019 04:20:00 -0500 Subject: [PATCH 1/3] grpc: 1.23.0 -> 1.24.3 Co-authored-by: Tom Bereknyei --- pkgs/development/libraries/grpc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index d45aba1cb378..5d6a10ff1132 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.23.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too + version = "1.24.3"; # 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 = "14svfy7lvz8lf6b7zg1fbypj2n46n9gq0ldgnv85jm0ikv72cgv6"; + sha256 = "19g3fihds9rih2ciypkwi4jahjaymyqnjhd9id397fgj1qkw4w69"; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; From 6b09e24bba6e7ae42d8c2231741955c83f455f73 Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Fri, 18 Oct 2019 20:31:34 -0400 Subject: [PATCH 2/3] pythonPackages.grpcio: inherit src from grpc --- pkgs/development/python-modules/grpcio/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 65e9e3fb5995..60bfae8dca5b 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,18 +1,10 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, darwin +{ stdenv, buildPythonPackage, darwin, grpc , six, protobuf, enum34, futures, isPy27, pkgconfig , cython}: buildPythonPackage rec { + inherit (grpc) src version; pname = "grpcio"; - version = "1.23.0"; - - src = fetchFromGitHub { - owner = "grpc"; - repo = "grpc"; - rev = "v${version}"; - fetchSubmodules = true; - sha256 = "18hf794frncqvq3n4j5n8kip0gp6ch4pf5b3n6809q0c1paf6rp5"; - }; nativeBuildInputs = [ cython pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; From d368f8cfe6ba25df74b2f92036f4a84d91b24846 Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Sun, 20 Oct 2019 17:51:58 -0400 Subject: [PATCH 3/3] pythonPackages.grpcio-tools: 1.23.0 -> 1.24.3 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index cb6e47a60026..919283fb04f9 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.23.0"; + version = "1.24.3"; src = fetchPypi { inherit pname version; - sha256 = "cbc35031ec2b29af36947d085a7fbbcd8b79b84d563adf6156103d82565f78db"; + sha256 = "5efc92721a364e049ad3a174d5b20a21009fae9db04b3e5020ed0b534d9c022f"; }; enableParallelBuilding = true;