From 91fb36148723cf3f87fe596a565c9082f4d82b05 Mon Sep 17 00:00:00 2001 From: Kamen Mladenov Date: Wed, 19 Feb 2025 10:29:12 +0200 Subject: chore: Update zkVM packages This includes: - Updating flake.lock - Updating all host and guest Cargo.toml and Cargo.lock files - Making zkvm default.nix file modifications to account for toolchain and setup changes --- zkvms/sp1/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'zkvms/sp1/default.nix') diff --git a/zkvms/sp1/default.nix b/zkvms/sp1/default.nix index 13f19c0..86a019c 100644 --- a/zkvms/sp1/default.nix +++ b/zkvms/sp1/default.nix @@ -5,12 +5,18 @@ metacraft-labs, pkg-config, craneLib-default, + gnum4, }: let commonArgs = { pname = "sp1"; inherit (metacraft-labs.sp1) version; + nativeBuildInputs = [ + metacraft-labs.sp1 + gnum4 + ]; + src = with lib.fileset; toSource { root = ../..; fileset = intersection (gitTracked ../..) (unions [ @@ -20,6 +26,8 @@ let ../../zkvms_host_io ]); }; + + extraLockfile = "${metacraft-labs.sp1}/Cargo.lock"; }; craneLib = craneLib-default.overrideToolchain metacraft-labs.sp1; @@ -29,10 +37,6 @@ in // { inherit cargoArtifacts; - nativeBuildInputs = [ - metacraft-labs.sp1 - ]; - guestTarget = "riscv32im-succinct-zkvm-elf"; doCheck = false; -- cgit v1.2.3