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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-10-23 16:50:09 +02:00
parent 4a979b8871 bea05a0816
commit 09c9a2de7e
30 changed files with 150 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.23.1";
version = "1.24.3";
src = fetchPypi {
inherit pname version;
sha256 = "c2f5306153dee33bc04212802c898cf79539917e31cf07516f31c2943bea2160";
sha256 = "5efc92721a364e049ad3a174d5b20a21009fae9db04b3e5020ed0b534d9c022f";
};
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
, 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;