diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2023-04-29 11:02:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-29 11:02:18 +0000 |
| commit | 11064624be340a04b53233920499a2f4109e0a97 (patch) | |
| tree | 41660961625eee634ec7a778ddb2f44697a20d39 | |
| parent | 438d3c55349e85bde042734f9e3f874bf5680951 (diff) | |
| parent | 4c88d7ceadea11d8d51c1545b529de5faa33fc1f (diff) | |
Merge #227
227: Use modern rust-toolchain.toml format r=matthiasbeyer a=TheNeikos
The bare rust-toolchain file is deprecated. This change moves it to the modern format.
Co-authored-by: Marcel Müller <neikos@neikos.email>
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | rust-toolchain | 1 | ||||
| -rw-r--r-- | rust-toolchain.toml | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -24,7 +24,7 @@ overlays = [ (import rust-overlay) ]; }; - rustTarget = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain; + rustTarget = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; craneLib = (crane.mkLib pkgs).overrideToolchain rustTarget; tomlInfo = craneLib.crateNameFromCargoToml { cargoToml = ./Cargo.toml; }; diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 65ee095..0000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.67.0 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..969710a --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.67.0" |