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

parsePathFlakeRefWithFragment(): Handle 'path?query' without a fragment (backport #12157) #12164

Open
wants to merge 5 commits into
base: 2.25-maintenance
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2025

Motivation

Commands like nix flake metadata '.?submodules=1' ignored the query part of the URL, while nix build '.?submodules=1#foo' did work correctly because of the presence of the fragment part.

Before:

$ nix flake metadata '.?submodules=1'
Resolved URL:  git+file:///home/eelco/Dev/nix

After:

$ nix flake metadata '.?submodules=1'
Resolved URL:  git+file:///home/eelco/Dev/nix?submodules=1

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

Commands like `nix flake metadata '.?submodules=1'` ignored the query
part of the URL, while `nix build '.?submodules=1#foo'` did work
correctly because of the presence of the fragment part.

(cherry picked from commit 28caa35)

# Conflicts:
#	src/libflake/flake/flakeref.cc
Backported from lazy-trees.

(cherry picked from commit 83ff523)

# Conflicts:
#	src/libflake/flake/flakeref.cc
(cherry picked from commit 1a38e62)
@mergify mergify bot requested a review from edolstra as a code owner January 9, 2025 16:41
Copy link
Contributor Author

mergify bot commented Jan 9, 2025

Cherry-pick of 28caa35 has failed:

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

You are currently cherry-picking commit 28caa35a9.
  (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:   tests/functional/flakes/flake-in-submodule.sh

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

Cherry-pick of 83ff523 has failed:

On branch mergify/bp/2.25-maintenance/pr-12157
Your branch is ahead of 'origin/2.25-maintenance' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 83ff52386.
  (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

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 9, 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