From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark H Weaver <mhw@netris.org>
Subject: Re: [PATCH] packages: Add zip archive support to 'patch-and-repack'.
Date: Wed, 25 Mar 2015 09:03:02 -0400
Message-ID: <87h9t9p6ux.fsf@netris.org>
References: <1427212612-24293-1-git-send-email-bavier@member.fsf.org>
	<87iodq15o4.fsf@gnu.org>
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]:59077)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mhw@netris.org>) id 1YakxJ-0000Fk-S9
	for guix-devel@gnu.org; Wed, 25 Mar 2015 09:02:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mhw@netris.org>) id 1YakxG-0005Dr-0G
	for guix-devel@gnu.org; Wed, 25 Mar 2015 09:02:45 -0400
In-Reply-To: <87iodq15o4.fsf@gnu.org> ("Ludovic
	\=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\=
	\=\?utf-8\?Q\?s\?\= message of "Tue, 24 Mar 2015 21:50:19 +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: Ludovic =?utf-8?Q?Court=C3=A8s?= <ludo@gnu.org>
Cc: guix-devel@gnu.org

ludo@gnu.org (Ludovic Court=C3=A8s) writes:

> Eric Bavier <bavier@member.fsf.org> skribis:
>
>> * guix/packages.scm (%standard-patch-inputs): Add "unzip".
>>   (patch-and-repack)[decompression-type]: Detect zip archive.
>>   [build]: Invoke "unzip" when appropriate.
>
> Please add =E2=80=9CFixes <http://bugs.gnu.org/19830>.=E2=80=9D right abo=
ve, and email
> 19830-close@debbugs.gnu.org with the commit id afterwards.
>
>> -                   (zero? (system* (string-append #$tar "/bin/tar")
>> -                                   "xvf" #$source)))
>> +                   #$@(if (string=3D? decompression-type "unzip")
>> +                          #~((zero? (system* "unzip" #$source)))
>> +                          #~((zero? (system* (string-append #$tar "/bin=
/tar")
>> +                                             "xvf" #$source)))))
>
> Simply:
>
>   #$(if (string=3D? decompression-type "unzip")
>         #~(zero? (system* "unzip" #$source))
>         #~(zero? (system* (string-append #$tar "/bin/tar") ...)))
>
> OK to push with these changes!

This is for core-updates, right?

       Mark