diff options
| author | Kamen Mladenov <kamen@syndamia.com> | 2025-03-21 11:13:57 +0200 |
|---|---|---|
| committer | Kamen Mladenov <kamen@syndamia.com> | 2025-04-04 11:03:00 +0300 |
| commit | d02aef570056fdc4efbe757e898328b46e0890e6 (patch) | |
| tree | e545969653a5d02b5b31528c9b42148a0a4e1eb4 /zkvms | |
| parent | fe7d70ad78c4660e4e11f8c6bbcfca05fe1099ce (diff) | |
| download | zkVMs-benchmarks-d02aef570056fdc4efbe757e898328b46e0890e6.tar zkVMs-benchmarks-d02aef570056fdc4efbe757e898328b46e0890e6.tar.gz zkVMs-benchmarks-d02aef570056fdc4efbe757e898328b46e0890e6.zip | |
chore(flake.nix): Replace rust-overlay with fenix
This follows the same change which was made in mcl-blockchain
Diffstat (limited to 'zkvms')
| -rw-r--r-- | zkvms/zkm/default.nix | 2 | ||||
| -rw-r--r-- | zkvms/zkwasm/default.nix | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/zkvms/zkm/default.nix b/zkvms/zkm/default.nix index 7fc52f6..4b4cfe2 100644 --- a/zkvms/zkm/default.nix +++ b/zkvms/zkm/default.nix @@ -1,4 +1,4 @@ -{ zkvmLib, lib, just, metacraft-labs, metacraft-labs-old, rust-bin, protobuf +{ zkvmLib, lib, just, metacraft-labs, metacraft-labs-old, protobuf , pkg-config, openssl, buildGoModule, fetchFromGitHub, craneLib-default, }: let zkm_libsnark = buildGoModule rec { 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 // { |