Gaetan Lepage 2026-05-19 23:12:13 +00:00
commit 6481565e50
4 changed files with 16 additions and 5 deletions

View file

@ -0,0 +1,9 @@
{ callPackage, ... }@args:
callPackage ./generic.nix (
{
version = "35.0";
hash = "sha256-J0NA19W44CzgSjKv3A+1An6vDRTDjaWMhDzQGEOtrCk=";
}
// args
)

View file

@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-rIP+Ft/SWVwh9Oy8y8GSUBgP6CtLCLvGmr6nOqmyHhY=";
})
]
++ lib.optionals (lib.versionAtLeast version "30") [
++ lib.optionals ((lib.versionAtLeast version "30") && (lib.versionOlder version "35")) [
# workaround nvcc bug in message_lite.h
# https://github.com/protocolbuffers/protobuf/issues/21542
# Caused by: https://github.com/protocolbuffers/protobuf/commit/8f7aab29b21afb89ea0d6e2efeafd17ca71486a9
@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-2/vc4anc+kH7otfLHfBtW8dRowPyObiXZn0+HtQktak=";
})
]
++ lib.optionals (lib.versionAtLeast version "33") [
++ lib.optionals ((lib.versionAtLeast version "33") && (lib.versionOlder version "35")) [
# Fix protoc plugins crashing on big-endian platforms
# https://github.com/protocolbuffers/protobuf/pull/25363
(fetchpatch {

View file

@ -9,12 +9,12 @@
buildPythonPackage (finalAttrs: {
pname = "protobuf";
version = "7.34.1";
version = "7.35.0";
pyproject = true;
src = fetchPypi {
inherit (finalAttrs) pname version;
hash = "sha256-nOQiRecEzFAnvnl8HbHrkxhNRNHN1xgR+y2bJa1UEoA=";
hash = "sha256-ou/YRgX0HlWfGIGwkStECZ0KKsm/RrNHSCPxD7OTsOY=";
};
build-system = [ setuptools ];

View file

@ -7081,10 +7081,11 @@ with pkgs;
# this version should align with the static protobuf version linked into python3.pkgs.tensorflow
# $ nix-shell -I nixpkgs=$(git rev-parse --show-toplevel) -p python3.pkgs.tensorflow --run "python3 -c 'import google.protobuf; print(google.protobuf.__version__)'"
protobuf = protobuf_34;
protobuf = protobuf_35;
inherit
({
protobuf_35 = callPackage ../development/libraries/protobuf/35.nix { };
protobuf_34 = callPackage ../development/libraries/protobuf/34.nix { };
protobuf_33 = callPackage ../development/libraries/protobuf/33.nix { };
protobuf_32 = callPackage ../development/libraries/protobuf/32.nix { };
@ -7103,6 +7104,7 @@ with pkgs;
abseil-cpp = abseil-cpp_202103;
};
})
protobuf_35
protobuf_34
protobuf_33
protobuf_32