Skip to content

grpc, pythonPackges.grpcio, pythonPackages.grpcio-tools: update to 1.16.1 #50672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
worldofpeace merged 4 commits into from
Nov 27, 2018
Merged

grpc, pythonPackges.grpcio, pythonPackages.grpcio-tools: update to 1.16.1 #50672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1644389
grpc: 1.15.0 -> 1.16.1
lopsided98 Nov 19, 2018
8473cce
pythonPackages.grpcio: 1.15.0 -> 1.16.1
lopsided98 Nov 19, 2018
49944f1
pythonPackages.grpcio-tools: 1.14.2 -> 1.16.1
lopsided98 Nov 19, 2018
eb1bc33
pythonPackages.protobuf: fix compatibility with Python 3.7
lopsided98 Nov 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/development/libraries/grpc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:

stdenv.mkDerivation rec {
version = "1.15.0";
version = "1.16.1";
name = "grpc-${version}";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev= "d2c7d4dea492b9a86a53555aabdbfa90c2b01730";
sha256 = "1dpnhc5kw7znivrnjx1gva57v6b548am4v5nvh3dkwwzsa1k6vkv";
rev = "v${version}";
sha256 = "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/grpcio-tools/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.14.2";
version = "1.16.1";

src = fetchPypi {
inherit pname version;
sha256 = "b3fd64a5b8c1d981f6d68a331449109633710a346051c44e0f0cca1812e2b4b0";
sha256 = "0h0w7jlggm8nc250wwqai7lihw8mymx9jjpkl0cdmqmwbypj72vd";
};

enableParallelBuilding = true;

propagatedBuildInputs = [ grpc grpcio ];
propagatedBuildInputs = [ grpcio ];

# no tests in the package
doCheck = false;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/grpcio/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
with stdenv.lib;
buildPythonPackage rec {
pname = "grpcio";
version = "1.15.0";
version = "1.16.1";

src = fetchPypi {
inherit pname version;
sha256 = "1lhh76kgyibgsk6c54nbzzhkskknkbvn71xvixsk0prfp8izr98m";
sha256 = "0am76f8r4v5kcvbar593n2c1mp25cxi67cxigjhd0rnncmk4bgs1";
};

nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools;
Expand Down
11 changes: 10 additions & 1 deletion pkgs/development/python-modules/protobuf/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, python, buildPythonPackage
{ stdenv, fetchpatch, python, buildPythonPackage
, protobuf, google_apputils, pyext, libcxx
, disabled, doCheck ? true }:

Expand All @@ -16,6 +16,15 @@ buildPythonPackage rec {
propagatedBuildInputs = [ protobuf google_apputils ];
buildInputs = [ google_apputils pyext ];

patches = [
# Python 3.7 compatibility (remove when protobuf 3.7 is released)
(fetchpatch {
url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";
sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1";
stripLen = 1;
})
];

prePatch = ''
while [ ! -d python ]; do
cd *
Expand Down