From mboxrd@z Thu Jan 1 00:00:00 1970 From: iyzsong@member.fsf.org (=?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?=) Subject: bug#31770: New =?UTF-8?Q?=E2=80=98guix_?= =?UTF-8?Q?pull=E2=80=99_?= =?UTF-8?Q?dosen=E2=80=99t?= update the guix manual in GuixSD Date: Mon, 11 Jun 2018 19:27:13 +0800 Message-ID: <87efhdwoku.fsf__45664.6934886978$1528716432$gmane$org@member.fsf.org> References: <87y3fogt8e.fsf@gnu.org> <87fu1wyr3i.fsf@member.fsf.org> <878t7me8rq.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSL0T-0002bJ-1v for bug-guix@gnu.org; Mon, 11 Jun 2018 07:29:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSL0P-0007a1-Tb for bug-guix@gnu.org; Mon, 11 Jun 2018 07:29:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34926) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSL0P-0007Zu-Pd for bug-guix@gnu.org; Mon, 11 Jun 2018 07:29:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fSL0P-00033W-IK for bug-guix@gnu.org; Mon, 11 Jun 2018 07:29:01 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <878t7me8rq.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Sun, 10 Jun 2018 21:33:45 +0200") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: guix-devel , 31770@debbugs.gnu.org ludo@gnu.org (Ludovic Court=C3=A8s) writes: >> 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 the= re 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: > > --- a/gnu/system.scm > +++ b/gnu/system.scm > @@ -602,7 +602,7 @@ directory." > # because they would require combining both profiles. > # FIXME: See . > export MANPATH=3D$HOME/.guix-profile/share/man:/run/current-system/profi= le/share/man > -export INFOPATH=3D$HOME/.config/guix/current/share/info:$HOME/.guix-prof= ile/share/info:/run/current-system/profile/share/info > +export INFOPATH=3D$HOME/.guix-profile/share/info:/run/current-system/pro= file/share/info > export XDG_DATA_DIRS=3D$HOME/.guix-profile/share:/run/current-system/pro= file/share > export XDG_CONFIG_DIRS=3D$HOME/.guix-profile/etc/xdg:/run/current-system= /profile/etc/xdg >=20=20 > @@ -630,7 +630,7 @@ then > export `cat /etc/environment | cut -d=3D -f1` > fi >=20=20 > -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 >=20=20 > +export INFOPATH=3D\"$HOME/.config/guix/current/share/info:$INFOPATH\" > + > # Set the umask, notably for users logging in via 'lsh'. > # See . > umask 022 > > > How does that sound? Yeah, that's fine. Maybe add comments about why source =E2=80=98current=E2= =80=99 after user profile (prefer current guix) and why =E2=80=98export INFOPATH=E2=80= =99 at the end (prefer the current guix manual). Thank you!