From d78cbffec7eb772a91f4234f47586990fb95c427 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 23 Sep 2024 00:36:27 +0800 Subject: [PATCH] update some of the references to published packages --- Cargo.lock | 114 ++++++++++++++++++++++++++++++----------------------- Cargo.toml | 12 +++--- 2 files changed, 70 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 11c9246d4..9aee0f758 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -129,7 +129,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -312,7 +312,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -597,7 +597,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -632,7 +632,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -735,7 +735,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -766,7 +766,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -873,7 +873,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-pio", "xous-pl230", "xous-swapper", @@ -897,7 +897,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-pio", "xous-pl230", ] @@ -1505,7 +1505,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1530,7 +1530,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2085,7 +2085,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2154,7 +2154,7 @@ dependencies = [ "wasm-bindgen-test", "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2194,7 +2194,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2287,7 +2287,7 @@ dependencies = [ "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2350,7 +2350,7 @@ dependencies = [ "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2493,7 +2493,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2507,7 +2507,7 @@ dependencies = [ "rkyv 0.8.8", "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2524,7 +2524,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2543,7 +2543,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2658,7 +2658,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2698,7 +2698,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2825,7 +2825,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -3013,7 +3013,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3048,7 +3048,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3078,7 +3078,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3139,7 +3139,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -3570,7 +3570,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "zeroize", "zeroize_derive", ] @@ -4223,7 +4223,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4357,7 +4357,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", "zeroize", ] @@ -4644,6 +4644,7 @@ dependencies = [ [[package]] name = "sha2" version = "0.10.8" +source = "git+https://github.com/betrusted-io/hashes.git?branch=sha2-v0.10.8-xous#5cc2265891fe0f7c1440ce7f37aacb52bf36c7fb" dependencies = [ "cfg-if", "cpufeatures", @@ -4659,7 +4660,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4744,7 +4745,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4856,7 +4857,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4937,7 +4938,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -5089,7 +5090,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5246,7 +5247,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5367,7 +5368,7 @@ dependencies = [ "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5387,7 +5388,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5404,7 +5405,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-tts-backend", ] @@ -5571,7 +5572,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", "xous-usb-hid", ] @@ -5792,7 +5793,7 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-usb-hid", ] @@ -6355,7 +6356,7 @@ dependencies = [ "num-derive 0.3.3", "num-traits", "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6368,7 +6369,7 @@ dependencies = [ "rkyv 0.8.8", "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6383,7 +6384,7 @@ dependencies = [ "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6398,7 +6399,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] @@ -6442,6 +6443,17 @@ dependencies = [ "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "xous-ipc" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b36fc22389ca2481b9c3ab9bc0e2402a9cde75e5930fa21ae6b8433aab3f6908" +dependencies = [ + "bitflags 1.3.2", + "rkyv 0.8.8", + "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "xous-kernel" version = "0.9.38" @@ -6476,7 +6488,7 @@ dependencies = [ "utralib 0.1.24", "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6491,7 +6503,7 @@ dependencies = [ "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6550,7 +6562,7 @@ dependencies = [ "xous-api-log", "xous-api-names", "xous-api-susres", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6567,7 +6579,7 @@ dependencies = [ "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-log", "xous-api-names", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6584,13 +6596,15 @@ dependencies = [ "xous-api-names", "xous-api-susres", "xous-api-ticktimer", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xous-semver", ] [[package]] name = "xous-tts-backend" version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2133f122ecaf3ec54ba59cb3731538b6f2dde513de1b9daf0ffa05c5263ccebc" dependencies = [ "log", "num-derive 0.3.3", @@ -6598,7 +6612,7 @@ dependencies = [ "rkyv 0.8.8", "xous 0.9.63 (registry+https://github.com/rust-lang/crates.io-index)", "xous-api-names", - "xous-ipc 0.10.0", + "xous-ipc 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 42fa49697..cb296fc4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -140,8 +140,8 @@ opt-level = "s" # z,s: Optimize for size instead of performance; 1 for easier de # prefer hardware-accelerated versions of services [patch.crates-io] -# sha2 = { git = "https://github.com/betrusted-io/hashes.git", branch = "sha2-v0.10.8-xous" } -sha2 = { path = "../hashes/sha2" } +sha2 = { git = "https://github.com/betrusted-io/hashes.git", branch = "sha2-v0.10.8-xous" } +# sha2 = { path = "../hashes/sha2" } [patch.crates-io.aes] path = "services/aes" @@ -186,8 +186,8 @@ path = "./utralib" path = "./svd2utra" # [patch.crates-io.xous] # path = "./xous-rs" -[patch.crates-io.xous-ipc] -path = "./xous-ipc" +# [patch.crates-io.xous-ipc] +# path = "./xous-ipc" [patch.crates-io.xous-api-names] path = "./api/xous-api-names" [patch.crates-io.xous-api-susres] @@ -197,5 +197,5 @@ path = "./api/xous-api-log" [patch.crates-io.xous-api-ticktimer] path = "./api/xous-api-ticktimer" -[patch.crates-io.xous-tts-backend] -path = "../tts-backend" +# [patch.crates-io.xous-tts-backend] +# path = "../tts-backend"