nixVersions.nix_2_31: init at 2.31.0#437584
Merged
Ericson2314 merged 8 commits intoNixOS:masterfrom Sep 1, 2025
Merged
Conversation
nixpkgs-ci
bot
added
10.rebuild-linux: 1-10
nix-owners
bot
requested review from
Ericson2314,
Mic92,
RaitoBezarius,
edolstra,
roberth,
tomberek and
xokdvium
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
Ericson2314
reviewed
Aug 27, 2025
pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix
Outdated
Show resolved
Hide resolved
philiptaron
commented
Aug 27, 2025
pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix
Outdated
Show resolved
Hide resolved
Contributor
|
We should bring over the Boehm GC patch from the parallel marking PR: NixOS/nix@0d559f0. I don't see a problem with making it unconditional though. That would have to go into |
nixpkgs-ci
bot
added
10.rebuild-linux: 101-500
This comment was marked as outdated.
This comment was marked as outdated.
Mic92
reviewed
Aug 29, 2025
Also, don't try to access cache.nixos.org in the libstore unit tests. We have to disable the test in versions prior to 2.31; that's OK, since it was being skipped when run under Nix anyway before that. (cherry picked from commit 01388b3e78582553cc30ee772db5b5aba8d89edd) Co-authored-by: Philip Taron <philip.taron@gmail.com>
(cherry picked from commit f29acd5bbc0505ea6a78a51e4828a22630dd0ff1)
…-tests This failed on macOS: nix-store-tests-run> C++ exception with description "../nix_api_store.cc:33: nix_err_code(ctx) != NIX_OK, message: error: getting status of '/nix/var/nix/daemon-socket/socket': Operation not permitted" thrown in the test body. (cherry picked from commit 778156072444fdd06812b89e86169bf45f2425df)
If the mark stack size is too small, it greatly inhibits parallel marking, which is very bad for performance on multi-core systems. (cherry picked from commit 0d559f0c1301af9bd2c6751761bff6490962d0ee)
…xecution environment (cherry picked from commit b21304fe4c491b871682fc292d9c31410cbb418a)
philiptaron
force-pushed
the
nixVersions.nix_2_31
branch
from
d75b88e to
42e6ff4
Compare
Contributor
Author
|
I cherry-picked upstream commits for all the changes made to the modular packaging. Now I'm running the tests for every packaged version of Nix. |
Contributor
Author
|
Here's the test results you asked for, @Mic92.
|
nixpkgs-ci
bot
added
the
6.topic: nixos
Contributor
Author
|
Member
Known issue |
Member
|
In the past I've prioritized getting the new package in over getting everything using |
13 tasks
Contributor
Author
I'm itching to press the merge button as soon as I get a ✅. The testing I've done is enough to convince me it's good to go. I had hoped that the Nix team's confidence in making a release would be enough to quickly provide that ✅ but as you note it is slow to arrive. C'est la vie I suppose. I have no problems bumping |
roberth
approved these changes
Sep 1, 2025
nixpkgs-ci
bot
added
12.approvals: 1
Member
|
Thanks for the very thorough job here, @philiptaron! |
13 tasks
| # small, run Nix with GC_PRINT_STATS=1 and look for messages | ||
| # such as `Mark stack overflow`, `No room to copy back mark | ||
| # stack`, and `Grew mark stack to ... frames`. | ||
| NIX_CFLAGS_COMPILE = "-DINITIAL_MARK_STACK_SIZE=1048576"; |
Contributor
There was a problem hiding this comment.
It looks like this is breaking anyone who sets env.NIX_CFLAGS_COMPILE globally. Previously there were efforts to ensure we only use env.NIX_CFLAGS_COMPILE and not the attrs.NIX_CFLAGS_COMPILE (see #217206).
Is there any reason this needs to be directly in attrs or was this just a small oversight and we can move to using env?
Contributor
There was a problem hiding this comment.
Yeah that was an oversight.
Contributor
Author
There was a problem hiding this comment.
I cherry-picked the upstream commit but I agree that we should not use overrideAttrs (and ideally not use overrides) here.
Contributor
There was a problem hiding this comment.
Thanks for the quick response! I don't have time at the moment to create a PR, but will do so tonight (just to use env. for now, not avoiding overrideAttrs overall) if no one else gets to it first.
Contributor
There was a problem hiding this comment.
Nvm, it was such a quick fix I just made the PR now: #439910
Contributor
Author
There was a problem hiding this comment.
caffineehacker
added a commit
to caffineehacker/nixpkgs
that referenced
this pull request
Sep 3, 2025
By not using env the current code causes problems for anyone globally overriding compile flags. This fix repairs the expected behavior. Break appears in NixOS#437584.
13 tasks
13 tasks
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
9 participants
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.
Diff: NixOS/nix@2.30.2...2.31.0
Changelog: https://discourse.nixos.org/t/nix-2-31-0-released/68465
Previous release PR:
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.