From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id yA/LL3trAGQrDgAAbAwnHQ (envelope-from ) for ; Thu, 02 Mar 2023 10:25:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id SFjzL3trAGSpKAEA9RJhRA (envelope-from ) for ; Thu, 02 Mar 2023 10:25:15 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 84DA7D25D for ; Thu, 2 Mar 2023 10:25:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXfBR-0007nr-Bv; Thu, 02 Mar 2023 04:25:05 -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 1pXfBO-0007c3-OH for guix-patches@gnu.org; Thu, 02 Mar 2023 04:25:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXfBO-00038A-BJ for guix-patches@gnu.org; Thu, 02 Mar 2023 04:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXfBO-0007ZS-5z for guix-patches@gnu.org; Thu, 02 Mar 2023 04:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61903] Fwd: Re: [PATCH] Update fish to 3.6.0 In-Reply-To: <87356oj9dk.fsf@disroot.org> Resent-From: Adriel Dumas--Jondeau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 09:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61903@debbugs.gnu.org Received: via spool by 61903-submit@debbugs.gnu.org id=B61903.167774909529083 (code B ref 61903); Thu, 02 Mar 2023 09:25:02 +0000 Received: (at 61903) by debbugs.gnu.org; 2 Mar 2023 09:24:55 +0000 Received: from localhost ([127.0.0.1]:55772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXfBH-0007Z1-4d for submit@debbugs.gnu.org; Thu, 02 Mar 2023 04:24:55 -0500 Received: from knopi.disroot.org ([178.21.23.139]:48256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXfBE-0007Ys-W8 for 61903@debbugs.gnu.org; Thu, 02 Mar 2023 04:24:53 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4ABB341446 for <61903@debbugs.gnu.org>; Thu, 2 Mar 2023 10:24:51 +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 Rt5hjGsg4Zo9 for <61903@debbugs.gnu.org>; Thu, 2 Mar 2023 10:24:50 +0100 (CET) References: <87y1oghukf.fsf@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1677749090; bh=I8lgKg7/basoDCB+NGV+5cO9RVQr3hl9T+iIwZsYx8I=; h=References:From:To:Subject:Date; b=dihD8iD7FlSvLN5rlSQKSA7ySIBnrAbfVF/0tObm7gjjOva+3EExZeV3yGSY2TJuh BoNpaMKLPRFMSeazCCc/XLi20jQA2tfUZFw6mkFIdeF+QdikLBQpNQ9VbhbecGfGdz Fa95z3j7QOuMYAh8twKji7F/C5u8S/jw/lsZRlQIqgJLDZ8j/IKrHzittI5e3i5+dj lhTL8tW9rsIdBcR7LeP5KQ4zqP8l6r3cALghVuEtDaTauHfBFGsIUmPj+5q1pno0xx gvACZ883URPtkbCoy+9Bg81qXnpWCWeinW0sb/qNXM/I8C2rpCNpHFjtbwftGIaFS5 9dpf0qye3dWgQ== Date: Thu, 02 Mar 2023 10:21:03 +0100 Message-ID: <87ttz3ijz3.fsf@disroot.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Adriel Dumas--Jondeau X-ACL-Warn: , Adriel Dumas--Jondeau via Guix-patches From: Adriel Dumas--Jondeau via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677749115; a=rsa-sha256; cv=none; b=YeZDEqdzp/e4YqkNOSxXG67qXgeL4jQ3F9IABp2WieGtOczUJodw8nUVWMWK0XnY0+7Vsk TB65HTPB23d/Z1pPo9qAhw5X8TxQI9cRDzEyj8d1roWJp2gR3z+N7HZDrNVdx1NByYy6ZX Wphd9+LV4g8Xk5hwIoIzY/Sm1lbgD6O5ikJ5z7ceQMAda2sArVN0t3EK3rFUCUIiZzHICn TA+eEucxt6i4AsSQEXd5ceS9g/aD5BzCPLiP6LOAiGobJ9QYE99tDQHRTKIlOeDLRvSCdE 3UKcSlBcQoTa2UsuC0sAxKInXx54hr8tNPtxI1d2HT9hz+lM0u08Pc/BIdngVA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=dihD8iD7; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677749115; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=8SjflyZanDm+R8EmHtKUy3uo7YIVKewXGBzDjYrZ11I=; b=pkkm/efIPN8dkdn+n0r8O4gKa08dvhJ0uYhI8wdnvofVhxHCJB5+5sMExMH4ZUQ5J9HnUb LIKEQut56ckvi0OfcAJtTz2QcAkG1Vt5bcoFM0SJYe5BGgJ7FegBdEmGSNlWHwC786HnXe HeiaTbWvNwWhE4qTB6eN/hW22JJxhOXNT8IEO5HQv7ym22sCbQsBddR5KH/vBOQ863RgaQ ao7xUP7Z4dlYBJaq+nphe2BnylblQ6VY+8iTP5CT9dKapOq1883vYPjBOktZVsQakT2KJB yc5MOo7K6CP3y5LhWvFhkQJgrg3f1KnMRutueVvWRPlINfT6R3x+0nTlTl1fvA== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -5.79 X-Spam-Score: -5.79 X-Migadu-Queue-Id: 84DA7D25D Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=dihD8iD7; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-TUID: MzPPZ2d/NhXv --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain And of course I also created a new patch request instead of commenting on the other one. I think we can close 61904, and I'm really sorry about that :( Adriel Dumas--Jondeau writes: > 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-Description: Update fish to 3.6.0 diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 0c8cbf3f4c..f550a2c943 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,15 +126,11 @@ (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 + (list fish-foreign-env ncurses pcre2 python)) ; for fish_config and manpage completions (native-inputs (list doxygen groff ; for 'fish --help' --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 Adriel --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHHBAEBCAAxFiEEdTo3gYfn+XlCL0s3vM4s3nSoxFIFAmQAa2ATHGxlaXJkYUBk aXNyb290Lm9yZwAKCRC8zizedKjEUn8HDACWZNfzk2YS7UD3pZT113QkuxXNtGTf 7yMuEps+P9tgq3xnbknjGaG8yzDvCJd3NH02ksyu5brWlovBGS2+ub0xRIVATGTz n0fH+7xxzuGN9039FXv3EM0IPb11RGYC7NavBvjJGWXFcthI8c1AvXiA867/sOrm AvUIXsrvD5kLOWtNVGRVJoUKdClNam2kcFJ/lfaWioH9WaJSXjVOyTCwLzmKJftv y2QiX3oEnVw1PekEamHU1S7Z6pCcutlvV39Di3vpJcOzGi52MA9kPes+dAamap8+ c8BpSh7yif/isO3LeiiGFZdZteynIdQ0eb9YhNomkvvpfDw2ykwoJrsEGjEAv8VF SnsrfoOUB2u2KAnOd8EyLvlBGONeoJuKmNk9aKc5JjCzskjXVD8B/gMLTH78H6ux c3kXMKZS5mQiKqD9SBx6KSb175qcOoWMNIie3xiTlv3lmFaMYI0bJJKUFrikQXOt q9JViX52zR5VcdMbJIdJn4iWaVdnxVhxck0= =j01g -----END PGP SIGNATURE----- --==-=-=--