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

packaging/components.nix: Don't import a symlink (backport #12450) #12455

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 12, 2025

Motivation

This is a workaround to avoid differing evaluation results between Nix 2.19 and >= 2.20 (#12449).

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

This is a workaround to avoid differing evaluation results between Nix
2.19 and >= 2.20 (#12449).

(cherry picked from commit 2e20a5f)

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

mergify bot commented Feb 12, 2025

Cherry-pick of 2e20a5f has failed:

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

You are currently cherry-picking commit 2e20a5f82.
  (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 <file>..." to mark resolution)
	both modified:   packaging/components.nix

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

@edolstra
Copy link
Member

Closing, not applicable.

@edolstra edolstra closed this Feb 12, 2025
@edolstra edolstra deleted the mergify/bp/2.24-maintenance/pr-12450 branch February 12, 2025 11:49
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