diff --git a/srcpkgs/fish-shell/patches/85504ca694ae099f023ae0febb363238d9c64e8d.patch b/srcpkgs/fish-shell/patches/85504ca694ae099f023ae0febb363238d9c64e8d.patch deleted file mode 100644 index 55a399d0e70..00000000000 --- 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 -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 f9b3d758edc..ed1260f2fc7 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