From 4a1b7f4a6da36d9dd0f02fda08ebad08d8a127e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sol=C3=A8ne=20Rapenne?= Date: Thu, 16 Jun 2022 17:22:05 +0200 Subject: [PATCH] fish: 3.4.1 -> 3.5.0 --- pkgs/shells/fish/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 8fc79ecfbb23..f2a6492e251d 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -134,7 +134,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -144,19 +144,9 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tvI7OEOwTbawqQ/qH28NDkDMAntKcyCYIAhj8oZKlOo="; + sha256 = "sha256-KR5Ox8bD/qVNwa7QV849QrNW+m9whlYnssffzsrv0hA="; }; - patches = [ - # merged https://github.com/fish-shell/fish-shell/pull/8978 - # "create_manpage_completions.py: Do not overstrip commands with dots" - (fetchpatch { - name = "fix-cmdname-completeion-generator.patch"; - url = "https://github.com/fish-shell/fish-shell/commit/32d646a5483844e9b1fae4b73f252a34ec0d4c76.patch"; - sha256 = "sha256-51hqgPHQ7oQbl1i3SfqvGsbkYMe2Jh+sEwCRu2kiv1U="; - }) - ]; - # Fix FHS paths in tests postPatch = '' # src/fish_tests.cpp