From f0c676c11659a45cf16d1f21074490bab40e393a Mon Sep 17 00:00:00 2001
From: Lu Zhang <zl9394@gmail.com>
Date: Sat, 14 Feb 2026 22:28:39 -0800
Subject: [PATCH] Point tokio-msim-fork to SubzeroLabs fork with tokio-macros
 2.6.1

Avoids Nix cargo vendor collision between crates.io tokio-macros 2.6.0
and the git fork's tokio-macros 2.6.0 (now 2.6.1).
---
 msim-tokio/Cargo.toml | 2 +-
 msim/Cargo.toml       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/msim-tokio/Cargo.toml b/msim-tokio/Cargo.toml
index 2613bdb..cc9df83 100644
--- a/msim-tokio/Cargo.toml
+++ b/msim-tokio/Cargo.toml
@@ -58,7 +58,7 @@ msim = { version = "0.1.0", path = "../msim" }
 [dependencies]
 tracing = "0.1"
 
-real_tokio = { git = "https://github.com/MystenLabs/tokio-msim-fork.git", rev = "6b1da10b18f9a4b1d42b1432415a0b3092908c77", package = "real_tokio", features = ["full"] }
+real_tokio = { git = "https://github.com/SubzeroLabs/tokio-msim-fork.git", rev = "74cb722ba7b41375a730940a34d8ddade2853f2f", package = "real_tokio", features = ["full"] }
 bytes = { version = "1.1" }
 futures = { version = "0.3.0", features = ["async-await"] }
 mio = { version = "0.8.1", features = ["net"] }
diff --git a/msim/Cargo.toml b/msim/Cargo.toml
index f272b5d..3c49759 100644
--- a/msim/Cargo.toml
+++ b/msim/Cargo.toml
@@ -38,8 +38,8 @@ ahash = "0.7"
 downcast-rs = "1.2"
 libc = "0.2"
 naive-timer = "0.2"
-tokio = { git = "https://github.com/MystenLabs/tokio-msim-fork.git", rev = "6b1da10b18f9a4b1d42b1432415a0b3092908c77" , package = "real_tokio", features = ["full"] }
-tokio-util = { git = "https://github.com/MystenLabs/tokio-msim-fork.git", rev = "6b1da10b18f9a4b1d42b1432415a0b3092908c77", features = ["full"] }
+tokio = { git = "https://github.com/SubzeroLabs/tokio-msim-fork.git", rev = "74cb722ba7b41375a730940a34d8ddade2853f2f" , package = "real_tokio", features = ["full"] }
+tokio-util = { git = "https://github.com/SubzeroLabs/tokio-msim-fork.git", rev = "74cb722ba7b41375a730940a34d8ddade2853f2f", features = ["full"] }
 toml = "0.5"
 socket2 = "0.4"
 erasable = "1.2"
@@ -50,7 +50,7 @@ async-task = { git = "https://github.com/mystenmark/async-task", rev = "4e45b26e
 [dev-dependencies]
 criterion = "0.3"
 structopt = "0.3"
-tokio = { git = "https://github.com/MystenLabs/tokio-msim-fork.git", rev = "6b1da10b18f9a4b1d42b1432415a0b3092908c77", package = "real_tokio", features = ["full"] }
+tokio = { git = "https://github.com/SubzeroLabs/tokio-msim-fork.git", rev = "74cb722ba7b41375a730940a34d8ddade2853f2f", package = "real_tokio", features = ["full"] }
 
 [[bench]]
 name = "rpc"