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

refactor: Extract EvalState::realiseString (backport #12362) #12365

Merged
merged 2 commits into from
Jan 28, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 27, 2025

Motivation

This is an operation that's needed in a couple of places for

Context

We'll want something similar for path coercions. Scoped out for this one.

This is a trivial refactor to support fixes, so I propose to backport this.


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

(cherry picked from commit 7465fbe)

# Conflicts:
#	src/libexpr/primops.cc
@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts labels Jan 27, 2025
@mergify mergify bot requested a review from roberth as a code owner January 27, 2025 15:50
@mergify mergify bot added the merge-queue label Jan 27, 2025
Copy link
Contributor Author

mergify bot commented Jan 27, 2025

Cherry-pick of 7465fbe has failed:

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

You are currently cherry-picking commit 7465fbe92.
  (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-c/nix_api_value.cc
	modified:   src/libexpr/eval.hh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libexpr/primops.cc

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 c api Nix as a C library with a stable interface label Jan 27, 2025
@mergify mergify bot merged commit 5fb6551 into 2.24-maintenance Jan 28, 2025
25 of 27 checks passed
@mergify mergify bot deleted the mergify/bp/2.24-maintenance/pr-12362 branch January 28, 2025 08:51
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) c api Nix as a C library with a stable interface conflicts merge-queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant