Obtain Rust toolchain via fenix and update to 1.84

DanNixon · Jan 27, 2025 · 719d9ca · 719d9ca
1 parent bb5bb56
commit 719d9ca
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 15 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,23 +1,36 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+
     flake-utils.url = "github:numtide/flake-utils";
+
+    fenix = {
+      url = "github:nix-community/fenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
     self,
     nixpkgs,
     flake-utils,
+    fenix,
   }:
     flake-utils.lib.eachDefaultSystem (
       system: let
         pkgs = (import nixpkgs) {
           inherit system;
         };
 
+        toolchain = fenix.packages.${system}.toolchainOf {
+          channel = "1.84";
+          date = "2025-01-09";
+          sha256 = "lMLAupxng4Fd9F1oDw8gx+qA0RuF7ou7xhNU8wgs0PU=";
+        };
+
         rustPlatform = pkgs.makeRustPlatform {
-          cargo = pkgs.cargo;
-          rustc = pkgs.rustc;
+          cargo = toolchain.cargo;
+          rustc = toolchain.rustc;
         };
 
         cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml);
@@ -36,18 +49,12 @@
 
           packages = with pkgs; [
             # Rust toolchain
-            cargo
-            rustc
-
-            # Code analysis tools
-            clippy
-            rust-analyzer
+            toolchain.toolchain
 
             # Code formatting tools
             treefmt
             alejandra
             mdl
-            rustfmt
 
             # Rust dependency linting
             cargo-deny