diff --git a/Cargo.lock b/Cargo.lock index ef784325d5..9d1520860c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1287,7 +1287,7 @@ dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", + "memoffset", "scopeguard", ] @@ -3451,15 +3451,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -3618,16 +3609,24 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "abbbc55ad7b13aac85f9401c796dcda1b864e07fcad40ad47792eaa8932ea502" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "896d4664b919f48478f3ce02c502adfe9bffeb61563d2a12ddf1aad8f6cd926f" +dependencies = [ + "bitflags 2.4.0", "cfg-if", "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", ] [[package]] @@ -4268,7 +4267,7 @@ dependencies = [ "inferno", "libc", "log", - "nix", + "nix 0.26.3", "once_cell", "parking_lot", "prost", @@ -4930,7 +4929,7 @@ dependencies = [ "libc", "log", "memchr", - "nix", + "nix 0.26.3", "scopeguard", "unicode-segmentation", "unicode-width", @@ -5863,7 +5862,7 @@ dependencies = [ "iox_catalog", "mutable_batch_lp", "mutable_batch_pb", - "nix", + "nix 0.27.0", "observability_deps", "once_cell", "parking_lot", @@ -6955,7 +6954,6 @@ dependencies = [ "log", "md-5", "memchr", - "nix", "nom", "num-traits", "object_store", diff --git a/test_helpers_end_to_end/Cargo.toml b/test_helpers_end_to_end/Cargo.toml index d6c48ab11d..e4fb35d33e 100644 --- a/test_helpers_end_to_end/Cargo.toml +++ b/test_helpers_end_to_end/Cargo.toml @@ -22,7 +22,7 @@ ingester_query_grpc = { path = "../ingester_query_grpc" } iox_catalog = { path = "../iox_catalog" } mutable_batch_lp = { path = "../mutable_batch_lp" } mutable_batch_pb = { path = "../mutable_batch_pb" } -nix = "0.26" +nix = { version = "0.27", default-features = false, features = ["signal"] } observability_deps = { path = "../observability_deps" } once_cell = { version = "1.18", features = ["parking_lot"] } parking_lot = "0.12" diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index ef188a0998..10e3553588 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -164,7 +164,6 @@ uuid = { version = "1", features = ["v4"] } [target.x86_64-unknown-linux-gnu.dependencies] bitflags = { version = "2", default-features = false, features = ["std"] } -nix = { version = "0.26" } once_cell = { version = "1", default-features = false, features = ["unstable"] } rustls = { version = "0.21" } @@ -175,7 +174,6 @@ rustls = { version = "0.21" } [target.x86_64-apple-darwin.dependencies] bitflags = { version = "2", default-features = false, features = ["std"] } -nix = { version = "0.26" } once_cell = { version = "1", default-features = false, features = ["unstable"] } rustls = { version = "0.21" } @@ -186,7 +184,6 @@ rustls = { version = "0.21" } [target.aarch64-apple-darwin.dependencies] bitflags = { version = "2", default-features = false, features = ["std"] } -nix = { version = "0.26" } once_cell = { version = "1", default-features = false, features = ["unstable"] } rustls = { version = "0.21" }