Skip to content

scripts/install.in: add riscv64 support to installer #10806

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.

Sign up for GitHub

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

Merged
edolstra merged 2 commits into from
Jun 3, 2024
Merged

scripts/install.in: add riscv64 support to installer #10806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ed356f
scripts/install.in: add riscv64 support to installer
jdek May 30, 2024
73f9afd
upload-release.pl: add riscv64 to nix-fallback-paths.nix
jdek May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions maintainers/upload-release.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Copy link
Member

@roberth roberth Jun 3, 2024

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?

" x86_64-darwin = \"" . getStorePath("build.x86_64-darwin") . "\";\n" .
" aarch64-darwin = \"" . getStorePath("build.aarch64-darwin") . "\";\n" .
"}\n");
Expand Down
5 changes: 5 additions & 0 deletions scripts/install.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ case "$(uname -s).$(uname -m)" in
path=@tarballPath_armv7l-linux@
system=armv7l-linux
;;
Linux.riscv64)
hash=@tarballHash_riscv64-linux@
path=@tarballPath_riscv64-linux@
system=riscv64-linux
;;
Darwin.x86_64)
hash=@tarballHash_x86_64-darwin@
path=@tarballPath_x86_64-darwin@
Expand Down