* [PR PATCH] nushell: update to 0.71.0.
@ 2022-11-14 11:26 jcgruenhage
2022-11-14 16:45 ` [PR PATCH] [Merged]: " paper42
0 siblings, 1 reply; 2+ messages in thread
From: jcgruenhage @ 2022-11-14 11:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1232 bytes --]
There is a new pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages nushell-0.71.0_1
https://github.com/void-linux/void-packages/pull/40523
nushell: update to 0.71.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40523.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nushell-0.71.0_1-40523.patch --]
[-- Type: text/x-diff, Size: 8724 bytes --]
From e42a41286b654680e126eea964a026adc1edf51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Mon, 14 Nov 2022 12:20:57 +0100
Subject: [PATCH] nushell: update to 0.71.0.
---
.../patches/0001-use-system-libraries.patch | 87 ++++++++-----------
srcpkgs/nushell/template | 4 +-
2 files changed, 38 insertions(+), 53 deletions(-)
diff --git a/srcpkgs/nushell/patches/0001-use-system-libraries.patch b/srcpkgs/nushell/patches/0001-use-system-libraries.patch
index af55ff7a0542..3df63674f80e 100644
--- a/srcpkgs/nushell/patches/0001-use-system-libraries.patch
+++ b/srcpkgs/nushell/patches/0001-use-system-libraries.patch
@@ -1,23 +1,23 @@
-From 0e3a07c593f805c8480290ca5aba61b76e3f7833 Mon Sep 17 00:00:00 2001
+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 | 6 +++---
- Cargo.toml | 12 +++++++++---
- 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, 17 insertions(+), 11 deletions(-)
+ 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 7376ffe6a..ddcb00e2b 100644
+index 7e75169c2..f74c8d9fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
-@@ -2085,7 +2085,6 @@ version = "0.25.1"
+@@ -2025,7 +2025,6 @@ version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f0455f2c1bc9a7caa792907026e469c1d91761fb0ea37cbb16427c77280cf35"
dependencies = [
@@ -25,7 +25,7 @@ index 7376ffe6a..ddcb00e2b 100644
"pkg-config",
"vcpkg",
]
-@@ -2604,6 +2603,7 @@ dependencies = [
+@@ -2498,6 +2497,7 @@ dependencies = [
"tempfile",
"time 0.3.14",
"winres",
@@ -33,83 +33,68 @@ index 7376ffe6a..ddcb00e2b 100644
]
[[package]]
-@@ -4071,8 +4071,7 @@ dependencies = [
- [[package]]
- name = "reedline"
- version = "0.13.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "555a4285d183a94d140d749712a6600b10e70d7cd6aef91e3cfb65ba09b1d75e"
-+source = "git+https://github.com/nushell/reedline.git?branch=main#698f4eb4288b1781ce956eec2d20dc5a95dc689b"
- dependencies = [
- "chrono",
- "crossterm 0.24.0",
-@@ -5881,4 +5880,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
+@@ -5786,4 +5786,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
dependencies = [
"cc",
"libc",
+ "pkg-config",
]
diff --git a/Cargo.toml b/Cargo.toml
-index df7c9a08f..f0cf359a8 100644
+index e9ab2c589..6b24e54d2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -52,8 +52,7 @@ nu-system = { path = "./crates/nu-system", version = "0.70.0" }
- nu-table = { path = "./crates/nu-table", version = "0.70.0" }
- nu-term-grid = { path = "./crates/nu-term-grid", version = "0.70.0" }
- nu-utils = { path = "./crates/nu-utils", version = "0.70.0" }
--reedline = { version = "0.13.0", features = ["bashisms", "sqlite"]}
--
-+reedline = { version = "0.13.0", features = ["bashisms", "sqlite-dynlib"]}
+@@ -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"
- simplelog = "0.12.0"
-@@ -130,4 +129,11 @@ path = "src/main.rs"
+@@ -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" }
+
-+# required for https://github.com/nushell/reedline/pull/504, will not be
-+# needed anymore once the next release after 0.13.0 is published.
-+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 03b794793..7f1d19fc4 100644
+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.70.0" }
- nu-utils = { path = "../nu-utils", version = "0.70.0" }
+@@ -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.70.0" }
--reedline = { version = "0.13.0", features = ["bashisms", "sqlite"]}
-+reedline = { version = "0.13.0", features = ["bashisms", "sqlite-dynlib"]}
+ 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 d293f3e39..a1cd87a34 100644
+index 99deb0cfc..647b56e9a 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
-@@ -88,9 +88,9 @@ unicode-segmentation = "1.8.0"
+@@ -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.13.0", features = ["bashisms", "sqlite"]}
-+reedline = { version = "0.13.0", features = ["bashisms", "sqlite-dynlib"]}
- wax = { version = "0.5.0", features = ["diagnostics"] }
+-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 d99708135..deb87e566 100644
+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.70.0" }
+@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.71.0" }
tempfile = "3.2.0"
[dependencies.rusqlite]
@@ -119,10 +104,10 @@ index d99708135..deb87e566 100644
[build-dependencies]
diff --git a/crates/old/nu_plugin_to_sqlite/Cargo.toml b/crates/old/nu_plugin_to_sqlite/Cargo.toml
-index 694d90d74..ca9b34198 100644
+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.70.0" }
+@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.71.0" }
tempfile = "3.2.0"
[dependencies.rusqlite]
diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index ff4ee36c9129..928bb9562363 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,6 +1,6 @@
# Template file for 'nushell'
pkgname=nushell
-version=0.70.0
+version=0.71.0
revision=1
build_style=cargo
configure_args="--features=extra"
@@ -14,7 +14,7 @@ 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=315d6f9723c9b036bb0ba268c236f84ba7fc3e3fc36be8e1c45f02dea1b077c4
+checksum=0f3a279ead004c86c44b6c9991e9e838b819dad23d65add7250a9691ad29f209
register_shell="/usr/bin/nu"
# all tests fail with argument --target
make_check=no
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-14 16:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-14 11:26 [PR PATCH] nushell: update to 0.71.0 jcgruenhage
2022-11-14 16:45 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).