nixVersions.nix_2_31: 2.31.2 -> 2.31.3#478158
Merged
philiptaron merged 1 commit intoJan 16, 2026
Merged
Conversation
nixpkgs-ci
Bot
requested review from
Ericson2314,
Mic92,
Radvendii,
RaitoBezarius,
edolstra,
tomberek and
xokdvium
nixpkgs-ci
Bot
added
10.rebuild-linux: 101-500
Contributor
Author
|
nixpkgs-ci
Bot
added
the
2.status: merge conflict
Contributor
|
@philiptaron, can you rebase to resolve the merge conflict with the disabled tests? |
Contributor
Author
|
One issue: does the release include the offending patch? It appears to do so... |
Changelog of fixes: ## Bug fixes (crashes) - Fix segfaults from `toView()` when compiled with newer nixpkgs (NixOS/nix#14154) - Fix use-after-move in `DerivationGoal::repairClosure` and `SampleStack` (NixOS/nix#14086) - Fix assertion failure on partially valid derivation outputs (NixOS/nix#14137) - Fix `RestrictedStore::addDependency` recursion causing crashes (NixOS/nix#14729) - Fix crash on flakerefs containing newlines (NixOS/nix#14450) ## Bug fixes (functionality) - Fix fakeSSH check breaking SSH copies with `user@host` format (NixOS/nix#14150) - Fix `builtins.dirOf` regression from Nix 2.23 (NixOS/nix#14515) - Restore missing `isAllowed` check in `ChrootLinuxDerivationBuilder` (NixOS/nix#14531) - Fix curl with c-ares failing to resolve DNS in sandbox on macOS (NixOS/nix#14792) - Fix tarball percent decoding for `file://` URIs (NixOS/nix#14729) - `exportReferencesGraph`: Handle heterogeneous arrays (NixOS/nix#13861) - Fix filesystem ops in store optimization (NixOS/nix#14676) ## Bug fixes (output) - Fix double-quoting of paths in logs (NixOS/nix#14210) - Include path in world-writable error messages (NixOS/nix#14785) ## Improvements - Better git refnames validation (NixOS/nix#14253) - Use pure/restricted eval for help pages (NixOS/nix#14156) - Improve store-reference compatibility with IPv6 ZoneId literals (NixOS/nix#14134) - Correct `build-dir` error in manual (NixOS/nix#14745) ## Build system - Add mdbook 0.5 support (NixOS/nix#14690) - Drop legacy Apple SDK pattern (NixOS/nix#13976) https://github.com/NixOS/nix/releases/tag/2.31.3
philiptaron
force-pushed
the
nixVersions.nix_2_31
branch
from
beb3263 to
a4ef4c1
Compare
nixpkgs-ci
Bot
removed
the
2.status: merge conflict
Contributor
Only the shebang one, nix-shell would still be flaky (since we can't do much about the rcfile issue) |
Ericson2314
approved these changes
Jan 16, 2026
Member
|
Side note, we can probably disable the NixOS daemon in most/all NixOS tests. If we do that, can we target master again? |
Merged
via the queue into
NixOS:staging-nixos
with commit Jan 16, 2026
e971cab
28 of 31 checks passed
Contributor
Author
Only if the resulting NixOS systems do not include Nix. |
philiptaron
added
9.needs: port to stable
Contributor
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin staging-25.11
git worktree add -d .worktree/backport-478158-to-staging-25.11 origin/staging-25.11
cd .worktree/backport-478158-to-staging-25.11
git switch --create backport-478158-to-staging-25.11
git cherry-pick -x a4ef4c189ca6a336cb3e7b7c0e6cc551a6d764c9 |
Contributor
|
@philiptaron @Ericson2314 the backport to 25.11 failed. However, this contains an important bug fix for users of nix on darwin. Is there a way this could be backported? |
Contributor
|
More specifically, this contains NixOS/nix#14676 which allows darwin nix users to use automatic store optimisation |
Contributor
|
@MangoIV, yes, we do want the backport. You can help by opening a manual backport PR with a version bump. Sorry, a bit swamped lately. |
Contributor
|
Opened an MR, #501359, review appreciated. |
Contributor
Author
|
After making my office hot from building all day, I've merged the PR above. Thank you again @MangoIV. |
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
4 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.
This PR targets staging-nixos due to needing to rebuild all NixOS tests.
Small changelog:
Bug fixes (crashes)
toView()when compiled with newer nixpkgs (treewide: Remove toView() because it leads to segfaults when compiled… nix#14154)DerivationGoal::repairClosureandSampleStack(nix-cli: use pure/restricted eval for help pages nix#14086)RestrictedStore::addDependencyrecursion causing crashes (Fix Non-virtual interface pattern forRestrictedStore::addDependencynix#14729)Bug fixes (functionality)
user@hostformat (libstore: fixup fakeSSH check nix#14150)builtins.dirOfregression from Nix 2.23 (libexpr: Don't use nix::dirOf in prim_dirOf (fix 2.23 regression) nix#14515)isAllowedcheck inChrootLinuxDerivationBuilder(Restore isAllowed check in ChrootLinuxDerivationBuilder nix#14531)curlwithc-aresfailing to resolve DNS inside sandbox on macOS nix#14792)file://URIs (libfetchers: Actually percentDecode path when using the path from fil… nix#14909)exportReferencesGraph: Handle heterogeneous arrays (exportReferencesGraph: Handle heterogeneous arrays nix#14189)Bug fixes (output)
Improvements
build-direrror in manual (Correctbuild-direrror in manual, link relevant settings nix#14745)Build system
https://github.com/NixOS/nix/releases/tag/2.31.3
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.