From ce9dbb70f387486c719823d3529329795cc4d98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 22 Jul 2021 13:01:28 +0700 Subject: [PATCH] nushell: unvendor curl, zstd, sqlite --- .../nushell/patches/system-libraries.patch | 38 +++++++++++++++++++ srcpkgs/nushell/template | 13 ++++--- 2 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/nushell/patches/system-libraries.patch diff --git a/srcpkgs/nushell/patches/system-libraries.patch b/srcpkgs/nushell/patches/system-libraries.patch new file mode 100644 index 000000000000..1b154a11dd41 --- /dev/null +++ b/srcpkgs/nushell/patches/system-libraries.patch @@ -0,0 +1,38 @@ +Index: nushell-0.34.0/Cargo.toml +=================================================================== +--- nushell-0.34.0.orig/Cargo.toml ++++ nushell-0.34.0/Cargo.toml +@@ -259,3 +259,7 @@ required-features = ["sqlite"] + [[bin]] + name = "nu" + path = "src/main.rs" ++ ++[dependencies.zstd] ++features = ["pkg-config"] ++version = ">=0.0.0" +Index: nushell-0.34.0/crates/nu_plugin_from_sqlite/Cargo.toml +=================================================================== +--- nushell-0.34.0.orig/crates/nu_plugin_from_sqlite/Cargo.toml ++++ nushell-0.34.0/crates/nu_plugin_from_sqlite/Cargo.toml +@@ -20,7 +20,7 @@ num-traits = "0.2.14" + tempfile = "3.2.0" + + [dependencies.rusqlite] +-features = ["bundled", "blob"] ++features = ["blob"] + version = "0.25.3" + + [build-dependencies] +Index: nushell-0.34.0/crates/nu_plugin_to_sqlite/Cargo.toml +=================================================================== +--- nushell-0.34.0.orig/crates/nu_plugin_to_sqlite/Cargo.toml ++++ nushell-0.34.0/crates/nu_plugin_to_sqlite/Cargo.toml +@@ -20,7 +20,7 @@ num-traits = "0.2.14" + tempfile = "3.2.0" + + [dependencies.rusqlite] +-features = ["bundled", "blob"] ++features = ["blob"] + version = "0.25.3" + + [build-dependencies] diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template index 98b7516a0864..4d5f77d90239 100644 --- a/srcpkgs/nushell/template +++ b/srcpkgs/nushell/template @@ -1,12 +1,13 @@ # Template file for 'nushell' pkgname=nushell version=0.34.0 -revision=1 +revision=2 build_style=cargo configure_args="--features=extra" hostmakedepends="pkg-config python3 libgit2-devel" makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel - libatomic-devel" + libatomic-devel libcurl-devel libzstd-devel liblz4-devel zlib-devel + nghttp2-devel bzip2-devel sqlite-devel" short_desc="Modern shell for the GitHub era" maintainer="Jan Christian Grünhage " license="MIT" @@ -18,9 +19,11 @@ register_shell="/usr/bin/nu" # all tests fail with argument --target make_check=no -if [ "$XBPS_TARGET_WORDSIZE" != 64 ]; then - broken='https://build.voidlinux.org/builders/i686_builder/builds/33520/steps/shell_3/logs/stdio' -fi +case "$XBPS_TARGET_MACHINE" in + i686*) + broken='https://build.voidlinux.org/builders/i686_builder/builds/33520/steps/shell_3/logs/stdio' + ;; +esac post_install() { vlicense LICENSE