From 8130df230015bd0ffd6e2cdb2e6f89ea0eeb5b77 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 8 Aug 2022 19:26:59 -0300 Subject: [PATCH 1/3] protobuf: 3.21.2 -> 3.21.5 --- pkgs/development/libraries/protobuf/3.21.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix index 70c6095ae7b62b4..37eca85b396fbf6 100644 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ b/pkgs/development/libraries/protobuf/3.21.nix @@ -1,6 +1,6 @@ { callPackage, abseil-cpp, ... }: callPackage ./generic-v3-cmake.nix { - version = "3.21.2"; - sha256 = "sha256-DUv07pWiZV7jNeSA2ClDOz9DY0x/hiJynxkbSTeJOSs="; + version = "3.21.5"; + sha256 = "sha256-bWT2Bak59Ki8Zy8Lf6Gr8ByC//RpEUJ89lStHu1lnWA="; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06a22fa16b1051b..18aac872d1814ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20689,7 +20689,7 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf3_19; + protobuf = protobuf3_21; protobuf3_21 = callPackage ../development/libraries/protobuf/3.21.nix { }; protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { }; From 8481f855270f9c37dcc2293891197f5f944d0971 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 10 Aug 2022 07:33:22 -0300 Subject: [PATCH 2/3] python310Packages.protobuf: 3.19.4 -> 4.21.5 --- pkgs/development/python-modules/protobuf/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index ee1d0bbffb5ab60..0b6ed53e2d8b0a4 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -14,7 +14,12 @@ }: buildPythonPackage { - inherit (protobuf) pname src version; + inherit (protobuf) pname src; + version = + if lib.versionAtLeast protobuf.version "3.21" then + "4.21.5" # Version source: https://github.com/protocolbuffers/protobuf/blob/v21.5/version.json#L13 + else protobuf.version; + inherit disabled; doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 From d29bf3aadaab270129208ca4945388901ceee4be Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 10 Aug 2022 13:29:51 -0300 Subject: [PATCH 3/3] python310Packages.grpcio-tools: 1.48.0 -> 1.47.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 4797772086adeb3..75c14553e73bddb 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }: +{ lib, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "grpcio-tools"; @@ -13,6 +13,10 @@ buildPythonPackage rec { enableParallelBuilding = true; + pythonRelaxDeps = [ "protobuf" ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + propagatedBuildInputs = [ protobuf grpcio setuptools ]; # no tests in the package