From 369e50d885301b80a0315c87379bfa5dd3da6612 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 23:18:37 +0000 Subject: [PATCH 1/2] python312Packages.grpcio-tools: 1.64.1 -> 1.65.1 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index fa204c048982..fb0b307ccead 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.64.1"; + version = "1.65.1"; format = "setuptools"; src = fetchPypi { pname = "grpcio_tools"; inherit version; - hash = "sha256-crNVC5GtuDVGVuzw9tHUYRKZBEuuEfsefMHRu2a4wes="; + hash = "sha256-JM/+i8kPuCN/C88kC9bHAwQlX+J7adsyYBSZoEP4cb4="; }; postPatch = '' From 2c5a1a1019569979923e09362821deae4533a938 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 27 Jul 2024 12:48:57 +0900 Subject: [PATCH 2/2] python312Packages.grpcio-tools: refactor --- .../python-modules/grpcio-tools/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index fb0b307ccead..68f19b916db8 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "grpcio-tools"; version = "1.65.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { pname = "grpcio_tools"; @@ -18,11 +18,6 @@ buildPythonPackage rec { hash = "sha256-JM/+i8kPuCN/C88kC9bHAwQlX+J7adsyYBSZoEP4cb4="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'protobuf>=4.21.6,<5.0dev' 'protobuf' - ''; - outputs = [ "out" "dev" @@ -30,7 +25,14 @@ buildPythonPackage rec { enableParallelBuilding = true; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ + "protobuf" + "grpcio" + ]; + + dependencies = [ protobuf grpcio setuptools