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

Merge pull request #65770 from marsam/update-grpc

Browse Source 
grpc: 1.19.1 -> 1.22.0
This commit is contained in:
Mario Rodas 2019-08-04 14:23:27 -05:00 committed by GitHub
commit 9b122174aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 17 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,13 @@
{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
stdenv.mkDerivation rec {
version = "1.19.1";
version = "1.22.0";
name = "grpc-${version}";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "0c0jra4qnd86gyr4rlblic3igb5dpgrldac35myk5i5ia547fdhj";
sha256 = "10wf9sakkxpcvc09n1h91x6slwwhxblghs4zn95klyc4m6py1gfg";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
"-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_GFLAGS_PROVIDER=package"
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
];
# CMake creates a build directory by default, this conflicts with the

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

@ -1,24 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi, lib, grpcio}:
{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio }:
buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.18.0";
version = "1.22.0";
src = fetchPypi {
inherit pname version;
sha256 = "77ec4d3c92ccbbe3de37c457e3c72962e519c36cafb96abe5842bced8eb926fa";
sha256 = "b5c0fe51a155625c9d1132ab8deb56b3015e111a6961e48aeb9dd89bd7c670ab";
};
enableParallelBuilding = true;
propagatedBuildInputs = [ grpcio ];
propagatedBuildInputs = [ protobuf grpcio ];
# no tests in the package
doCheck = false;
meta = with stdenv.lib; {
description = "Protobuf code generator for gRPC";
license = lib.licenses.asl20;
license = licenses.asl20;
homepage = "https://grpc.io/grpc/python/";
maintainers = with maintainers; [ vanschelven ];
};

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

@ -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 ];
};