arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-26 23:32:03 +00:00
Code Issues Releases Wiki Activity

build(core): switch to nightly Rust

Browse Source
This commit is contained in:
matejcik 2022-08-18 13:16:53 +02:00 committed by matejcik
parent f253d7e591
commit 612d52e298
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ci/shell.nix
View File

@ -3,7 +3,7 @@
}:
let
# the last commit from master as of 2022-02-08
# the last commit from master as of 2022-08-02
rustOverlay = import (builtins.fetchTarball {
url = "https://github.com/oxalica/rust-overlay/archive/b38c1683594aeefa5c3c4dde115401f059146be6.tar.gz";
sha256 = "0rk4i42cys2v7k2ir57x5qa8dc37nrs432cdpbr4cddskgvyi8ky";
@ -29,15 +29,15 @@ let
chmod -w $out
'';
# NOTE: don't forget to update Minimum Supported Rust Version in docs/core/build/emulator.md
rustProfiles = nixpkgs.rust-bin.stable."1.63.0";
rustStable = rustProfiles.minimal.override {
rustProfiles = nixpkgs.rust-bin.nightly."2022-08-02";
rustNightly = rustProfiles.minimal.override {
targets = [
"thumbv7em-none-eabihf" # TT
"thumbv7m-none-eabi" # T1
];
# we use rustfmt from nixpkgs because it's built with the nighly flag needed for wrap_comments
# to use official binary, remove rustfmt from buildInputs and add it to extensions:
extensions = [ "clippy" ];
extensions = [ "clippy" "rustfmt" ];
};
llvmPackages = nixpkgs.llvmPackages_13;
# see pyright/README.md for update procedure
@ -88,8 +88,7 @@ stdenvNoCC.mkDerivation ({
poetry
protobuf
pyright
rustfmt
rustStable
rustNightly
wget
zlib
moreutils

8
docs/core/build/emulator.md
View File

@ -54,12 +54,12 @@ brew install scons sdl2 sdl2_image pkg-config llvm
## Rust
You will require Rust and Cargo. The currently supported version is 1.58 stable.
The recommended way to install both is with [`rustup`](https://rustup.rs/). If you
are installing `rustup` for the first time, the stable toolchain will be installed
for you automatically. Otherwise, make sure you are up to date:
You will require Rust and Cargo. The currently supported version is 1.64 nightly. The
recommended way to install both is with [`rustup`](https://rustup.rs/). Make sure you
are up to date:
```sh
rustup default nightly
rustup update
```