Update and dedupe nix

servo · Sep 6, 2019 · c8aae12 · c8aae12
1 parent 7a67261
commit c8aae12
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 44 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/background_hang_monitor/Cargo.toml b/components/background_hang_monitor/Cargo.toml
@@ -30,5 +30,5 @@ lazy_static = "1.0"
 mach = "0.2.3"
 
 [target.'cfg(all(target_os = "linux", not(any(target_arch = "arm", target_arch = "aarch64"))))'.dependencies]
-nix = "0.13"
+nix = "0.14"
 unwind-sys = "0.1.1"
diff --git a/servo-tidy.toml b/servo-tidy.toml
@@ -35,7 +35,6 @@ rand = [
 # Ignored packages with duplicated versions
 packages = [
   "gl_generator", # https://github.com/servo/servo/pull/23288#issuecomment-494687746
-  "nix", # https://github.com/servo/servo/issues/23189#issuecomment-487512605
   "proc-macro2",
   "quote",
   "rand_core",