From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: Re: Libreoffice building (sort of) Date: Wed, 11 Mar 2015 15:17:56 -0400 Message-ID: <87k2ynz6l7.fsf@netris.org> References: <20150309220320.GA16814@debian> <787D3051-1EA0-4CFA-8D7C-A201DB6EA50B@sumou.com> <7C40BA9C-C875-446D-B2FD-3749CF026313@sumou.com> <87mw3lm3cp.fsf@gnu.org> <26d5018175cf3d29bd0f9c99081c4841@hcoop.net> <871tkv1ojp.fsf@netris.org> <31c4ac58a6a35a5f0aaf774ae6c51062@hcoop.net> 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]:35277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVm8W-00021S-QD for guix-devel@gnu.org; Wed, 11 Mar 2015 15:17:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVm8S-0000PE-Ja for guix-devel@gnu.org; Wed, 11 Mar 2015 15:17:44 -0400 Received: from world.peace.net ([50.252.239.5]:46551) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVm8S-0000P6-FP for guix-devel@gnu.org; Wed, 11 Mar 2015 15:17:40 -0400 In-Reply-To: <31c4ac58a6a35a5f0aaf774ae6c51062@hcoop.net> (=?utf-8?B?Ig==?= =?utf-8?B?55m944GE54aK77yg55u45pKy6YGTIidz?= message of "Wed, 11 Mar 2015 18:32:24 +0100") 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: =?utf-8?B?55m944GE54aK77yg55u45pKy6YGT?= Cc: GuixSD =E7=99=BD=E3=81=84=E7=86=8A=EF=BC=A0=E7=9B=B8=E6=92=B2=E9=81=93 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=3Dfile:///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=3Dfile:///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=3Dfile:///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