diff --git a/Cargo.lock b/Cargo.lock index 5bfe8e66e9..dae071a596 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1171,7 +1171,7 @@ dependencies = [ "byteorder", "chrono", "diesel_derives", - "ipnetwork", + "ipnetwork 0.20.0", "itoa 1.0.2", "libc", "pq-sys", @@ -2398,6 +2398,15 @@ dependencies = [ "serde", ] +[[package]] +name = "ipnetwork" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" +dependencies = [ + "serde", +] + [[package]] name = "itertools" version = "0.10.3" @@ -2781,7 +2790,7 @@ dependencies = [ "db-macros", "diesel", "hex", - "ipnetwork", + "ipnetwork 0.20.0", "macaddr", "newtype_derive", "nexus-defaults", @@ -2802,7 +2811,7 @@ dependencies = [ name = "nexus-defaults" version = "0.1.0" dependencies = [ - "ipnetwork", + "ipnetwork 0.20.0", "lazy_static", "omicron-common 0.1.0", "rand 0.8.5", @@ -2992,7 +3001,7 @@ dependencies = [ "futures", "http", "hyper", - "ipnetwork", + "ipnetwork 0.20.0", "macaddr", "parse-display", "progenitor", @@ -3028,7 +3037,7 @@ dependencies = [ "futures", "http", "hyper", - "ipnetwork", + "ipnetwork 0.18.0", "macaddr", "parse-display", "progenitor", @@ -3126,7 +3135,7 @@ dependencies = [ "httptest", "hyper", "internal-dns-client", - "ipnetwork", + "ipnetwork 0.20.0", "itertools", "lazy_static", "libc", @@ -3234,7 +3243,7 @@ dependencies = [ "futures", "http", "internal-dns-client", - "ipnetwork", + "ipnetwork 0.20.0", "libc", "macaddr", "mockall", diff --git a/common/Cargo.toml b/common/Cargo.toml index b17a4a1212..814fa4b92b 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -13,7 +13,7 @@ dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main" futures = "0.3.21" http = "0.2.7" hyper = "0.14" -ipnetwork = "0.18" +ipnetwork = "0.20" macaddr = { version = "1.0.1", features = [ "serde_std" ] } rand = "0.8.4" reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] } diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml index e7b7b66264..5037b34d20 100644 --- a/nexus/Cargo.toml +++ b/nexus/Cargo.toml @@ -25,7 +25,7 @@ hex = "0.4.3" http = "0.2.7" hyper = "0.14" internal-dns-client = { path = "../internal-dns-client" } -ipnetwork = "0.18" +ipnetwork = "0.20" lazy_static = "1.4.0" libc = "0.2.126" macaddr = { version = "1.0.1", features = [ "serde_std" ]} diff --git a/nexus/db-model/Cargo.toml b/nexus/db-model/Cargo.toml index 4b9094421e..9a188f38cc 100644 --- a/nexus/db-model/Cargo.toml +++ b/nexus/db-model/Cargo.toml @@ -9,7 +9,7 @@ anyhow = "1.0" chrono = { version = "0.4", features = ["serde"] } diesel = { version = "2.0.0-rc.1", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] } hex = "0.4.3" -ipnetwork = "0.18" +ipnetwork = "0.20" macaddr = { version = "1.0.1", features = [ "serde_std" ]} newtype_derive = "0.1.6" parse-display = "0.5.4" diff --git a/nexus/defaults/Cargo.toml b/nexus/defaults/Cargo.toml index 61e9ba65d1..af8459041c 100644 --- a/nexus/defaults/Cargo.toml +++ b/nexus/defaults/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" license = "MPL-2.0" [dependencies] -ipnetwork = "0.18" +ipnetwork = "0.20" lazy_static = "1.4.0" rand = "0.8.5" serde_json = "1.0" diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml index 550abdd71e..024b632030 100644 --- a/sled-agent/Cargo.toml +++ b/sled-agent/Cargo.toml @@ -19,7 +19,7 @@ ddm-admin-client = { path = "../ddm-admin-client" } dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] } futures = "0.3.21" internal-dns-client = { path = "../internal-dns-client" } -ipnetwork = "0.18" +ipnetwork = "0.20" libc = "0.2.126" macaddr = { version = "1.0.1", features = [ "serde_std" ] } nexus-client = { path = "../nexus-client" }