Skip to content

Commit

Permalink
Update Rust
Browse files Browse the repository at this point in the history
  • Loading branch information
KaminariOS committed Nov 2, 2023
1 parent b1bf518 commit 780d24d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
};
supportedSystems = [ "x86_64-linux" ];
in lib.eachSystem supportedSystems (system: let
nightlyVersion = "2023-08-18";
# nightlyVersion = "2023-10-01";
pkgs = import nixpkgs {
inherit system;
overlays = [
(import rust-overlay)
];
};
pinnedRust = pkgs.rust-bin.nightly.${nightlyVersion}.default.override {
extensions = ["rustc-dev" "rust-src" "rust-analyzer-preview" "llvm-tools-preview"];
pinnedRust = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override {
# extensions = ["rustc-dev" "rust-src" "rust-analyzer-preview" "llvm-tools-preview"];
targets = [ "riscv64gc-unknown-none-elf"];
};
# rustPlatform = pkgs.makeRustPlatform {
Expand All @@ -30,7 +30,6 @@
# };
#cargoPlay = pkgs.cargo-feature.override { inherit rustPlatform; };
in {

devShell = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
qemu
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
profile = "minimal"
channel = "nightly-2023-08-05"
channel = "nightly-2023-10-01"
components = ["rust-src", "llvm-tools-preview", "rustfmt", "clippy"]

0 comments on commit 780d24d

Please sign in to comment.