mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-07 07:33:48 +02:00
nushell: update to 0.68.1.
This commit is contained in:
parent
fe45bbe7c8
commit
3b6ef069e9
2 changed files with 75 additions and 18 deletions
|
@ -1,21 +1,31 @@
|
||||||
From a567591980eeb3bddaac8d13be38baf0ac6e15a7 Mon Sep 17 00:00:00 2001
|
From dc7a5b11ed8b8c437796deb83f2f9f84137404c0 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
|
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
|
||||||
<jan.christian@gruenhage.xyz>
|
<jan.christian@gruenhage.xyz>
|
||||||
Date: Wed, 8 Jun 2022 16:15:55 +0200
|
Date: Wed, 8 Jun 2022 16:15:55 +0200
|
||||||
Subject: [PATCH] use system libraries
|
Subject: [PATCH] use system libraries
|
||||||
|
|
||||||
---
|
---
|
||||||
Cargo.lock | 2 ++
|
Cargo.lock | 6 +++---
|
||||||
Cargo.toml | 4 ++++
|
Cargo.toml | 5 ++++-
|
||||||
|
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_from_sqlite/Cargo.toml | 2 +-
|
||||||
crates/old/nu_plugin_to_sqlite/Cargo.toml | 2 +-
|
crates/old/nu_plugin_to_sqlite/Cargo.toml | 2 +-
|
||||||
4 files changed, 8 insertions(+), 2 deletions(-)
|
6 files changed, 12 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
diff --git a/Cargo.lock b/Cargo.lock
|
diff --git a/Cargo.lock b/Cargo.lock
|
||||||
index 7d36ecddf..1360ada48 100644
|
index aaf74b424..8ce23ed77 100644
|
||||||
--- a/Cargo.lock
|
--- a/Cargo.lock
|
||||||
+++ b/Cargo.lock
|
+++ b/Cargo.lock
|
||||||
@@ -2544,6 +2544,7 @@ dependencies = [
|
@@ -2118,7 +2118,6 @@ version = "0.25.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9f0455f2c1bc9a7caa792907026e469c1d91761fb0ea37cbb16427c77280cf35"
|
||||||
|
dependencies = [
|
||||||
|
- "cc",
|
||||||
|
"pkg-config",
|
||||||
|
"vcpkg",
|
||||||
|
]
|
||||||
|
@@ -2614,6 +2613,7 @@ dependencies = [
|
||||||
"tempfile",
|
"tempfile",
|
||||||
"time 0.3.13",
|
"time 0.3.13",
|
||||||
"winres",
|
"winres",
|
||||||
|
@ -23,29 +33,76 @@ index 7d36ecddf..1360ada48 100644
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -5679,4 +5680,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
|
@@ -4079,8 +4079,7 @@ dependencies = [
|
||||||
|
[[package]]
|
||||||
|
name = "reedline"
|
||||||
|
version = "0.11.0"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "5559b5ab4817b0da0c6fc6814edfae537209e01d955a2f3e7595606e3d039691"
|
||||||
|
+source = "git+https://github.com/jcgruenhage/reedline.git?branch=dont-bundle-sqlite-by-default#0968b9d2f74390259ad5f8e867926c0f51c0dabe"
|
||||||
|
dependencies = [
|
||||||
|
"chrono",
|
||||||
|
"crossterm 0.24.0",
|
||||||
|
@@ -5907,4 +5906,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"libc",
|
"libc",
|
||||||
+ "pkg-config",
|
+ "pkg-config",
|
||||||
]
|
]
|
||||||
diff --git a/Cargo.toml b/Cargo.toml
|
diff --git a/Cargo.toml b/Cargo.toml
|
||||||
index 6199fbaa0..5edf138c3 100644
|
index 5b358f82b..70db93a1a 100644
|
||||||
--- a/Cargo.toml
|
--- a/Cargo.toml
|
||||||
+++ b/Cargo.toml
|
+++ b/Cargo.toml
|
||||||
@@ -121,3 +121,7 @@ debug = false
|
@@ -53,7 +53,7 @@ nu-system = { path = "./crates/nu-system", version = "0.68.1" }
|
||||||
[[bin]]
|
nu-table = { path = "./crates/nu-table", version = "0.68.1" }
|
||||||
|
nu-term-grid = { path = "./crates/nu-term-grid", version = "0.68.1" }
|
||||||
|
nu-utils = { path = "./crates/nu-utils", version = "0.68.1" }
|
||||||
|
-reedline = { version = "0.11.0", features = ["bashisms", "sqlite"]}
|
||||||
|
+reedline = { git = "https://github.com/jcgruenhage/reedline.git", branch = "dont-bundle-sqlite-by-default", features = ["bashisms", "sqlite"]}
|
||||||
|
rayon = "1.5.1"
|
||||||
|
is_executable = "1.0.1"
|
||||||
|
simplelog = "0.12.0"
|
||||||
|
@@ -122,3 +122,6 @@ debug = false
|
||||||
name = "nu"
|
name = "nu"
|
||||||
path = "src/main.rs"
|
path = "src/main.rs"
|
||||||
+
|
|
||||||
+[dependencies.zstd]
|
+[dependencies.zstd]
|
||||||
+features = ["pkg-config"]
|
+features = ["pkg-config"]
|
||||||
+version = ">=0.0.0"
|
+version = ">=0.0.0"
|
||||||
|
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
|
||||||
|
index a2782b1c1..2a256ce2f 100644
|
||||||
|
--- a/crates/nu-cli/Cargo.toml
|
||||||
|
+++ b/crates/nu-cli/Cargo.toml
|
||||||
|
@@ -20,7 +20,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.68.1" }
|
||||||
|
nu-utils = { path = "../nu-utils", version = "0.68.1" }
|
||||||
|
nu-ansi-term = "0.46.0"
|
||||||
|
nu-color-config = { path = "../nu-color-config", version = "0.68.1" }
|
||||||
|
-reedline = { version = "0.11.0", features = ["bashisms", "sqlite"]}
|
||||||
|
+reedline = { git = "https://github.com/jcgruenhage/reedline.git", branch = "dont-bundle-sqlite-by-default", features = ["bashisms", "sqlite"]}
|
||||||
|
|
||||||
|
atty = "0.2.14"
|
||||||
|
chrono = "0.4.21"
|
||||||
|
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
|
||||||
|
index 7092f58c6..2783282b0 100644
|
||||||
|
--- a/crates/nu-command/Cargo.toml
|
||||||
|
+++ b/crates/nu-command/Cargo.toml
|
||||||
|
@@ -87,9 +87,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.11.0", features = ["bashisms", "sqlite"]}
|
||||||
|
+reedline = { git = "https://github.com/jcgruenhage/reedline.git", branch = "dont-bundle-sqlite-by-default", features = ["bashisms", "sqlite"]}
|
||||||
|
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.16.0", features = ["serde"], optional = true }
|
||||||
|
|
||||||
|
[target.'cfg(unix)'.dependencies]
|
||||||
diff --git a/crates/old/nu_plugin_from_sqlite/Cargo.toml b/crates/old/nu_plugin_from_sqlite/Cargo.toml
|
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 35968022a..a09bb591f 100644
|
||||||
--- a/crates/old/nu_plugin_from_sqlite/Cargo.toml
|
--- a/crates/old/nu_plugin_from_sqlite/Cargo.toml
|
||||||
+++ b/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.68.1" }
|
||||||
tempfile = "3.2.0"
|
tempfile = "3.2.0"
|
||||||
|
|
||||||
[dependencies.rusqlite]
|
[dependencies.rusqlite]
|
||||||
|
@ -55,10 +112,10 @@ index 151e1e9bb..dea47e809 100644
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
diff --git a/crates/old/nu_plugin_to_sqlite/Cargo.toml b/crates/old/nu_plugin_to_sqlite/Cargo.toml
|
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 1ef5cf77f..aedd6fe88 100644
|
||||||
--- a/crates/old/nu_plugin_to_sqlite/Cargo.toml
|
--- a/crates/old/nu_plugin_to_sqlite/Cargo.toml
|
||||||
+++ b/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.68.1" }
|
||||||
tempfile = "3.2.0"
|
tempfile = "3.2.0"
|
||||||
|
|
||||||
[dependencies.rusqlite]
|
[dependencies.rusqlite]
|
||||||
|
@ -68,5 +125,5 @@ index 34d93b9cc..e0d778c39 100644
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
--
|
--
|
||||||
2.37.2
|
2.37.3
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'nushell'
|
# Template file for 'nushell'
|
||||||
pkgname=nushell
|
pkgname=nushell
|
||||||
version=0.67.0
|
version=0.68.1
|
||||||
revision=1
|
revision=1
|
||||||
build_style=cargo
|
build_style=cargo
|
||||||
configure_args="--features=extra"
|
configure_args="--features=extra"
|
||||||
|
@ -14,7 +14,7 @@ license="MIT"
|
||||||
homepage="https://www.nushell.sh/"
|
homepage="https://www.nushell.sh/"
|
||||||
changelog="https://www.nushell.sh/blog/"
|
changelog="https://www.nushell.sh/blog/"
|
||||||
distfiles="https://github.com/nushell/nushell/archive/refs/tags/${version}.tar.gz"
|
distfiles="https://github.com/nushell/nushell/archive/refs/tags/${version}.tar.gz"
|
||||||
checksum=a8c4c092087d035805781dff11000f2b7c4a44ae487b013f9d0a59c4dc610546
|
checksum=d3719f5b3eca5dee6215e39fe1da1b559d49837f0baf18c7edc14f1719c986bb
|
||||||
register_shell="/usr/bin/nu"
|
register_shell="/usr/bin/nu"
|
||||||
# all tests fail with argument --target
|
# all tests fail with argument --target
|
||||||
make_check=no
|
make_check=no
|
||||||
|
|
Loading…
Add table
Reference in a new issue