From cbc2d424bcccfbad18de69b08208e1399fb84821 Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Tue, 9 Jun 2026 21:11:15 +0200 Subject: [PATCH] flake: simplify nix code --- flake.nix | 3 +-- nix/rust-toolchain.nix | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 nix/rust-toolchain.nix diff --git a/flake.nix b/flake.nix index bc5c8b96..6431773c 100644 --- a/flake.nix +++ b/flake.nix @@ -28,9 +28,8 @@ pkgs: let rust-bin = (inputs.rust-overlay.lib.mkRustBin { }) pkgs; - rustToolchainBuilder = import ./nix/rust-toolchain.nix; in - rustToolchainBuilder { inherit rust-bin; }; + rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; in { devShells = forAllSystems (pkgs: { diff --git a/nix/rust-toolchain.nix b/nix/rust-toolchain.nix deleted file mode 100644 index 021a2601..00000000 --- a/nix/rust-toolchain.nix +++ /dev/null @@ -1,9 +0,0 @@ -# Returns a Rust toolchain for Nix that matches the one from the toolchain file. - -{ - # Comes from rust-overlay - rust-bin, -}: - -# Includes rustc, cargo, rustfmt, etc -rust-bin.fromRustupToolchainFile ../rust-toolchain.toml