Radish alpha
h
rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5
Radicle Heartwood Protocol & Stack
Radicle
Git
Use rust-analyzer from tool chain in devShell
Merged did:key:z6MkeyYz...ccbv opened 2 months ago

The devShell now uses rust-analyzer from the tool chain. Previously, using the nixpkgs rust-analyzer (from an older rust version) led to inaccurate results.

1 file changed +10 -3 d7a4137e 537eaba8
modified flake.nix
@@ -62,6 +62,14 @@
        commonArgs = mkCommonArgs craneLib;
      };

+
      rustupDevShell = rec {
+
        toolchain = rustup.toolchain.override (prev: {
+
          extensions = prev.extensions ++ ["rust-analyzer"];
+
        });
+
        craneLib = (crane.mkLib pkgs).overrideToolchain toolchain;
+
        commonArgs = mkCommonArgs craneLib;
+
      };
+

      srcFilters = path: type:
        builtins.any (suffix: lib.hasSuffix suffix path) [
          ".sql" # schemas
@@ -336,7 +344,7 @@
          };
        };

-
      devShells.default = rustup.craneLib.devShell {
+
      devShells.default = rustupDevShell.craneLib.devShell {
        inherit (self.checks.${system}.pre-commit-check) shellHook;
        buildInputs = self.checks.${system}.pre-commit-check.enabledPackages;

@@ -348,11 +356,10 @@
          cargo-nextest
          cargo-semver-checks
          ripgrep
-
          rust-analyzer
          sqlite
        ];

-
        env.RUST_SRC_PATH = "${rustup.toolchain}/lib/rustlib/src/rust/library";
+
        env.RUST_SRC_PATH = "${rustupDevShell.toolchain}/lib/rustlib/src/rust/library";
      };
    });
}