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.

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

alyssais
Copy link
Member

@alyssais alyssais commented Sep 4, 2024

Description of changes

Motivation: protobuf_21 doesn't build with musl 1.2.5. (See #229439.)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@K900
Copy link
Contributor

K900 commented Sep 4, 2024

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.

@alyssais
Copy link
Member Author

alyssais commented Sep 5, 2024

Python needs some care to ensure there's no random protobuf version conflicts when you use any two ML packages

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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

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?

@K900
Copy link
Contributor

K900 commented Sep 5, 2024

Python needs some care to ensure there's no random protobuf version conflicts when you use any two ML packages

Even though we're still using the same version of the Python protobuf library, and just changing the C++ one?

I remember it exploding somehow for some weird reason.

@alyssais alyssais added the 6.topic: musl Running or building packages with musl libc label Sep 8, 2024
@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Sep 9, 2024
@alyssais
Copy link
Member Author

@SuperSandro2000 do you know what I'm supposed to do now that python3Packages.protobuf is protobuf 5 in staging, which does not have a protobuf passthru attribute?

@SuperSandro2000
Copy link
Member

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.

@alyssais
Copy link
Member Author

So just go back to what I was doing before?

@SuperSandro2000
Copy link
Member

Yeah, probably 😅 sorry about the back and forth. Didn't think about that change.

@alyssais
Copy link
Member Author

no worries

@alyssais
Copy link
Member Author

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.

@alyssais alyssais mentioned this pull request Sep 13, 2024
47 tasks
@alyssais
Copy link
Member Author

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).

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a 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.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Sep 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: musl Running or building packages with musl libc 6.topic: qt/kde 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants