From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 21 15:46:44 2019 Received: (at submit) by debbugs.gnu.org; 21 Jul 2019 19:46:44 +0000 Received: from localhost ([127.0.0.1]:59537 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hpHn9-0001Io-Pb for submit@debbugs.gnu.org; Sun, 21 Jul 2019 15:46:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:45371) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hpHn6-0001If-Oc for submit@debbugs.gnu.org; Sun, 21 Jul 2019 15:46:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60307) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpHn5-0006gi-In for guix-patches@gnu.org; Sun, 21 Jul 2019 15:46:40 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpHn4-00077k-4t for guix-patches@gnu.org; Sun, 21 Jul 2019 15:46:39 -0400 Received: from pb-smtp20.pobox.com ([173.228.157.52]:60779) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpHn3-00076S-LA for guix-patches@gnu.org; Sun, 21 Jul 2019 15:46:38 -0400 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 2D21B86D16; Sun, 21 Jul 2019 15:46:35 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=sasl; bh=LEk0smZml/R4rNW0kf71Q8TtqxY=; b=tKM+ArIF3BGgTHuvtkbr EaJzvaGB+I5wYYxij9p6QxUJdH6O+WKOzCyrIHm8xKqFYGAz7iX52vvjON+7l/35 IEnjB2vhV08xcnHqH2kOVph8vuhFI3/6yRfDdDzqBx9485UyTOSN7SQfBEJkyKx9 rIsoxqsJoFG+gAqydksNsvw= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 2537486D15; Sun, 21 Jul 2019 15:46:35 -0400 (EDT) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:date:message-id:mime-version:content-transfer-encoding; s=mesmtp; bh=hz4GPNEB8rRr7UEG65TmEIiuzjlswxfTbUpxFq/871Y=; b=uCxTonpcKGE6mjn1slCUMoso/e7O9CCYUBXMUcJOBC3mBqY0VkvsQgIP4OK7GkZf2d3yka+UJ5wWfwJCU1OPDvNThTmoSAWIbSG7F8ff7q2xl6/PUngrjPZdS+DLXCDFBNm/gZmY/jwm4P++r7qD8dzSLZBHiSfhp/lR/fRstao= Received: from hylob.fios-router.home (unknown [96.246.193.231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 44D6086D13; Sun, 21 Jul 2019 15:46:30 -0400 (EDT) (envelope-from kyle@kyleam.com) From: Kyle Meyer To: guix-patches@gnu.org Subject: [PATCH 0/2] git-annex: Don't patch hook shebangs and update version Date: Sun, 21 Jul 2019 15:46:26 -0400 Message-Id: <20190721194626.10944-1-kyle@kyleam.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-Pobox-Relay-ID: 3CF9313E-ABF0-11E9-94A7-B0405B776F7B-24757444!pb-smtp20.pobox.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 173.228.157.52 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Timothy Sample , Kyle Meyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) The git-annex definition patches the snippet that git-annex uses as the shebang when creating its Git hooks. As discussed previously [1], this i= s problematic because the hooks refer to a bash that may later be garbage collected. However, a large number of the tests fail if we simply don't patch the sh= ebang because the hooks of course can't find the unpatched "/bin/sh" in the bui= ld environment [2]. The first patch updates the definition to use a "patch, build, test, revert patch, re-build" sequence. It's not pretty, but it certainly seems better than disabling the tests. Please let me know if y= ou have suggestions for a cleaner approach. The second patch updates git-annex to its latest version. [1] https://lists.gnu.org/archive/html/guix-devel/2018-08/msg00142.html [2] https://lists.gnu.org/archive/html/guix-devel/2019-02/msg00012.html Kyle Meyer (2): gnu: git-annex: Don't patch shebang used in hooks. gnu: git-annex: Update to 7.20190708. gnu/packages/haskell-apps.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) --=20 2.22.0