537eaba Use rust-analyzer from tool chain in devShell — heartwood

Radicle Heartwood Protocol & Stack

Use rust-analyzer from tool chain in devShell

✗ CI failure Aaron Würth committed 2 months ago

commit 537eaba8d16cbc34dab2a04e212a704b3bb68f7c
parent d7a4137e23b68b768f0d41349e5d0664bea772d0

3 failed (3 total) View logs

1 file changed +10 -3

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";
       };
     });
 }