Skip to content

Backport #10728: Fix file+noindex URI usage on Windows#10871

Merged
mergify[bot] merged 1 commit into3.14from
mergify/bp/3.14/pr-10728
Mar 28, 2025
Merged

Backport #10728: Fix file+noindex URI usage on Windows#10871
mergify[bot] merged 1 commit into3.14from
mergify/bp/3.14/pr-10728

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 27, 2025

This PR fixes the parsing of URIs for file+noindex repositories when using Windows paths. As suggested by @phadej in #10703 we now use (and specify in the docs) //./C:/... paths on Windows.

QA

In Windows, one can now specify //./ paths in file+noindex repositories. To check, create a simple package, then cabal sdist, move the tar.gz to some directory and in a different project declare the following stanza:

repository my-local-repo
  url: file+noindex:////./C:/path/to/repo

It might still fail because of #9891


Template Α: This PR modifies behaviour or interface

Include the following checklist in your PR:

@mergify
Copy link
Contributor Author

mergify bot commented Mar 27, 2025

Cherry-pick of e10db19 has failed:

On branch mergify/bp/3.14/pr-10728
Your branch is up to date with 'origin/3.14'.

You are currently cherry-picking commit e10db1905.
  (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:   Cabal-syntax/src/Distribution/Utils/Path.hs
	modified:   cabal-install/src/Distribution/Client/Config.hs
	modified:   cabal-install/src/Distribution/Client/GlobalFlags.hs
	modified:   cabal-install/src/Distribution/Client/IndexUtils.hs
	modified:   cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs
	modified:   cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs
	modified:   cabal-testsuite/src/Test/Cabal/Prelude.hs
	new file:   changelog.d/pr-10728
	modified:   doc/config.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Makefile
	both modified:   cabal-testsuite/src/Test/Cabal/OutputNormalizer.hs

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

@mergify mergify bot added the conflicts label Mar 27, 2025
@mergify mergify bot mentioned this pull request Mar 27, 2025
6 tasks
@mergify mergify bot added the backport label Mar 27, 2025
@jasagredo jasagredo self-assigned this Mar 27, 2025
@geekosaur geekosaur force-pushed the mergify/bp/3.14/pr-10728 branch from f1b213c to 1a4b028 Compare March 27, 2025 23:02
@geekosaur geekosaur force-pushed the mergify/bp/3.14/pr-10728 branch 5 times, most recently from 2461a58 to 7963542 Compare March 28, 2025 01:17
@jasagredo jasagredo added the merge me Tell Mergify Bot to merge label Mar 28, 2025
@Mikolaj Mikolaj force-pushed the mergify/bp/3.14/pr-10728 branch from 7963542 to bbbec9b Compare March 28, 2025 08:14
@mergify mergify bot merged commit 36e2364 into 3.14 Mar 28, 2025
59 checks passed
@mergify mergify bot deleted the mergify/bp/3.14/pr-10728 branch March 28, 2025 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport merge me Tell Mergify Bot to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants