Skip to content
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

Update deps #402

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Update Rust
KaminariOS committed Nov 2, 2023

Verified

This commit was signed with the committer’s verified signature.
KaminariOS Kosumi
commit 780d24d2aac9f6a8ad914d84ce313cff941f7988
7 changes: 3 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -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 {
@@ -30,7 +30,6 @@
# };
#cargoPlay = pkgs.cargo-feature.override { inherit rustPlatform; };
in {

devShell = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
qemu
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"]