From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: New =?utf-8?Q?=E2=80=98guix_pull=E2=80=99_dosen=E2=80=99t?= update the guix manual in GuixSD Date: Sun, 10 Jun 2018 21:33:45 +0200 Message-ID: <878t7me8rq.fsf@gnu.org> References: <87y3fogt8e.fsf@gnu.org> <87fu1wyr3i.fsf@member.fsf.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fS667-0001s4-I3 for guix-devel@gnu.org; Sun, 10 Jun 2018 15:33:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fS666-0007MD-Kl for guix-devel@gnu.org; Sun, 10 Jun 2018 15:33:55 -0400 In-Reply-To: <87fu1wyr3i.fsf@member.fsf.org> (=?utf-8?B?IuWui+aWh+atpiIn?= =?utf-8?B?cw==?= message of "Sat, 09 Jun 2018 22:25:21 +0800") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: =?utf-8?B?5a6L5paH5q2m?= Cc: guix-devel , 31770@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello =E5=AE=8B=E6=96=87=E6=AD=A6! iyzsong@member.fsf.org (=E5=AE=8B=E6=96=87=E6=AD=A6) skribis: > After run =E2=80=98guix pull=E2=80=99 twice, I have got =E2=80=98~/.confi= g/guix/current=E2=80=99, then > use it to do a system reconfigure for =E2=80=98/etc/profile=E2=80=99. > > But the guix manual doesn=E2=80=99t got updated, my =E2=80=98INFOPATH=E2= =80=99 contains: > > - /home/iyzsong/.guix-profile/share/info > - /run/current-system/profile/share/info > - /home/iyzsong/.config/guix/current/share/info > - /home/iyzsong/.guix-profile/share/info > - /run/current-system/profile/share/info > > The last there are from the =E2=80=98export=E2=80=99 statement of =E2=80= =98/etc/profile=E2=80=99, the > first two are added by =E2=80=98source=E2=80=99 the profiles. Since ther= e is a guix in > the system profile contains the old info manual, the current one won=E2= =80=99t > be picked. Ooh! I think the change below should be enough to ensure ~/.config/guix/current comes first: --=-=-= Content-Type: text/x-patch Content-Disposition: inline --- a/gnu/system.scm +++ b/gnu/system.scm @@ -602,7 +602,7 @@ directory." # because they would require combining both profiles. # FIXME: See . export MANPATH=$HOME/.guix-profile/share/man:/run/current-system/profile/share/man -export INFOPATH=$HOME/.config/guix/current/share/info:$HOME/.guix-profile/share/info:/run/current-system/profile/share/info +export INFOPATH=$HOME/.guix-profile/share/info:/run/current-system/profile/share/info export XDG_DATA_DIRS=$HOME/.guix-profile/share:/run/current-system/profile/share export XDG_CONFIG_DIRS=$HOME/.guix-profile/etc/xdg:/run/current-system/profile/etc/xdg @@ -630,7 +630,7 @@ then export `cat /etc/environment | cut -d= -f1` fi -for profile in \"$HOME/.config/guix/current\" \"$HOME/.guix-profile\" +for profile in \"$HOME/.guix-profile\" \"$HOME/.config/guix/current\" do if [ -f \"$profile/etc/profile\" ] then @@ -644,6 +644,8 @@ do fi done +export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\" + # Set the umask, notably for users logging in via 'lsh'. # See . umask 022 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable How does that sound? (Note that in the meantime you can always work around the bug by using =E2=80=98info -f ~/.config/guix/current/share/info/guix.info=E2=80=99 or = =E2=80=98C-u C-h i =E2=80=A6=E2=80=99 in Emacs.) Thanks for the heads-up! Ludo=E2=80=99. --=-=-=--