summary refs log tree commit diff
path: root/pkgs/shells
diff options
context:
space:
mode:
authorSolène Rapenne <solene.rapenne@tweag.io>2022-06-16 17:22:05 +0200
committerSolène Rapenne <solene.rapenne@tweag.io>2022-06-16 17:22:05 +0200
commit4a1b7f4a6da36d9dd0f02fda08ebad08d8a127e3 (patch)
tree72ac0afcd8b21ebe0561fb7d78086a323db17c90 /pkgs/shells
parent29769d2a1390d294469bcc6518f17931953545e1 (diff)
downloadnixpkgs-4a1b7f4a6da36d9dd0f02fda08ebad08d8a127e3.tar
nixpkgs-4a1b7f4a6da36d9dd0f02fda08ebad08d8a127e3.tar.gz
nixpkgs-4a1b7f4a6da36d9dd0f02fda08ebad08d8a127e3.tar.bz2
nixpkgs-4a1b7f4a6da36d9dd0f02fda08ebad08d8a127e3.tar.lz
nixpkgs-4a1b7f4a6da36d9dd0f02fda08ebad08d8a127e3.tar.xz
nixpkgs-4a1b7f4a6da36d9dd0f02fda08ebad08d8a127e3.tar.zst
nixpkgs-4a1b7f4a6da36d9dd0f02fda08ebad08d8a127e3.zip
fish: 3.4.1 -> 3.5.0
Diffstat (limited to 'pkgs/shells')
-rw-r--r--pkgs/shells/fish/default.nix14
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 8fc79ecfbb2..f2a6492e251 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