From cd394af018c1816f5d504e49b37af9258ce052e6 Mon Sep 17 00:00:00 2001
From: Jonathan Schwender <55576758+jschwe@users.noreply.github.com>
Date: Sat, 13 Jul 2024 09:48:01 +0200
Subject: [PATCH] Bump duplicated nix to 0.29 (#32764)

Signed-off-by: Jonathan Schwender <jonathan.schwender@huawei.com>
---
 Cargo.lock                                    | 15 ++-------------
 components/background_hang_monitor/Cargo.toml |  2 +-
 servo-tidy.toml                               |  1 -
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6b915de30a6..ed5790c52c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -301,7 +301,7 @@ dependencies = [
  "libc",
  "log",
  "mach2",
- "nix 0.27.1",
+ "nix",
  "serde_json",
  "unwind-sys",
 ]
@@ -2155,7 +2155,7 @@ dependencies = [
  "libc",
  "libudev-sys",
  "log",
- "nix 0.29.0",
+ "nix",
  "uuid",
  "vec_map",
  "wasm-bindgen",
@@ -4238,17 +4238,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
-[[package]]
-name = "nix"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.29.0"
diff --git a/components/background_hang_monitor/Cargo.toml b/components/background_hang_monitor/Cargo.toml
index ce3ca08d374..8eb0dbfd7b1 100644
--- a/components/background_hang_monitor/Cargo.toml
+++ b/components/background_hang_monitor/Cargo.toml
@@ -29,5 +29,5 @@ lazy_static = { workspace = true }
 mach2 = "0.4"
 
 [target.'cfg(all(target_os = "linux", not(any(target_arch = "arm", target_arch = "aarch64"))))'.dependencies]
-nix = { version = "0.27", features = ["signal"] }
+nix = { version = "0.29", features = ["signal"] }
 unwind-sys = "0.1.4"
diff --git a/servo-tidy.toml b/servo-tidy.toml
index a0624968ef2..8f2092575cf 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -25,7 +25,6 @@ packages = [
     "cookie",
     "futures",
     "hermit-abi",
-    "nix",
     "redox_syscall",
     "syn",
     "synstructure",