{nix,lix}: remove unused boehmgc-coroutine-sp-fallback.patch, nix: skip more flaky tests on aarch64-darwin #481478
Merged
philiptaron merged 4 commits intoNixOS:masterfrom Jan 19, 2026
Merged
Conversation
lix < 2.91 is no longer in nixpkgs and nix itself no longer needs patched boehm. Doesn't result in any rebuilds as verified via ci/eval.
A proper fix is unclear. See the revert in Lix [1]. rcfile doesn't have a shebang and adding it would be breaking change. Disable the tests to make it at least build on hydra in the meantime. I've disabled all the tests that we've seen fail on hydra at least once. [1]: https://git.lix.systems/lix-project/lix/commit/45783a0435186b14509296f28d2466ab8a8157f0
Otherwise the length of git hashes might change. The only proper way to use fetchpatch2 is with ?full_index=1.
Fixes a missing include on newer glibc 2.42 that is currently in staging-next. See NixOS/nix#15011.
philiptaron
approved these changes
Jan 19, 2026
Contributor
philiptaron
left a comment
There was a problem hiding this comment.
Reviewed commit-by-commit -- agree with the motivation on all. Doing a build.
Contributor
|
Contributor
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-25.11
git worktree add -d .worktree/backport-481478-to-release-25.11 origin/release-25.11
cd .worktree/backport-481478-to-release-25.11
git switch --create backport-481478-to-release-25.11
git cherry-pick -x 9863071a254650e378a8a20dcaa3c54092125ca7 3c46954c517169a4930a0f7308474d7d87fb47c1 f11eeec1214aa79e5d79f4d8ea58046941628804 3db033dd7ee230a5d440ad6fa0fafbc55f212bbd |
Contributor
Author
|
Will do a manual backport soon if nobody beats me to it |
Contributor
|
I'm no good at the backport game. All yours. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.