-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
scripts/install.in: add riscv64 support to installer #10806
Conversation
The artifacts are already built and hosted, the install script just needs to be taught about riscv64. Signed-off-by: J. Dekker <jdek@itanimul.li>
I believe you'll also need to add riscv64 here: nix/maintainers/upload-release.pl Lines 161 to 165 in ef5c846
|
@cole-h wouldn't that require a native riscv64 builder? the cross-compiled one is already downloaded: nix/maintainers/upload-release.pl Lines 174 to 177 in ef5c846
Though this should probably be hooked up to the cross-compiled store path for riscv64 here too: nix/maintainers/upload-release.pl Lines 240 to 248 in ef5c846
|
Oh oops you're right, I meant to point at the |
This uses the x86_64-linux's cross-compiled output as we don't have a native riscv64 builder. Signed-off-by: J. Dekker <jdek@itanimul.li>
@cole-h something like 73f9afd, I presume. I'm looking at https://hydra.nixos.org/build/260037794 for reference. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks to be complete.
Not sure about fallback paths, but I don't see harm in it, so 👍 from me.
@@ -243,6 +243,7 @@ sub downloadFile { | |||
" x86_64-linux = \"" . getStorePath("build.x86_64-linux") . "\";\n" . | |||
" i686-linux = \"" . getStorePath("build.i686-linux") . "\";\n" . | |||
" aarch64-linux = \"" . getStorePath("build.aarch64-linux") . "\";\n" . | |||
" riscv64-linux = \"" . getStorePath("buildCross.riscv64-unknown-linux-gnu.x86_64-linux") . "\";\n" . |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The lack of armv7 here suggests that this is not strictly necessary, but it seems like adding cross builds here could be useful for those who need it, when they need it, which would be rare.
I don't know the history of this feature. wdyt @edolstra?
Merging this with the caveat that it's best-effort (since we're not actually testing whether it works, only cross-building) and may be disabled if it breaks and blocks the release (since none of the maintainers are really capable of fixing riscv64 issues). |
Cool, thanks. Feel free to @ me to test RISC-V related stuff. |
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/2024-06-03-nix-team-meeting-minutes-149/46582/1 |
I also got access to a bigger riscv64 machine. |
Motivation
The artifacts are already built and hosted, the install script just needs to be taught about riscv64.
Context
Making this change manually to the install script the Nix installation was able to succeed.
Priorities and Process
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.