Add a Nix devShell for the linting toolchain

linera-io · Nov 21, 2023 · fa0664a · fa0664a
1 parent cff4632
commit fa0664a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -26,12 +26,10 @@
           pkg-config
           nodejs
         ];
-        rustToolchain = (pkgs.rust-bin.fromRustupToolchainFile
-          ./rust-toolchain.toml);
-        rustPlatform = pkgs.makeRustPlatform {
-          rustc = rustToolchain;
-          cargo = rustToolchain;
-        };
+        rustBuildToolchain = (pkgs.rust-bin.fromRustupToolchainFile
+          ./toolchains/build/rust-toolchain.toml);
+        rustLintToolchain = (pkgs.rust-bin.fromRustupToolchainFile
+          ./toolchains/lint/rust-toolchain.toml);
       in {
         _module.args.pkgs = import inputs.nixpkgs {
           inherit system;
@@ -45,17 +43,21 @@
           ];
           shellHook = ''
             # For rust-analyzer 'hover' tooltips to work.
-            export RUST_SRC_PATH=${rustToolchain.availableComponents.rust-src}
+            export RUST_SRC_PATH=${rustBuildToolchain.availableComponents.rust-src}
             export LIBCLANG_PATH=${pkgs.libclang.lib}/lib
             export PATH=$PWD/target/release:~/.cargo/bin:$PATH
           '';
           buildInputs = nonRustDeps;
           nativeBuildInputs = with pkgs; [
-            rustToolchain
+            rustBuildToolchain
             rust-analyzer
           ];
         };
 
+        devShells.lint = pkgs.mkShell {
+          nativeBuildInputs = [ rustLintToolchain ];
+        };
+
         # Add your auto-formatters here.
         # cf. https://numtide.github.io/treefmt/
         treefmt.config = {