nushell: update to 0.90.1

This commit is contained in:
cinerea0 2024-02-28 15:55:35 -05:00 committed by cinerea0
parent 9a6548d6d2
commit c901105a1d
2 changed files with 32 additions and 59 deletions

View File

@ -1,67 +1,39 @@
From d50a7241de7ebba53bec74b3dd5086417f38923b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Sat, 16 Dec 2023 14:01:23 +0100
Subject: [PATCH] use system libraries
---
Cargo.lock | 1 -
Cargo.toml | 2 +-
crates/nu-cli/Cargo.toml | 2 +-
crates/nu-command/Cargo.toml | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 495bc2678..c7c1e24c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2194,7 +2194,6 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
dependencies = [
- "cc",
"pkg-config",
"vcpkg",
]
diff --git a/Cargo.toml b/Cargo.toml
index b3848de41..b8236f27a 100644
index ff57424af7e..27e0ed3c154 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,7 +69,7 @@ nu-term-grid = { path = "./crates/nu-term-grid", version = "0.88.1" }
nu-std = { path = "./crates/nu-std", version = "0.88.1" }
nu-utils = { path = "./crates/nu-utils", version = "0.88.1" }
nu-ansi-term = "0.49.0"
-reedline = { version = "0.27.0", features = ["bashisms", "sqlite"] }
+reedline = { version = "0.27.0", features = ["bashisms", "sqlite-dynlib"] }
@@ -78,7 +78,7 @@ nu-std = { path = "./crates/nu-std", version = "0.90.1" }
nu-utils = { path = "./crates/nu-utils", version = "0.90.1" }
nu-ansi-term = "0.50.0"
-reedline = { version = "0.29.0", features = ["bashisms", "sqlite"] }
+reedline = { version = "0.29.0", features = ["bashisms", "sqlite-dynlib"] }
crossterm = "0.27"
ctrlc = "3.4"
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index d07b6dab4..c2e50461d 100644
index cbcfe333e0f..ab349ecbc6a 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -25,7 +25,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.88.1" }
nu-utils = { path = "../nu-utils", version = "0.88.1" }
nu-color-config = { path = "../nu-color-config", version = "0.88.1" }
nu-ansi-term = "0.49.0"
-reedline = { version = "0.27.0", features = ["bashisms", "sqlite"] }
+reedline = { version = "0.27.0", features = ["bashisms", "sqlite-dynlib"] }
@@ -25,7 +25,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.90.1" }
nu-utils = { path = "../nu-utils", version = "0.90.1" }
nu-color-config = { path = "../nu-color-config", version = "0.90.1" }
nu-ansi-term = "0.50.0"
-reedline = { version = "0.29.0", features = ["bashisms", "sqlite"] }
+reedline = { version = "0.29.0", features = ["bashisms", "sqlite-dynlib"] }
chrono = { default-features = false, features = ["std"], version = "0.4" }
crossterm = "0.27"
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index 4835bf264..ef8a83aaf 100644
index 56f6a3ab622..9779f991a18 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -73,7 +73,7 @@ rand = "0.8"
@@ -72,7 +72,7 @@ rand = "0.8"
rayon = "1.8"
regex = "1.9.5"
roxmltree = "0.18"
-rusqlite = { version = "0.29", features = ["bundled", "backup"], optional = true }
+rusqlite = { version = "0.29", features = ["backup"], optional = true }
-rusqlite = { version = "0.29", features = ["bundled", "backup", "chrono"], optional = true }
+rusqlite = { version = "0.29", features = ["backup", "chrono"], optional = true }
same-file = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
--
2.43.0
serde_json = { version = "1.0", features = ["preserve_order"] }

View File

@ -1,28 +1,25 @@
# Template file for 'nushell'
pkgname=nushell
version=0.88.1
revision=2
version=0.90.1
revision=1
build_style=cargo
configure_args="--features=extra"
hostmakedepends="pkg-config python3 libgit2-devel"
makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel
libcurl-devel libzstd-devel liblz4-devel zlib-devel
nghttp2-devel bzip2-devel sqlite-devel"
configure_args="--features=extra,dataframe"
hostmakedepends="pkg-config libgit2-devel"
makedepends="openssl-devel libgit2-devel libzstd-devel sqlite-devel"
depends="mimalloc"
short_desc="Modern shell for the GitHub era"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
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=19f5a46799142117f61989a76f85fdd24361fe9e5068565d7fff36b91a7a7a39
checksum=cb15559556311dea349a0f0b5fddeb3cc7a3adea9b0586753f0c632d69727084
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'
;;
i686*) broken="simd-json does not implement i686" ;;
ppc*) broken="arrow-rs parquet is busted garbage" ;;
esac
@ -30,6 +27,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
XBPS_CROSS_RUSTFLAGS+=" -latomic"
fi
post_patch() {
cargo update --recursive reedline
}
post_install() {
vlicense LICENSE
vsconf crates/nu-utils/src/sample_config/default_config.nu