From mboxrd@z Thu Jan  1 00:00:00 1970
From: iyzsong@member.fsf.org (=?utf-8?B?5a6L5paH5q2m?=)
Subject: Re: New =?utf-8?Q?=E2=80=98guix_pull=E2=80=99_dosen=E2=80=99t?=
	update the guix manual in GuixSD
Date: Mon, 11 Jun 2018 19:27:13 +0800
Message-ID: <87efhdwoku.fsf@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: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36229)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <iyzsong@member.fsf.org>) id 1fSKzd-000264-9j
	for guix-devel@gnu.org; Mon, 11 Jun 2018 07:28:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <iyzsong@member.fsf.org>) id 1fSKzc-0006dM-4R
	for guix-devel@gnu.org; Mon, 11 Jun 2018 07:28:13 -0400
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: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@gnu.org>
Cc: guix-devel <guix-devel@gnu.org>, 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 <http://bugs.gnu.org/20255>.
>  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 <http://bugs.gnu.org/22650>.
>  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!