feat(nix,rust): pin toolchain via rust-toolchain.toml (#46)

this introduces a single source of truth for the used rust toolchain
threefoldtech · Apr 24, 2024 · 16f3269 · 16f3269
1 parent 7b324e9
commit 16f3269
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 3 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,22 +6,36 @@
     crane.inputs.nixpkgs.follows = "nixpkgs";
 
     flake-utils.inputs.nixpkgs.follows = "nixpkgs";
+
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
+    };
   };
 
   outputs = {
     self,
     nixpkgs,
     crane,
     flake-utils,
+    rust-overlay,
   }:
     flake-utils.lib.eachSystem
     [
       flake-utils.lib.system.x86_64-linux
       flake-utils.lib.system.aarch64-linux
       flake-utils.lib.system.aarch64-darwin
     ] (system: let
-      pkgs = nixpkgs.legacyPackages.${system};
-      craneLib = crane.lib.${system};
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [(import rust-overlay)];
+      };
+
+      customToolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+      craneLib = (crane.mkLib pkgs).overrideToolchain customToolchain;
     in {
       devShells.default = craneLib.devShell {
         packages = [

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.74.0"
+