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

Don't absolutize 'git+file:' in parseURLFlakeRef() (backport #12280) #12284

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

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 17, 2025

Motivation

This is needed to unbreak the 2.25 branch due to the interaction between #12269 and #12266 which our CI didn't catch. On master, this is resolved as side-effect of #10089.

See also #12273 (comment).

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

#12273 (comment)
(cherry picked from commit 938f0f4)

# Conflicts:
#	src/libflake/flake/flakeref.cc
#	tests/functional/flakes/flakes.sh
Copy link
Contributor Author

mergify bot commented Jan 17, 2025

Cherry-pick of 938f0f4 has failed:

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

You are currently cherry-picking commit 938f0f4fd.
  (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:   src/libflake/flake/flakeref.cc
	both modified:   tests/functional/flakes/flakes.sh

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

@github-actions github-actions bot added the with-tests Issues related to testing. PRs with tests have some priority label Jan 17, 2025
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