Skip to content

Fix windows build (backport #12794) #12795

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

Merged
merged 1 commit into from
Mar 29, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 29, 2025

Motivation

PR #12767 accidentally broke it.

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

@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue labels Mar 29, 2025
Copy link
Contributor Author

mergify bot commented Mar 29, 2025

Cherry-pick of 99041b4 has failed:

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

You are currently cherry-picking commit 99041b4d8.
  (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:   src/libstore/local-store.cc
	modified:   src/libutil/file-system.cc

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libutil/file-system.hh

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 review from Ericson2314 and edolstra as code owners March 29, 2025 01:05
@github-actions github-actions bot added the store Issues and pull requests concerning the Nix store label Mar 29, 2025
PR #12767 accidentally broke it.

(cherry picked from commit 99041b4)
@Ericson2314 Ericson2314 force-pushed the mergify/bp/2.24-maintenance/pr-12794 branch from 4cda7c1 to d92b509 Compare March 29, 2025 01:08
@Ericson2314 Ericson2314 enabled auto-merge March 29, 2025 01:08
@Ericson2314 Ericson2314 merged commit e1dad7d into 2.24-maintenance Mar 29, 2025
29 checks passed
@Ericson2314 Ericson2314 deleted the mergify/bp/2.24-maintenance/pr-12794 branch March 29, 2025 01:54
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 merge-queue store Issues and pull requests concerning the Nix store
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant