[PR PATCH] fish: update to 3.7

[PR PATCH] fish: update to 3.7

[akierig]

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

There is a new pull request by akierig against master on the void-packages repository

https://github.com/akierig/void-packages fish-3.7
https://github.com/void-linux/void-packages/pull/48047

fish: update to 3.7
also removes unneeded patch

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl


A patch file from https://github.com/void-linux/void-packages/pull/48047.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fish-3.7-48047.patch --]
[-- Type: text/x-diff, Size: 3199 bytes --]

From 3a776da67e3d20877545c295d32dab1afe22f051 Mon Sep 17 00:00:00 2001
From: anelki <akierig@fastmail.de>
Date: Wed, 3 Jan 2024 10:38:21 -0600
Subject: [PATCH] fish: update to 3.7

also removes unneeded patch
---
 ...4ca694ae099f023ae0febb363238d9c64e8d.patch | 33 -------------------
 srcpkgs/fish-shell/template                   |  4 +--
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/fish-shell/patches/85504ca694ae099f023ae0febb363238d9c64e8d.patch

diff --git a/srcpkgs/fish-shell/patches/85504ca694ae099f023ae0febb363238d9c64e8d.patch b/srcpkgs/fish-shell/patches/85504ca694ae099f023ae0febb363238d9c64e8d.patch
deleted file mode 100644
index 55a399d0e70d4..0000000000000
--- a/srcpkgs/fish-shell/patches/85504ca694ae099f023ae0febb363238d9c64e8d.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 85504ca694ae099f023ae0febb363238d9c64e8d Mon Sep 17 00:00:00 2001
-From: Fabian Boehm <FHomborg@gmail.com>
-Date: Fri, 10 Feb 2023 20:55:37 +0100
-Subject: [PATCH] completions/zfs: Check for zpool
-
-This is an additional tool, and this function is executed on source
-time so we'd spew errors.
-
-(also remove an ineffective line - it's probably *nicer* with the
-read, but that's not what's currently effectively doing anything)
----
- share/functions/__fish_is_zfs_feature_enabled.fish | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/share/functions/__fish_is_zfs_feature_enabled.fish b/share/functions/__fish_is_zfs_feature_enabled.fish
-index 29e63a494b0..66a4bca8fef 100644
---- a/share/functions/__fish_is_zfs_feature_enabled.fish
-+++ b/share/functions/__fish_is_zfs_feature_enabled.fish
-@@ -1,4 +1,6 @@
- function __fish_is_zfs_feature_enabled -a feature target -d "Returns 0 if the given ZFS feature is available or enabled for the given full-path target (zpool or dataset), or any target if none given"
-+    type -q zpool
-+    or return
-     set -l pool (string replace -r '/.*' '' -- $target)
-     set -l feature_name ""
-     if test -z "$pool"
-@@ -9,7 +11,6 @@ function __fish_is_zfs_feature_enabled -a feature target -d "Returns 0 if the gi
-     if test $status -ne 0 # No such feature
-         return 1
-     end
--    echo $feature_name | read -l _ _ state _
-     set -l state (echo $feature_name | cut -f3)
-     string match -qr '(active|enabled)' -- $state
-     return $status
diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index f9b3d758edc10..ed1260f2fc759 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=3.6.4
+version=3.7.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 changelog="https://github.com/fish-shell/fish-shell/raw/master/CHANGELOG.rst"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=0f3f610e580de092fbe882c8aa76623ecf91bb16fdf0543241e6e90d5d4bc393
+checksum=df1b7378b714f0690b285ed9e4e58afe270ac98dbc9ca5839589c1afcca33ab1
 register_shell="/bin/fish /usr/bin/fish"
 # tests don't work as root
 make_check=ci-skip

Re: [PR PATCH] [Merged]: fish: update to 3.7

[Duncaen]

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

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

fish: update to 3.7
https://github.com/void-linux/void-packages/pull/48047

Description:
also removes unneeded patch

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl