also effectively remove diesel from the workspace-hack

Cargo.toml

@@ -304,7 +304,8 @@ db-macros = { path = "nexus/db-macros" }
 debug-ignore = "1.0.5"
 derive_more = "0.99.18"
 derive-where = "1.2.7"
-diesel = { version = "2.2.2", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
+# Having the i-implement-... feature here makes diesel go away from the workspace-hack
+diesel = { version = "2.2.2", features = ["i-implement-a-third-party-backend-and-opt-into-breaking-changes", "postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
 diesel-dtrace = { git = "https://github.com/oxidecomputer/diesel-dtrace", branch = "main" }
 dns-server = { path = "dns-server" }
 dns-server-api = { path = "dns-server-api" }

workspace-hack/Cargo.toml

@@ -40,7 +40,6 @@ crossbeam-utils = { version = "0.8.19" }
 crossterm = { version = "0.27.0", features = ["event-stream", "serde"] }
 crypto-common = { version = "0.1.6", default-features = false, features = ["getrandom", "std"] }
 der = { version = "0.7.9", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] }
-diesel = { version = "2.2.2", features = ["chrono", "i-implement-a-third-party-backend-and-opt-into-breaking-changes", "network-address", "postgres", "r2d2", "serde_json", "uuid"] }
 digest = { version = "0.10.7", features = ["mac", "oid", "std"] }
 either = { version = "1.12.0" }
 elliptic-curve = { version = "0.13.8", features = ["ecdh", "hazmat", "pem", "std"] }
@@ -64,7 +63,6 @@ hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
 hyper = { version = "0.14.30", features = ["full"] }
 indexmap = { version = "2.3.0", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
-ipnetwork = { version = "0.20.0", features = ["schemars"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
 itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
 lalrpop-util = { version = "0.19.12" }
@@ -145,7 +143,6 @@ crossbeam-utils = { version = "0.8.19" }
 crossterm = { version = "0.27.0", features = ["event-stream", "serde"] }
 crypto-common = { version = "0.1.6", default-features = false, features = ["getrandom", "std"] }
 der = { version = "0.7.9", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] }
-diesel = { version = "2.2.2", features = ["chrono", "i-implement-a-third-party-backend-and-opt-into-breaking-changes", "network-address", "postgres", "r2d2", "serde_json", "uuid"] }
 digest = { version = "0.10.7", features = ["mac", "oid", "std"] }
 either = { version = "1.12.0" }
 elliptic-curve = { version = "0.13.8", features = ["ecdh", "hazmat", "pem", "std"] }
@@ -169,7 +166,6 @@ hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
 hyper = { version = "0.14.30", features = ["full"] }
 indexmap = { version = "2.3.0", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
-ipnetwork = { version = "0.20.0", features = ["schemars"] }
 itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
 itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
 lalrpop-util = { version = "0.19.12" }