[bug#61904] [PATCH] Update fish to 3.6.0

[Adriel Dumas--Jondeau via Guix-patches via <guix-patches@gnu.org>]

[-- Attachment #1.1: Type: text/plain, Size: 159 bytes --]


Aye,

I sent the wrong patch (I formatted the latest retrieved commit on
origin instead of my local branch).

Here's the right one, I'm sorry for the noise.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: gnu: Update fish to 3.6.0 --]
[-- Type: text/x-patch, Size: 1442 bytes --]

From 65ffabb46942ed2439a203862ce64867b3bb75d1 Mon Sep 17 00:00:00 2001
Message-Id: <65ffabb46942ed2439a203862ce64867b3bb75d1.1677716351.git.leirda@disroot.org>
From: Adriel Dumas--Jondeau <leirda@disroot.org>
Date: Wed, 1 Mar 2023 18:11:19 +0100
Subject: [PATCH] gnu: Update fish to 3.6.0

---
 gnu/packages/shells.scm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 0c8cbf3f4c..f74d2f8ade 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -118,7 +118,7 @@ (define-public dash
 (define-public fish
   (package
     (name "fish")
-    (version "3.5.1")
+    (version "3.6.0")
     (source
      (origin
        (method url-fetch)
@@ -126,12 +126,8 @@ (define-public fish
                            "releases/download/" version "/"
                            "fish-" version ".tar.xz"))
        (sha256
-        (base32 "0a39vf0wqq6asw5xcrwgdsc67h5bxkgxzy77f8bx6pd4qlympm56"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           ;; Remove bundled software.
-           (delete-file-recursively "pcre2")))))
+        (base32 "10b1xa1hpmi62rzh3qgxlw7xrhyigs8kssagccawmrryfxbls14p"))
+       (modules '((guix build utils)))))
     (build-system cmake-build-system)
     (inputs
      (list fish-foreign-env ncurses pcre2 ; don't use the bundled PCRE2
-- 
2.39.1


[-- Attachment #1.3: Type: text/plain, Size: 15 bytes --]


-- 
Adriel

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 686 bytes --]