diff --git a/Cargo.lock b/Cargo.lock index 9339635..cf0cbac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1597,18 +1597,18 @@ dependencies = [ [[package]] name = "hyperlight-component-macro" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7ae5cd7c8e5f5b925b07bce45be853ac0be0e6d4e8b2afd17ad8c16aa135c4" +checksum = "956a19ec0312f6ed60f54ae0a1253bf7f7f2f3f83b43d11309ff12f07ce43cfb" dependencies = [ "env_logger", - "hyperlight-component-util", + "hyperlight-component-util 0.15.0", "itertools 0.14.0", "prettyplease", "proc-macro2", "quote", "syn", - "wasmparser 0.246.2", + "wasmparser 0.248.0", ] [[package]] @@ -1625,6 +1625,13 @@ dependencies = [ "wasmparser 0.247.0", ] +[[package]] +name = "hyperlight-component-util" +version = "0.15.0" +dependencies = [ + "hyperlight-component-util 0.14.0", +] + [[package]] name = "hyperlight-guest" version = "0.14.0" @@ -1885,7 +1892,7 @@ name = "hyperlight-wasm-macro" version = "0.14.0" source = "git+https://github.com/jsturtevant/hyperlight-wasm?rev=13906096edc2e014220c11a040242070ce6dee90#13906096edc2e014220c11a040242070ce6dee90" dependencies = [ - "hyperlight-component-util", + "hyperlight-component-util 0.14.0", "itertools 0.14.0", "prettyplease", "proc-macro2", @@ -4127,6 +4134,19 @@ dependencies = [ "serde", ] +[[package]] +name = "wasmparser" +version = "0.248.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4439c5eee9df71ee0c6efb37f63b1fcb1fec38f85f5142c54e7ed05d33091a" +dependencies = [ + "bitflags 2.11.1", + "hashbrown 0.17.0", + "indexmap", + "semver", + "serde", +] + [[package]] name = "wasmprinter" version = "0.236.1" diff --git a/Cargo.toml b/Cargo.toml index 3c2c827..ade25cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ hyperlight-javascript-sandbox = { path = "src/javascript_sandbox" } hyperlight-wasm-sandbox = { path = "src/wasm_sandbox" } hyperlight-sandbox-pyo3-common = { path = "src/sdk/python/pyo3_common" } hyperlight-common = { version = "0.14.0", default-features = false } -hyperlight-component-macro = { version = "0.14.0" } +hyperlight-component-macro = { version = "0.15.0" } hyperlight-host = { version = "0.14.0", default-features = false, features = ["executable_heap"] } hyperlight-wasm = { git = "https://github.com/jsturtevant/hyperlight-wasm", rev = "13906096edc2e014220c11a040242070ce6dee90" } #branch util-compont-fixes pyo3 = { version = "0.28", features = ["extension-module"] } @@ -37,4 +37,8 @@ hyperlight-host = { version = "0.14.0" } hyperlight-component-util = { git = "https://github.com/jsturtevant/hyperlight-1", rev="cdbed80af127b4d74e2633511cadb07bfea0160e", package = "hyperlight-component-util" } [patch.crates-io] -hyperlight-component-util = { git = "https://github.com/jsturtevant/hyperlight-1", rev="cdbed80af127b4d74e2633511cadb07bfea0160e", package = "hyperlight-component-util" } +# Keep the patched 0.14 util available for crates that still depend on it. +hyperlight-component-util-014 = { package = "hyperlight-component-util", git = "https://github.com/jsturtevant/hyperlight-1", rev="cdbed80af127b4d74e2633511cadb07bfea0160e" } +# hyperlight-component-macro 0.15 depends on util 0.15, but the published +# util is missing the bindgen fixes this workspace relies on. +hyperlight-component-util = { path = "patches/hyperlight-component-util-0.15" } diff --git a/patches/hyperlight-component-util-0.15/Cargo.toml b/patches/hyperlight-component-util-0.15/Cargo.toml new file mode 100644 index 0000000..3f89241 --- /dev/null +++ b/patches/hyperlight-component-util-0.15/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "hyperlight-component-util" +version = "0.15.0" +edition = "2024" +rust-version = "1.89" +license = "Apache-2.0" +description = "Compatibility shim for the patched Hyperlight component util used by this workspace" +publish = false + +[lib] +name = "hyperlight_component_util" + +[dependencies] +hyperlight-component-util-compat = { package = "hyperlight-component-util", git = "https://github.com/jsturtevant/hyperlight-1", rev = "cdbed80af127b4d74e2633511cadb07bfea0160e" } diff --git a/patches/hyperlight-component-util-0.15/src/lib.rs b/patches/hyperlight-component-util-0.15/src/lib.rs new file mode 100644 index 0000000..449bffd --- /dev/null +++ b/patches/hyperlight-component-util-0.15/src/lib.rs @@ -0,0 +1 @@ +pub use hyperlight_component_util_compat::*;