all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: ng0 <ng0@we.make.ritual.n0.is>
To: Leo Famulari <leo@famulari.name>, Ben Woodcroft <b.woodcroft@uq.edu.au>
Cc: "guix-devel@gnu.org" <guix-devel@gnu.org>
Subject: Re: Our git just broke
Date: Sat, 13 Aug 2016 15:33:29 +0000	[thread overview]
Message-ID: <87d1lclm46.fsf@we.make.ritual.n0.is> (raw)
In-Reply-To: <20160813130729.GA13976@jasmine>

Hi,

Leo Famulari <leo@famulari.name> writes:

> On Sat, Aug 13, 2016 at 10:41:59PM +1000, Ben Woodcroft wrote:
>> Hi,
>> 
>> I cannot currently build git on the master branch. I bisected and got to
>> this commit. I had a quick look but couldn't see what the problem was. The
>> new package builds fine. Can someone take a look please?
>> 
>> 
>> b3885778e8e438e8526a8ee9e96072fd00f5cae5 is the first bad commit
>> commit b3885778e8e438e8526a8ee9e96072fd00f5cae5
>> Author: ng0 <ng0@we.make.ritual.n0.is>
>> Date:   Wed Aug 10 10:04:29 2016 +0000
>> 
>>     gnu: Add stagit.
>> 
>>     * gnu/packages/version-control.scm (stagit): New variable.
>> 
>>     Signed-off-by: Leo Famulari <leo@famulari.name>
>
> Oops! I've reverted the commit.
>
> The variable expat is defined twice. We need to change
> version-control.scm to use a license prefix rather than selecting
> licenses.
>
> ng0, will you update version-control.scm to use a license prefix and
> re-send an updated stagit patch?

It is reverted and has no immediate priority as I read.
I can do so tomorrow or later today. Sorry that my commit broke it, I
thought the message about twice defined license was just verbose. Now I
know this can break the make.
-- 
♥Ⓐ  ng0
For non-prism friendly talk find me on http://www.psyced.org

  parent reply	other threads:[~2016-08-13 15:33 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-13 12:41 Our git just broke Ben Woodcroft
2016-08-13 13:07 ` Leo Famulari
2016-08-13 13:23   ` Vincent Legoll
2016-08-13 13:32   ` Ben Woodcroft
2016-08-13 15:33   ` ng0 [this message]
2016-08-13 23:11     ` Leo Famulari
2016-08-13 15:36   ` ng0
2016-08-13 23:11     ` Leo Famulari
2016-08-14  2:46       ` Eric Bavier
2016-08-14 18:24   ` Our git just broke [PATCH]: gnu: Add stagit, adjust version-control.scm ng0
2016-08-17 11:38     ` ng0
2016-08-13 17:28 ` Our git just broke Pjotr Prins
2016-08-14  4:28   ` Ben Woodcroft
2016-08-14 16:13     ` Leo Famulari
2016-08-15  1:08       ` Mark H Weaver
2016-08-15 11:23         ` Ben Woodcroft
2016-08-15 17:11           ` Leo Famulari
2016-08-15 18:04             ` Pjotr Prins

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

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

  git send-email \
    --in-reply-to=87d1lclm46.fsf@we.make.ritual.n0.is \
    --to=ng0@we.make.ritual.n0.is \
    --cc=b.woodcroft@uq.edu.au \
    --cc=guix-devel@gnu.org \
    --cc=leo@famulari.name \
    /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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.