Skip to content

Conversation

@alyssais
Copy link
Member

@alyssais alyssais commented Feb 9, 2024

Description of changes

Link: #285295 (comment)
Fixes: 996b4eb ("curl: build with public suffix list support")

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

Link: NixOS#285295 (comment)
Fixes: 996b4eb ("curl: build with public suffix list support")
@alyssais alyssais added the 6.topic: static Static builds (e.g. pkgsStatic) label Feb 9, 2024
@alyssais alyssais requested review from mweinelt and vcunat February 9, 2024 16:06
We need static curl for nixStatic, so we should test that it builds
when changing curl.

This would have caught a regression introduced by
996b4eb ("curl: build with public suffix list support").
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Feb 9, 2024
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Looks OK, fixes the build for me and without rebuilding unnecessarily.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Feb 9, 2024
@mweinelt mweinelt merged commit 8d11149 into NixOS:staging-next Feb 9, 2024
@alyssais alyssais deleted the curl-static branch February 9, 2024 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: static Static builds (e.g. pkgsStatic) 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants