diff --git a/Cargo.lock b/Cargo.lock index eb8d458fe..9fe03fd53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -573,7 +573,7 @@ version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b103d85ca6e209388771bfb7aa6b68a7aeec4afbf6f0a0264bfbf50360e5212e" dependencies = [ - "crossterm", + "crossterm 0.23.2", "strum 0.23.0", "strum_macros 0.23.1", "unicode-width", @@ -734,6 +734,22 @@ name = "crossterm" version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17" +dependencies = [ + "bitflags", + "crossterm_winapi", + "libc", + "mio 0.8.4", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi 0.3.9", +] + +[[package]] +name = "crossterm" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9f7409c70a38a56216480fba371ee460207dd8926ccf5b4160591759559170" dependencies = [ "bitflags", "crossterm_winapi", @@ -2084,12 +2100,12 @@ dependencies = [ [[package]] name = "lscolors" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e4434edeec6cd16a7e8e13569af4568a66fcd6d79abd8696db22dd95f920e6" +checksum = "a24e014efe73b727e5792b6f422a23c04b10ba9d8cdc74b197a25a08db7eac86" dependencies = [ "ansi_term", - "crossterm", + "crossterm 0.24.0", ] [[package]] @@ -2469,7 +2485,7 @@ version = "0.66.3" dependencies = [ "assert_cmd", "chrono", - "crossterm", + "crossterm 0.24.0", "ctrlc", "hamcrest2", "is_executable", @@ -2519,7 +2535,7 @@ name = "nu-cli" version = "0.66.3" dependencies = [ "chrono", - "crossterm", + "crossterm 0.24.0", "fuzzy-matcher", "is_executable", "lazy_static", @@ -2566,7 +2582,7 @@ dependencies = [ "chrono", "chrono-humanize", "chrono-tz", - "crossterm", + "crossterm 0.24.0", "csv", "dialoguer", "digest 0.10.3", @@ -3875,11 +3891,10 @@ dependencies = [ [[package]] name = "reedline" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1815a84fe3d1c632106199f4ba844c109d783e16682df293044bb994537671d8" +source = "git+https://github.com/nushell/reedline.git?branch=main#a406bfc6621f01805a0a80cd520ac59c128aec23" dependencies = [ "chrono", - "crossterm", + "crossterm 0.24.0", "fd-lock", "gethostname", "itertools", diff --git a/Cargo.toml b/Cargo.toml index cf7ec2c2b..4fd587bcf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ members = [ [dependencies] chrono = { version = "0.4.19", features = ["serde"] } -crossterm = "0.23.0" +crossterm = "0.24.0" ctrlc = "3.2.1" log = "0.4" miette = "5.1.0" @@ -120,3 +120,6 @@ debug = false [[bin]] name = "nu" path = "src/main.rs" + +[patch.crates-io] +reedline = { git = "https://github.com/nushell/reedline.git", branch = "main" } \ No newline at end of file diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml index 7751fcc15..3e1eabb4d 100644 --- a/crates/nu-cli/Cargo.toml +++ b/crates/nu-cli/Cargo.toml @@ -20,7 +20,7 @@ nu-utils = { path = "../nu-utils", version = "0.66.3" } nu-ansi-term = "0.46.0" nu-color-config = { path = "../nu-color-config", version = "0.66.3" } reedline = { version = "0.9.0", features = ["bashisms", "sqlite"]} -crossterm = "0.23.0" +crossterm = "0.24.0" miette = { version = "5.1.0", features = ["fancy"] } thiserror = "1.0.31" fuzzy-matcher = "0.3.7" diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml index 3d6504fe3..a935724bd 100644 --- a/crates/nu-command/Cargo.toml +++ b/crates/nu-command/Cargo.toml @@ -34,7 +34,7 @@ calamine = "0.18.0" chrono = { version = "0.4.19", features = ["serde"] } chrono-humanize = "0.2.1" chrono-tz = "0.6.1" -crossterm = "0.23.0" +crossterm = "0.24.0" csv = "1.1.6" dialoguer = "0.9.0" digest = "0.10.0" @@ -52,7 +52,7 @@ is-root = "0.1.2" itertools = "0.10.0" lazy_static = "1.4.0" log = "0.4.14" -lscolors = { version = "0.10.0", features = ["crossterm"]} +lscolors = { version = "0.11.0", features = ["crossterm"]} md5 = { package = "md-5", version = "0.10.0" } meval = "0.2.0" mime = "0.3.16" diff --git a/crates/nu-utils/Cargo.toml b/crates/nu-utils/Cargo.toml index 038f07337..f49d816b2 100644 --- a/crates/nu-utils/Cargo.toml +++ b/crates/nu-utils/Cargo.toml @@ -12,7 +12,7 @@ name = "utils" path = "src/main.rs" [dependencies] -lscolors = { version = "0.10.0", features = ["crossterm"]} +lscolors = { version = "0.11.0", features = ["crossterm"]} [target.'cfg(windows)'.dependencies] crossterm_winapi = "0.9.0"