Skip to content

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

Closed
mergify[bot] wants to merge 1 commit into2.24-maintenancefrom
mergify/bp/2.24-maintenance/pr-12280
Closed

Don't absolutize 'git+file:' in parseURLFlakeRef() (backport #12280)#12284
mergify[bot] wants to merge 1 commit into2.24-maintenancefrom
mergify/bp/2.24-maintenance/pr-12280

Conversation

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

@edolstra @mergify
Don't absolutize 'git+file:' in parseURLFlakeRef()
bf87511 
#12273 (comment)
(cherry picked from commit 938f0f4)

# Conflicts:
#	src/libflake/flake/flakeref.cc
#	tests/functional/flakes/flakes.sh
@mergify mergify bot requested a review from edolstra as a code owner January 17, 2025 12:46
@mergify
Copy link
Copy Markdown
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
@bryango bryango mentioned this pull request Jan 17, 2025
Merged
@bryango
Copy link
Copy Markdown
Member

bryango commented Jan 19, 2025

I tried but could not resolve the conflicts because this PR depends on many previous commits such as #10089. As an alternative maybe we can just do #12287 for 2.24 (CI is happy for that one).

@roberth roberth added the automatic backport This PR is a backport produced by automation (does not trigger backporting) label Jan 20, 2025
@roberth roberth closed this Jan 20, 2025
@xokdvium xokdvium deleted the mergify/bp/2.24-maintenance/pr-12280 branch October 7, 2025 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

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

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@bryango @roberth @edolstra