diff --git a/Cargo.lock b/Cargo.lock
index 1e284c6756c..9bae0cd0fb7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -986,7 +986,7 @@ dependencies = [
  "camino-tempfile",
  "chacha20poly1305",
  "ciborium",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "hex",
  "hkdf",
  "omicron-common",
@@ -1654,7 +1654,7 @@ dependencies = [
  "camino-tempfile",
  "chrono",
  "daft",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "expectorate",
  "itertools 0.14.0",
  "omicron-common",
@@ -1787,7 +1787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1796,7 +1796,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1953,9 +1953,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
 [[package]]
 name = "convert_case"
-version = "0.7.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
+checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
 dependencies = [
  "unicode-segmentation",
 ]
@@ -2189,7 +2189,7 @@ checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
 dependencies = [
  "bitflags 2.9.4",
  "crossterm_winapi",
- "derive_more 2.0.1",
+ "derive_more 2.1.1",
  "document-features",
  "futures-core",
  "mio",
@@ -2715,22 +2715,23 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
 dependencies = [
  "derive_more-impl",
 ]
 
 [[package]]
 name = "derive_more-impl"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
 dependencies = [
- "convert_case 0.7.1",
+ "convert_case 0.10.0",
  "proc-macro2",
  "quote",
+ "rustc_version 0.4.1",
  "syn 2.0.114",
 ]
 
@@ -6091,7 +6092,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -7687,7 +7688,7 @@ dependencies = [
  "cookie",
  "daft",
  "derive-where",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "dropshot",
  "ereport-types",
  "expectorate",
@@ -8989,7 +8990,7 @@ dependencies = [
  "clickhouse-admin-types",
  "cockroach-admin-client",
  "crucible-agent-client",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "dice-verifier 0.3.0-pre0 (git+https://github.com/oxidecomputer/dice-util?branch=main)",
  "display-error-chain",
  "dns-server",
@@ -9193,6 +9194,8 @@ dependencies = [
  "daft",
  "data-encoding",
  "der",
+ "derive_more 2.1.1",
+ "derive_more-impl",
  "digest",
  "dof 0.3.0",
  "dof 0.4.0",
@@ -12213,7 +12216,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.11.0",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.1",
 ]
 
 [[package]]
@@ -13209,7 +13212,7 @@ dependencies = [
  "camino-tempfile-ext",
  "chrono",
  "debug-ignore",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "dropshot",
  "either",
  "expectorate",
@@ -13255,7 +13258,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "dropshot",
  "futures",
  "illumos-utils",
@@ -13501,7 +13504,7 @@ dependencies = [
  "camino-tempfile",
  "cfg-if",
  "debug-ignore",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "expectorate",
  "futures",
  "glob",
@@ -13742,7 +13745,7 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03c3c6b7927ffe7ecaa769ee0e3994da3b8cafc8f444578982c83ecb161af917"
 dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "syn 2.0.114",
@@ -14387,7 +14390,7 @@ dependencies = [
  "getrandom 0.3.4",
  "once_cell",
  "rustix 1.1.3",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.1",
 ]
 
 [[package]]
@@ -15284,7 +15287,7 @@ dependencies = [
  "ciborium",
  "daft",
  "debug-ignore",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "dropshot",
  "futures",
  "gfss",
@@ -15333,7 +15336,7 @@ dependencies = [
  "chacha20poly1305",
  "ciborium",
  "daft",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "dropshot",
  "gfss",
  "hex",
@@ -15398,7 +15401,7 @@ name = "trust-quorum-types-versions"
 version = "0.1.0"
 dependencies = [
  "daft",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "gfss",
  "iddqd",
  "omicron-uuid-kinds",
@@ -16672,7 +16675,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 983c2eedea8..e38c18daa4f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -461,7 +461,7 @@ omicron-ddm-admin-client = { path = "clients/ddm-admin-client" }
 datatest-stable = "0.3.2"
 db-macros = { path = "nexus/db-macros" }
 debug-ignore = "1.0.5"
-derive_more = "0.99.20"
+derive_more = "2.1.1"
 derive-where = "1.5.0"
 dev-tools-common = { path = "dev-tools/common" }
 dice-verifier = { git = "https://github.com/oxidecomputer/dice-util", branch = "main", default-features = false }
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index ecdf8c62045..8d042110532 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -44,6 +44,7 @@ curve25519-dalek = { version = "4.1.3", features = ["digest", "legacy_compatibil
 daft = { version = "0.1.4", features = ["derive", "newtype-uuid1", "oxnet01", "uuid1"] }
 data-encoding = { version = "2.9.0" }
 der = { version = "0.7.10", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] }
+derive_more = { version = "2.1.1", features = ["is_variant"] }
 digest = { version = "0.10.7", features = ["mac", "oid", "std"] }
 ecdsa = { version = "0.16.9", features = ["pem", "signing", "std", "verifying"] }
 ed25519-dalek = { version = "2.1.1", features = ["digest", "pem", "rand_core"] }
@@ -186,6 +187,8 @@ curve25519-dalek = { version = "4.1.3", features = ["digest", "legacy_compatibil
 daft = { version = "0.1.4", features = ["derive", "newtype-uuid1", "oxnet01", "uuid1"] }
 data-encoding = { version = "2.9.0" }
 der = { version = "0.7.10", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] }
+derive_more = { version = "2.1.1", features = ["is_variant"] }
+derive_more-impl = { version = "2.1.1", features = ["is_variant"] }
 digest = { version = "0.10.7", features = ["mac", "oid", "std"] }
 ecdsa = { version = "0.16.9", features = ["pem", "signing", "std", "verifying"] }
 ed25519-dalek = { version = "2.1.1", features = ["digest", "pem", "rand_core"] }