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

Merge pull request #71371 from tomberek/tomberek/grpcio

Browse Source 
grpcio: 1.23.0 -> 1.24.3
This commit is contained in:
Mario Rodas 2019-10-23 09:37:35 -05:00 committed by GitHub
commit 54c4d899b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/grpc/default.nix
View File

@ -1,13 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
stdenv.mkDerivation rec { 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"; pname = "grpc";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grpc"; owner = "grpc";
repo = "grpc"; repo = "grpc";
rev = "v${version}"; rev = "v${version}";
sha256 = "14svfy7lvz8lf6b7zg1fbypj2n46n9gq0ldgnv85jm0ikv72cgv6"; sha256 = "19g3fihds9rih2ciypkwi4jahjaymyqnjhd9id397fgj1qkw4w69";
fetchSubmodules = true;
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ]; buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];

4
pkgs/development/python-modules/grpcio-tools/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "grpcio-tools"; pname = "grpcio-tools";
version = "1.23.0"; version = "1.24.3";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "cbc35031ec2b29af36947d085a7fbbcd8b79b84d563adf6156103d82565f78db"; sha256 = "5efc92721a364e049ad3a174d5b20a21009fae9db04b3e5020ed0b534d9c022f";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

12
pkgs/development/python-modules/grpcio/default.nix
View File

@ -1,18 +1,10 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, darwin { stdenv, buildPythonPackage, darwin, grpc
, six, protobuf, enum34, futures, isPy27, pkgconfig , six, protobuf, enum34, futures, isPy27, pkgconfig
, cython}: , cython}:
buildPythonPackage rec { buildPythonPackage rec {
inherit (grpc) src version;
pname = "grpcio"; pname = "grpcio";
version = "1.23.0";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "18hf794frncqvq3n4j5n8kip0gp6ch4pf5b3n6809q0c1paf6rp5";
};
nativeBuildInputs = [ cython pkgconfig ] nativeBuildInputs = [ cython pkgconfig ]
++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;