Skip to content

treewide: use stdenv.buildPlatform.canExecute#350195

Merged
philiptaron merged 23 commits intoNixOS:masterfrom
pbsds:migrate-canExecute-1729502562
Oct 23, 2024
Merged

treewide: use stdenv.buildPlatform.canExecute#350195
philiptaron merged 23 commits intoNixOS:masterfrom
pbsds:migrate-canExecute-1729502562

Conversation

@pbsds
Copy link
Copy Markdown
Member

@pbsds pbsds commented Oct 21, 2024 •
edited
Loading

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 added 23 commits October 21, 2024 11:34
@pbsds
eiwd: use stdenv.buildPlatform.canExecute
d7b0a7f
@pbsds
ffmpeg_7-full: use stdenv.buildPlatform.canExecute
a6f72e5
@pbsds
flatbuffers_23: use stdenv.buildPlatform.canExecute
80a7af3
@pbsds
flatbuffers_2_0: use stdenv.buildPlatform.canExecute
59dd05e
@pbsds
fossil: use stdenv.buildPlatform.canExecute
9109a87
@pbsds
glab: use stdenv.buildPlatform.canExecute
2e685bb
@pbsds
k6: use stdenv.buildPlatform.canExecute
1ea118d
@pbsds
kaniko: use stdenv.buildPlatform.canExecute
4d672b2
@pbsds
kmymoney: use stdenv.buildPlatform.canExecute
7ef881b
@pbsds
kubeshark: use stdenv.buildPlatform.canExecute
a914275
@pbsds
kubevela: use stdenv.buildPlatform.canExecute
fe7e01b
@pbsds
mangal: use stdenv.buildPlatform.canExecute
b80f0ed
@pbsds
mtdutils: use stdenv.buildPlatform.canExecute
faa7f0f
@pbsds
nlohmann_json: use stdenv.buildPlatform.canExecute
8a3a11c
@pbsds
pidgin: use stdenv.buildPlatform.canExecute
60c99f1
@pbsds
utox: use stdenv.buildPlatform.canExecute
2d992c6
@pbsds
velero: use stdenv.buildPlatform.canExecute
56783f8
@pbsds
zerotierone: use stdenv.buildPlatform.canExecute
66c524a
@pbsds
bencodetools: use stdenv.buildPlatform.canExecute
191df78
@pbsds
minizip2: use stdenv.buildPlatform.canExecute
bb16748
@pbsds
tpm2-tss: use stdenv.buildPlatform.canExecute
4b43b3c
@pbsds
uriparser: use stdenv.buildPlatform.canExecute
22c69ed
@pbsds
visidata: use stdenv.buildPlatform.canExecute
e77269f
@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 This PR causes between 1 and 10 packages to rebuild on Linux. labels Oct 21, 2024
@pbsds pbsds requested a review from philiptaron October 22, 2024 17:54
@pbsds
Copy link
Copy Markdown
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
@pbsds pbsds mentioned this pull request Nov 5, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@philiptaron philiptaron philiptaron approved these changes

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@pbsds @philiptaron