Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EvalState::realiseContext(): Allow access to the entire closure (backport #12045) #12078

Open
wants to merge 1 commit into
base: 2.25-maintenance
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2024

Motivation

When doing IFD, we should allow access to the entire closure of the store paths built by the derivation, not just the top-level paths.

Fixes #11030.

Context


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 #12045 done by [Mergify](https://mergify.com).

Fixes #11030.

(cherry picked from commit 08361f0)

# Conflicts:
#	src/libexpr/eval.cc
#	tests/functional/import-from-derivation.nix
Copy link
Contributor Author

mergify bot commented Dec 16, 2024

Cherry-pick of 08361f0 has failed:

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

You are currently cherry-picking commit 08361f031.
  (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)

Changes to be committed:
	modified:   src/libexpr/eval.hh
	modified:   src/libexpr/primops.cc
	modified:   tests/functional/import-from-derivation.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libexpr/eval.cc
	both modified:   tests/functional/import-from-derivation.nix

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

@github-actions github-actions bot added the with-tests Issues related to testing. PRs with tests have some priority label Dec 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts merge-queue with-tests Issues related to testing. PRs with tests have some priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant