From mboxrd@z Thu Jan  1 00:00:00 1970
From: ng0 <ng0@we.make.ritual.n0.is>
Subject: Re: Our git just broke
Date: Sat, 13 Aug 2016 15:33:29 +0000
Message-ID: <87d1lclm46.fsf@we.make.ritual.n0.is>
References: <e04d6242-e40c-f5a4-4e71-df637145f11c@uq.edu.au>
	<20160813130729.GA13976@jasmine>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51259)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ng0@we.make.ritual.n0.is>) id 1bYawL-0004EN-88
	for guix-devel@gnu.org; Sat, 13 Aug 2016 11:33:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ng0@we.make.ritual.n0.is>) id 1bYawI-0007yr-Jv
	for guix-devel@gnu.org; Sat, 13 Aug 2016 11:33:36 -0400
Received: from mithlond.libertad.in-berlin.de ([2001:67c:1400:2490::1]:48675
	helo=beleriand.n0.is) by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ng0@we.make.ritual.n0.is>) id 1bYawI-0007xG-6N
	for guix-devel@gnu.org; Sat, 13 Aug 2016 11:33:34 -0400
In-Reply-To: <20160813130729.GA13976@jasmine>
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: Leo Famulari <leo@famulari.name>, Ben Woodcroft <b.woodcroft@uq.edu.au>
Cc: "guix-devel@gnu.org" <guix-devel@gnu.org>

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