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: apply eventfd free patch #373692

Open
wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Conversation

szlend
Copy link
Member

@szlend szlend commented Jan 14, 2025

Fixes #373540

Next scheduled release for curl is Feb 5th + the time for staging to build. I think it's better to patch this now.

Applying on 24.11 as well in #373688

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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 Jan 14, 2025

We absolutely cannot eat a curl rebuild this far into the staging cycle.

@vcunat
Copy link
Member

vcunat commented Jan 14, 2025

Given the other PR, I don't think it was even intended.

@szlend
Copy link
Member Author

szlend commented Jan 14, 2025

We absolutely cannot eat a curl rebuild this far into the staging cycle.

Fair if it's that far in the build process. When is the next staging merge scheduled?

I think the curl 8.11.1 upgrade is going to cause a lot of headaches given our experience in CI after the channel update in nixos-24.11. Arch Linux maintainers ran into the same issue with pacman after updating curl.

@vcunat
Copy link
Member

vcunat commented Jan 14, 2025

Right now, merging staging-next to master only waits for humans fixing regression(s).

@vcunat vcunat added the backport staging-24.11 Backport PR automatically label Jan 14, 2025
@szlend szlend changed the base branch from staging-next to staging January 14, 2025 11:13
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Jan 14, 2025
@github-actions github-actions bot removed the 6.topic: kernel The Linux kernel label Jan 14, 2025
@szlend
Copy link
Member Author

szlend commented Jan 14, 2025

I would argue we want to backport this to 24.11 asap, hence why I manually targeted staging-next-24.11 in the other MR. But I can close it if there's disagreement.

Changed base to staging and rebased.

Edit: Ah staging-next-24.11 is currently empty, so we can just automatically backport. All good then.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants