Merge pull request #115 from TornaxO7/fix/improve-flake

reducing toolchain files to a single one
AMythicDev · Dec 13, 2023 · 73a1ca6 · 73a1ca6
2 parents 602957f + 1f4b986
commit 73a1ca6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/flake.nix b/flake.nix
@@ -15,23 +15,13 @@
         };
 
         rust-toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
-        rust-nightly-toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain-nightly.toml;
 
-        shared_packages = with pkgs; [
-          just
-        ];
       in
       with pkgs;
       {
-        devShells = rec {
-          default = msrv;
-
-          nightly = mkShell {
-            packages = shared_packages ++ [ rust-nightly-toolchain ];
-          };
-
-          msrv = mkShell {
-            packages = shared_packages ++ [ rust-toolchain ];
+        devShells = {
+          default = mkShell {
+            packages = [ just ] ++ [ rust-toolchain ];
           };
         };
       }

diff --git a/rust-toolchain-nightly.toml b/rust-toolchain-nightly.toml
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
 channel = "1.67.0"
-components = ["rust-src", "rust-analyzer"]
+components = ["rust-src", "rust-analyzer", "rustfmt"]