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

curl-impersonate: fix darwin build and make cross-compilation work #310386

Merged

Conversation

lilyinstarlight
Copy link
Member

Description of changes

Darwin build has been broken since the last version bump, and it broke because upstream added a /usr/bin/grep call that needs to be patched. Additioanlly it looks like p11-kit changed p11-kit-trust.so to p11-kit-trust.dylib on darwin too at some point

I don't actually remember if cross was ever tested before, but it works now (at least x86_64-linux build for aarch64-linux host)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
    • x86_64-linux -> aarch64-linux (cross)
  • 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.05 Release Notes (or backporting 23.05 and 23.11 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.

@lilyinstarlight
Copy link
Member Author

lilyinstarlight commented May 9, 2024

@ofborg build python3Packages.curl-cffi curl-impersonate

@ofborg ofborg bot added 6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: darwin Running or building packages on Darwin 11.by: package-maintainer 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels May 9, 2024
@lilyinstarlight
Copy link
Member Author

(ofborg failures on darwin are because the nixos test is in passthru.tests and the person who said they would fix that hasn't yet oops)

Copy link
Contributor

@chuangzhu chuangzhu left a comment

Choose a reason for hiding this comment

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

Confirmed legacyPackages.x86_64-linux.pkgsCross.aarch64-multiplatform.curl-impersonate builds and runs

Copy link
Contributor

@nbraud nbraud left a comment

Choose a reason for hiding this comment

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

Looks good, can merge once question is answered

@nbraud nbraud merged commit d2d4643 into NixOS:master May 21, 2024
39 checks passed
@lilyinstarlight lilyinstarlight deleted the fix/curl-impersonate-darwin-and-cross branch May 21, 2024 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer 12.approvals: 2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants