122 lines
4.3 KiB
Diff
122 lines
4.3 KiB
Diff
From c26c60ed459918ed817ac52cfc36733563a570b7 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
|
|
<jan.christian@gruenhage.xyz>
|
|
Date: Wed, 8 Jun 2022 16:15:55 +0200
|
|
Subject: [PATCH] use system libraries
|
|
|
|
---
|
|
Cargo.lock | 3 ++-
|
|
Cargo.toml | 7 +++++--
|
|
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_to_sqlite/Cargo.toml | 2 +-
|
|
6 files changed, 12 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/Cargo.lock b/Cargo.lock
|
|
index 7e75169c2..f74c8d9fc 100644
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -2025,7 +2025,6 @@ version = "0.25.1"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
checksum = "9f0455f2c1bc9a7caa792907026e469c1d91761fb0ea37cbb16427c77280cf35"
|
|
dependencies = [
|
|
- "cc",
|
|
"pkg-config",
|
|
"vcpkg",
|
|
]
|
|
@@ -2498,6 +2497,7 @@ dependencies = [
|
|
"tempfile",
|
|
"time 0.3.14",
|
|
"winres",
|
|
+ "zstd",
|
|
]
|
|
|
|
[[package]]
|
|
@@ -5786,4 +5786,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
|
|
dependencies = [
|
|
"cc",
|
|
"libc",
|
|
+ "pkg-config",
|
|
]
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index e9ab2c589..6b24e54d2 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -52,7 +52,7 @@ nu-system = { path = "./crates/nu-system", version = "0.71.0" }
|
|
nu-table = { path = "./crates/nu-table", version = "0.71.0" }
|
|
nu-term-grid = { path = "./crates/nu-term-grid", version = "0.71.0" }
|
|
nu-utils = { path = "./crates/nu-utils", version = "0.71.0" }
|
|
-reedline = { version = "0.14.0", features = ["bashisms", "sqlite"]}
|
|
+reedline = { version = "0.14.0", features = ["bashisms", "sqlite-dynlib"]}
|
|
|
|
rayon = "1.5.1"
|
|
is_executable = "1.0.1"
|
|
@@ -130,4 +130,7 @@ path = "src/main.rs"
|
|
# To use a development version of a dependency please use a global override here
|
|
# changing versions in each sub-crate of the workspace is tedious
|
|
[patch.crates-io]
|
|
-# reedline = { git = "https://github.com/nushell/reedline.git", branch = "main" }
|
|
+
|
|
+[dependencies.zstd]
|
|
+features = ["pkg-config"]
|
|
+version = ">=0.0.0"
|
|
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
|
|
index dbe2b639c..8bfcb0dd8 100644
|
|
--- a/crates/nu-cli/Cargo.toml
|
|
+++ b/crates/nu-cli/Cargo.toml
|
|
@@ -20,7 +20,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.71.0" }
|
|
nu-utils = { path = "../nu-utils", version = "0.71.0" }
|
|
nu-ansi-term = "0.46.0"
|
|
nu-color-config = { path = "../nu-color-config", version = "0.71.0" }
|
|
-reedline = { version = "0.14.0", features = ["bashisms", "sqlite"]}
|
|
+reedline = { version = "0.14.0", features = ["bashisms", "sqlite-dynlib"]}
|
|
|
|
atty = "0.2.14"
|
|
chrono = "0.4.21"
|
|
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
|
|
index 99deb0cfc..647b56e9a 100644
|
|
--- a/crates/nu-command/Cargo.toml
|
|
+++ b/crates/nu-command/Cargo.toml
|
|
@@ -86,9 +86,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.14.0", features = ["bashisms", "sqlite"]}
|
|
+reedline = { version = "0.14.0", features = ["bashisms", "sqlite-dynlib"]}
|
|
wax = { version = "0.5.0" }
|
|
-rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
|
|
+rusqlite = { version = "0.28.0", optional = true }
|
|
sqlparser = { version = "0.23.0", features = ["serde"], optional = true }
|
|
|
|
[target.'cfg(windows)'.dependencies]
|
|
diff --git a/crates/old/nu_plugin_from_sqlite/Cargo.toml b/crates/old/nu_plugin_from_sqlite/Cargo.toml
|
|
index 3166d3203..520052cfd 100644
|
|
--- a/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.71.0" }
|
|
tempfile = "3.2.0"
|
|
|
|
[dependencies.rusqlite]
|
|
-features = ["bundled", "blob"]
|
|
+features = ["blob"]
|
|
version = "0.26.1"
|
|
|
|
[build-dependencies]
|
|
diff --git a/crates/old/nu_plugin_to_sqlite/Cargo.toml b/crates/old/nu_plugin_to_sqlite/Cargo.toml
|
|
index 085163b21..923301c9f 100644
|
|
--- a/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.71.0" }
|
|
tempfile = "3.2.0"
|
|
|
|
[dependencies.rusqlite]
|
|
-features = ["bundled", "blob"]
|
|
+features = ["blob"]
|
|
version = "0.26.1"
|
|
|
|
[build-dependencies]
|
|
--
|
|
2.38.1
|
|
|