Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 30, 2025

Motivation

Building paths that are in sandbox-paths broke in some recent changes. This restores that ability.

Context

Correct me if I'm wrong but it seems obvious that erasing any output paths from pathsInChroot needs to happen after getPathsInSandbox(), not before.


Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #13356 done by [Mergify](https://mergify.com).

It seems obvious that erasing any output paths from pathsInChroot needs
to happen after getPathsInSandbox(), not before.

Signed-off-by: Samuli Thomasson <[email protected]>
(cherry picked from commit 0f6cb33)

# Conflicts:
#	src/libstore/unix/build/linux-derivation-builder.cc
@mergify mergify bot added the automatic backport This PR is a backport produced by automation (does not trigger backporting) label Jul 30, 2025
@mergify mergify bot requested a review from Ericson2314 as a code owner July 30, 2025 12:52
Copy link
Contributor Author

mergify bot commented Jul 30, 2025

Cherry-pick of 0f6cb33 has failed:

On branch mergify/bp/2.28-maintenance/pr-13356
Your branch is up to date with 'origin/2.28-maintenance'.

You are currently cherry-picking commit 0f6cb3376.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   src/libstore/unix/build/linux-derivation-builder.cc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added conflicts automatic backport This PR is a backport produced by automation (does not trigger backporting) labels Jul 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant