From 537eaba8d16cbc34dab2a04e212a704b3bb68f7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aaron=20W=C3=BCrth?= <aaron.wuerth@posteo.de>
Date: Sat, 7 Feb 2026 11:45:25 +0100
Subject: [PATCH] Use rust-analyzer from tool chain in devShell

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.
---
 flake.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index f309419c..91ac878e 100644
--- a/flake.nix
+++ b/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";
       };
     });
 }