From 0aad597eba4108caf4430c8d627dda97ac9fcbf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Sun, 30 Oct 2022 16:19:36 +0100 Subject: [PATCH] nushell: update to 0.70.0. --- .../patches/0001-use-system-libraries.patch | 104 ++++++++++++++---- srcpkgs/nushell/template | 4 +- 2 files changed, 86 insertions(+), 22 deletions(-) diff --git a/srcpkgs/nushell/patches/0001-use-system-libraries.patch b/srcpkgs/nushell/patches/0001-use-system-libraries.patch index 609f5a66e5e5..af55ff7a0542 100644 --- a/srcpkgs/nushell/patches/0001-use-system-libraries.patch +++ b/srcpkgs/nushell/patches/0001-use-system-libraries.patch @@ -1,51 +1,115 @@ -From a567591980eeb3bddaac8d13be38baf0ac6e15a7 Mon Sep 17 00:00:00 2001 +From 0e3a07c593f805c8480290ca5aba61b76e3f7833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 8 Jun 2022 16:15:55 +0200 Subject: [PATCH] use system libraries --- - Cargo.lock | 2 ++ - Cargo.toml | 4 ++++ - crates/old/nu_plugin_from_sqlite/Cargo.toml | 2 +- - crates/old/nu_plugin_to_sqlite/Cargo.toml | 2 +- - 4 files changed, 8 insertions(+), 2 deletions(-) + Cargo.lock | 6 +++--- + Cargo.toml | 12 +++++++++--- + crates/nu-cli/Cargo.toml | 2 +- + crates/nu-command/Cargo.toml | 4 ++-- + crates/old/nu_plugin_from_sqlite/Cargo.toml | 2 +- + crates/old/nu_plugin_to_sqlite/Cargo.toml | 2 +- + 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 7d36ecddf..1360ada48 100644 +index 7376ffe6a..ddcb00e2b 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -2544,6 +2544,7 @@ dependencies = [ +@@ -2085,7 +2085,6 @@ version = "0.25.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9f0455f2c1bc9a7caa792907026e469c1d91761fb0ea37cbb16427c77280cf35" + dependencies = [ +- "cc", + "pkg-config", + "vcpkg", + ] +@@ -2604,6 +2603,7 @@ dependencies = [ "tempfile", - "time 0.3.13", + "time 0.3.14", "winres", + "zstd", ] [[package]] -@@ -5679,4 +5680,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +@@ -4071,8 +4071,7 @@ dependencies = [ + [[package]] + name = "reedline" + version = "0.13.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "555a4285d183a94d140d749712a6600b10e70d7cd6aef91e3cfb65ba09b1d75e" ++source = "git+https://github.com/nushell/reedline.git?branch=main#698f4eb4288b1781ce956eec2d20dc5a95dc689b" + dependencies = [ + "chrono", + "crossterm 0.24.0", +@@ -5881,4 +5880,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml -index 6199fbaa0..5edf138c3 100644 +index df7c9a08f..f0cf359a8 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -121,3 +121,7 @@ debug = false - [[bin]] - name = "nu" - path = "src/main.rs" +@@ -52,8 +52,7 @@ nu-system = { path = "./crates/nu-system", version = "0.70.0" } + nu-table = { path = "./crates/nu-table", version = "0.70.0" } + nu-term-grid = { path = "./crates/nu-term-grid", version = "0.70.0" } + nu-utils = { path = "./crates/nu-utils", version = "0.70.0" } +-reedline = { version = "0.13.0", features = ["bashisms", "sqlite"]} +- ++reedline = { version = "0.13.0", features = ["bashisms", "sqlite-dynlib"]} + rayon = "1.5.1" + is_executable = "1.0.1" + simplelog = "0.12.0" +@@ -130,4 +129,11 @@ path = "src/main.rs" + # To use a development version of a dependency please use a global override here + # changing versions in each sub-crate of the workspace is tedious + [patch.crates-io] +-# reedline = { git = "https://github.com/nushell/reedline.git", branch = "main" } ++ ++# required for https://github.com/nushell/reedline/pull/504, will not be ++# needed anymore once the next release after 0.13.0 is published. ++reedline = { git = "https://github.com/nushell/reedline.git", branch = "main" } + +[dependencies.zstd] +features = ["pkg-config"] +version = ">=0.0.0" +diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml +index 03b794793..7f1d19fc4 100644 +--- a/crates/nu-cli/Cargo.toml ++++ b/crates/nu-cli/Cargo.toml +@@ -20,7 +20,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.70.0" } + nu-utils = { path = "../nu-utils", version = "0.70.0" } + nu-ansi-term = "0.46.0" + nu-color-config = { path = "../nu-color-config", version = "0.70.0" } +-reedline = { version = "0.13.0", features = ["bashisms", "sqlite"]} ++reedline = { version = "0.13.0", features = ["bashisms", "sqlite-dynlib"]} + + atty = "0.2.14" + chrono = "0.4.21" +diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml +index d293f3e39..a1cd87a34 100644 +--- a/crates/nu-command/Cargo.toml ++++ b/crates/nu-command/Cargo.toml +@@ -88,9 +88,9 @@ unicode-segmentation = "1.8.0" + url = "2.2.1" + uuid = { version = "1.1.2", features = ["v4"] } + which = { version = "4.3.0", optional = true } +-reedline = { version = "0.13.0", features = ["bashisms", "sqlite"]} ++reedline = { version = "0.13.0", features = ["bashisms", "sqlite-dynlib"]} + wax = { version = "0.5.0", features = ["diagnostics"] } +-rusqlite = { version = "0.28.0", features = ["bundled"], optional = true } ++rusqlite = { version = "0.28.0", optional = true } + sqlparser = { version = "0.23.0", features = ["serde"], optional = true } + + [target.'cfg(windows)'.dependencies] diff --git a/crates/old/nu_plugin_from_sqlite/Cargo.toml b/crates/old/nu_plugin_from_sqlite/Cargo.toml -index 151e1e9bb..dea47e809 100644 +index d99708135..deb87e566 100644 --- a/crates/old/nu_plugin_from_sqlite/Cargo.toml +++ b/crates/old/nu_plugin_from_sqlite/Cargo.toml -@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.67.0" } +@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.70.0" } tempfile = "3.2.0" [dependencies.rusqlite] @@ -55,10 +119,10 @@ index 151e1e9bb..dea47e809 100644 [build-dependencies] diff --git a/crates/old/nu_plugin_to_sqlite/Cargo.toml b/crates/old/nu_plugin_to_sqlite/Cargo.toml -index 34d93b9cc..e0d778c39 100644 +index 694d90d74..ca9b34198 100644 --- a/crates/old/nu_plugin_to_sqlite/Cargo.toml +++ b/crates/old/nu_plugin_to_sqlite/Cargo.toml -@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.67.0" } +@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.70.0" } tempfile = "3.2.0" [dependencies.rusqlite] @@ -68,5 +132,5 @@ index 34d93b9cc..e0d778c39 100644 [build-dependencies] -- -2.37.2 +2.38.1 diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template index 31aa8d86b48b..ff4ee36c9129 100644 --- a/srcpkgs/nushell/template +++ b/srcpkgs/nushell/template @@ -1,6 +1,6 @@ # Template file for 'nushell' pkgname=nushell -version=0.67.0 +version=0.70.0 revision=1 build_style=cargo configure_args="--features=extra" @@ -14,7 +14,7 @@ license="MIT" homepage="https://www.nushell.sh/" changelog="https://www.nushell.sh/blog/" distfiles="https://github.com/nushell/nushell/archive/refs/tags/${version}.tar.gz" -checksum=a8c4c092087d035805781dff11000f2b7c4a44ae487b013f9d0a59c4dc610546 +checksum=315d6f9723c9b036bb0ba268c236f84ba7fc3e3fc36be8e1c45f02dea1b077c4 register_shell="/usr/bin/nu" # all tests fail with argument --target make_check=no