Skip to content

Commit b41e176

Browse files
chore: Update to v6.2.0 (#4)
1 parent 1b3415d commit b41e176

5 files changed

Lines changed: 22 additions & 9 deletions

File tree

pkgs/cargo-prove.nix

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,32 @@
1010
}:
1111
rustPlatform.buildRustPackage rec {
1212
pname = "cargo-prove";
13-
version = "6.0.2";
13+
version = "6.2.0";
1414

1515
src = fetchFromGitHub {
1616
owner = "succinctlabs";
1717
repo = "sp1";
1818
rev = "v${version}";
19-
hash = "sha256-DJ3/BlGJX9eLsBPMsmKtnoJYF9vgkxKn32dybQVggxA=";
19+
hash = "sha256-0f8aHrrsMVml+prEK5jXrjYSkVgE17KD0pBeeV3d7O8=";
2020
};
2121

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

2424
buildAndTestSubdir = "crates/cli";
2525

26+
# The runner crate's build script spawns a nested `cargo build` to produce a
27+
# helper binary it then embeds. Under `buildRustPackage` the outer build sets
28+
# `--target <host-triple>`, which the nested invocation inherits via
29+
# `CARGO_BUILD_TARGET`. That places the binary under
30+
# `target/<triple>/release/` while the script looks for it at
31+
# `target/release/`. Clear the env vars in the nested invocation so the path
32+
# matches.
33+
postPatch = ''
34+
substituteInPlace crates/core/runner/build.rs \
35+
--replace-fail 'cmd.env_remove("RUSTFLAGS");' \
36+
'cmd.env_remove("RUSTFLAGS"); cmd.env_remove("CARGO_BUILD_TARGET"); cmd.env_remove("CARGO_BUILD_TARGET_DIR");'
37+
'';
38+
2639
# Tests require network access which is not available in sandboxed Nix builds.
2740
doCheck = false;
2841

templates/hello-world-async/program/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ edition = "2021"
55

66
[dependencies]
77
alloy-sol-types = { workspace = true }
8-
sp1-zkvm = "6.0.2"
8+
sp1-zkvm = "6.2.0"
99
fibonacci-lib = { path = "../lib" }

templates/hello-world-async/script/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ name = "vkey"
1717
path = "src/bin/vkey.rs"
1818

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

3131
[build-dependencies]
32-
sp1-build = "6.0.2"
32+
sp1-build = "6.2.0"

templates/hello-world-blocking/program/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ edition = "2021"
55

66
[dependencies]
77
alloy-sol-types = { workspace = true }
8-
sp1-zkvm = "6.0.2"
8+
sp1-zkvm = "6.2.0"
99
fibonacci-lib = { path = "../lib" }

templates/hello-world-blocking/script/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ name = "vkey"
1717
path = "src/bin/vkey.rs"
1818

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

3030
[build-dependencies]
31-
sp1-build = "6.0.2"
31+
sp1-build = "6.2.0"

0 commit comments

Comments
 (0)