Skip to content

libical: fix strict deps#324951

Merged
emilazy merged 1 commit intoNixOS:stagingfrom
paparodeo:libical-strict-deps
Jul 27, 2024
Merged

libical: fix strict deps#324951
emilazy merged 1 commit intoNixOS:stagingfrom
paparodeo:libical-strict-deps

Conversation

@paparodeo
Copy link
Contributor

Description of changes

strict deps doesn't quite work for cmake as it pulls in buildInputs into the PATH. this change uses a fix for cmake #318226 so this doesn't happen and then fixes the packages that set strict deps but broke with the fixed cmake.

staging companion to: #324545

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.

add icu to nativeBuildInputs
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 6, 2024
@paparodeo paparodeo marked this pull request as ready for review July 9, 2024 22:12
@K900 K900 mentioned this pull request Jul 25, 2024
13 tasks
Copy link
Contributor

@SomeoneSerge SomeoneSerge left a comment

Choose a reason for hiding this comment

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

Shall we delay the merge until #318226 is ready, to reduce # of rebuilds? Alternatively, if we start rebuilding with this and #329822 now we might get better reports for #318226

@paparodeo
Copy link
Contributor Author

i don't see a reason to delay. all the strictDeps fixes to the various packages are ready to get merged independently of the cmake fix.

Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

This is on staging so it shouldn’t cause additional rebuilds.

@emilazy emilazy merged commit 0e125ce into NixOS:staging Jul 27, 2024
@paparodeo paparodeo deleted the libical-strict-deps branch July 27, 2024 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants