Skip to content

{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
xokdvium:nix-lix-patches-fixes
Jan 19, 2026
Merged

{nix,lix}: remove unused boehmgc-coroutine-sp-fallback.patch, nix: skip more flaky tests on aarch64-darwin #481478
philiptaron merged 4 commits intoNixOS:masterfrom
xokdvium:nix-lix-patches-fixes

Conversation

@xokdvium
Copy link
Contributor

@xokdvium xokdvium commented Jan 19, 2026

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

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.
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. labels Jan 19, 2026
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jan 19, 2026
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

Reviewed commit-by-commit -- agree with the motivation on all. Doing a build.

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jan 19, 2026
@philiptaron
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 481478 --additional-package nixVersions.stable.tests --additional-package nixVersions.latest.tests
Commit: 3db033dd7ee230a5d440ad6fa0fafbc55f212bbd


x86_64-linux

❌ 1 package failed to build:
  • nixVersions.latest.tests.upgrade (nixVersions.stable.tests.upgrade)
✅ 48 packages built:
  • attic-client
  • devenv
  • haskellPackages.nix-serve-ng
  • haskellPackages.nix-serve-ng.doc
  • nix-du
  • nix-heuristic-gc
  • nix-heuristic-gc.dist
  • nix-inspect
  • nix-plugins
  • nix-serve-ng
  • nix-unit
  • nixVersions.latest (nixVersions.nix_2_33)
  • nixVersions.latest.dev (nixVersions.nix_2_33.dev)
  • nixVersions.latest.doc (nixVersions.nix_2_33.doc)
  • nixVersions.latest.man (nixVersions.nix_2_33.man)
  • nixVersions.latest.tests.misc (nixVersions.stable.tests.misc)
  • nixVersions.latest.tests.nixi686
  • nixVersions.latest.tests.nixi686.dev
  • nixVersions.latest.tests.nixi686.doc
  • nixVersions.latest.tests.nixi686.man
  • nixVersions.latest.tests.nixpkgs-lib
  • nixVersions.latest.tests.pkg-config
  • nixVersions.latest.tests.simpleUefiSystemdBoot (nixVersions.stable.tests.simpleUefiSystemdBoot)
  • nixVersions.latest.tests.srcVersion
  • nixVersions.nix_2_28
  • nixVersions.nix_2_28.debug
  • nixVersions.nix_2_28.dev
  • nixVersions.nix_2_28.doc
  • nixVersions.nix_2_28.man
  • nixVersions.nix_2_30
  • nixVersions.nix_2_30.dev
  • nixVersions.nix_2_30.doc
  • nixVersions.nix_2_30.man
  • nixVersions.stable.tests.nix-fallback-paths
  • nixVersions.stable.tests.nixi686
  • nixVersions.stable.tests.nixi686.dev
  • nixVersions.stable.tests.nixi686.doc
  • nixVersions.stable.tests.nixi686.man
  • nixVersions.stable.tests.nixpkgs-lib
  • nixVersions.stable.tests.pkg-config
  • nixVersions.stable.tests.srcVersion
  • nixd
  • nixf
  • nixf-diagnose
  • nixf.dev
  • nixt
  • nixt.dev
  • tests.lib-tests

Error logs: `x86_64-linux`
nixVersions.latest.tests.upgrade
kill vlan (pid 7)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Caught signal 15, cleaning up and exiting
(finished: cleanup, in 0.00 seconds)
Traceback (most recent call last):
  File "/nix/store/cqzdgngsxhz6dxdcqjsicn0lchdc7w69-nixos-test-driver-1.1/bin/.nixos-test-driver-wrapped", line 9, in <module>
    sys.exit(main())
             ~~~~^^
  File "/nix/store/cqzdgngsxhz6dxdcqjsicn0lchdc7w69-nixos-test-driver-1.1/lib/python3.13/site-packages/test_driver/__init__.py", line 162, in main
    driver.run_tests()
    ~~~~~~~~~~~~~~~~^^
  File "/nix/store/cqzdgngsxhz6dxdcqjsicn0lchdc7w69-nixos-test-driver-1.1/lib/python3.13/site-packages/test_driver/driver.py", line 246, in run_tests
    self.test_script()
    ~~~~~~~~~~~~~~~~^^
  File "/nix/store/cqzdgngsxhz6dxdcqjsicn0lchdc7w69-nixos-test-driver-1.1/lib/python3.13/site-packages/test_driver/driver.py", line 204, in test_script
    exec(self.tests, symbols, None)
    ~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "<string>", line 17, in <module>
Exception: Couldn't find new version in output: nix (Nix) 2.33.1+1

@philiptaron philiptaron added this pull request to the merge queue Jan 19, 2026
Merged via the queue into NixOS:master with commit 3ae74db Jan 19, 2026
34 of 36 checks passed
@vcunat vcunat added the backport release-25.11 Backport PR automatically label Jan 19, 2026
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 19, 2026

Backport failed for release-25.11, because it was unable to cherry-pick the commit(s).

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

@xokdvium
Copy link
Contributor Author

Will do a manual backport soon if nobody beats me to it

@xokdvium xokdvium deleted the nix-lix-patches-fixes branch January 20, 2026 01:31
@philiptaron
Copy link
Contributor

I'm no good at the backport game. All yours.

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

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. backport release-25.11 Backport PR automatically

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants