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: drop Darwin-specific patches #260599

Closed
wants to merge 1 commit into from

Conversation

reckenrode
Copy link
Contributor

Description of changes

The Darwin stdenv and CF no longer depend on libcurl, so the patches required to break the mutual recursion between CF and libcurl are no longer needed. Dropping them simplifies the curl derivation and restores support for NAT64.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

The Darwin stdenv and CF no longer depend on libcurl, so the patches
required to break the mutual recursion between CF and libcurl are no
longer needed. Dropping them simplifies the curl derivation and restores
support for NAT64.
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 12, 2023
reckenrode added a commit to reckenrode/nixpkgs that referenced this pull request Oct 13, 2023
Unblocks staging-next and restores NAT64 support on Darwin.

Closes NixOS#260599
@wegank
Copy link
Member

wegank commented Oct 24, 2023

Superseded by #260599.

@wegank wegank closed this Oct 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict 6.topic: darwin Running or building packages on Darwin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants