diff --git a/Cargo.lock b/Cargo.lock index 60e9b210e..4964ae57a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -142,7 +142,7 @@ dependencies = [ "polling", "rustix", "slab", - "windows-sys 0.61.1", + "windows-sys 0.61.2", ] [[package]] @@ -169,7 +169,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -212,11 +212,11 @@ dependencies = [ "itertools", "libc", "libsystemd", - "nix 0.31.3", + "nix 0.32.0", "notify", "oci-spec", "quick-xml 0.42.0", - "rand 0.10.3", + "rand 0.10.4", "regex", "reqwest", "rustix", @@ -250,7 +250,7 @@ dependencies = [ "color-eyre", "data-encoding", "libc", - "nix 0.31.3", + "nix 0.32.0", "rustix", "tokio", "tracing", @@ -434,9 +434,9 @@ checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" [[package]] name = "cfg_aliases" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" [[package]] name = "chacha20" @@ -460,7 +460,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -494,7 +494,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -585,7 +585,7 @@ dependencies = [ "encode_unicode", "libc", "unicode-width", - "windows-sys 0.61.1", + "windows-sys 0.61.2", ] [[package]] @@ -882,7 +882,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -1035,7 +1035,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1523,7 +1523,7 @@ dependencies = [ "dirs", "itest", "linkme", - "rand 0.10.3", + "rand 0.10.4", "regex", "scopeguard", "serde", @@ -1602,7 +1602,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1719,22 +1719,22 @@ dependencies = [ [[package]] name = "linkme" -version = "0.3.37" +version = "0.3.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3045e122bd98aef8ec3ad58ce84f0791f64e70163d1a02710af4aa11a4d54cc5" +checksum = "10a4e12fd3f6b22d5bc28beccac0f53bb35db4a897c6ddb709c4a0161f72eb6e" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.37" +version = "0.3.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77060ebe535362c3da75682cd17b0431017b6e7c5661e714fc69a7ad017d1301" +checksum = "22cd04c256b1cd686a45898c8fd150c79b801d96a3eb7bae1075f9eb3b4b85c1" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1825,7 +1825,7 @@ dependencies = [ "libc", "log", "wasi 0.11.1+wasi-snapshot-preview1", - "windows-sys 0.61.1", + "windows-sys 0.61.2", ] [[package]] @@ -1880,6 +1880,19 @@ dependencies = [ "memoffset", ] +[[package]] +name = "nix" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77730ed34f01f4990cb2ea67fec715ecebc6fab9a6396cf83c5529b13f581bdc" +dependencies = [ + "bitflags 2.9.4", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", +] + [[package]] name = "nom" version = "8.0.0" @@ -1905,7 +1918,7 @@ dependencies = [ "objc2-core-foundation", "objc2-core-services", "walkdir", - "windows-sys 0.61.1", + "windows-sys 0.61.2", ] [[package]] @@ -2117,7 +2130,7 @@ dependencies = [ "hermit-abi", "pin-project-lite", "rustix", - "windows-sys 0.61.1", + "windows-sys 0.61.2", ] [[package]] @@ -2241,9 +2254,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" +checksum = "8f6fa277c67e6ea590466f04c3fe82cb509f0864fe470643e5570de9514a9b11" dependencies = [ "chacha20", "getrandom 0.4.3", @@ -2399,7 +2412,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -2472,7 +2485,7 @@ version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" dependencies = [ - "windows-sys 0.61.1", + "windows-sys 0.61.2", ] [[package]] @@ -2531,7 +2544,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -2736,9 +2749,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.9" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" +checksum = "4ae9ccbea3a7b0b09443036490c8f34a8b1b760fd345e5c0dae0aac718faea79" dependencies = [ "proc-macro2", "quote", @@ -2793,10 +2806,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.3", + "getrandom 0.3.3", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -2816,7 +2829,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -2853,7 +2866,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys 0.61.1", + "windows-sys 0.61.2", ] [[package]] @@ -2864,7 +2877,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -3158,9 +3171,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.29.1" +version = "1.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a06f08a856b009bc7bbaf7d3e79808595d032dd19074c0c2ef26e49e03e6bdc" +checksum = "bed99139f7dac9b5cfe5f17be4d66dc7079a34dee1d74bcc77217119240e267c" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -3371,7 +3384,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -3388,7 +3401,7 @@ checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9" dependencies = [ "windows-implement", "windows-interface", - "windows-link 0.2.0", + "windows-link 0.2.1", "windows-result 0.4.0", "windows-strings 0.5.0", ] @@ -3423,9 +3436,9 @@ checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" [[package]] name = "windows-link" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-registry" @@ -3453,7 +3466,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f" dependencies = [ - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -3471,7 +3484,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda" dependencies = [ - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -3494,11 +3507,11 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.61.1" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.0", + "windows-link 0.2.1", ] [[package]] @@ -3523,7 +3536,7 @@ version = "0.53.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b" dependencies = [ - "windows-link 0.2.0", + "windows-link 0.2.1", "windows_aarch64_gnullvm 0.53.0", "windows_aarch64_msvc 0.53.0", "windows_i686_gnu 0.53.0", @@ -3820,20 +3833,21 @@ dependencies = [ [[package]] name = "zlink" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "198be428106fe2987e3c014daadf976120909f4a765587341c9d4c2624912d61" +checksum = "0a1ad9b0ce1b2429b410a62073718c912f116e8321dd792174f1c3740b1dfefd" dependencies = [ "zlink-core", "zlink-smol", "zlink-tokio", + "zlink-zruntime", ] [[package]] name = "zlink-core" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a314bfe2e205db0b9cc286abc09b08f34837a06dd709b10ef7cf28bd622e4f" +checksum = "e7255eca2f112bfa0810330552cab275b9ccf6e85de5c621fb6f50ed3785e199" dependencies = [ "futures-util", "itoa", @@ -3851,18 +3865,18 @@ dependencies = [ [[package]] name = "zlink-idl" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9beafa91ab0672e1a2adc828cac4163152156d54046a0cad298807e290153ccf" +checksum = "47c109a8267b0136e69d3388fb88404f90b454a1bc927e7db0a7c00ef9392c46" dependencies = [ "zlink-names", ] [[package]] name = "zlink-macros" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad68b7baceb8afe7b0b21e408961f6a9d28fe5f10e02b19ef15b7ac3be39fc90" +checksum = "e5645ee29f57b5e3fba0c3127cf924f1ede3489b80ad7050642d5b773324af7b" dependencies = [ "proc-macro2", "quote", @@ -3872,9 +3886,9 @@ dependencies = [ [[package]] name = "zlink-names" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2019f3c1186761aee19689ba2f99e659ec7f0d637ad1ee96f22a54434e743a" +checksum = "f24e03c07a8aca8c447162c4cb5a0e766f4a3cae979f9fa82d5c2c77ab4f1f4b" dependencies = [ "serde", "winnow 0.7.15", @@ -3883,9 +3897,9 @@ dependencies = [ [[package]] name = "zlink-smol" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f8b15370cace714c53983a91688004407f897eb1cf9b877b3e9df9330a26aa" +checksum = "835c6426b2d787424a762d5bfacbafd2f41dd9d4e4c4ec97dd9de04f7574a07c" dependencies = [ "async-broadcast", "async-channel", @@ -3898,9 +3912,9 @@ dependencies = [ [[package]] name = "zlink-tokio" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a46c4f9f765ecac29e50b21dc5c73185a2c2885a3d1ca1485ff1a97d96bc1538" +checksum = "d1ebb6da7d196254b733a4b922a97ce9974bd8a6d3b85a124c4de205824261b1" dependencies = [ "futures-util", "pin-project-lite", @@ -3909,8 +3923,35 @@ dependencies = [ "zlink-core", ] +[[package]] +name = "zlink-zruntime" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1633767291a4afaac19d08a6c95f706be7bebb7a3e457a06822d1246d7bee186" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "zlink-core", + "zruntime", +] + [[package]] name = "zmij" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" + +[[package]] +name = "zruntime" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6a55d4f521760475a30f7b96779508fe8c40dc834478709454dd1d5f0ebc72" +dependencies = [ + "futures-core", + "futures-io", + "rustix", + "socket2", + "tracing", + "windows-sys 0.61.2", +] diff --git a/crates/bcvk-qemu/Cargo.toml b/crates/bcvk-qemu/Cargo.toml index d7386ee4c..4c0757a2f 100644 --- a/crates/bcvk-qemu/Cargo.toml +++ b/crates/bcvk-qemu/Cargo.toml @@ -12,7 +12,7 @@ cap-std-ext = { workspace = true } color-eyre = { workspace = true } data-encoding = "2.9" libc = "0.2" -nix = { version = "0.31", features = ["socket"] } +nix = { version = "0.32", features = ["socket"] } rustix = { version = "1", features = ["pipe", "process"] } tokio = { version = "1", features = ["fs", "process", "time", "macros"] } tracing = { workspace = true } diff --git a/crates/integration-tests/Cargo.toml b/crates/integration-tests/Cargo.toml index 73ad35ce7..fd04d6427 100644 --- a/crates/integration-tests/Cargo.toml +++ b/crates/integration-tests/Cargo.toml @@ -29,7 +29,7 @@ xshell = { workspace = true } cfg-if = { workspace = true } serde = { version = "1.0.199", features = ["derive"] } serde_json = "1.0.116" -zlink = "0.8" +zlink = "0.9" tokio = { version = "1", features = ["rt", "net", "macros"] } tempfile = "3" uuid = { version = "1.18.1", features = ["v4"] } diff --git a/crates/kit/Cargo.toml b/crates/kit/Cargo.toml index 56b9df925..504f8ecca 100644 --- a/crates/kit/Cargo.toml +++ b/crates/kit/Cargo.toml @@ -53,9 +53,9 @@ bootc-utils = { package = "bootc-internal-utils", version = "1.16.14" } composefs-boot = { version = "0.9.4", default-features = false } rustix = { version = "1", features = ["thread", "net", "fs", "pipe", "system", "process", "mount"] } vsock = "0.5" -nix = { version = "0.31", features = ["socket"] } +nix = { version = "0.32", features = ["socket"] } libc = "0.2" -zlink = "0.8" +zlink = "0.9" futures-util = "0.3" libsystemd = "0.7"