From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: Run ./nix/sync-with-upstream after pull!
Date: Thu, 19 Dec 2013 00:43:25 +0100
Message-ID: <874n65209u.fsf@gnu.org>
References: <87eh5921yu.fsf@gnu.org> <20131218233159.GA12553@debian>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58277)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1VtQm5-0000pQ-Pf
	for guix-devel@gnu.org; Wed, 18 Dec 2013 18:43:40 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1VtQlz-00038S-6t
	for guix-devel@gnu.org; Wed, 18 Dec 2013 18:43:33 -0500
Received: from mail2-relais-roc.national.inria.fr ([192.134.164.83]:25373)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1VtQlz-000383-01
	for guix-devel@gnu.org; Wed, 18 Dec 2013 18:43:27 -0500
In-Reply-To: <20131218233159.GA12553@debian> (Andreas Enge's message of "Thu,
	19 Dec 2013 00:31:59 +0100")
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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Andreas Enge <andreas@enge.fr>
Cc: guix-devel@gnu.org

Andreas Enge <andreas@enge.fr> skribis:

> On Thu, Dec 19, 2013 at 12:06:49AM +0100, Ludovic Court=C3=A8s wrote:
>> Make sure to run ./nix/sync-with-upstream to fix that (this script has
>> an additional patch rule to fix that.)
>
> When doing this, I get:
>
> sync-with-upstream: `..' is not the valid top-level source directory
>
>
> When I do "cd nix; ./sync-with-upstream",

Right, that=E2=80=99s actually the right command.  :-)

> I get:
>
> (lots of messages)
> `./libstore/pathlocks.hh' -> `../../nix/./libstore/pathlocks.hh'
> removed `../nix/libstore/schema.sql.hh'
> `../nix-upstream/COPYING' -> `../nix/COPYING'
> `../nix-upstream/AUTHORS' -> `../nix/AUTHORS'
> sed: can't read ../nix/libutil/hash.{cc,hh}: No such file or directory
>
> The files ../nix/libutil/hash.cc and ../nix/libutil/hash.hh exist, but
> apparently the command looks for a single file with { and } in its name.

What does =E2=80=98/bin/sh --version=E2=80=99 report?  I bet it=E2=80=99s d=
ash instead of Bash.

> The following modification solves the problem:
> diff --git a/nix/sync-with-upstream b/nix/sync-with-upstream
> index bb3a68b..dc7a7e3 100755
> --- a/nix/sync-with-upstream
> +++ b/nix/sync-with-upstream
> @@ -76,5 +76,7 @@ sed -i "$top_srcdir/nix/libstore/gc.cc"=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20
>  # context is expected to truly copy the underlying hash context.  The co=
py
>  # constructor cannot be used in 'Ctx' if that's a union, so turn it into=
 a
>  # structure (we can afford to two wasted words.)
> -sed -i "$top_srcdir/nix/libutil/hash".{cc,hh}  \
> +sed -i "$top_srcdir/nix/libutil/hash".cc       \
> +    -e 's|union Ctx|struct Ctx|g'
> +sed -i "$top_srcdir/nix/libutil/hash".hh       \
>      -e 's|union Ctx|struct Ctx|g'

I=E2=80=99ve applied something similar.

Thanks,
Ludo=E2=80=99.