From patchwork Mon Feb 27 03:22:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Winter X-Patchwork-Id: 47445 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 A76A316C10; Mon, 27 Feb 2023 15:07:04 +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=unavailable 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 9D38D16C03 for ; Mon, 27 Feb 2023 15:07:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWf5O-0004qq-KN; Mon, 27 Feb 2023 10:06:42 -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 1pWVRg-00028C-Pi for guix-patches@gnu.org; Sun, 26 Feb 2023 23:49:05 -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 1pWVRf-0007Gd-SZ for guix-patches@gnu.org; Sun, 26 Feb 2023 23:49:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWVRf-0004OM-OC for guix-patches@gnu.org; Sun, 26 Feb 2023 23:49:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61834] [PATCH] gnu: fish: Update to 3.6.0. Resent-From: Winter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Feb 2023 04:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61834 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61834@debbugs.gnu.org Cc: Winter X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167747331616807 (code B ref -1); Mon, 27 Feb 2023 04:49:03 +0000 Received: (at submit) by debbugs.gnu.org; 27 Feb 2023 04:48:36 +0000 Received: from localhost ([127.0.0.1]:45629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWVRE-0004Mw-H6 for submit@debbugs.gnu.org; Sun, 26 Feb 2023 23:48:36 -0500 Received: from lists.gnu.org ([209.51.188.17]:55190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWU6m-0001zF-1N for submit@debbugs.gnu.org; Sun, 26 Feb 2023 22:23:24 -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 1pWU6l-0007jG-M4 for guix-patches@gnu.org; Sun, 26 Feb 2023 22:23:23 -0500 Received: from out-10.mta0.migadu.com ([2001:41d0:1004:224b::a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWU6j-00005D-6J for guix-patches@gnu.org; Sun, 26 Feb 2023 22:23:23 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=winter.cafe; s=key1; t=1677468199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=02mIDTxeOicxUG6OAGqQi8Zn030/N6njiJmEcXNqWNk=; b=Raj1CfGgiC6ZDbHawj1rnJGWmkwkUNLrBKBVEBxXSp7GakGRSZ4aIK11wFnuOnCCax3DyS Mb7avih40Hp712CDdzyVCiyH6wpqlcKxAyOIvzZCjt/EkV/VE60n4N0twsIr/bLiokJEPf 4opmHH0NFFheYM92yu/LhUeo0bo0IXHeQ9x2gybGIBeogIDHgpGyEjPTqCR0LRGqnxcTvP II9YeLidRwLwHahR4HsUSnl/Quxn3eCYt7Z3DQQU7hD7zmjFqo0GnoJtZDvcD9aODB0awF i7DjUufcrYEvMljj9TW1MdLZDA1kvBuj8BGZVnwxTfDIKjDGwnlYej/UgZIxEw== Date: Sun, 26 Feb 2023 22:22:33 -0500 Message-Id: <20230227032233.2733-2-winter@winter.cafe> In-Reply-To: <20230227032233.2733-1-winter@winter.cafe> References: <20230227032233.2733-1-winter@winter.cafe> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=2001:41d0:1004:224b::a; envelope-from=winter@winter.cafe; helo=out-10.mta0.migadu.com 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-Mailman-Approved-At: Sun, 26 Feb 2023 23:48:32 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Mon, 27 Feb 2023 10:06:40 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Winter X-ACL-Warn: , Winter via Guix-patches X-Patchwork-Original-From: Winter via Guix-patches via From: Winter 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 * gnu/packages/shells.scm (fish): Update to 3.6.0. [source]: Remove snippet, as the vendored PCRE2 sources have been removed (see upstream changelog). --- gnu/packages/shells.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) base-commit: 81fbf5d71fb95367a0a93e45a86de5e930589a05 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'