mirror of
https://github.com/uutils/coreutils
synced 2024-10-02 22:13:37 +00:00
change ~ relax 'nix' version and remove 'nix' patch
- code coverage compilation on MacOS latest (MacOS-11+) now works with newer 'nix' versions
This commit is contained in:
parent
dcfdeb334d
commit
774e72551b
|
@ -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" }
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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" }
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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" }
|
||||
|
||||
|
|
|
@ -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]]
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue