From patchwork Fri Jan 5 11:36:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tanguy LE CARROUR X-Patchwork-Id: 58373 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 CE62F27BBE9; Fri, 5 Jan 2024 11:37: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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 6FD3927BBE2 for ; Fri, 5 Jan 2024 11:37:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLiVY-0005Ux-Gc; Fri, 05 Jan 2024 06:37:00 -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 1rLiVW-0005U3-2u for guix-patches@gnu.org; Fri, 05 Jan 2024 06:36:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLiVV-00075x-Pa for guix-patches@gnu.org; Fri, 05 Jan 2024 06:36:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLiVa-0002o1-07 for guix-patches@gnu.org; Fri, 05 Jan 2024 06:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68260] [PATCH] gnu: fish-foreign-env: Update to 0.20230823. Resent-From: Tanguy Le Carrour Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jan 2024 11:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68260@debbugs.gnu.org Cc: Tanguy Le Carrour X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170445461810774 (code B ref -1); Fri, 05 Jan 2024 11:37:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jan 2024 11:36:58 +0000 Received: from localhost ([127.0.0.1]:56554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLiVW-0002ni-BH for submit@debbugs.gnu.org; Fri, 05 Jan 2024 06:36:58 -0500 Received: from lists.gnu.org ([2001:470:142::17]:46082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLiVT-0002nU-KX for submit@debbugs.gnu.org; Fri, 05 Jan 2024 06:36:57 -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 1rLiVJ-0005Rm-Ti for guix-patches@gnu.org; Fri, 05 Jan 2024 06:36:45 -0500 Received: from smtp-8fae.mail.infomaniak.ch ([2001:1600:4:17::8fae]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLiVH-00074R-58 for guix-patches@gnu.org; Fri, 05 Jan 2024 06:36:45 -0500 Received: from smtp-3-0000.mail.infomaniak.ch (unknown [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4T61cy18H5zMq5xs; Fri, 5 Jan 2024 11:36:34 +0000 (UTC) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4T61cx5NjNz3f; Fri, 5 Jan 2024 12:36:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bioneland.org; s=20230804; t=1704454594; bh=yaGGDWw/nv/BIceTZVPuRgeRYNYjhTSJWOVsK6a404M=; h=From:To:Cc:Subject:Date:From; b=alhvCAg18wwrSKUmduMBCBqI8yqNKWiUUap1laTiClXzLgjkXf3nh7CcukE31tyi2 H4NKXHc6o79vT4Lfj0yZTmm/9N86PvkWR1cMYpaqeI0kQ7E5luaOY5mVqTDk53Akxe wzVQ58fGbcStoSpfTGqqOCrLtkaWk4Q8ZF0LT3Pyfu+I0bwprekEI9PJaUOnWSaiMH 5AcWo7VcQoMJb1C/3SjWDwiz0WIKimVOxvPW1TAqGfnaJ4e+gDvMCH0m5RjDImV09r yHC1SvV4rVvL+AER65+i1+rAevB+sKsqon+bSos+X1mIAOe9IXa4fZIWku8oZIJplJ SEH8ZP4JEjD4g== From: Tanguy Le Carrour Date: Fri, 5 Jan 2024 12:36:17 +0100 Message-ID: <889d4b47504a8e7d395a5dd0b3833cb0bb3e9a8b.1704453996.git.tanguy@bioneland.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Infomaniak-Routing: alpha Received-SPF: pass client-ip=2001:1600:4:17::8fae; envelope-from=tanguy@bioneland.org; helo=smtp-8fae.mail.infomaniak.ch 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , 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 Hi Guix, Long time not contributed, but… this one should be trivial! … 🤞 Regards Tanguy * gnu/packages/shells.scm (fish-foreign-env): Update to 0.20230823. [arguments]: Do no substitute in file that no longer exists. --- gnu/packages/shells.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: ac69b423865f12310cef5662d9c303aa4b90c869 diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 8d2aadc0aa..e3de0eb205 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2022 Andrew Tropin ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 David Pflug +;;; Copyright © 2024 Tanguy Le Carrour ;;; ;;; This file is part of GNU Guix. ;;; @@ -273,16 +274,16 @@ (define-public fish (define-public fish-foreign-env (package (name "fish-foreign-env") - (version "0.20190116") + (version "0.20230823") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/oh-my-fish/plugin-foreign-env") - (commit "dddd9213272a0ab848d474d0cbde12ad034e65bc"))) + (commit "7f0cf099ae1e1e4ab38f46350ed6757d54471de7"))) (file-name (git-file-name name version)) (sha256 - (base32 "00xqlyl3lffc5l0viin1nyp819wf81fncqyz87jx8ljjdhilmgbs")))) + (base32 "0d16mdgjdwln41zk44qa5vcilmlia4w15r8z2rc3p49i5ankksg3")))) (build-system trivial-build-system) (arguments '(#:modules ((guix build utils)) @@ -298,7 +299,6 @@ (define-public fish-foreign-env ;; Embed absolute paths. (substitute* `(,(string-append func-path "/fenv.fish") - ,(string-append func-path "/fenv.apply.fish") ,(string-append func-path "/fenv.main.fish")) (("bash") (search-input-file %build-inputs "/bin/bash"))