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

treewide: use stdenv.buildPlatform.canExecute #350195

Merged
merged 23 commits into from
Oct 23, 2024

Conversation

pbsds
Copy link
Member

@pbsds pbsds commented Oct 21, 2024

candidate for #346453

candidates were made using

old='postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform)'
new='postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform)'
rg -F -l -- "$old" pkgs/ | xe sd -F -- "$old" "$new"

old='postInstall = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform)'
new='postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform)'
rg -F -l -- "$old" pkgs/ | xe sd -F -- "$old" "$new"


old='doCheck = stdenv.hostPlatform == stdenv.buildPlatform;'
new='doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;'
rg -F -l -- "$old" pkgs/ | xe sd -F -- "$old" "$new"

old='doCheck = stdenv.buildPlatform == stdenv.hostPlatform;'
new='doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;'
rg -F -l -- "$old" pkgs/ | xe sd -F -- "$old" "$new"


old='doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;'
new='doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;'
rg -F -l -- "$old" pkgs/ | xe sd -F -- "$old" "$new"

old='doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform;'
new='doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;'
rg -F -l -- "$old" pkgs/ | xe sd -F -- "$old" "$new"

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.

@pbsds pbsds marked this pull request as ready for review October 21, 2024 09:50
@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 Oct 21, 2024
@pbsds pbsds requested a review from philiptaron October 22, 2024 17:54
@pbsds
Copy link
Member Author

pbsds commented Oct 22, 2024

not sure how nixStatic got rebuilt, but the binary seems to work

@philiptaron philiptaron merged commit 4dbb808 into NixOS:master Oct 23, 2024
43 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

2 participants