chore(nushell): update to 0.61.0

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
This commit is contained in:
Aditya Alok 2022-04-14 12:35:34 +05:30
parent fe326e9990
commit 930042d031
No known key found for this signature in database
GPG Key ID: 345AE134142077D8
4 changed files with 21 additions and 49 deletions

View File

@ -1,11 +0,0 @@
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,7 +72,7 @@
[features]
plugin = ["nu-plugin", "nu-cli/plugin", "nu-parser/plugin", "nu-command/plugin", "nu-protocol/plugin", "nu-engine/plugin"]
-default = ["plugin", "which", "zip-support", "trash-support"]
+default = ["plugin", "which", "zip-support"]
stable = ["default"]
extra = ["default", "dataframe"]
wasi = []

View File

@ -2,22 +2,21 @@ TERMUX_PKG_HOMEPAGE=https://www.nushell.sh
TERMUX_PKG_DESCRIPTION="A new type of shell operating on structured data"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.60.0
TERMUX_PKG_VERSION=0.61.0
TERMUX_PKG_SRCURL=https://github.com/nushell/nushell/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=9b9deb8e42cf18ccf328833a4d051fc14cef0be468afc3b0dbde6657deb9f079
TERMUX_PKG_SHA256=9d12eafd790fbd7bde4d4a71bf5121cc4897fbaf18c0ac50167fb6153167fe57
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="openssl, zlib"
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_CONFIGURE_EXTRA_ARGS="--features=extra"
termux_step_pre_configure() {
# CARGO_TARGET_NAME is not set before termux_setup_rust
local _CARGO_TARGET_NAME
if [ $TERMUX_ARCH = "arm" ]; then
_CARGO_TARGET_NAME=armv7-linux-androideabi
else
_CARGO_TARGET_NAME=$TERMUX_ARCH-linux-android
fi
local _CARGO_TARGET_LIBDIR=target/$_CARGO_TARGET_NAME/release/deps
termux_setup_rust
export CFLAGS="${TARGET_CFLAGS}"
local _CARGO_TARGET_LIBDIR="target/${CARGO_TARGET_NAME}/release/deps"
mkdir -p $_CARGO_TARGET_LIBDIR
if [ $TERMUX_ARCH = "i686" ]; then
@ -25,10 +24,21 @@ termux_step_pre_configure() {
elif [ $TERMUX_ARCH = "x86_64" ]; then
pushd $_CARGO_TARGET_LIBDIR
local libgcc="$($CC -print-libgcc-file-name)"
echo "INPUT($libgcc -l:libunwind.a)" > libgcc.so
echo "INPUT($libgcc -l:libunwind.a)" >libgcc.so
popd
fi
: "${CARGO_HOME:=$HOME/.cargo}"
export CARGO_HOME
cargo fetch --target "${CARGO_TARGET_NAME}"
for d in $CARGO_HOME/registry/src/github.com-*/libgit2-sys-*/libgit2; do
patch --silent -p1 -d ${d} \
<$TERMUX_SCRIPTDIR/packages/libgit2/src-rand.c.patch || :
cp $TERMUX_SCRIPTDIR/packages/libgit2/getloadavg.c ${d}/src/ || :
done
mv $TERMUX_PREFIX/lib/libz.so.1{,.tmp}
mv $TERMUX_PREFIX/lib/libz.so{,.tmp}

View File

@ -1,11 +0,0 @@
--- a/crates/nu-system/Cargo.toml
+++ b/crates/nu-system/Cargo.toml
@@ -14,7 +14,7 @@
[dependencies]
-[target.'cfg(target_os = "linux")'.dependencies]
+[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
procfs = "0.12.0"
users = "0.11"
which = "4"

View File

@ -1,16 +0,0 @@
--- a/crates/nu-system/src/lib.rs
+++ b/crates/nu-system/src/lib.rs
@@ -1,11 +1,11 @@
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "android"))]
mod linux;
#[cfg(target_os = "macos")]
mod macos;
#[cfg(target_os = "windows")]
mod windows;
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "android"))]
pub use self::linux::*;
#[cfg(target_os = "macos")]
pub use self::macos::*;