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

More mingw build fixes (backport #12303) #12312

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 20, 2025

Motivation

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

Mingw apparently is less smart about coercing std::filesystem::path into strings.

(cherry picked from commit a78f55e)

# Conflicts:
#	src/libfetchers/git.cc
(cherry picked from commit 89e5047)
(cherry picked from commit 2cb494f)
(cherry picked from commit 8e05ddf)
@mergify mergify bot added the automatic backport This PR is a backport produced by automation (does not trigger backporting) label Jan 20, 2025
Copy link
Contributor Author

mergify bot commented Jan 20, 2025

Cherry-pick of a78f55e has failed:

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

You are currently cherry-picking commit a78f55ef9.
  (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/libfetchers/git.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

@mergify mergify bot requested a review from edolstra as a code owner January 20, 2025 16:42
@github-actions github-actions bot added new-cli Relating to the "nix" command fetching Networking with the outside (non-Nix) world, input locking labels Jan 20, 2025
@roberth
Copy link
Member

roberth commented Jan 20, 2025

@roberth roberth closed this Jan 20, 2025
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 fetching Networking with the outside (non-Nix) world, input locking merge-queue new-cli Relating to the "nix" command
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants