From c2d26c68ecab04afa47cf84be151889072f27e83 Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Wed, 18 Mar 2026 23:17:39 +0000 Subject: [PATCH] WIP to get crucible verify after LR --- Cargo.lock | 36 ++++++++++++++++++------------------ Cargo.toml | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 35aa4f1ef..b10f98733 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1041,7 +1041,7 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crucible" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=a945a32ba9e1f2098ce3a8963765f1894f37110b#a945a32ba9e1f2098ce3a8963765f1894f37110b" +source = "git+https://github.com/oxidecomputer/crucible?rev=34f2eb205c314376fa80fb4954b2f92e0a3e28c2#34f2eb205c314376fa80fb4954b2f92e0a3e28c2" dependencies = [ "aes-gcm-siv", "anyhow", @@ -1097,7 +1097,7 @@ dependencies = [ [[package]] name = "crucible-client-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=a945a32ba9e1f2098ce3a8963765f1894f37110b#a945a32ba9e1f2098ce3a8963765f1894f37110b" +source = "git+https://github.com/oxidecomputer/crucible?rev=34f2eb205c314376fa80fb4954b2f92e0a3e28c2#34f2eb205c314376fa80fb4954b2f92e0a3e28c2" dependencies = [ "base64 0.22.1", "crucible-workspace-hack", @@ -1110,13 +1110,13 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=a945a32ba9e1f2098ce3a8963765f1894f37110b#a945a32ba9e1f2098ce3a8963765f1894f37110b" +source = "git+https://github.com/oxidecomputer/crucible?rev=34f2eb205c314376fa80fb4954b2f92e0a3e28c2#34f2eb205c314376fa80fb4954b2f92e0a3e28c2" dependencies = [ "anyhow", "atty", "crucible-workspace-hack", "dropshot", - "nix 0.30.1", + "nix 0.31.1", "rustls-pemfile 1.0.4", "schemars", "serde", @@ -1140,7 +1140,7 @@ dependencies = [ [[package]] name = "crucible-protocol" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=a945a32ba9e1f2098ce3a8963765f1894f37110b#a945a32ba9e1f2098ce3a8963765f1894f37110b" +source = "git+https://github.com/oxidecomputer/crucible?rev=34f2eb205c314376fa80fb4954b2f92e0a3e28c2#34f2eb205c314376fa80fb4954b2f92e0a3e28c2" dependencies = [ "anyhow", "bincode", @@ -1151,7 +1151,7 @@ dependencies = [ "schemars", "serde", "strum 0.27.2", - "strum_macros 0.27.2", + "strum_macros 0.28.0", "tokio", "tokio-util", "uuid", @@ -3942,18 +3942,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" -dependencies = [ - "bitflags 2.9.4", - "cfg-if", - "cfg_aliases 0.2.1", - "libc", -] - [[package]] name = "nix" version = "0.31.1" @@ -7427,6 +7415,18 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "strum_macros" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "subtle" version = "2.5.0" diff --git a/Cargo.toml b/Cargo.toml index 4265b5595..ad0487891 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -92,8 +92,8 @@ oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } sled-agent-client = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } # Crucible -crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "a945a32ba9e1f2098ce3a8963765f1894f37110b" } -crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "a945a32ba9e1f2098ce3a8963765f1894f37110b" } +crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "34f2eb205c314376fa80fb4954b2f92e0a3e28c2" } +crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "34f2eb205c314376fa80fb4954b2f92e0a3e28c2" } # External dependencies anyhow = "1.0"