* New ‘guix pull’ dosen’t update the guix manual in GuixSD [not found] <87y3fogt8e.fsf@gnu.org> @ 2018-06-09 14:25 ` 宋文武 2018-06-10 19:33 ` bug#31770: " Ludovic Courtès [not found] ` <878t7me8rq.fsf@gnu.org> 0 siblings, 2 replies; 4+ messages in thread From: 宋文武 @ 2018-06-09 14:25 UTC (permalink / raw) To: Ludovic Courtès; +Cc: guix-devel, bug-guix ludo@gnu.org (Ludovic Courtès) writes: > Hello Guix! > > For those who haven’t been following along on > <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=22629#35>, I have just > pushed a new ‘guix pull’. > > To summarize, ~/.config/guix/latest no longer exists. Instead > ~/.config/guix/current is populated with a complete Guix (without > ‘guix-daemon’ though), including an up-to-date manual and so on. > ~/.config/guix/current is a regular profile, meaning that you can > roll-back to a previously-pulled Guix and so on. Great! After run ‘guix pull’ twice, I have got ‘~/.config/guix/current’, then use it to do a system reconfigure for ‘/etc/profile’. But the guix manual doesn’t got updated, my ‘INFOPATH’ 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 ‘export’ statement of ‘/etc/profile’, the first two are added by ‘source’ the profiles. Since there is a guix in the system profile contains the old info manual, the current one won’t be picked. I think we should make ‘INFOPATH’ a search path of the ‘current’ guix profile, so that it overrides previous ones. ^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#31770: New ‘guix pull’ dosen’t update the guix manual in GuixSD 2018-06-09 14:25 ` New ‘guix pull’ dosen’t update the guix manual in GuixSD 宋文武 @ 2018-06-10 19:33 ` Ludovic Courtès [not found] ` <878t7me8rq.fsf@gnu.org> 1 sibling, 0 replies; 4+ messages in thread From: Ludovic Courtès @ 2018-06-10 19:33 UTC (permalink / raw) To: 宋文武; +Cc: guix-devel, 31770 [-- Attachment #1: Type: text/plain, Size: 870 bytes --] Hello 宋文武! iyzsong@member.fsf.org (宋文武) skribis: > After run ‘guix pull’ twice, I have got ‘~/.config/guix/current’, then > use it to do a system reconfigure for ‘/etc/profile’. > > But the guix manual doesn’t got updated, my ‘INFOPATH’ 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 ‘export’ statement of ‘/etc/profile’, the > first two are added by ‘source’ the profiles. Since there is a guix in > the system profile contains the old info manual, the current one won’t > be picked. Ooh! I think the change below should be enough to ensure ~/.config/guix/current comes first: [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: Type: text/x-patch, Size: 1123 bytes --] --- 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=$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 <http://bugs.gnu.org/22650>. umask 022 [-- Attachment #3: Type: text/plain, Size: 232 bytes --] How does that sound? (Note that in the meantime you can always work around the bug by using ‘info -f ~/.config/guix/current/share/info/guix.info’ or ‘C-u C-h i …’ in Emacs.) Thanks for the heads-up! Ludo’. ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <878t7me8rq.fsf@gnu.org>]
* bug#31770: New ‘guix pull’ dosen’t update the guix manual in GuixSD [not found] ` <878t7me8rq.fsf@gnu.org> @ 2018-06-11 11:27 ` 宋文武 [not found] ` <87efhdwoku.fsf@member.fsf.org> 1 sibling, 0 replies; 4+ messages in thread From: 宋文武 @ 2018-06-11 11:27 UTC (permalink / raw) To: Ludovic Courtès; +Cc: guix-devel, 31770 ludo@gnu.org (Ludovic Courtès) writes: >> The last there are from the ‘export’ statement of ‘/etc/profile’, the >> first two are added by ‘source’ the profiles. Since there is a guix in >> the system profile contains the old info manual, the current one won’t >> 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=$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 <http://bugs.gnu.org/22650>. > umask 022 > > > How does that sound? Yeah, that's fine. Maybe add comments about why source ‘current’ after user profile (prefer current guix) and why ‘export INFOPATH’ at the end (prefer the current guix manual). Thank you! ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <87efhdwoku.fsf@member.fsf.org>]
* bug#31770: New ‘guix pull’ dosen’t update the guix manual in GuixSD [not found] ` <87efhdwoku.fsf@member.fsf.org> @ 2018-06-12 13:54 ` Ludovic Courtès 0 siblings, 0 replies; 4+ messages in thread From: Ludovic Courtès @ 2018-06-12 13:54 UTC (permalink / raw) To: 宋文武; +Cc: guix-devel, 31770-done iyzsong@member.fsf.org (宋文武) skribis: > ludo@gnu.org (Ludovic Courtès) writes: [...] >> -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 <http://bugs.gnu.org/22650>. >> umask 022 >> >> >> How does that sound? > > Yeah, that's fine. Maybe add comments about why source ‘current’ after > user profile (prefer current guix) and why ‘export INFOPATH’ at the end > (prefer the current guix manual). Thank you! Good idea. Pushed as 8d09bfe21870c2d5fdb1cd04bc5fdcab177204b0, thanks! Ludo’. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-06-12 13:55 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <87y3fogt8e.fsf@gnu.org> 2018-06-09 14:25 ` New ‘guix pull’ dosen’t update the guix manual in GuixSD 宋文武 2018-06-10 19:33 ` bug#31770: " Ludovic Courtès [not found] ` <878t7me8rq.fsf@gnu.org> 2018-06-11 11:27 ` 宋文武 [not found] ` <87efhdwoku.fsf@member.fsf.org> 2018-06-12 13:54 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).