GNU bug report logs - #76796
[PATCH] gnu: fish: Add support for guix home profile.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 76796 in the body.
You can then email your comments to 76796 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Luis Guilherme Coelho <lgcoelho <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: Luis Guilherme Coelho <lgcoelho <at> disroot.org>
Subject: [PATCH] gnu: fish: Add support for guix home profile.
Date: Thu,  6 Mar 2025 21:18:04 -0300

* 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(-)

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\""

base-commit: 310adf4ce70cbb864859274fcc7842bd519bbddc
-- 
2.48.1

Message #10 received at 76796-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Luis Guilherme Coelho <lgcoelho <at> disroot.org>
Cc: 76796-done <at> debbugs.gnu.org
Subject: Re: [bug#76796] [PATCH] gnu: fish: Add support for guix home profile.
Date: Sun, 09 Mar 2025 22:36:49 +0100

Luis Guilherme Coelho <lgcoelho <at> disroot.org> skribis:

> * gnu/packages/shells.scm (fish)[arguments]<#:phases>
> {patch-fish-extra-paths}: Add `~/.guix-home/profile' to `__guix_profile_paths'.
>
> Change-Id: If896cfc4f948d86c52073235a6f4a2c1d085e7a6

Applied, thanks!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.