refactor(nix): decouple rust extensions; add toolchains

eljamm · Feb 15, 2025 · ae087c7 · ae087c7
1 parent 014a7bf
commit ae087c7
Showing 1 changed file with 23 additions and 14 deletions.
diff --git a/nix/modules/rust.nix b/nix/modules/rust.nix
@@ -1,29 +1,38 @@
 { inputs, ... }:
 {
   perSystem =
-    { system, pkgs, ... }:
+    {
+      system,
+      pkgs,
+      self',
+      ...
+    }:
     {
       # Add rust-overlay to `pkgs`
       _module.args.pkgs = import inputs.nixpkgs {
         inherit system;
         overlays = [ inputs.rust-overlay.overlays.default ];
       };
 
+      legacyPackages.rust = rec {
+        extensions = [
+          "cargo"
+          "clippy"
+          "rust-src"
+          "rustc"
+          "rustfmt"
+          "rust-analyzer"
+        ];
+
+        toolchains.stable = pkgs.rust-bin.stable.latest.minimal.override { inherit extensions; };
+        toolchains.nightly = pkgs.rust-bin.selectLatestNightlyWith (
+          toolchain: toolchain.minimal.override { inherit extensions; }
+        );
+      };
+
       devShells.rust = pkgs.mkShell {
         packages = [
-          (pkgs.rust-bin.selectLatestNightlyWith (
-            toolchain:
-            toolchain.minimal.override {
-              extensions = [
-                "cargo"
-                "clippy"
-                "rust-src"
-                "rustc"
-                "rustfmt"
-                "rust-analyzer"
-              ];
-            }
-          ))
+          self'.legacyPackages.rust.toolchains.nightly
         ];
       };
     };