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

protobuf: protobuf_25 -> protobuf_28 #338885

Merged
merged 6 commits into from
Sep 7, 2024
Merged

protobuf: protobuf_25 -> protobuf_28 #338885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7cdaa0b
protobuf: protobuf_25 -> protobuf_28
GaetanLepage Sep 1, 2024
187b315
protobuf: add GaetanLepage as maintainer
GaetanLepage Sep 1, 2024
b26982f
protobuf: add testVersion check
GaetanLepage Sep 2, 2024
391c332
python311Packages.tensorflow: pin protobuf python to python311Package…
GaetanLepage Sep 2, 2024
4c41bfc
or-tools: pin protobuf python to python312Packages.protobuf4
GaetanLepage Sep 2, 2024
8f4eb77
ola: pin protobuf python to python312Packages.protobuf4
GaetanLepage Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/applications/misc/ola/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
python3
];
propagatedBuildInputs = [
(python3.pkgs.protobuf.override { protobuf = protobuf; })
(python3.pkgs.protobuf4.override { protobuf = protobuf; })
python3.pkgs.numpy
];

Expand Down
11 changes: 6 additions & 5 deletions pkgs/development/libraries/protobuf/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
, grpc
, enableShared ? !stdenv.hostPlatform.isStatic

, testers
, protobuf
, ...
}:

Expand All @@ -28,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "protocolbuffers";
repo = "protobuf";
rev = "v${version}";
rev = "refs/tags/v${version}";
inherit hash;
};

Expand Down Expand Up @@ -89,10 +91,9 @@ stdenv.mkDerivation (finalAttrs: {

passthru = {
tests = {
pythonProtobuf = python3.pkgs.protobuf.override (_: {
protobuf = finalAttrs.finalPackage;
});
pythonProtobuf = python3.pkgs.protobuf;
inherit grpc;
version = testers.testVersion { package = protobuf; };
};

inherit abseil-cpp;
Expand All @@ -108,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.bsd3;
platforms = lib.platforms.all;
homepage = "https://protobuf.dev/";
maintainers = [ ];
maintainers = with lib.maintainers; [ GaetanLepage ];
mainProgram = "protoc";
};
})
2 changes: 1 addition & 1 deletion pkgs/development/libraries/science/math/or-tools/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
abseil-cpp
protobuf
(python.pkgs.protobuf.override { protobuf = protobuf; })
(python.pkgs.protobuf4.override { protobuf = protobuf; })
python.pkgs.numpy
];
nativeCheckInputs = [
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 @@ -23147,7 +23147,7 @@ with pkgs;

prospector = callPackage ../development/tools/prospector { };

protobuf = protobuf_25;
protobuf = protobuf_28;

inherit
({
Expand Down
4 changes: 2 additions & 2 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10894,7 +10894,7 @@ self: super: with self; {
protobuf5 = callPackage ../development/python-modules/protobuf/default.nix { };

# If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version.
protobuf = protobuf4;
protobuf = protobuf5;

protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };

Expand Down Expand Up @@ -15540,7 +15540,7 @@ self: super: with self; {
).override {
protobuf = protobufTF;
};
protobuf-pythonTF = self.protobuf.override {
protobuf-pythonTF = self.protobuf4.override {
protobuf = protobufTF;
};
grpcioTF = self.grpcio.override {
Expand Down