pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: rust-toolchain -> rust-toolchain.toml (#1313)

Browse source 
The new location has been stable for a year, by now peoples toolchains
should have been able to catch up.
This commit is contained in:
a-kenji 2022-04-12 08:15:13 +02:00 • committed by GitHub
parent 0531a13fc5
commit ac3c09066b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nix/default.nix
View file

@ -40,7 +40,7 @@ flake-utils.lib.eachSystem [
src = pkgs.nix-gitignore.gitignoreSource ignoreSource root;
rustToolchainToml = pkgs.rust-bin.fromRustupToolchainFile ../rust-toolchain;
rustToolchainToml = pkgs.rust-bin.fromRustupToolchainFile (src + "/rust-toolchain.toml");
cargoLock = {
lockFile = builtins.path {
path = ../Cargo.lock;
@ -158,7 +158,6 @@ in rec {
meta
;
};
defaultPackage = packages.zellij;
# nix run

11
rust-toolchain
View file

@ -1,11 +0,0 @@
# This file is updated by `update-toolchain.sh`
# We aim to be around 1-2 rust releases behind in order
# to get people the time to update their toolchains properly.
# By enforcing this, we can also make full use of the features
# provided by the current channel.
[toolchain]
channel = "1.57.0"
components = ["rustfmt", "clippy", "rust-analysis"]
targets = ["wasm32-wasi", "x86_64-unknown-linux-musl"]

5
rust-toolchain.toml Normal file
View file

@ -0,0 +1,5 @@
# This file is updated by `update-toolchain.sh`
[toolchain]
channel = "1.58.0"
components = ["rustfmt", "clippy", "rust-analysis"]
targets = ["wasm32-wasi", "x86_64-unknown-linux-musl"]