use [patch] sections to specify serde_json dependency

fortanix · Oct 22, 2024 · ffd7622 · ffd7622
1 parent 4d3e1af
commit ffd7622
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 55 deletions.
diff --git a/api-model/Cargo.toml b/api-model/Cargo.toml
@@ -10,4 +10,7 @@ repository = "https://github.com/fortanix/salmiac"
 [dependencies]
 hex = "0.4"
 serde = { version = "1.0", features = ["derive"], optional = true }
+serde_json = "1.0"
+
+[patch.crates-io]
 serde_json = { git = "https://github.com/fortanix/serde-json.git", branch = "base64_bytes" }
diff --git a/tools/container-converter/Cargo.lock b/tools/container-converter/Cargo.lock
diff --git a/tools/container-converter/Cargo.toml b/tools/container-converter/Cargo.toml
@@ -22,7 +22,7 @@ log = "0.4"
 nix = { version = "0.26.1", features = ["user", "fs"] }
 rand = "0.8.4"
 serde = { version = "1.0.127", features = ["derive"] }
-serde_json =  { git = "https://github.com/fortanix/serde-json.git", branch = "base64_bytes" }
+serde_json = "1.0"
 shiplift = { git = "https://github.com/fortanix/shiplift.git" }
 sys-mount = "1.5.1"
 tar = { git = "https://github.com/alexcrichton/tar-rs" }
@@ -32,3 +32,6 @@ toml = "0.5.8"
 
 [dev-dependencies]
 chrono = "0.4.22"
+
+[patch.crates-io]
+serde_json = { git = "https://github.com/fortanix/serde-json.git", branch = "base64_bytes" }
diff --git a/vsock-proxy/Cargo.lock b/vsock-proxy/Cargo.lock
diff --git a/vsock-proxy/Cargo.toml b/vsock-proxy/Cargo.toml
@@ -5,3 +5,9 @@ members = [
     "parent",
     "enclave",
 ]
+
+[workspace.dependencies]
+serde_json = "1.0"
+
+[patch.crates-io]
+serde_json = { git = "https://github.com/fortanix/serde-json.git", branch = "base64_bytes" }
diff --git a/vsock-proxy/enclave/Cargo.toml b/vsock-proxy/enclave/Cargo.toml
@@ -30,7 +30,7 @@ rtnetlink = "0.8.0"
 sdkms = { version = "0.2.1", default-features = false, features = ["hyper-native-tls"] }
 serde = { version = "1.0.127", features = ["derive"] }
 serde_cbor = "0.11.2"
-serde_json =  { git = "https://github.com/fortanix/serde-json.git", branch = "base64_bytes" }
+serde_json = { workspace = true }
 shared = { path = "../shared" }
 sysinfo = "0.29.8"
 tokio = { version = "1.0.1", features = ["macros", "rt", "rt-multi-thread", "io-util"] }