Skip to content

uhd: Better cross compilation support#226676

Merged
doronbehar merged 4 commits intoNixOS:masterfrom
doronbehar:pkg/uhd-cross
Apr 21, 2023
Merged

uhd: Better cross compilation support#226676
doronbehar merged 4 commits intoNixOS:masterfrom
doronbehar:pkg/uhd-cross

Conversation

@doronbehar
Copy link
Copy Markdown
Contributor

Description of changes

This reverts commit ec1631a from #226558, and helps cross compilation differently.

I tested this with:

nix build -Lf. pkgsCross.aarch64-multiplatform.uhd

And checked that there are no references to buildPackages.python3 via:

nix-store --query --references ./result
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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.

@doronbehar doronbehar requested a review from a user April 17, 2023 16:45
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 17, 2023
@ofborg ofborg bot requested review from bjornfor, fpletz and tomberek April 17, 2023 17:09
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Apr 17, 2023
Copy link
Copy Markdown
Contributor

@bjornfor bjornfor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Please write in revert commits why they are reverted. (Yes, it's documented in github, but not as straight forward to spot when viewing git log.)

This reverts commit ec1631a.

It was merged too fast, without giving a chance to maintainers to
suggest the changes in the upcoming commits.
@ofborg ofborg bot requested a review from bjornfor April 17, 2023 18:37
@doronbehar doronbehar mentioned this pull request Apr 18, 2023
12 tasks
@doronbehar doronbehar merged commit 0038a3c into NixOS:master Apr 21, 2023
@doronbehar doronbehar deleted the pkg/uhd-cross branch April 21, 2023 10:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants