Skip to content
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

lib/systems: set gcc.arch = "armv6kz", gcc.fpu = "vfpv2" for raspberryPi #327778

Merged
merged 1 commit into from
Aug 26, 2024

Conversation

tie
Copy link
Member

@tie tie commented Jul 17, 2024

Description of changes

The CPU in the Raspberry Pi 1 and Zero implements the ARMv6 ISA (with VFP2)
https://wiki.debian.org/RaspberryPi#:~:text=The%20CPU%20in%20the%20Raspberry%20Pi,VFP2%29

See also

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: lib The Nixpkgs function library label Jul 17, 2024
@tie tie changed the title lib/systems: set gcc.fpu to vfp2 for raspberryPi lib/systems: set gcc.fpu to vfpv2 for raspberryPi Jul 17, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jul 17, 2024
@tie tie marked this pull request as ready for review July 17, 2024 02:16
@tie tie requested review from alyssais and Ericson2314 as code owners July 17, 2024 02:16
@tie
Copy link
Member Author

tie commented Jul 17, 2024

Hm, found #205176 (comment). Probably still worth updating the named platform preset to avoid confusion.

@jue89
Copy link
Contributor

jue89 commented Jul 18, 2024

nix build github:tie/nixpkgs/c81d0d5c8c013f09e708e8379f252d3fca21b2ad#legacyPackages.x86_64-linux.pkgsCross.raspberryPi.nodejs results into this build error

error: builder for '/nix/store/1zybrnm373s0nmrlaixpkcl0r650ad8c-nodejs-armv6l-unknown-linux-gnueabihf-20.14.0.drv' failed with exit code 2;
       last 10 log lines:
       >                  [--libdir LIBDIR] [--without-v8-platform]
       >                  [--without-bundled-v8] [--verbose] [--v8-non-optimized-debug]
       >                  [--v8-with-dchecks] [--v8-lite-mode]
       >                  [--v8-enable-object-print] [--v8-disable-object-print]
       >                  [--v8-enable-hugepage] [--v8-enable-maglev]
       >                  [--v8-enable-short-builtin-calls]
       >                  [--v8-enable-snapshot-compression]
       >                  [--node-builtin-modules-path NODE_BUILTIN_MODULES_PATH]
       >                  [--node-snapshot-main NODE_SNAPSHOT_MAIN]
       > configure: error: argument --with-arm-fpu: invalid choice: 'vfpv2' (choose from 'vfp', 'vfpv3', 'vfpv3-d16', 'neon')
       For full logs, run 'nix log /nix/store/1zybrnm373s0nmrlaixpkcl0r650ad8c-nodejs-armv6l-unknown-linux-gnueabihf-20.14.0.drv'.

@tie
Copy link
Member Author

tie commented Jul 18, 2024

@jue89, please see #327653 for Node.js part.

@tie tie changed the title lib/systems: set gcc.fpu to vfpv2 for raspberryPi lib/systems: set gcc = { arch = "armv6kz"; fpu = "vfpv2"; } for raspberryPi Jul 18, 2024
@tie tie changed the title lib/systems: set gcc = { arch = "armv6kz"; fpu = "vfpv2"; } for raspberryPi lib/systems: set gcc.arch = "armv6kz", gcc.fpu = "vfpv2" for raspberryPi Jul 18, 2024
@tie
Copy link
Member Author

tie commented Aug 6, 2024

@alyssais, gentle ping. Would you mind taking a look at this?

@tie
Copy link
Member Author

tie commented Aug 26, 2024

Hm, found #205176 (comment). Probably still worth updating the named platform preset to avoid confusion.

Also cc @samueldr. We still have product-named platforms and I think it makes sense to have reasonable defaults, even if we intend to remove them in the future.

@alyssais alyssais merged commit 9ae6726 into NixOS:master Aug 26, 2024
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: lib The Nixpkgs function library 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants