From d02aef570056fdc4efbe757e898328b46e0890e6 Mon Sep 17 00:00:00 2001 From: Kamen Mladenov Date: Fri, 21 Mar 2025 11:13:57 +0200 Subject: chore(flake.nix): Replace rust-overlay with fenix This follows the same change which was made in mcl-blockchain --- zkvms/zkwasm/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'zkvms/zkwasm') diff --git a/zkvms/zkwasm/default.nix b/zkvms/zkwasm/default.nix index 88947ba..e78d721 100644 --- a/zkvms/zkwasm/default.nix +++ b/zkvms/zkwasm/default.nix @@ -1,4 +1,4 @@ -{ zkvmLib, lib, rust-bin, metacraft-labs, wasm-pack, wasm-bindgen-cli, binaryen +{ zkvmLib, lib, fenix, metacraft-labs, wasm-pack, wasm-bindgen-cli, binaryen , craneLib-default, stdenv, }: let commonArgs = rec { @@ -13,9 +13,17 @@ let }; }; - rust-toolchain = rust-bin.nightly."2024-04-09".default.override { - targets = [ "wasm32-unknown-unknown" ]; - }; + rust-toolchain = let + toolchain-arg = { + channel = "nightly"; + date = "2024-04-09"; + sha256 = "sha256-Pf/EIA/M8/JpX7naMcutqBajVwhZoqrPkkyBwho6dyI="; + }; + in with fenix; combine [ + (toolchainOf toolchain-arg).minimalToolchain + (targets.wasm32-unknown-unknown.toolchainOf toolchain-arg).toolchain + ]; + craneLib = craneLib-default.overrideToolchain rust-toolchain; cargoArtifacts = zkvmLib.buildDepsOnly craneLib commonArgs; in zkvmLib.buildPackage craneLib (commonArgs // { -- cgit v1.2.3