Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 30, 2025

Motivation

The Nix daemon detects supported system types at start time, so it needs to be restarted to detect x86_64-darwin support.

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

The Nix daemon detects supported system types at start time, so it
needs to be restarted to detect x86_64-darwin support.

(cherry picked from commit 20ba6be)

# Conflicts:
#	src/libstore/unix/build/derivation-builder.cc
@mergify mergify bot requested a review from Ericson2314 as a code owner July 30, 2025 13:00
@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue labels Jul 30, 2025
Copy link
Contributor Author

mergify bot commented Jul 30, 2025

Cherry-pick of 20ba6be has failed:

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

You are currently cherry-picking commit 20ba6be74.
  (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/libstore/unix/build/derivation-builder.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

@edolstra edolstra closed this Aug 25, 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.

1 participant