From 989a1af9793f50a8c2b61da55778341393ea45bd Mon Sep 17 00:00:00 2001
From: samuelburnham <45365069+samuelburnham@users.noreply.github.com>
Date: Fri, 15 May 2026 11:56:11 -0400
Subject: [PATCH] chore: Update to v6.2.0

---
 pkgs/cargo-prove.nix                          | 19 ++++++++++++++++---
 .../hello-world-async/program/Cargo.toml      |  2 +-
 templates/hello-world-async/script/Cargo.toml |  4 ++--
 .../hello-world-blocking/program/Cargo.toml   |  2 +-
 .../hello-world-blocking/script/Cargo.toml    |  4 ++--
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/cargo-prove.nix b/pkgs/cargo-prove.nix
index 844fac5..972a99d 100644
--- a/pkgs/cargo-prove.nix
+++ b/pkgs/cargo-prove.nix
@@ -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;
 
diff --git a/templates/hello-world-async/program/Cargo.toml b/templates/hello-world-async/program/Cargo.toml
index 6d357bc..7f720b8 100644
--- a/templates/hello-world-async/program/Cargo.toml
+++ b/templates/hello-world-async/program/Cargo.toml
@@ -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" }
diff --git a/templates/hello-world-async/script/Cargo.toml b/templates/hello-world-async/script/Cargo.toml
index f0e81bb..816da65 100644
--- a/templates/hello-world-async/script/Cargo.toml
+++ b/templates/hello-world-async/script/Cargo.toml
@@ -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"] }
@@ -29,4 +29,4 @@ fibonacci-lib = { path = "../lib" }
 dotenv = "0.15.0"
 
 [build-dependencies]
-sp1-build = "6.0.2"
+sp1-build = "6.2.0"
diff --git a/templates/hello-world-blocking/program/Cargo.toml b/templates/hello-world-blocking/program/Cargo.toml
index 6d357bc..7f720b8 100644
--- a/templates/hello-world-blocking/program/Cargo.toml
+++ b/templates/hello-world-blocking/program/Cargo.toml
@@ -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" }
diff --git a/templates/hello-world-blocking/script/Cargo.toml b/templates/hello-world-blocking/script/Cargo.toml
index 9d79de3..1e4dca7 100644
--- a/templates/hello-world-blocking/script/Cargo.toml
+++ b/templates/hello-world-blocking/script/Cargo.toml
@@ -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"] }
@@ -28,4 +28,4 @@ fibonacci-lib = { path = "../lib" }
 dotenv = "0.15.0"
 
 [build-dependencies]
-sp1-build = "6.0.2"
+sp1-build = "6.2.0"