diff options
| author | a-kenji <aks.kenji@protonmail.com> | 2022-04-12 08:15:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-12 08:15:13 +0200 |
| commit | ac3c09066b461d5e66bb5447741878b8a3a94642 (patch) | |
| tree | 4bbd6d6a783f713b7f2304bbdff178b0b4b2ebb0 | |
| parent | 0531a13fc5d24fe8884a5b4fed6cfd538d8c16a7 (diff) | |
fix: `rust-toolchain` -> `rust-toolchain.toml` (#1313)
The new location has been stable for a year, by now peoples toolchains
should have been able to catch up.
| -rw-r--r-- | nix/default.nix | 3 | ||||
| -rw-r--r-- | rust-toolchain | 11 | ||||
| -rw-r--r-- | rust-toolchain.toml | 5 |
3 files changed, 6 insertions, 13 deletions
diff --git a/nix/default.nix b/nix/default.nix index b01ec11b7..c1d5a8868 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -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 diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index cc85da321..000000000 --- a/rust-toolchain +++ /dev/null @@ -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"] diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 000000000..e37283b00 --- /dev/null +++ b/rust-toolchain.toml @@ -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"] |