From 38e7f1bcd1c944d3ab6646eb4f6b9152305a86c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 17 Aug 2022 07:36:57 +0200 Subject: [PATCH] nushell: update to 0.67.0. --- .../patches/0001-use-system-libraries.patch | 26 +++++++++---------- .../0002-allow-building-without-git.patch | 26 ------------------- srcpkgs/nushell/template | 4 +-- 3 files changed, 15 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/nushell/patches/0002-allow-building-without-git.patch diff --git a/srcpkgs/nushell/patches/0001-use-system-libraries.patch b/srcpkgs/nushell/patches/0001-use-system-libraries.patch index b6786032b006..609f5a66e5e5 100644 --- a/srcpkgs/nushell/patches/0001-use-system-libraries.patch +++ b/srcpkgs/nushell/patches/0001-use-system-libraries.patch @@ -1,8 +1,8 @@ -From 4c05448f1c6a40583b6649cadc23d417bb90d2ef Mon Sep 17 00:00:00 2001 +From a567591980eeb3bddaac8d13be38baf0ac6e15a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Wed, 8 Jun 2022 16:15:55 +0200 -Subject: [PATCH 1/2] use system libraries +Subject: [PATCH] use system libraries --- Cargo.lock | 2 ++ @@ -12,28 +12,28 @@ Subject: [PATCH 1/2] use system libraries 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index bed0c1c50..95f833fbc 100644 +index 7d36ecddf..1360ada48 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -2488,6 +2488,7 @@ dependencies = [ - "serial_test", +@@ -2544,6 +2544,7 @@ dependencies = [ "tempfile", + "time 0.3.13", "winres", + "zstd", ] [[package]] -@@ -5490,4 +5491,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +@@ -5679,4 +5680,5 @@ checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml -index 26df23417..98209824c 100644 +index 6199fbaa0..5edf138c3 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -118,3 +118,7 @@ debug = false +@@ -121,3 +121,7 @@ debug = false [[bin]] name = "nu" path = "src/main.rs" @@ -42,10 +42,10 @@ index 26df23417..98209824c 100644 +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 c805ef8eb..fd7565c7c 100644 +index 151e1e9bb..dea47e809 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.63.1" } +@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.67.0" } tempfile = "3.2.0" [dependencies.rusqlite] @@ -55,10 +55,10 @@ index c805ef8eb..fd7565c7c 100644 [build-dependencies] diff --git a/crates/old/nu_plugin_to_sqlite/Cargo.toml b/crates/old/nu_plugin_to_sqlite/Cargo.toml -index 7146b4c33..78ad01ab0 100644 +index 34d93b9cc..e0d778c39 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.63.1" } +@@ -18,7 +18,7 @@ nu-source = { path="../nu-source", version = "0.67.0" } tempfile = "3.2.0" [dependencies.rusqlite] @@ -68,5 +68,5 @@ index 7146b4c33..78ad01ab0 100644 [build-dependencies] -- -2.36.1 +2.37.2 diff --git a/srcpkgs/nushell/patches/0002-allow-building-without-git.patch b/srcpkgs/nushell/patches/0002-allow-building-without-git.patch deleted file mode 100644 index ced015759646..000000000000 --- a/srcpkgs/nushell/patches/0002-allow-building-without-git.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4b4cbe8cb0c735cf79432d8cc8b8b578dcea9aa3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= - -Date: Wed, 8 Jun 2022 16:25:15 +0200 -Subject: [PATCH 2/2] allow building without git - ---- - crates/nu-command/build.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crates/nu-command/build.rs b/crates/nu-command/build.rs -index 67343c24b..02c51d9cb 100644 ---- a/crates/nu-command/build.rs -+++ b/crates/nu-command/build.rs -@@ -3,7 +3,7 @@ use std::process::Command; - fn main() -> shadow_rs::SdResult<()> { - // Look up the current Git commit ourselves instead of relying on shadow_rs, - // because shadow_rs does it in a really slow-to-compile way (it builds libgit2) -- let hash = get_git_hash().expect("failed to get latest git commit hash"); -+ let hash = get_git_hash().unwrap_or("0000000000000000000000000000000000000000".to_owned()); - println!("cargo:rustc-env=NU_COMMIT_HASH={}", hash); - - shadow_rs::new() --- -2.36.1 - diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template index cbfed068fd87..31aa8d86b48b 100644 --- a/srcpkgs/nushell/template +++ b/srcpkgs/nushell/template @@ -1,6 +1,6 @@ # Template file for 'nushell' pkgname=nushell -version=0.66.2 +version=0.67.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=548668fe0e746cb068443b7701829e1839565e30aa5faa20c5481d0ead808045 +checksum=a8c4c092087d035805781dff11000f2b7c4a44ae487b013f9d0a59c4dc610546 register_shell="/usr/bin/nu" # all tests fail with argument --target make_check=no