Skip to content

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

Merged
mergify[bot] merged 3 commits into2.24-maintenancefrom
mergify/bp/2.24-maintenance/pr-12045
Dec 31, 2024
Merged

EvalState::realiseContext(): Allow access to the entire closure (backport #12045)#12077
mergify[bot] merged 3 commits into2.24-maintenancefrom
mergify/bp/2.24-maintenance/pr-12045

Conversation

@mergify
Copy link
Copy Markdown
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).

@edolstra @mergify
EvalState::realiseContext(): Allow access to the entire closure
f986f7e 
Fixes #11030.

(cherry picked from commit 08361f0)

# Conflicts:
#	src/libexpr/eval.cc
#	tests/functional/import-from-derivation.nix
#	tests/functional/import-from-derivation.sh
@mergify mergify bot requested a review from roberth as a code owner December 16, 2024 15:36
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Dec 16, 2024

Cherry-pick of 08361f0 has failed:

On branch mergify/bp/2.24-maintenance/pr-12045
Your branch is up to date with 'origin/2.24-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

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

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
mergify bot added a commit that referenced this pull request Dec 31, 2024
@mergify
Merge of #12077
b968c0c
@mergify mergify bot mentioned this pull request Dec 31, 2024
Closed
29 tasks
@mergify mergify bot merged commit bda59de into 2.24-maintenance Dec 31, 2024
@mergify mergify bot deleted the mergify/bp/2.24-maintenance/pr-12045 branch December 31, 2024 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@roberth roberth Awaiting requested review from roberth

@fricklerhandwerk fricklerhandwerk Awaiting requested review from fricklerhandwerk

@edolstra edolstra Awaiting requested review from edolstra edolstra is a code owner

Assignees

No one assigned

Labels

conflicts merge-queue with-tests Issues related to testing. PRs with tests have some priority

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@edolstra @roberth