From patchwork Fri Mar 7 00:18:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Guilherme Coelho X-Patchwork-Id: 39741 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 E742227BBEA; Fri, 7 Mar 2025 02:01:07 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 4ACFF27BBE2 for ; Fri, 7 Mar 2025 02:01:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqN0K-0004E0-2O; Thu, 06 Mar 2025 21:00: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 1tqLQd-0000Zs-28 for guix-patches@gnu.org; Thu, 06 Mar 2025 19:19:03 -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 1tqLQc-0002Ol-PH for guix-patches@gnu.org; Thu, 06 Mar 2025 19:19:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=8zeNJQsfC3NVN1EfXqJoDZPcuoUw/uAjcmITHQXfMn0=; b=HWCr6q3d7b6QadYSlh67nXWATaU3+5iRCa4BevWlk20yKiDFhXtEY3hYD23ANgI6AqrFzXMvQqlXxNQrj6K64e4FJjPf78DvPnqu6FkfF1dJs+7agVGqAOoLCKGV2JtqoMhGxeum4I0o5GBpgDEOc/cGkqbkGx8E9c5cCpZoDeQiviGJcWBRH6OI7JYI4lCzmTcgNQkOekVapdbvgn23RcW0mcwBZK25+EojnruKurIelbsnZfcFowl4d8zUd0v+528sMv/X13/JYNskpJM1/3CNQzmp1lMFgNvEz2YzDkooXUihC+50l+MncvBecpylRFkARuK7wzz5/4VINCkF/Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tqLQc-0006gH-KE for guix-patches@gnu.org; Thu, 06 Mar 2025 19:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76796] [PATCH] gnu: fish: Add support for guix home profile. Resent-From: Luis Guilherme Coelho Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Mar 2025 00:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76796 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76796@debbugs.gnu.org Cc: Luis Guilherme Coelho X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174130673425662 (code B ref -1); Fri, 07 Mar 2025 00:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Mar 2025 00:18:54 +0000 Received: from localhost ([127.0.0.1]:45973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tqLQU-0006fq-3Q for submit@debbugs.gnu.org; Thu, 06 Mar 2025 19:18:54 -0500 Received: from lists.gnu.org ([2001:470:142::17]:45784) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tqLQS-0006fb-AQ for submit@debbugs.gnu.org; Thu, 06 Mar 2025 19:18:52 -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 1tqLQL-0000YB-QH for guix-patches@gnu.org; Thu, 06 Mar 2025 19:18:46 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqLQJ-0002LX-2r for guix-patches@gnu.org; Thu, 06 Mar 2025 19:18:45 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1F6142588F; Fri, 7 Mar 2025 01:18:36 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id CxkrkKFnVuuv; Fri, 7 Mar 2025 01:18:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1741306714; bh=zLPNQ2y0qqUSbrEiK/uXXaMHwtoGHESUtDUNmb38Qrs=; h=From:To:Cc:Subject:Date; b=XgXNBqLdp3KUyO0RqVfMLh62CLUu7YmxEGJX7omIxSbdnLG/jrTP2f+TmFbFxryFX Ufo/aQi77tcpOZNWlHK+w04aQUjI+Mrb95Bk+PNoK6eAcm8oixxABMhquVqxcs2da8 jn6/KJl6O/Ly/ejjLznj3u6Fn9slkIo22W5H72R1+2fqB54p1VQRclWGR42D8IuIIc AEVp052RDUBhrHb37mKezl+lI3LrnD9/1RhdgJJ3OYjjxx9eo+QTi523digRShp/qn XM8yRTG+laFIYFanTIop5hMBiSVooA25gzTVHEF27caRWXzvqLyaKK7Gs/8J2QBlRQ 8wCebdkCvoEEQ== Date: Thu, 6 Mar 2025 21:18:04 -0300 Message-ID: <31435aaacaceddc8a2baa176e431393a10446ed1.1741306684.git.lgcoelho@disroot.org> MIME-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=lgcoelho@disroot.org; helo=layka.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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-Mailman-Approved-At: Thu, 06 Mar 2025 20:59:57 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Luis Guilherme Coelho X-ACL-Warn: , Luis Guilherme Coelho via Guix-patches X-Patchwork-Original-From: Luis Guilherme Coelho via Guix-patches via From: Luis Guilherme Coelho 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)[arguments]<#:phases> {patch-fish-extra-paths}: Add `~/.guix-home/profile' to `__guix_profile_paths'. Change-Id: If896cfc4f948d86c52073235a6f4a2c1d085e7a6 --- Currently, the completions, configurations and functions installed in ~/.guix-home/profile/etc/fish/{completions,conf.d,functions} are ignored, as these directories aren't listed under __fish_vendor_completionsdirs, __fish_vendor_confdirs and __fish_vendor_functionsdirs. This patch addresses, and fixes, this issue. gnu/packages/shells.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) base-commit: 310adf4ce70cbb864859274fcc7842bd519bbddc diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 63bdf69705..e177a90de0 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -223,10 +223,10 @@ (define-public fish (string-append "\n\n" "# Patched by Guix.\n" - "# Enable completions, functions and configurations in user's" - " and system's guix profiles by adding them to __extra_*" + "# Enable completions, functions and configurations in user's," + " home's and system's guix profiles by adding them to __extra_*" " variables.\n" - "set -l __guix_profile_paths ~/.guix-profile" + "set -l __guix_profile_paths ~/.guix-profile ~/.guix-home/profile" " /run/current-system/profile\n" "set __extra_completionsdir" " $__guix_profile_paths\"/etc/fish/completions\""