From unknown Sun Jun 15 09:01:31 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#61904] [PATCH] Update fish to 3.6.0 Resent-From: Adriel Dumas--Jondeau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 00:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61904 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61904@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167771648931744 (code B ref -1); Thu, 02 Mar 2023 00:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Mar 2023 00:21:29 +0000 Received: from localhost ([127.0.0.1]:55284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXWhM-0008Fw-QX for submit@debbugs.gnu.org; Wed, 01 Mar 2023 19:21:29 -0500 Received: from lists.gnu.org ([209.51.188.17]:50736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXWhL-0008Fp-Th for submit@debbugs.gnu.org; Wed, 01 Mar 2023 19:21:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXWhJ-00013f-QN for guix-patches@gnu.org; Wed, 01 Mar 2023 19:21:26 -0500 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXWhI-000858-9G for guix-patches@gnu.org; Wed, 01 Mar 2023 19:21:25 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id DF9FD44534 for ; Thu, 2 Mar 2023 01:21:22 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KHtwjCKRXiwN for ; Thu, 2 Mar 2023 01:21:21 +0100 (CET) References: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1677716481; bh=/hWjgkm6q1bJZmOMaaIwwIbKxbu8WCCHVQmUV+0e5io=; h=References:From:To:Subject:Date:In-reply-to; b=Eu/BUwN7vZ2KDqoSX2YHBGzUuWk7KZDizsLY4LqHaKnW5NTULI+c7WsdkFqpTZNpd fesHqu5bIJwBpTxmfuBXHhpVD50/LQ2Tj8WA8dZ1IVoToP4OXw9i3vXW6KEEkUfAHc jWzAuE4cUqwgjD79YUTbP9dKsdKe76AGNviPCyXCEfv6cFBSihr6WnU8/QUttK2G4t NGWP9KFjYQZufAktDgrnNQLaHuL+/6xEeydOa/JbTy6nIcgxgF3nz2/K50N5vX6m2A NMQU9ZKyj4byW5tTPMIoxUCGv4Phg6k7aRzOIfEF7wTEgP3tv2kmfPuUHjyIhbTzyE zHhyX3+XuDaRg== From: Adriel Dumas--Jondeau Date: Thu, 02 Mar 2023 01:19:14 +0100 In-reply-to: Message-ID: <87y1oghukf.fsf@disroot.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=178.21.23.139; envelope-from=leirda@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain 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. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-Update-fish-to-3.6.0.patch Content-Transfer-Encoding: quoted-printable Content-Description: gnu: Update fish to 3.6.0 From=2065ffabb46942ed2439a203862ce64867b3bb75d1 Mon Sep 17 00:00:00 2001 Message-Id: <65ffabb46942ed2439a203862ce64867b3bb75d1.1677716351.git.leirda= @disroot.org> From: Adriel Dumas--Jondeau Date: Wed, 1 Mar 2023 18:11:19 +0100 Subject: [PATCH] gnu: Update fish to 3.6.0 =2D-- 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 =2D-- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -118,7 +118,7 @@ (define-public dash (define-public fish (package (name "fish") =2D (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 =2D (base32 "0a39vf0wqq6asw5xcrwgdsc67h5bxkgxzy77f8bx6pd4qlympm56")) =2D (modules '((guix build utils))) =2D (snippet =2D '(begin =2D ;; Remove bundled software. =2D (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 =2D-=20 2.39.1 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 Adriel --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHHBAEBCAAxFiEEdTo3gYfn+XlCL0s3vM4s3nSoxFIFAmP/7AATHGxlaXJkYUBk aXNyb290Lm9yZwAKCRC8zizedKjEUl42C/9zw4OlJ5yR1O4+4yZylKACEXP+DvcH zq1AVEyEFdu9Vj70nFLTBfByrjSvLqUweApuAIyS/jXGfCuPgx5JFSoJ+FGvjeK4 ZWM8d23GLYOCez6hNxLeLW1jB4eEffILdDvNsjkRXXBpTdvLam73fvPZqgX4kFOA bPlEWn/otjiiz7veUWhjhj4cugyMF2zMDvgeKUwJbEByXsN3ux88DotWbBszGiIE vr0jykNCJHgX2+70RXgOMN0Be36vzHo7UvVKIAIF72AglK9mLEKEFZcBy4g2P9sj DBI2nMz6grNXJMdd3U4yEcGBWXoZEj29Shi9XobSwILzNCZf/veGkroZQnX+gdrE Ee4w0kFMaeW/YMbkqplm/nFhRAbFx5o69c4RrgZINcUJrsaOLgZPFVXHJDgWggR4 fN6Q5S94RLxo2ca8gU+3GtjV3GwkPADw7zw+o8WrXC8rqMkSU+csjbvpZLstkBhY wQT7418u7v7dzBHbel6nB1B4pewUKaq+EHs= =TKoA -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 02 07:58:59 2023 Received: (at control) by debbugs.gnu.org; 2 Mar 2023 12:58:59 +0000 Received: from localhost ([127.0.0.1]:56107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXiWQ-0007ID-RM for submit@debbugs.gnu.org; Thu, 02 Mar 2023 07:58:59 -0500 Received: from out-52.mta0.migadu.com ([91.218.175.52]:53056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXiWO-0007I4-Mk for control@debbugs.gnu.org; Thu, 02 Mar 2023 07:58:58 -0500 Content-Type: multipart/alternative; boundary=Apple-Mail-4974DD72-405E-480E-9527-0C62D3155FBF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=winter.cafe; s=key1; t=1677761932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QYLg7srK9yt4hAlr6GJ3D0LRBJAkltzKWf/1IliYcgI=; b=PDwRWuAGe9hvPiLcfbAJks8jwymKckVKahNuurrYkmVByoPsmRhLOHOwEHHf7tiguxwCl4 Mahz9jjZOb6/WSU45JfDQ2KTQvdhgxRNw9IqIxu8nqeO90DSW7SsxfvQ/qIz358dV9hZ04 sopVEXVn/oLmrqpBEgr+TYjlqdTnFBKk1B6gHA9nBIJhdNFrzh61t9ioZ2WoDUYwhoiXLG sNi8xj6mjylYSOlSBnsCJ7OvzDmB9Z2WwkUmMAn8sQBzAxhcxGwzPexM1BPwpJAfjEb50D 9vIYy3nTut/xwdE1uzOsBs+tJIkIjOKXoyLLLIMfuYWFYdw6rTkDQtApFR9gIg== Content-Transfer-Encoding: 7bit X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Winter MIME-Version: 1.0 Date: Thu, 2 Mar 2023 07:58:40 -0500 Subject: [PATCH] Update fish to 3.6.0 Message-Id: <94889429-E33D-422F-9553-AD0ED0DFADF1@winter.cafe> To: control@debbugs.gnu.org X-Migadu-Flow: FLOW_OUT X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control Cc: leirda@disroot.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --Apple-Mail-4974DD72-405E-480E-9527-0C62D3155FBF Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable close 61903 close 61904 thanks Hi, Thanks for the patch! However, this is a duplicate of https://issues.guix.gnu.org/61834. As our di= ffs are identical, I think it would make sense to close yours in favor of mi= ne. (I presume the control server will reject my commands, but let's see.) (I'm also closing the issue with the wrong patch.) Thanks, Winter= --Apple-Mail-4974DD72-405E-480E-9527-0C62D3155FBF Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 7bit close 61903
close 61904
thanks

Hi,

Thanks for the patch!

However, this is a duplicate of https://issues.guix.gnu.org/61834. As our diffs are identical, I think it would make sense to close yours in favor of mine. (I presume the control server will reject my commands, but let's see.)

(I'm also closing the issue with the wrong patch.)

Thanks,
Winter
--Apple-Mail-4974DD72-405E-480E-9527-0C62D3155FBF--