Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] nushell: update to 0.68.0.
@ 2022-09-07  8:27 jcgruenhage
  2022-09-07 15:56 ` sgn
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: jcgruenhage @ 2022-09-07  8:27 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.68.0_1
https://github.com/void-linux/void-packages/pull/39143

nushell: update to 0.68.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/39143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nushell-0.68.0_1-39143.patch --]
[-- Type: text/x-diff, Size: 4256 bytes --]

From a1fd06aa27a4933277e16866f7c0e3ea012948a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 7 Sep 2022 10:27:07 +0200
Subject: [PATCH] nushell: update to 0.68.0.

---
 .../patches/0001-use-system-libraries.patch   | 29 +++++++++----------
 srcpkgs/nushell/template                      |  4 +--
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/nushell/patches/0001-use-system-libraries.patch b/srcpkgs/nushell/patches/0001-use-system-libraries.patch
index 609f5a66e5e5..3364b10b2306 100644
--- a/srcpkgs/nushell/patches/0001-use-system-libraries.patch
+++ b/srcpkgs/nushell/patches/0001-use-system-libraries.patch
@@ -1,4 +1,4 @@
-From a567591980eeb3bddaac8d13be38baf0ac6e15a7 Mon Sep 17 00:00:00 2001
+From e1041df22d985a5cd35e5247780d279a133d3e8e 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
@@ -6,16 +6,16 @@ Subject: [PATCH] use system libraries
 
 ---
  Cargo.lock                                  | 2 ++
- Cargo.toml                                  | 4 ++++
+ Cargo.toml                                  | 3 +++
  crates/old/nu_plugin_from_sqlite/Cargo.toml | 2 +-
  crates/old/nu_plugin_to_sqlite/Cargo.toml   | 2 +-
- 4 files changed, 8 insertions(+), 2 deletions(-)
+ 4 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/Cargo.lock b/Cargo.lock
-index 7d36ecddf..1360ada48 100644
+index e20624f0c..74d27b4dc 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -2544,6 +2544,7 @@ dependencies = [
+@@ -2614,6 +2614,7 @@ dependencies = [
   "tempfile",
   "time 0.3.13",
   "winres",
@@ -23,29 +23,28 @@ index 7d36ecddf..1360ada48 100644
  ]
  
  [[package]]
-@@ -5679,4 +5680,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
+@@ -5907,4 +5908,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
  dependencies = [
   "cc",
   "libc",
 + "pkg-config",
  ]
 diff --git a/Cargo.toml b/Cargo.toml
-index 6199fbaa0..5edf138c3 100644
+index 7480b8160..4c806560f 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -121,3 +121,7 @@ debug = false
- [[bin]]
+@@ -122,3 +122,6 @@ debug = false
  name = "nu"
  path = "src/main.rs"
-+
+ 
 +[dependencies.zstd]
 +features = ["pkg-config"]
 +version = ">=0.0.0"
 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 f00892aa0..43c97c5fc 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.67.0" }
+@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.68.0" }
  tempfile = "3.2.0"
  
  [dependencies.rusqlite]
@@ -55,10 +54,10 @@ index 151e1e9bb..dea47e809 100644
  
  [build-dependencies]
 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 75cf91cbb..9c9ffe988 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.67.0" }
+@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.68.0" }
  tempfile = "3.2.0"
  
  [dependencies.rusqlite]
@@ -68,5 +67,5 @@ index 34d93b9cc..e0d778c39 100644
  
  [build-dependencies]
 -- 
-2.37.2
+2.37.3
 
diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 31aa8d86b48b..588c545bc926 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,6 +1,6 @@
 # Template file for 'nushell'
 pkgname=nushell
-version=0.67.0
+version=0.68.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=a8c4c092087d035805781dff11000f2b7c4a44ae487b013f9d0a59c4dc610546
+checksum=c170ce2a0fa931194c8169585608747fea0cbf7c957f67c6e2fd54c0c5071c64
 register_shell="/usr/bin/nu"
 # all tests fail with argument --target
 make_check=no

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: nushell: update to 0.68.0.
  2022-09-07  8:27 [PR PATCH] nushell: update to 0.68.0 jcgruenhage
@ 2022-09-07 15:56 ` sgn
  2022-09-08  8:47 ` jcgruenhage
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2022-09-07 15:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/39143#issuecomment-1239582933

Comment:
curl and sqlite is bundled again? I think I unbundled them long time ago? unbundle curl is a must!!

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: nushell: update to 0.68.0.
  2022-09-07  8:27 [PR PATCH] nushell: update to 0.68.0 jcgruenhage
  2022-09-07 15:56 ` sgn
@ 2022-09-08  8:47 ` jcgruenhage
  2022-09-08 11:40 ` jcgruenhage
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: jcgruenhage @ 2022-09-08  8:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/39143#issuecomment-1240417515

Comment:
Would be cool if we could check for stuff like this automatically

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: nushell: update to 0.68.0.
  2022-09-07  8:27 [PR PATCH] nushell: update to 0.68.0 jcgruenhage
  2022-09-07 15:56 ` sgn
  2022-09-08  8:47 ` jcgruenhage
@ 2022-09-08 11:40 ` jcgruenhage
  2022-09-08 11:56 ` [PR PATCH] [Updated] " jcgruenhage
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: jcgruenhage @ 2022-09-08 11:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 249 bytes --]

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/39143#issuecomment-1240601560

Comment:
@sgn can you show me where curl is being bundled? I can't even find curl in the nushell deps right now.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] nushell: update to 0.68.0.
  2022-09-07  8:27 [PR PATCH] nushell: update to 0.68.0 jcgruenhage
                   ` (2 preceding siblings ...)
  2022-09-08 11:40 ` jcgruenhage
@ 2022-09-08 11:56 ` jcgruenhage
  2022-09-09 10:17 ` jcgruenhage
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: jcgruenhage @ 2022-09-08 11:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]

There is an updated pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages nushell-0.68.0_1
https://github.com/void-linux/void-packages/pull/39143

nushell: update to 0.68.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/39143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nushell-0.68.0_1-39143.patch --]
[-- Type: text/x-diff, Size: 7190 bytes --]

From 7b06d9b37bb05779252c7220a3b5da45072de929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 7 Sep 2022 10:27:07 +0200
Subject: [PATCH] nushell: update to 0.68.0.

---
 .../patches/0001-use-system-libraries.patch   | 89 +++++++++++++++----
 srcpkgs/nushell/template                      |  4 +-
 2 files changed, 75 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/nushell/patches/0001-use-system-libraries.patch b/srcpkgs/nushell/patches/0001-use-system-libraries.patch
index 609f5a66e5e5..bfca2cc251a5 100644
--- a/srcpkgs/nushell/patches/0001-use-system-libraries.patch
+++ b/srcpkgs/nushell/patches/0001-use-system-libraries.patch
@@ -1,21 +1,31 @@
-From a567591980eeb3bddaac8d13be38baf0ac6e15a7 Mon Sep 17 00:00:00 2001
+From a3f2669641ad005e91e9ce07e5ad17178c82ca56 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                                  | 2 ++
- Cargo.toml                                  | 4 ++++
+ Cargo.lock                                  | 6 +++---
+ 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_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
-index 7d36ecddf..1360ada48 100644
+index e20624f0c..6de4c47da 100644
 --- a/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",
   "time 0.3.13",
   "winres",
@@ -23,29 +33,76 @@ index 7d36ecddf..1360ada48 100644
  ]
  
  [[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 = [
   "cc",
   "libc",
 + "pkg-config",
  ]
 diff --git a/Cargo.toml b/Cargo.toml
-index 6199fbaa0..5edf138c3 100644
+index 7480b8160..c6c69443e 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -121,3 +121,7 @@ debug = false
- [[bin]]
+@@ -53,7 +53,7 @@ nu-system = { path = "./crates/nu-system", version = "0.68.0" }
+ nu-table = { path = "./crates/nu-table", version = "0.68.0"  }
+ nu-term-grid = { path = "./crates/nu-term-grid", version = "0.68.0"  }
+ nu-utils = { path = "./crates/nu-utils", version = "0.68.0"  }
+-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"
  path = "src/main.rs"
-+
+ 
 +[dependencies.zstd]
 +features = ["pkg-config"]
 +version = ">=0.0.0"
+diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
+index 20ff1e315..3826e5f28 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.0"  }
+ nu-utils = { path = "../nu-utils", version = "0.68.0"  }
+ nu-ansi-term = "0.46.0"
+ nu-color-config = { path = "../nu-color-config", version = "0.68.0"  }
+-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 629d5b28c..558027dc6 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
-index 151e1e9bb..dea47e809 100644
+index f00892aa0..43c97c5fc 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.67.0" }
+@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.68.0" }
  tempfile = "3.2.0"
  
  [dependencies.rusqlite]
@@ -55,10 +112,10 @@ index 151e1e9bb..dea47e809 100644
  
  [build-dependencies]
 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 75cf91cbb..9c9ffe988 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.67.0" }
+@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.68.0" }
  tempfile = "3.2.0"
  
  [dependencies.rusqlite]
@@ -68,5 +125,5 @@ index 34d93b9cc..e0d778c39 100644
  
  [build-dependencies]
 -- 
-2.37.2
+2.37.3
 
diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 31aa8d86b48b..588c545bc926 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,6 +1,6 @@
 # Template file for 'nushell'
 pkgname=nushell
-version=0.67.0
+version=0.68.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=a8c4c092087d035805781dff11000f2b7c4a44ae487b013f9d0a59c4dc610546
+checksum=c170ce2a0fa931194c8169585608747fea0cbf7c957f67c6e2fd54c0c5071c64
 register_shell="/usr/bin/nu"
 # all tests fail with argument --target
 make_check=no

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] nushell: update to 0.68.0.
  2022-09-07  8:27 [PR PATCH] nushell: update to 0.68.0 jcgruenhage
                   ` (3 preceding siblings ...)
  2022-09-08 11:56 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-09-09 10:17 ` jcgruenhage
  2022-09-19 16:45 ` [PR PATCH] [Merged]: " sgn
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: jcgruenhage @ 2022-09-09 10:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]

There is an updated pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages nushell-0.68.0_1
https://github.com/void-linux/void-packages/pull/39143

nushell: update to 0.68.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/39143.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nushell-0.68.0_1-39143.patch --]
[-- Type: text/x-diff, Size: 7190 bytes --]

From 58a0618f0529dc77dc3de6771d44876d94dd6dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 7 Sep 2022 10:27:07 +0200
Subject: [PATCH] nushell: update to 0.68.1.

---
 .../patches/0001-use-system-libraries.patch   | 89 +++++++++++++++----
 srcpkgs/nushell/template                      |  4 +-
 2 files changed, 75 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/nushell/patches/0001-use-system-libraries.patch b/srcpkgs/nushell/patches/0001-use-system-libraries.patch
index 609f5a66e5e5..69e2b880205d 100644
--- a/srcpkgs/nushell/patches/0001-use-system-libraries.patch
+++ b/srcpkgs/nushell/patches/0001-use-system-libraries.patch
@@ -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?=
  <jan.christian@gruenhage.xyz>
 Date: Wed, 8 Jun 2022 16:15:55 +0200
 Subject: [PATCH] use system libraries
 
 ---
- Cargo.lock                                  | 2 ++
- Cargo.toml                                  | 4 ++++
+ Cargo.lock                                  | 6 +++---
+ 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_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
-index 7d36ecddf..1360ada48 100644
+index aaf74b424..8ce23ed77 100644
 --- a/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",
   "time 0.3.13",
   "winres",
@@ -23,29 +33,76 @@ index 7d36ecddf..1360ada48 100644
  ]
  
  [[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 = [
   "cc",
   "libc",
 + "pkg-config",
  ]
 diff --git a/Cargo.toml b/Cargo.toml
-index 6199fbaa0..5edf138c3 100644
+index 5b358f82b..70db93a1a 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -121,3 +121,7 @@ debug = false
- [[bin]]
+@@ -53,7 +53,7 @@ nu-system = { path = "./crates/nu-system", version = "0.68.1" }
+ 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"
  path = "src/main.rs"
-+
+ 
 +[dependencies.zstd]
 +features = ["pkg-config"]
 +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
-index 151e1e9bb..dea47e809 100644
+index 35968022a..a09bb591f 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.67.0" }
+@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.68.1" }
  tempfile = "3.2.0"
  
  [dependencies.rusqlite]
@@ -55,10 +112,10 @@ index 151e1e9bb..dea47e809 100644
  
  [build-dependencies]
 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
 +++ 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"
  
  [dependencies.rusqlite]
@@ -68,5 +125,5 @@ index 34d93b9cc..e0d778c39 100644
  
  [build-dependencies]
 -- 
-2.37.2
+2.37.3
 
diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 31aa8d86b48b..6235223e978c 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,6 +1,6 @@
 # Template file for 'nushell'
 pkgname=nushell
-version=0.67.0
+version=0.68.1
 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=a8c4c092087d035805781dff11000f2b7c4a44ae487b013f9d0a59c4dc610546
+checksum=d3719f5b3eca5dee6215e39fe1da1b559d49837f0baf18c7edc14f1719c986bb
 register_shell="/usr/bin/nu"
 # all tests fail with argument --target
 make_check=no

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Merged]: nushell: update to 0.68.0.
  2022-09-07  8:27 [PR PATCH] nushell: update to 0.68.0 jcgruenhage
                   ` (4 preceding siblings ...)
  2022-09-09 10:17 ` jcgruenhage
@ 2022-09-19 16:45 ` sgn
  2022-09-19 16:50 ` sgn
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2022-09-19 16:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]

There's a merged pull request on the void-packages repository

nushell: update to 0.68.0.
https://github.com/void-linux/void-packages/pull/39143

Description:
<!-- 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
-->


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: nushell: update to 0.68.0.
  2022-09-07  8:27 [PR PATCH] nushell: update to 0.68.0 jcgruenhage
                   ` (5 preceding siblings ...)
  2022-09-19 16:45 ` [PR PATCH] [Merged]: " sgn
@ 2022-09-19 16:50 ` sgn
  2022-09-20  6:44 ` jcgruenhage
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2022-09-19 16:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/39143#issuecomment-1251284591

Comment:
Hey, can you fix the unbundling again.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: nushell: update to 0.68.0.
  2022-09-07  8:27 [PR PATCH] nushell: update to 0.68.0 jcgruenhage
                   ` (6 preceding siblings ...)
  2022-09-19 16:50 ` sgn
@ 2022-09-20  6:44 ` jcgruenhage
  2022-09-20  6:50 ` sgn
  2022-09-20  8:48 ` jcgruenhage
  9 siblings, 0 replies; 11+ messages in thread
From: jcgruenhage @ 2022-09-20  6:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 234 bytes --]

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/39143#issuecomment-1251909381

Comment:
wdym? I've fixed it for sqlite afaict and am not aware of any other bundled libraries?


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: nushell: update to 0.68.0.
  2022-09-07  8:27 [PR PATCH] nushell: update to 0.68.0 jcgruenhage
                   ` (7 preceding siblings ...)
  2022-09-20  6:44 ` jcgruenhage
@ 2022-09-20  6:50 ` sgn
  2022-09-20  8:48 ` jcgruenhage
  9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2022-09-20  6:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/39143#issuecomment-1251914572

Comment:
https://build.voidlinux.org/builders/aarch64-musl_builder/builds/39455/steps/shell_3/logs/stdio

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: nushell: update to 0.68.0.
  2022-09-07  8:27 [PR PATCH] nushell: update to 0.68.0 jcgruenhage
                   ` (8 preceding siblings ...)
  2022-09-20  6:50 ` sgn
@ 2022-09-20  8:48 ` jcgruenhage
  9 siblings, 0 replies; 11+ messages in thread
From: jcgruenhage @ 2022-09-20  8:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

New comment by jcgruenhage on void-packages repository

https://github.com/void-linux/void-packages/pull/39143#issuecomment-1252038276

Comment:
Yeah, so upstream has pushed to my branch (which github allowed bc of it being in a PR), so the commit was gone. I've changed it back to where it was before now, so the build should work now.

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-09-20  8:48 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-07  8:27 [PR PATCH] nushell: update to 0.68.0 jcgruenhage
2022-09-07 15:56 ` sgn
2022-09-08  8:47 ` jcgruenhage
2022-09-08 11:40 ` jcgruenhage
2022-09-08 11:56 ` [PR PATCH] [Updated] " jcgruenhage
2022-09-09 10:17 ` jcgruenhage
2022-09-19 16:45 ` [PR PATCH] [Merged]: " sgn
2022-09-19 16:50 ` sgn
2022-09-20  6:44 ` jcgruenhage
2022-09-20  6:50 ` sgn
2022-09-20  8:48 ` jcgruenhage

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).