Skip to content

Fix nix_system_cpu on i686-linux (backport #13535)#13540

Merged
edolstra merged 2 commits into2.29-maintenancefrom
mergify/bp/2.29-maintenance/pr-13535
Jul 25, 2025
Merged

Fix nix_system_cpu on i686-linux (backport #13535)#13540
edolstra merged 2 commits into2.29-maintenancefrom
mergify/bp/2.29-maintenance/pr-13535

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jul 24, 2025

Motivation

Fixes #13532.

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 #13535 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 Jul 24, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jul 24, 2025

Cherry-pick of 54dc531 has failed:

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

You are currently cherry-picking commit 54dc5314e.
  (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:   tests/functional/misc.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   nix-meson-build-support/default-system-cpu/meson.build

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 July 24, 2025 17:14
@mergify mergify bot added merge-queue conflicts automatic backport This PR is a backport produced by automation (does not trigger backporting) labels Jul 24, 2025
@github-actions github-actions bot added the with-tests Issues related to testing. PRs with tests have some priority label Jul 24, 2025
@edolstra edolstra force-pushed the mergify/bp/2.29-maintenance/pr-13535 branch from 29e0cb8 to a9d09cb Compare July 24, 2025 17:18
@edolstra edolstra enabled auto-merge July 24, 2025 17:18
@edolstra edolstra mentioned this pull request Jul 24, 2025
Closed
xokdvium and others added 2 commits July 25, 2025 02:53
@xokdvium
meson: Correctly handle endianness for PowerPC CPU families
359227a 
I've missed this while reviewing 6db6190.
I only built big endian ppc64, so that didn't occur to me.

From meson manual:

> Those porting from autotools should note that Meson does not add
> endianness to the name of the cpu_family. For example, autotools will
> call little endian PPC64 "ppc64le", Meson will not, you must also check
> the .endian() value of the machine for this information.

This code should handle that correctly.

(cherry picked from commit ebd311b)
@edolstra @xokdvium
Fix nix_system_cpu on i686-linux
a1efe99 
Fixes #13532.

(cherry picked from commit 54dc531)
@xokdvium xokdvium force-pushed the mergify/bp/2.29-maintenance/pr-13535 branch from e7e0536 to a1efe99 Compare July 24, 2025 23:54
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jul 25, 2025

This pull request has been removed from the queue for the following reason: pull request dequeued.

Pull request #13540 has been dequeued. The pull request could not be merged. This could be related to an activated branch protection or ruleset rule that prevents us from merging. (details: Required status check "installer test on macos" is in progress.).

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.
If you do update this pull request, it will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue instead, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

@edolstra edolstra merged commit c1f54da into 2.29-maintenance Jul 25, 2025
25 of 27 checks passed
@edolstra edolstra deleted the mergify/bp/2.29-maintenance/pr-13535 branch July 25, 2025 00:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@edolstra edolstra Awaiting requested review from edolstra edolstra is a code owner

Assignees

No one assigned

Labels

automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue with-tests Issues related to testing. PRs with tests have some priority

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@edolstra @xokdvium