Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions pkgs/cargo-prove.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,32 @@
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-prove";
version = "6.0.2";
version = "6.2.0";

src = fetchFromGitHub {
owner = "succinctlabs";
repo = "sp1";
rev = "v${version}";
hash = "sha256-DJ3/BlGJX9eLsBPMsmKtnoJYF9vgkxKn32dybQVggxA=";
hash = "sha256-0f8aHrrsMVml+prEK5jXrjYSkVgE17KD0pBeeV3d7O8=";
};

cargoHash = "sha256-6MCx5a6vydi34YvWgN+8Sj69FCZugHabQGXowv+550g=";
cargoHash = "sha256-M6lKVu4Vx6jo++6pU3V9Jm+1yanWHOj4tdXyQRbxrBA=";

buildAndTestSubdir = "crates/cli";

# The runner crate's build script spawns a nested `cargo build` to produce a
# helper binary it then embeds. Under `buildRustPackage` the outer build sets
# `--target <host-triple>`, which the nested invocation inherits via
# `CARGO_BUILD_TARGET`. That places the binary under
# `target/<triple>/release/` while the script looks for it at
# `target/release/`. Clear the env vars in the nested invocation so the path
# matches.
postPatch = ''
substituteInPlace crates/core/runner/build.rs \
--replace-fail 'cmd.env_remove("RUSTFLAGS");' \
'cmd.env_remove("RUSTFLAGS"); cmd.env_remove("CARGO_BUILD_TARGET"); cmd.env_remove("CARGO_BUILD_TARGET_DIR");'
'';

# Tests require network access which is not available in sandboxed Nix builds.
doCheck = false;

Expand Down
2 changes: 1 addition & 1 deletion templates/hello-world-async/program/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ edition = "2021"

[dependencies]
alloy-sol-types = { workspace = true }
sp1-zkvm = "6.0.2"
sp1-zkvm = "6.2.0"
fibonacci-lib = { path = "../lib" }
4 changes: 2 additions & 2 deletions templates/hello-world-async/script/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ name = "vkey"
path = "src/bin/vkey.rs"

[dependencies]
sp1-sdk = "6.0.2"
sp1-sdk = "6.2.0"
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
serde = { version = "1.0.200", default-features = false, features = ["derive"] }
Expand All @@ -29,4 +29,4 @@ fibonacci-lib = { path = "../lib" }
dotenv = "0.15.0"

[build-dependencies]
sp1-build = "6.0.2"
sp1-build = "6.2.0"
2 changes: 1 addition & 1 deletion templates/hello-world-blocking/program/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ edition = "2021"

[dependencies]
alloy-sol-types = { workspace = true }
sp1-zkvm = "6.0.2"
sp1-zkvm = "6.2.0"
fibonacci-lib = { path = "../lib" }
4 changes: 2 additions & 2 deletions templates/hello-world-blocking/script/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ name = "vkey"
path = "src/bin/vkey.rs"

[dependencies]
sp1-sdk = { version = "6.0.2", features = ["blocking", "native-gnark"] }
sp1-sdk = { version = "6.2.0", features = ["blocking", "native-gnark"] }
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
serde = { version = "1.0.200", default-features = false, features = ["derive"] }
clap = { version = "4.0", features = ["derive", "env"] }
Expand All @@ -28,4 +28,4 @@ fibonacci-lib = { path = "../lib" }
dotenv = "0.15.0"

[build-dependencies]
sp1-build = "6.0.2"
sp1-build = "6.2.0"