Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 20, 2025

Motivation

The build is failing: https://hydra.nixos.org/build/285623585

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

(cherry picked from commit c656725)

# Conflicts:
#	src/libutil/posix-source-accessor.cc
This breaks the build with "symbol wrong type (4 vs 3)".

https://stackoverflow.com/questions/28267100/dll-linking-failed-with-lto-using-mingw-w64
(cherry picked from commit d863684)

# Conflicts:
#	packaging/dependencies.nix
@mergify mergify bot requested a review from edolstra as a code owner January 20, 2025 15:21
@mergify
Copy link
Contributor Author

mergify bot commented Jan 20, 2025

Cherry-pick of c656725 has failed:

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

You are currently cherry-picking commit c656725a1.
  (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/libutil/posix-source-accessor.cc

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of d863684 has failed:

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

You are currently cherry-picking commit d8636843b.
  (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:   packaging/dependencies.nix

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

@edolstra edolstra closed this Jan 20, 2025
@edolstra edolstra deleted the mergify/bp/2.24-maintenance/pr-12298 branch January 20, 2025 15:24
@roberth roberth added the automatic backport This PR is a backport produced by automation (does not trigger backporting) label 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 merge-queue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants