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.

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

Jump to bottom

protobuf: 3.21.2 -> 3.21.5 #185733

Closed
wants to merge 3 commits into from
Closed

protobuf: 3.21.2 -> 3.21.5 #185733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8130df2
protobuf: 3.21.2 -> 3.21.5
superherointj Aug 8, 2022
8481f85
python310Packages.protobuf: 3.19.4 -> 4.21.5
superherointj Aug 10, 2022
d29bf3a
python310Packages.grpcio-tools: 1.48.0 -> 1.47.0
superherointj Aug 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/libraries/protobuf/3.21.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=";
}
6 changes: 5 additions & 1 deletion pkgs/development/python-modules/grpcio-tools/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }:
{ lib, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools, pythonRelaxDepsHook }:

buildPythonPackage rec {
pname = "grpcio-tools";
Expand All @@ -13,6 +13,10 @@ buildPythonPackage rec {

enableParallelBuilding = true;

pythonRelaxDeps = [ "protobuf" ];

nativeBuildInputs = [ pythonRelaxDepsHook ];

propagatedBuildInputs = [ protobuf grpcio setuptools ];

# no tests in the package
Expand Down
7 changes: 6 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
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down