From patchwork Thu Mar 2 09:21:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adriel Dumas--Jondeau X-Patchwork-Id: 47530 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 74BDA16CF1; Thu, 2 Mar 2023 09:25:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9CAB916BFB for ; Thu, 2 Mar 2023 09:25:15 +0000 (GMT) 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 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 X-Patchwork-Original-From: Adriel Dumas--Jondeau via Guix-patches via From: Adriel Dumas--Jondeau Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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. 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'