Skip to content

treewide: Fix Meson CPU names for powerpc CPUs (backport #13514)#13516

Merged
mergify[bot] merged 1 commit into2.28-maintenancefrom
mergify/bp/2.28-maintenance/pr-13514
Jul 21, 2025
Merged

treewide: Fix Meson CPU names for powerpc CPUs (backport #13514)#13516
mergify[bot] merged 1 commit into2.28-maintenancefrom
mergify/bp/2.28-maintenance/pr-13514

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 21, 2025

(Still building on my machine, will undraft when it finishes & builtins.currentSystem returns the correct value)

Motivation

Meson's cpu_family() function returns ppc* on POWER systems, while Nixpkgs expects the previously-used powerpc* to be the CPU name:

puna@HC ~/D/nixpkgs (wip/ppc64-elfv1)> nix repl --file .
Nix 2.28.4
Type :? for help.
error:
       … while evaluating a branch condition
         at /home/puna/Development/nixpkgs/pkgs/stdenv/booter.nix:68:9:
           67|         pred: n:
           68|         if n == len then
             |         ^
           69|           rnul pred

       … while calling the 'length' builtin
         at /home/puna/Development/nixpkgs/pkgs/stdenv/booter.nix:65:13:
           64|     let
           65|       len = builtins.length list;
             |             ^
           66|       go =

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: Unknown CPU type: ppc64

Fix this discrepancy.

Context

Closes #12769

No real experience with Meson, so happy about better-looking suggestions.


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

@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) merge-queue labels Jul 21, 2025
@mergify mergify bot requested review from Ericson2314 and edolstra as code owners July 21, 2025 22:49
@mergify mergify bot added merge-queue automatic backport This PR is a backport produced by automation (does not trigger backporting) labels Jul 21, 2025
@github-actions github-actions bot added the with-tests Issues related to testing. PRs with tests have some priority label Jul 21, 2025
@mergify mergify bot merged commit f5dfd9a into 2.28-maintenance Jul 21, 2025
27 checks passed
@mergify mergify bot deleted the mergify/bp/2.28-maintenance/pr-13514 branch July 21, 2025 23:28
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) merge-queue with-tests Issues related to testing. PRs with tests have some priority

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant