-
-
Notifications
You must be signed in to change notification settings - Fork 14.2k
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.
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
treewide: unpin protobuf_21 where possible #339631
base: master
Are you sure you want to change the base?
Conversation
Marble should be OK, Python needs some care to ensure there's no random protobuf version conflicts when you use any two ML packages, no opinion on the rest. |
Even though we're still using the same version of the Python protobuf library, and just changing the C++ one? |
@@ -44,14 +44,13 @@ buildPythonPackage rec { | |||
|
|||
buildInputs = [ | |||
abseil-cpp | |||
protobuf | |||
python-protobuf |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The matching protobuf version should be taken from passthru https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/protobuf/4.nix#L119
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah thanks! How does that look?
I remember it exploding somehow for some weird reason. |
@SuperSandro2000 do you know what I'm supposed to do now that python3Packages.protobuf is protobuf 5 in staging, which does not have a |
Mhhh, we no longer build it directly from protobuf and just use the pypi download. So I would just use pkgs.protobuf and test if that works. |
So just go back to what I was doing before? |
Yeah, probably 😅 sorry about the back and forth. Didn't think about that change. |
no worries |
Seems like python3Packages.onnx is broken on staging by the protobuf upgrade anyway, so I'll fix it there first and then we can come back to this. |
I've just dropped the python3Packages.onnx change from this PR, so it doesn't have to hold the rest back. It seems like it will be some time before it can be fixed on staging, due to #340252 (comment). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM but I am not super confident that there are not more regressions. Someone else please decide if we just want to send it to master and see how it goes.
Description of changes
Motivation: protobuf_21 doesn't build with musl 1.2.5. (See #229439.)
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.