Subject: bug#76796: closed (Re: [bug#76796] [PATCH] gnu: fish: Add support for guix home profile.)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 09 Mar 2025 21:37:03 +0000

Your bug report

#76796: [PATCH] gnu: fish: Add support for guix home profile.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
76796: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=76796
GNU Bug Tracking System
Contact [email-masked] with problems

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

Luis Guilherme Coelho <[email-masked]> 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!

Subject: [PATCH] gnu: fish: Add support for guix home profile.
From: Luis Guilherme Coelho <[email-masked]>
To: [email-masked]
Cc: Luis Guilherme Coelho <[email-masked]>
Date: Thu, 6 Mar 2025 21:18:04 -0300
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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