GNU bug report logs - #61358
[PATCH] system: default-skeletons: Merge search-paths of multiple profiles.

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 61358 in the body.
You can then email your comments to 61358 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: iyzsong <at> envs.net
To: guix-patches <at> gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [PATCH] system: default-skeletons: Merge search-paths of multiple
 profiles.
Date: Wed,  8 Feb 2023 10:37:35 +0800

From: 宋文武 <iyzsong <at> member.fsf.org>

Fixes <https://issues.guix/gnu.org/20255>.

* gnu/system/shadow.scm (default-skeletons)[bash_profile, zprofile]:
Merge search-paths from multiple profiles via "guix package".
---
 gnu/system/shadow.scm | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index 2e87928368..a46f53e784 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -152,11 +152,31 @@ (define (default-skeletons)
 
   (let ((profile (plain-file "bash_profile" "\
 # Honor per-interactive-shell startup file
-if [ -f ~/.bashrc ]; then . ~/.bashrc; fi\n"))
+if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
+
+# Merge search-paths from multiple profiles, the order matters.
+eval \"$(guix package --search-paths \\
+-p $HOME/.config/guix/current \\
+-p $HOME/.guix-profile \\
+-p /run/current-system/profile)\"
+
+# Prepend setuid programs.
+export PATH=/run/setuid-programs:$PATH
+"))
         (bashrc  %default-bashrc)
         (zprofile    (plain-file "zprofile" "\
 # Honor system-wide environment variables
-source /etc/profile\n"))
+source /etc/profile
+
+# Merge search-paths from multiple profiles, the order matters.
+eval \"$(guix package --search-paths \\
+-p $HOME/.config/guix/current \\
+-p $HOME/.guix-profile \\
+-p /run/current-system/profile)\"
+
+# Prepend setuid programs.
+export PATH=/run/setuid-programs:$PATH
+"))
         (xdefaults (plain-file "Xdefaults" "\
 XTerm*utf8: always
 XTerm*metaSendsEscape: true\n"))
-- 
2.39.1

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

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: iyzsong <at> envs.net, 61358 <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: Re: [PATCH] system: default-skeletons: Merge search-paths of
 multiple profiles.
Date: Wed, 08 Feb 2023 06:18:04 +0100

Am Mittwoch, dem 08.02.2023 um 10:37 +0800 schrieb iyzsong <at> envs.net:
> From: 宋文武 <iyzsong <at> member.fsf.org>
> 
> Fixes <https://issues.guix/gnu.org/20255>.
> 
> * gnu/system/shadow.scm (default-skeletons)[bash_profile, zprofile]:
> Merge search-paths from multiple profiles via "guix package".
> ---
>  gnu/system/shadow.scm | 24 ++++++++++++++++++++++--
>  1 file changed, 22 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
> index 2e87928368..a46f53e784 100644
> --- a/gnu/system/shadow.scm
> +++ b/gnu/system/shadow.scm
> @@ -152,11 +152,31 @@ (define (default-skeletons)
>  
>    (let ((profile (plain-file "bash_profile" "\
>  # Honor per-interactive-shell startup file
> -if [ -f ~/.bashrc ]; then . ~/.bashrc; fi\n"))
> +if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
> +
> +# Merge search-paths from multiple profiles, the order matters.
> +eval \"$(guix package --search-paths \\
> +-p $HOME/.config/guix/current \\
> +-p $HOME/.guix-profile \\
> +-p /run/current-system/profile)\"
> +
> +# Prepend setuid programs.
> +export PATH=/run/setuid-programs:$PATH
> +"))
>          (bashrc  %default-bashrc)
>          (zprofile    (plain-file "zprofile" "\
>  # Honor system-wide environment variables
> -source /etc/profile\n"))
> +source /etc/profile
> +
> +# Merge search-paths from multiple profiles, the order matters.
> +eval \"$(guix package --search-paths \\
> +-p $HOME/.config/guix/current \\
> +-p $HOME/.guix-profile \\
> +-p /run/current-system/profile)\"
> +
> +# Prepend setuid programs.
> +export PATH=/run/setuid-programs:$PATH
> +"))
>          (xdefaults (plain-file "Xdefaults" "\
>  XTerm*utf8: always
>  XTerm*metaSendsEscape: true\n"))
Why not do this in /etc/profile?

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

From: 宋文武 <iyzsong <at> envs.net>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 宋文武 <iyzsong <at> member.fsf.org>, 61358 <at> debbugs.gnu.org
Subject: Re: [PATCH] system: default-skeletons: Merge search-paths of
 multiple profiles.
Date: Wed, 08 Feb 2023 15:20:44 +0800

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> Am Mittwoch, dem 08.02.2023 um 10:37 +0800 schrieb iyzsong <at> envs.net:
>> From: 宋文武 <iyzsong <at> member.fsf.org>
>> 
>> Fixes <https://issues.guix/gnu.org/20255>.
>> 
>> * gnu/system/shadow.scm (default-skeletons)[bash_profile, zprofile]:
>> Merge search-paths from multiple profiles via "guix package".
>> ---
>>  gnu/system/shadow.scm | 24 ++++++++++++++++++++++--
>>  1 file changed, 22 insertions(+), 2 deletions(-)
>>  [...]

> Why not do this in /etc/profile?

It's easier to modify ~/.bash_profile If you don't like the way (eval!
and speed as disscussed in #20255).

Also this doesn't include home profiles, which a user likely want to add
them into "guix package -p ..." too.

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

From: 宋文武 <iyzsong <at> envs.net>
To: 61358-done <at> debbugs.gnu.org
Subject: Re: bug#61358: [PATCH] system: default-skeletons: Merge
 search-paths of multiple profiles.
Date: Fri, 12 May 2023 20:30:43 +0800

Pushed now!

Previous Next

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