backport: nixVersions.nix_2_31: 2.31.2 -> 2.31.3#501359
Merged
philiptaron merged 1 commit intoMar 19, 2026
Merged
Conversation
Changelog of fixes: - 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) - 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) - Fix double-quoting of paths in logs (NixOS/nix#14210) - Include path in world-writable error messages (NixOS/nix#14785) - 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) - 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 (cherry picked from commit a4ef4c1)
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between 368f01e and original a4ef4c1 may warrant inspection.
Show diff
@@ Commit message
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)
@@ Commit message
- `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
+ (cherry picked from commit a4ef4c189ca6a336cb3e7b7c0e6cc551a6d764c9)
## nixos/modules/installer/tools/nix-fallback-paths.nix ##
@@
@@ pkgs/tools/package-management/nix/default.nix: lib.makeExtensible (
- nixComponents_2_31 =
- (nixDependencies.callPackage ./modular/packages.nix rec {
- version = "2.31.2";
-- inherit (self.nix_2_30.meta) teams;
+- inherit (self.nix_2_30.meta) maintainers teams;
- otherSplices = generateSplicesForNixComponents "nixComponents_2_31";
- src = fetchFromGitHub {
- owner = "NixOS";
@@ pkgs/tools/package-management/nix/default.nix: lib.makeExtensible (
- hash = "sha256-NLGXPLjENLeKVOg3OZgHXZ+1x6sPIKq9FHH8pxbCrDI=";
- };
- }).appendPatches
-- (
-- [
-- (fetchpatch2 {
-- name = "nix-2.31-14692-mdbook-0.5-support.patch";
-- url = "https://github.com/NixOS/nix/commit/a4f5f365090980a6eeb2ef483e49c04bdefd71a8.patch";
-- hash = "sha256-GOWZtHSzHovnD8iUknr61bo7y85i0BKdw3kVBGDfBX0=";
-- })
-- ]
-- ++
-- # issues on darwin: https://github.com/NixOS/nixpkgs/pull/468208#issuecomment-3626314109
-- lib.optional stdenv.isLinux (fetchpatch2 {
-- name = "nix-2.31-14240-sri-error-message.patch";
-- url = "https://github.com/NixOS/nix/commit/56751b1cd2c4700c71c545f2246adf602c97fdf5.patch";
-- hash = "sha256-CerSBAI+H2RqPp9jsCP0QIM2rZYx3yBZHVVUAztgc18=";
-- })
-- );
+- patches_common;
+ nixComponents_2_31 = nixDependencies.callPackage ./modular/packages.nix rec {
+ version = "2.31.3";
-+ inherit (self.nix_2_30.meta) teams;
++ inherit (self.nix_2_30.meta) maintainers teams;
+ otherSplices = generateSplicesForNixComponents "nixComponents_2_31";
+ src = fetchFromGitHub {
+ owner = "NixOS";
Hint: The full diffs are also available in the runner logs with slightly better highlighting.
13 tasks
nixpkgs-ci
Bot
added
8.has: package (update)
philiptaron
dismissed
github-actions[bot]’s stale review
I reviewed the diffs; the changes are perfectly acceptable.
Contributor
|
I'm doing a build, which since it's staging and building a couple NixOS tests, is going on for a bit. |
Contributor
|
Contributor
|
Thanks for this, @MangoIV! |
Merged
via the queue into
NixOS:staging-25.11
with commit Mar 19, 2026
2dc954e
36 of 39 checks passed
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
2 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.
Changelog of fixes:
Fix segfaults from
toView()when compiled with newer nixpkgs (treewide: Remove toView() because it leads to segfaults when compiled… nix#14154)Fix use-after-move in
DerivationGoal::repairClosureandSampleStack(nix-cli: use pure/restricted eval for help pages nix#14086)Fix assertion failure on partially valid derivation outputs (fix(libstore/build/derivation-goal): don't assert on partially valid outputs nix#14137)
Fix
RestrictedStore::addDependencyrecursion causing crashes (Fix Non-virtual interface pattern forRestrictedStore::addDependencynix#14729)Fix crash on flakerefs containing newlines (flake: Update, nixos-25.05-small -> nixos-25.05 nix#14450)
Fix fakeSSH check breaking SSH copies with
user@hostformat (libstore: fixup fakeSSH check nix#14150)Fix
builtins.dirOfregression from Nix 2.23 (libexpr: Don't use nix::dirOf in prim_dirOf (fix 2.23 regression) nix#14515)Restore missing
isAllowedcheck inChrootLinuxDerivationBuilder(Restore isAllowed check in ChrootLinuxDerivationBuilder nix#14531)Fix curl with c-ares failing to resolve DNS in sandbox on macOS (Fix
curlwithc-aresfailing to resolve DNS inside sandbox on macOS nix#14792)Fix tarball percent decoding for
file://URIs (Fix Non-virtual interface pattern forRestrictedStore::addDependencynix#14729)exportReferencesGraph: Handle heterogeneous arrays (libutil: Try to call std::terminate for panic, use C++20 std::source_location nix#13861)Fix filesystem ops in store optimization (libstore: Use makeTempPath in optimizePath_, assorted fs fixes nix#14676)
Fix double-quoting of paths in logs (libstore: Fix double-quoting of paths in logs nix#14210)
Include path in world-writable error messages (libstore: include path in the world-writable error nix#14785)
Better git refnames validation (libfetchers/git-utils: Be more correct about validating refnames nix#14253)
Use pure/restricted eval for help pages (treewide: Squash some user-after-free bugs nix#14156)
Improve store-reference compatibility with IPv6 ZoneId literals (libstore: Include missing header to fix compile with libc++ 20 nix#14134)
Correct
build-direrror in manual (Correctbuild-direrror in manual, link relevant settings nix#14745)Add mdbook 0.5 support (Support mdbook 0.5 nix#14690)
Drop legacy Apple SDK pattern (packaging: Drop legacy apple sdk pattern nix#13976)
https://github.com/NixOS/nix/releases/tag/2.31.3
(cherry picked from commit a4ef4c1)
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.