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

copyPathToStore(): Preserve symlinks (backport #12448) #12451

Merged
merged 1 commit into from
Feb 11, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 11, 2025

Motivation

E.g. in a derivation attribute foo = ./bar, if ./bar is a symlink, we should copy the symlink to the store, not its target. This restores the behaviour of Nix <= 2.19.

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

E.g. in a derivation attribute `foo = ./bar`, if ./bar is a symlink,
we should copy the symlink to the store, not its target. This restores
the behaviour of Nix <= 2.19.

(cherry picked from commit 26b87e7)

# Conflicts:
#	tests/functional/meson.build
@mergify mergify bot requested a review from edolstra as a code owner February 11, 2025 21:51
@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue labels Feb 11, 2025
Copy link
Contributor Author

mergify bot commented Feb 11, 2025

Cherry-pick of 26b87e7 has failed:

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

You are currently cherry-picking commit 26b87e78b.
  (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.cc
	modified:   tests/functional/simple.sh
	new file:   tests/functional/symlinks.sh

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   tests/functional/meson.build

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 Feb 11, 2025
@mergify mergify bot merged commit d3a52c2 into 2.24-maintenance Feb 11, 2025
27 checks passed
@mergify mergify bot deleted the mergify/bp/2.24-maintenance/pr-12448 branch February 11, 2025 22:21
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 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