Lillian-Violet/dev-templates
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge 6a2bbeb4b6 into 1cc7b2178a

Browse source
This commit is contained in:
Yuval Kogman 2023-07-13 22:30:13 +00:00 committed by GitHub
parent 1cc7b2178a 6a2bbeb4b6
commit fa1a24ef25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
rust/flake.nix
View file

@ -22,13 +22,17 @@
rustToolchain = rustToolchain =
let let
rust = super.rust-bin; rust = super.rust-bin;
toolchain =
if builtins.pathExists ./rust-toolchain.toml then
rust.fromRustupToolchainFile ./rust-toolchain.toml
else if builtins.pathExists ./rust-toolchain then
rust.fromRustupToolchainFile ./rust-toolchain
else
rust.stable.latest.default;
in in
if builtins.pathExists ./rust-toolchain.toml then toolchain.override {
rust.fromRustupToolchainFile ./rust-toolchain.toml extensions = [ "rust-src" ]; # https://github.com/the-nix-way/dev-templates/issues/4
else if builtins.pathExists ./rust-toolchain then };
rust.fromRustupToolchainFile ./rust-toolchain
else
rust.stable.latest.default;
}) })
]; ];
@ -44,6 +48,7 @@
cargo-edit cargo-edit
cargo-watch cargo-watch
rust-analyzer rust-analyzer
evcxr
]; ];
shellHook = '' shellHook = ''