Merge pull request #2011 from cachix/fix-rust-hooks-with-custom-toolchain

rust: expose `toolchainPackage` and use it correctly override git hooks

Author: domenkozar

docs/reference/options.md

@@ -15648,6 +15648,23 @@ null or package
 
 
 
+## languages.rust.toolchainPackage
+
+
+
+The aggregated toolchain package, which includes the configured components and targets.
+This is automatically set based on the channel and components configuration.
+
+
+
+*Type:*
+package
+
+*Declared by:*
+ - [https://github.com/cachix/devenv/blob/main/src/modules/languages/rust.nix](https://github.com/cachix/devenv/blob/main/src/modules/languages/rust.nix)
+
+
+
 ## languages.rust.version
 
 

docs/supported-languages/rust.md

@@ -229,6 +229,20 @@ null or package
 
 
 
+### languages\.rust\.toolchainPackage
+
+
+
+The aggregated toolchain package, which includes the configured components and targets\.
+This is automatically set based on the channel and components configuration\.
+
+
+
+*Type:*
+package
+
+
+
 ### languages\.rust\.version
 
 

src/modules/languages/rust.nix

@@ -94,6 +94,14 @@ in
       defaultText = lib.literalExpression "nixpkgs";
       description = "Rust component packages. May optionally define additional components, for example `miri`.";
     };
+
+    toolchainPackage = lib.mkOption {
+      type = lib.types.package;
+      description = ''
+        The aggregated toolchain package, which includes the configured components and targets.
+        This is automatically set based on the channel and components configuration.
+      '';
+    };
   };
 
   config = lib.mkIf cfg.enable (lib.mkMerge [
@@ -163,14 +171,20 @@ in
             CFLAGS = lib.optionalString pkgs.stdenv.isDarwin "-iframework ${config.devenv.profile}/Library/Frameworks";
           };
 
-        git-hooks.tools.cargo = mkOverrideTools cfg.toolchain.cargo or null;
-        git-hooks.tools.rustfmt = mkOverrideTools cfg.toolchain.rustfmt or null;
-        git-hooks.tools.clippy = mkOverrideTools cfg.toolchain.clippy or null;
+        git-hooks.tools.cargo = mkOverrideTools cfg.toolchainPackage;
+        git-hooks.tools.rustfmt = mkOverrideTools cfg.toolchainPackage;
+        git-hooks.tools.clippy = mkOverrideTools cfg.toolchainPackage;
       }
     )
 
     (lib.mkIf (cfg.channel == "nixpkgs") {
-      packages = builtins.map (c: cfg.toolchain.${c} or (throw "toolchain.${c}")) cfg.components;
+      languages.rust.toolchainPackage = lib.mkDefault (
+        pkgs.symlinkJoin {
+          name = "rust-toolchain-${cfg.channel}";
+          paths = builtins.map (c: cfg.toolchain.${c} or (throw "toolchain.${c}")) cfg.components;
+        }
+      );
+      packages = [ cfg.toolchainPackage ];
     })
 
     (lib.mkIf (cfg.channel != "nixpkgs") (
@@ -245,7 +259,8 @@ in
       in
       {
         languages.rust.toolchain = builtins.mapAttrs (_: lib.mkDefault) toolchainComponents;
-        packages = [ profile ];
+        languages.rust.toolchainPackage = lib.mkDefault profile;
+        packages = [ cfg.toolchainPackage ];
       }
     ))
   ]);