Skip to content
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.

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

grpc: 1.62.1 -> 1.67.0 #350432

Open
wants to merge 8 commits into
base: staging
Choose a base branch
from
4 changes: 2 additions & 2 deletions pkgs/development/libraries/grpc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@

stdenv.mkDerivation rec {
pname = "grpc";
version = "1.66.1"; # N.B: if you change this, please update:
version = "1.67.0"; # N.B: if you change this, please update:
# pythonPackages.grpcio-tools
# pythonPackages.grpcio-status

src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
hash = "sha256-CmQUUbIYPWRS7q7OX+TmkTvoqtJAUEwhL/lev8JdB8U=";
hash = "sha256-NjoSm3ZiHqe0QeVRFWO2FheoOzKjSX2oyiCM3qNUxhM=";
fetchSubmodules = true;
};

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/grpcio-channelz/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

buildPythonPackage rec {
pname = "grpcio-channelz";
version = "1.66.2";
version = "1.67.0";
pyproject = true;

src = fetchPypi {
pname = "grpcio_channelz";
inherit version;
hash = "sha256-SQTHg3UjQ2YkiV2QYmlPKQt/Mzg7KWoex8SXtuTH7Rk=";
hash = "sha256-F2Jfq6lOYn4RsjP9Ay21G67F6HkGeY3SIEk26Z0BWnE=";
};

build-system = [ setuptools ];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

buildPythonPackage rec {
pname = "grpcio-health-checking";
version = "1.66.2";
version = "1.67.0";
format = "setuptools";

src = fetchPypi {
pname = "grpcio_health_checking";
inherit version;
hash = "sha256-yQ35YiRWBC7DSV03qzC190ckqsW11VMU8HPu9eJHChM=";
hash = "sha256-PepxXVboJQ/wW6Se9RF/g2skD/N5vkY2DCbO/ZydsRo=";
};

propagatedBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/grpcio-reflection/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

buildPythonPackage rec {
pname = "grpcio-reflection";
version = "1.66.2";
version = "1.67.0";
pyproject = true;

src = fetchPypi {
pname = "grpcio_reflection";
inherit version;
hash = "sha256-rdgn4t61bpaAPIKs4dTnf6DI7DdH1jmOmVH3OdcQZ9Q=";
hash = "sha256-xHFDc4sYl7bOSvXg4zjIXJruX9y7M1XTaKjcrkbYkzw=";
};

build-system = [ setuptools ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/grpcio-status/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@

buildPythonPackage rec {
pname = "grpcio-status";
version = "1.66.2";
version = "1.67.0";
format = "setuptools";

disabled = pythonOlder "3.6";

src = fetchPypi {
pname = "grpcio_status";
inherit version;
hash = "sha256-+1XLtcLmcGL3pNXJnkidB0+1fphnjVw8ZpKi102J6a4=";
hash = "sha256-w+Wob6AH6eJjzV+YioqQdITaTKq1godOoqSmCSc0BGs=";
};

postPatch = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/grpcio-testing/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@

buildPythonPackage rec {
pname = "grpcio-testing";
version = "1.66.2";
version = "1.67.0";
pyproject = true;

disabled = pythonOlder "3.7";

src = fetchPypi {
pname = "grpcio_testing";
inherit version;
hash = "sha256-pje9w7MSutXZKQd2dP0TS0zJbkm0P39OwQVLR28ZRgQ=";
hash = "sha256-YVRnu0aObDSfYCIKlrvMKin70hmwDdip96I+Qyi7+Dw=";
};

postPatch = ''
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/grpcio-tools/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.66.2";
format = "setuptools";
version = "1.67.0";
pyproject = true;

src = fetchPypi {
pname = "grpcio_tools";
inherit version;
hash = "sha256-SjbgeRPSa6XM/SaFumPKl/JrCMJJ0syedN2jfvpJ1+Q=";
hash = "sha256-GBs9TmG4MULBguw2bzB5sAI1CXQ5huVMlGXKOMrCVfg=";
};

outputs = [
Expand Down
36 changes: 16 additions & 20 deletions pkgs/development/python-modules/grpcio/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
lib,
stdenv,
buildPythonPackage,
c-ares,
cython,
fetchPypi,
grpc,
six,
protobuf,
enum34 ? null,
futures ? null,
isPy27,
pkg-config,
cython,
c-ares,
openssl,
pkg-config,
protobuf,
pythonOlder,
setuptools,
zlib,
}:

buildPythonPackage rec {
pname = "grpcio";
format = "setuptools";
version = "1.66.2";
version = "1.67.0";
pyproject = true;

disabled = pythonOlder "3.8";

src = fetchPypi {
inherit pname version;
Expand All @@ -31,6 +31,8 @@ buildPythonPackage rec {
"dev"
];

build-system = [ setuptools ];

nativeBuildInputs = [
cython
pkg-config
Expand All @@ -41,15 +43,8 @@ buildPythonPackage rec {
openssl
zlib
];
propagatedBuildInputs =
[
six
protobuf
]
++ lib.optionals (isPy27) [
enum34
futures
];

dependencies = [ protobuf ];

preBuild =
''
Expand All @@ -76,8 +71,9 @@ buildPythonPackage rec {

meta = with lib; {
description = "HTTP/2-based RPC framework";
license = licenses.asl20;
homepage = "https://grpc.io/grpc/python/";
changelog = "https://github.com/grpc/grpc/releases/tag/v${version}";
license = licenses.asl20;
maintainers = [ ];
};
}