From 1fbad5a100e9fbaee77e498beac321340c3a4d69 Mon Sep 17 00:00:00 2001 From: sirkhancision Date: Wed, 5 Jul 2023 14:49:58 -0300 Subject: [PATCH] nushell: update to 0.82.0. --- .../patches/0001-use-system-libraries.patch | 84 ++++++++----------- srcpkgs/nushell/template | 12 +-- 2 files changed, 39 insertions(+), 57 deletions(-) diff --git a/srcpkgs/nushell/patches/0001-use-system-libraries.patch b/srcpkgs/nushell/patches/0001-use-system-libraries.patch index 1cc665f5105d..5d62245d9ab7 100644 --- a/srcpkgs/nushell/patches/0001-use-system-libraries.patch +++ b/srcpkgs/nushell/patches/0001-use-system-libraries.patch @@ -1,69 +1,51 @@ -From b740aa919b96451231e26a6827b5cfe7bc568e22 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 | 1 - - Cargo.toml | 2 +- - crates/nu-cli/Cargo.toml | 2 +- - crates/nu-command/Cargo.toml | 4 ++-- - 4 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index e2b876e3c..2d5772965 100644 +diff --git a/a/Cargo.lock b/a/Cargo.lock +index 014838b..cb599db 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -2208,7 +2208,6 @@ version = "0.25.2" +@@ -2191,7 +2191,6 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" + checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ - "cc", "pkg-config", "vcpkg", ] -diff --git a/Cargo.toml b/Cargo.toml -index 3db073901..318186fda 100644 +diff --git a/a/Cargo.toml b/a/Cargo.toml +index d1f11f0..b8e96f7 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -63,7 +63,7 @@ nu-term-grid = { path = "./crates/nu-term-grid", version = "0.78.0" } - nu-utils = { path = "./crates/nu-utils", version = "0.78.0" } - +@@ -67,7 +67,7 @@ nu-term-grid = { path = "./crates/nu-term-grid", version = "0.82.0" } + nu-std = { path = "./crates/nu-std", version = "0.82.0" } + nu-utils = { path = "./crates/nu-utils", version = "0.82.0" } nu-ansi-term = "0.47.0" --reedline = { version = "0.18.0", features = ["bashisms", "sqlite"] } -+reedline = { version = "0.18.0", features = ["bashisms", "sqlite-dynlib"] } +-reedline = { version = "0.21.0", features = ["bashisms", "sqlite"]} ++reedline = { version = "0.21.0", features = ["bashisms", "sqlite-dynlib"]} + + mimalloc = { version = "0.1.37", default-features = false, optional = true} - rayon = "1.7.0" - is_executable = "1.0.1" -diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml -index 2d3ef54c4..d10497bcc 100644 +diff --git a/a/crates/nu-cli/Cargo.toml b/a/crates/nu-cli/Cargo.toml +index 841ff85..ea70d4a 100644 --- a/crates/nu-cli/Cargo.toml +++ b/crates/nu-cli/Cargo.toml -@@ -24,7 +24,7 @@ nu-utils = { path = "../nu-utils", version = "0.78.0" } - nu-color-config = { path = "../nu-color-config", version = "0.78.0" } - +@@ -25,7 +25,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.82.0" } + nu-utils = { path = "../nu-utils", version = "0.82.0" } + nu-color-config = { path = "../nu-color-config", version = "0.82.0" } nu-ansi-term = "0.47.0" --reedline = { version = "0.18.0", features = ["bashisms", "sqlite"] } -+reedline = { version = "0.18.0", features = ["bashisms", "sqlite-dynlib"] } +-reedline = { version = "0.21.0", features = ["bashisms", "sqlite"]} ++reedline = { version = "0.21.0", features = ["bashisms", "sqlite-dynlib"]} - atty = "0.2.14" - chrono = { default-features = false, features = ["std"], version = "0.4.23" } -diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml -index ba02a8518..9006484fb 100644 + atty = "0.2" + chrono = { default-features = false, features = ["std"], version = "0.4" } +diff --git a/a/crates/nu-command/Cargo.toml b/a/crates/nu-command/Cargo.toml +index 7bb5710..9911440 100644 --- a/crates/nu-command/Cargo.toml +++ b/crates/nu-command/Cargo.toml -@@ -85,8 +85,8 @@ serde_yaml = "0.9.4" - sha2 = "0.10.0" - # Disable default features b/c the default features build Git (very slow to compile) - percent-encoding = "2.2.0" --reedline = { version = "0.18.0", features = ["bashisms", "sqlite"] } --rusqlite = { version = "0.28.0", features = ["bundled"], optional = true } -+reedline = { version = "0.18.0", features = ["bashisms", "sqlite-dynlib"] } -+rusqlite = { version = "0.28.0", optional = true } - sqlparser = { version = "0.32.0", features = ["serde"], optional = true } - sysinfo = "0.28.2" - tabled = "0.10.0" --- -2.40.0 - +@@ -75,7 +75,7 @@ rand = "0.8" + rayon = "1.7" + regex = "1.7" + roxmltree = "0.18" +-rusqlite = { version = "0.29", features = ["bundled"], optional = true } ++rusqlite = { version = "0.29", optional = true } + rust-embed = "6.6" + same-file = "1.0" + serde = { version = "1.0", features = ["derive"] } diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template index b01d8452a303..c0ea4d3a94e0 100644 --- a/srcpkgs/nushell/template +++ b/srcpkgs/nushell/template @@ -1,6 +1,6 @@ # Template file for 'nushell' pkgname=nushell -version=0.78.0 +version=0.82.0 revision=1 build_style=cargo configure_args="--features=extra" @@ -14,16 +14,16 @@ 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=eff55bf4e0739113cfdc890c0ed90f46ebbfd722b49f7ce65e76b347733bc654 +checksum=587847feeb9fc06eb2a9da5ff05ffea5238fe5928ebea944c042838d8ad136e8 register_shell="/usr/bin/nu" # all tests fail with argument --target make_check=no case "$XBPS_TARGET_MACHINE" in - i686*) - broken='https://build.voidlinux.org/builders/i686_builder/builds/33520/steps/shell_3/logs/stdio' - ;; - ppc*) broken="arrow-rs parquet is busted garbage";; +i686*) + broken='https://build.voidlinux.org/builders/i686_builder/builds/33520/steps/shell_3/logs/stdio' + ;; +ppc*) broken="arrow-rs parquet is busted garbage" ;; esac post_install() {