From ca81d85c856c1d9435ac1a5c5a2f38fa5b443a2d Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:50:55 +0200 Subject: [PATCH 1/8] grpc: 1.62.1 -> 1.67.0 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 948048895700c..3fa4f5492d315 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ 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 @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-CmQUUbIYPWRS7q7OX+TmkTvoqtJAUEwhL/lev8JdB8U="; + hash = "sha256-NjoSm3ZiHqe0QeVRFWO2FheoOzKjSX2oyiCM3qNUxhM="; fetchSubmodules = true; }; From 19ac92c619b942bf4a8bb3b236c82fdff0adc895 Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:51:39 +0200 Subject: [PATCH 2/8] python312Packages.grpcio-channelz: 1.66.2 -> 1.67.0 --- pkgs/development/python-modules/grpcio-channelz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 4d5662509e069..dc73ee462b68d 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -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 ]; From e1b88807433c5abbd98b829abf5283f67596370f Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:52:17 +0200 Subject: [PATCH 3/8] python312Packages.grpcio-health-checking: 1.66.2 -> 1.67.0 --- .../python-modules/grpcio-health-checking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index e7b6f49f158be..c235e46bee7e4 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -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 = [ From 2853e86dfd45652cd1f5dbdd1e77c759c1e661c9 Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:52:35 +0200 Subject: [PATCH 4/8] python312Packages.grpcio-reflection: 1.66.2 -> 1.67.0 --- pkgs/development/python-modules/grpcio-reflection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 35fb1faaeaefa..804e1fe656553 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -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 ]; From 0bddc71698b5594a58b342bf55abe141929ff4a6 Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:52:50 +0200 Subject: [PATCH 5/8] python312Packages.grpcio-status: 1.64.1 -> 1.67.0 --- pkgs/development/python-modules/grpcio-status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 89c02c344dd76..e6c03a04a1fe1 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.66.2"; + version = "1.67.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_status"; inherit version; - hash = "sha256-+1XLtcLmcGL3pNXJnkidB0+1fphnjVw8ZpKi102J6a4="; + hash = "sha256-w+Wob6AH6eJjzV+YioqQdITaTKq1godOoqSmCSc0BGs="; }; postPatch = '' From 2a4535cc10bc7a06db9fa06a40f43445da7f4ef5 Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:53:03 +0200 Subject: [PATCH 6/8] python312Packages.grpcio-testing: 1.66.2 -> 1.67.0 --- pkgs/development/python-modules/grpcio-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index cabad7a8cfbe7..ed4fcdb361147 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.66.2"; + version = "1.67.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-pje9w7MSutXZKQd2dP0TS0zJbkm0P39OwQVLR28ZRgQ="; + hash = "sha256-YVRnu0aObDSfYCIKlrvMKin70hmwDdip96I+Qyi7+Dw="; }; postPatch = '' From 6b5a8cb3f462b163674ab883bdffcda9c24f4940 Mon Sep 17 00:00:00 2001 From: scraptux Date: Tue, 22 Oct 2024 10:53:19 +0200 Subject: [PATCH 7/8] python312Packages.grpcio-tools: 1.65.1 -> 1.67.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 50b243cdf3d2f..9fa12e405e14e 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.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 = [ From da16a24f0aff890f114d545b7d5fee89f458dc8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Oct 2024 10:56:52 +0200 Subject: [PATCH 8/8] python312Packages.grpcio: 1.64.1 -> 1.67.0 Changelog: https://github.com/grpc/grpc/releases/tag/v1.67.0 --- .../python-modules/grpcio/default.nix | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 8cff17c81eb4a..976b3e9c27361 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -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; @@ -31,6 +31,8 @@ buildPythonPackage rec { "dev" ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ cython pkg-config @@ -41,15 +43,8 @@ buildPythonPackage rec { openssl zlib ]; - propagatedBuildInputs = - [ - six - protobuf - ] - ++ lib.optionals (isPy27) [ - enum34 - futures - ]; + + dependencies = [ protobuf ]; preBuild = '' @@ -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 = [ ]; }; }