From 132cab15d2ff3d579398efe3464675811c2e36ab Mon Sep 17 00:00:00 2001 From: Jan Scheer Date: Fri, 22 Apr 2022 09:54:21 +0200 Subject: [PATCH] tail: update notify crate notify-crate: Switch from latest release to latest commit on main branch in order to fix the builds on FreeBSD/macOS. https://github.com/notify-rs/notify/pull/399 --- Cargo.lock | 35 ++++++++++------------------------- src/uu/tail/Cargo.toml | 3 ++- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f42949d024..09e0ca6352 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -611,7 +611,7 @@ dependencies = [ "bitflags", "crossterm_winapi", "libc", - "mio 0.7.14", + "mio", "parking_lot", "signal-hook", "signal-hook-mio", @@ -827,9 +827,9 @@ checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" [[package]] name = "fsevent-sys" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0e564d24da983c053beff1bb7178e237501206840a3e6bf4e267b9e8ae734a" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" dependencies = [ "libc", ] @@ -966,9 +966,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88ed757e516714cd8736e65b84ed901f72458512111871f20c1d377abdfbf5e" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ "bitflags", "inotify-sys", @@ -1026,9 +1026,9 @@ dependencies = [ [[package]] name = "kqueue" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058a107a784f8be94c7d35c1300f4facced2e93d2fbe5b1452b44e905ddca4a9" +checksum = "97caf428b83f7c86809b7450722cd1f2b1fc7fb23aa7b9dee7e72ed14d048352" dependencies = [ "kqueue-sys", "libc", @@ -1177,20 +1177,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "mio" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "wasi 0.11.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - [[package]] name = "miow" version = "0.3.7" @@ -1226,8 +1212,7 @@ dependencies = [ [[package]] name = "notify" version = "5.0.0-pre.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d13c22db70a63592e098fb51735bab36646821e6389a0ba171f3549facdf0b74" +source = "git+https://github.com/notify-rs/notify#8399e4195b31f6f188109363292ed220226146f4" dependencies = [ "bitflags", "crossbeam-channel", @@ -1236,7 +1221,7 @@ dependencies = [ "inotify", "kqueue", "libc", - "mio 0.8.2", + "mio", "walkdir", "winapi 0.3.9", ] @@ -1829,7 +1814,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", - "mio 0.7.14", + "mio", "signal-hook", ] diff --git a/src/uu/tail/Cargo.toml b/src/uu/tail/Cargo.toml index 122a9ce841..888438bd9f 100644 --- a/src/uu/tail/Cargo.toml +++ b/src/uu/tail/Cargo.toml @@ -18,7 +18,8 @@ path = "src/tail.rs" [dependencies] clap = { version = "3.1", features = ["wrap_help", "cargo"] } libc = "0.2.121" -notify = { version = "5.0.0-pre.14", features=["macos_kqueue"]} +# notify = { version = "5.0.0-pre.14", features=["macos_kqueue"]} +notify = { git = "https://github.com/notify-rs/notify", features=["macos_kqueue"]} uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["ringbuffer", "lines"] } [target.'cfg(windows)'.dependencies]