RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-31 04:57:45 +00:00
Code Issues Activity

change ~ relax 'nix' version and remove 'nix' patch

Browse source 
- code coverage compilation on MacOS latest (MacOS-11+) now works with newer 'nix' versions
This commit is contained in:
Roy Ivy III 2022-01-01 18:37:20 -06:00
parent dcfdeb334d
commit 774e72551b
9 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Cargo.toml
View file

@ -381,15 +381,10 @@ atty = "0.2"
rlimit = "0.4.0" rlimit = "0.4.0"
[target.'cfg(unix)'.dev-dependencies] [target.'cfg(unix)'.dev-dependencies]
nix = "=0.23.1" nix = "0.23.1"
rust-users = { version="0.10", package="users" } rust-users = { version="0.10", package="users" }
unix_socket = "0.5.0" unix_socket = "0.5.0"
[[bin]] [[bin]]
name = "coreutils" name = "coreutils"
path = "src/bin/coreutils.rs" 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" }

2
src/uu/cat/Cargo.toml
View file

@ -23,7 +23,7 @@ uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_p
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
unix_socket = "0.5.0" unix_socket = "0.5.0"
nix = "=0.23.1" nix = "0.23.1"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winapi-util = "0.1.5" winapi-util = "0.1.5"

2
src/uu/more/Cargo.toml
View file

@ -28,7 +28,7 @@ redox_termios = "0.1"
redox_syscall = "0.2" redox_syscall = "0.2"
[target.'cfg(all(unix, not(target_os = "fuchsia")))'.dependencies] [target.'cfg(all(unix, not(target_os = "fuchsia")))'.dependencies]
nix = "=0.23.1" nix = "0.23.1"
[[bin]] [[bin]]
name = "more" name = "more"

2
src/uu/nice/Cargo.toml
View file

@ -17,7 +17,7 @@ path = "src/nice.rs"
[dependencies] [dependencies]
clap = { version = "2.33", features = ["wrap_help"] } clap = { version = "2.33", features = ["wrap_help"] }
libc = "0.2.42" libc = "0.2.42"
nix = "=0.23.1" nix = "0.23.1"
uucore = { version=">=0.0.10", package="uucore", path="../../uucore" } uucore = { version=">=0.0.10", package="uucore", path="../../uucore" }
uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" } uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }

2
src/uu/tail/Cargo.toml
View file

@ -27,7 +27,7 @@ winapi = { version="0.3", features=["fileapi", "handleapi", "processthreadsapi",
redox_syscall = "0.2" redox_syscall = "0.2"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
nix = "=0.23.1" nix = "0.23.1"
[[bin]] [[bin]]
name = "tail" name = "tail"

2
src/uu/timeout/Cargo.toml
View file

@ -17,7 +17,7 @@ path = "src/timeout.rs"
[dependencies] [dependencies]
clap = { version = "2.33", features = ["wrap_help"] } clap = { version = "2.33", features = ["wrap_help"] }
libc = "0.2.42" 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 = { version=">=0.0.10", package="uucore", path="../../uucore", features=["process", "signals"] }
uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" } uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }

2
src/uu/wc/Cargo.toml
View file

@ -23,7 +23,7 @@ utf-8 = "0.7.6"
unicode-width = "0.1.8" unicode-width = "0.1.8"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
nix = "=0.23.1" nix = "0.23.1"
libc = "0.2" libc = "0.2"
[[bin]] [[bin]]

2
src/uu/yes/Cargo.toml
View file

@ -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" } uucore_procs = { version=">=0.0.7", package="uucore_procs", path="../../uucore_procs" }
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
nix = "=0.23.1" nix = "0.23.1"
[[bin]] [[bin]]
name = "yes" name = "yes"

2
src/uucore/Cargo.toml
View file

@ -33,7 +33,7 @@ os_display = "0.1.0"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
walkdir = { version="2.3.2", optional=true } walkdir = { version="2.3.2", optional=true }
nix = { version="=0.23.1", optional=true } nix = { version="0.23.1", optional=true }
[dev-dependencies] [dev-dependencies]
clap = "2.33.3" clap = "2.33.3"