From 774e72551b54f2fcb9197aa6fba8768711a94196 Mon Sep 17 00:00:00 2001
From: Roy Ivy III <rivy.dev@gmail.com>
Date: Sat, 1 Jan 2022 18:37:20 -0600
Subject: [PATCH] change ~ relax 'nix' version and remove 'nix' patch

- code coverage compilation on MacOS latest (MacOS-11+) now works with newer 'nix' versions
---
 Cargo.toml                | 7 +------
 src/uu/cat/Cargo.toml     | 2 +-
 src/uu/more/Cargo.toml    | 2 +-
 src/uu/nice/Cargo.toml    | 2 +-
 src/uu/tail/Cargo.toml    | 2 +-
 src/uu/timeout/Cargo.toml | 2 +-
 src/uu/wc/Cargo.toml      | 2 +-
 src/uu/yes/Cargo.toml     | 2 +-
 src/uucore/Cargo.toml     | 2 +-
 9 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1ce218fb2..8310c3329 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -381,15 +381,10 @@ atty = "0.2"
 rlimit = "0.4.0"
 
 [target.'cfg(unix)'.dev-dependencies]
-nix = "=0.23.1"
+nix = "0.23.1"
 rust-users = { version="0.10", package="users" }
 unix_socket = "0.5.0"
 
 [[bin]]
 name = "coreutils"
 path = "src/bin/coreutils.rs"
-
-[patch.crates-io]
-# FixME: [2021-11-16; rivy] remove 'nix' patch when MacOS compatibility is restored; ref: <https://github.com/nix-rust/nix/pull/1590>
-# nix = { git = "https://github.com/rivy-t/nix" }
-nix = { path = "vendor/nix-v0.23.1-patched" }
diff --git a/src/uu/cat/Cargo.toml b/src/uu/cat/Cargo.toml
index 0374e80d9..bb549af28 100644
--- a/src/uu/cat/Cargo.toml
+++ b/src/uu/cat/Cargo.toml
@@ -23,7 +23,7 @@ uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_p
 
 [target.'cfg(unix)'.dependencies]
 unix_socket = "0.5.0"
-nix = "=0.23.1"
+nix = "0.23.1"
 
 [target.'cfg(windows)'.dependencies]
 winapi-util = "0.1.5"
diff --git a/src/uu/more/Cargo.toml b/src/uu/more/Cargo.toml
index c720ba1de..8da6382d9 100644
--- a/src/uu/more/Cargo.toml
+++ b/src/uu/more/Cargo.toml
@@ -28,7 +28,7 @@ redox_termios = "0.1"
 redox_syscall = "0.2"
 
 [target.'cfg(all(unix, not(target_os = "fuchsia")))'.dependencies]
-nix = "=0.23.1"
+nix = "0.23.1"
 
 [[bin]]
 name = "more"
diff --git a/src/uu/nice/Cargo.toml b/src/uu/nice/Cargo.toml
index 19625b7f2..ab6afcab2 100644
--- a/src/uu/nice/Cargo.toml
+++ b/src/uu/nice/Cargo.toml
@@ -17,7 +17,7 @@ path = "src/nice.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-nix = "=0.23.1"
+nix = "0.23.1"
 uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
 uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
diff --git a/src/uu/tail/Cargo.toml b/src/uu/tail/Cargo.toml
index 55878ca63..dc4559036 100644
--- a/src/uu/tail/Cargo.toml
+++ b/src/uu/tail/Cargo.toml
@@ -27,7 +27,7 @@ winapi = { version="0.3", features=["fileapi", "handleapi", "processthreadsapi",
 redox_syscall = "0.2"
 
 [target.'cfg(unix)'.dependencies]
-nix = "=0.23.1"
+nix = "0.23.1"
 
 [[bin]]
 name = "tail"
diff --git a/src/uu/timeout/Cargo.toml b/src/uu/timeout/Cargo.toml
index 87ef01a72..537924c84 100644
--- a/src/uu/timeout/Cargo.toml
+++ b/src/uu/timeout/Cargo.toml
@@ -17,7 +17,7 @@ path = "src/timeout.rs"
 [dependencies]
 clap = { version = "2.33", features = ["wrap_help"] }
 libc = "0.2.42"
-nix = "=0.23.1"
+nix = "0.23.1"
 uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=["process", "signals"] }
 uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
diff --git a/src/uu/wc/Cargo.toml b/src/uu/wc/Cargo.toml
index ec649820b..59702757a 100644
--- a/src/uu/wc/Cargo.toml
+++ b/src/uu/wc/Cargo.toml
@@ -23,7 +23,7 @@ utf-8 = "0.7.6"
 unicode-width = "0.1.8"
 
 [target.'cfg(unix)'.dependencies]
-nix = "=0.23.1"
+nix = "0.23.1"
 libc = "0.2"
 
 [[bin]]
diff --git a/src/uu/yes/Cargo.toml b/src/uu/yes/Cargo.toml
index 3bf0ad7cb..7c2b43329 100644
--- a/src/uu/yes/Cargo.toml
+++ b/src/uu/yes/Cargo.toml
@@ -20,7 +20,7 @@ uucore = { version=">=0.0.10", package="uucore", path="../../uucore", features=[
 uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
 
 [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
-nix = "=0.23.1"
+nix = "0.23.1"
 
 [[bin]]
 name = "yes"
diff --git a/src/uucore/Cargo.toml b/src/uucore/Cargo.toml
index 99e1061ec..f4b66e799 100644
--- a/src/uucore/Cargo.toml
+++ b/src/uucore/Cargo.toml
@@ -33,7 +33,7 @@ os_display = "0.1.0"
 
 [target.'cfg(unix)'.dependencies]
 walkdir = { version="2.3.2", optional=true }
-nix = { version="=0.23.1", optional=true }
+nix = { version="0.23.1", optional=true }
 
 [dev-dependencies]
 clap = "2.33.3"