unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Mark H Weaver <mhw@netris.org>
To: 白い熊@相撲道 <guix-devel_gnu.org@sumou.com>
Cc: GuixSD <guix-devel@gnu.org>
Subject: Re: Libreoffice building (sort of)
Date: Wed, 11 Mar 2015 15:17:56 -0400	[thread overview]
Message-ID: <87k2ynz6l7.fsf@netris.org> (raw)
In-Reply-To: <31c4ac58a6a35a5f0aaf774ae6c51062@hcoop.net> ("白い熊@相撲道"'s message of "Wed, 11 Mar 2015 18:32:24 +0100")

白い熊@相撲道 <guix-devel_gnu.org@sumou.com> writes:

> On 2015-03-11 17:34, Mark H Weaver wrote:
>> What you've done is to roll back your Guix to the 4-month-old
>> version of
>> Guix that the 'wip-libreoffice' branch was based on.
>>
>> The proper way would be to use 'git' to rebase that branch on our
>> current master branch, and then use that.  "guix pull" can't do that.
>>
>>> I'm asking this as I see a different behavior now
>>> with `guix package -d' and `-i' for other packages now than before,
>>> and a lot of building from source.
>>
>> That's probably because Hydra has long ago deleted the binaries from 4
>> months ago.
>
> Thanks a lot for this confirmation Mark, I suspected something like
> this must have happened when I saw the sourcebuilding...
>
> How best to proceed from here to:
> - get back to current master
> - keep the built libreoffice in the store
>
> I had an idea that pulling the current master from the downloaded file
> will bring me forward again, but doesn't seem it happened - still
> building from source.

A plain "guix pull", should bring you forward again, but now there's a
different problem: hydra.gnu.org is currently down.  Hopefully it'll be
back up soon.

After "guix pull", you'll also need to use "guix package -i" to bring
back the new versions of any packages you had installed while using the
wip-libreoffice branch.

Also, if you had run "guix system reconfigure" while you were on the
wip-libreoffice branch, then you should run that command again to get
back to the latest software.

> I don't use Guix from git, this is the GuixSD installed as a clean
> system from USB. Is there no other way now than to clone the git guix,
> build it an rebase?

If you want to merge two different branches of our git repository, then
'git' is the right tool for that job.

> How will it interact with the GuixSD version of the tools?

'guix pull' populates $HOME/.config/guix/latest (or
$XDG_CONFIG_HOME/guix/latest if XDG_CONFIG_HOME is set).  Other 'guix'
commands look in that directory and use the package descriptions found
there.

So, assumes your environment variables are set sanely, if you ran

  guix pull --url=file:///path/to/wip-libreoffice.tar.gz

as user 'foo', then only 'guix' commands run as user 'foo' will use
packages from the wip-libreoffice branch.  Other users running 'guix'
would not be affected.

> Isn't this going to lead to more conflicts? How do I insure
> the git guix will take precedende - just make sure to run local
> commands only from the git build directory?

When you run "/path/to/git/checkout/pre-inst-env guix ..." then it will
always use the package descriptions from the git checkout.  This is what
I *always* do.  In fact, to make this easier, I put this script in
~/bin/guix:

If you want to merge two different branches of our git repository, then
'git' is the right tool for that job.

> How will it interact with the GuixSD version of the tools?

'guix pull' populates $HOME/.config/guix/latest (or
$XDG_CONFIG_HOME/guix/latest if XDG_CONFIG_HOME is set).  Other 'guix'
commands look in that directory and use the package descriptions found
there.

So, assumes your environment variables are set sanely, if you ran

  guix pull --url=file:///path/to/wip-libreoffice.tar.gz

as user 'foo', then only 'guix' commands run as user 'foo' will use
packages from the wip-libreoffice branch.  Other users running 'guix'
would not be affected.

> Isn't this going to lead to more conflicts? How do I insure
> the git guix will take precedende - just make sure to run local
> commands only from the git build directory?

When you run "/path/to/git/checkout/pre-inst-env guix ..." then it will
always use the package descriptions from the git checkout.  This is what
I *always* do.  In fact, to make this easier, I put this script in
~/bin/guix:

If you want to merge two different branches of our git repository, then
'git' is the right tool for that job.

> How will it interact with the GuixSD version of the tools?

'guix pull' populates $HOME/.config/guix/latest (or
$XDG_CONFIG_HOME/guix/latest if XDG_CONFIG_HOME is set).  Other 'guix'
commands look in that directory and use the package descriptions found
there.

So, assumes your environment variables are set sanely, if you ran

  guix pull --url=file:///path/to/wip-libreoffice.tar.gz

as user 'foo', then only 'guix' commands run as user 'foo' will use
packages from the wip-libreoffice branch.  Other users running 'guix'
would not be affected.

> Isn't this going to lead to more conflicts? How do I insure
> the git guix will take precedende - just make sure to run local
> commands only from the git build directory?

When you run "/path/to/git/checkout/pre-inst-env guix ..." then it will
always use the package descriptions from the git checkout.  This is what
I *always* do.  In fact, to make this easier, I put this script in
~/bin/guix:

--8<---------------cut here---------------start------------->8---
#!/bin/sh

exec /home/mhw/guix/pre-inst-env guix "$@"
--8<---------------cut here---------------end--------------->8---

Also note that when 'pre-inst-env' is used, $HOME/.config/guix/latest is
always ignored, so anything you've done with 'guix pull' is irrelevant.

      Mark

  reply	other threads:[~2015-03-11 19:17 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-09 21:24 9x15bold xfont 白い熊 @相撲道
2015-03-09 22:03 ` Andreas Enge
2015-03-09 23:57   ` 白い熊 @相撲道
2015-03-10  2:29     ` 宋文武
2015-03-10  8:54       ` Libreoffice building (sort of) 白い熊 @相撲道
2015-03-10 12:06         ` 白い熊 @相撲道
2015-03-10 12:41           ` Ludovic Courtès
2015-03-11  9:01             ` 白い熊@相撲道
2015-03-11  9:27               ` 白い熊@相撲道
2015-03-11 12:04                 ` Andreas Enge
2015-03-11 12:34                   ` 白い熊@相撲道
2015-03-12  9:22                   ` Ludovic Courtès
2015-03-11 16:34               ` Mark H Weaver
2015-03-11 17:32                 ` 白い熊@相撲道
2015-03-11 19:17                   ` Mark H Weaver [this message]
2015-03-12 22:56                     ` 白い熊@相撲道
2015-03-12 23:10                       ` Mark H Weaver
2015-03-12  9:25               ` Merging wip-libreoffice Ludovic Courtès
2015-03-12  9:47                 ` Andreas Enge
2015-03-12 14:18                   ` Ludovic Courtès
2015-03-10 12:40       ` 9x15bold xfont Ludovic Courtès
  -- strict thread matches above, loose matches on Subject: below --
2014-11-24 17:19 Libreoffice building (sort of) John Darrington
2014-11-24 18:03 ` Ludovic Courtès
2014-11-24 19:07   ` John Darrington

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87k2ynz6l7.fsf@netris.org \
    --to=mhw@netris.org \
    --cc=guix-devel@gnu.org \
    --cc=guix-devel_gnu.org@sumou.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).