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 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 21 15:51:17 2019 Received: (at 36752) by debbugs.gnu.org; 21 Jul 2019 19:51:17 +0000 Received: from localhost ([127.0.0.1]:59542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hpHrV-0001QY-Ei for submit@debbugs.gnu.org; Sun, 21 Jul 2019 15:51:17 -0400 Received: from pb-smtp20.pobox.com ([173.228.157.52]:50609) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hpHrU-0001QP-2P for 36752@debbugs.gnu.org; Sun, 21 Jul 2019 15:51:12 -0400 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 6A26A86DC3; Sun, 21 Jul 2019 15:51:11 -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:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=sasl; bh=mFKGaBvMELdk yLrIXGGo6YzrqqU=; b=hzrD+0q481F4oQAAwIdBTb2WOkt0linU1iQYw3il9ViC ayU4UP1aZkVoM2r8zDmdXTVAmWJciKlIuIpaKUaKynuRWYZgjPVWgb1BgM8luZS0 xTzn+oRRy35RYox/ZLfzyj+taeXnVyCwaVzQe+kaAtJr73dIO05PKFLWEP3txOE= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 62F5286DC2; Sun, 21 Jul 2019 15:51:11 -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:in-reply-to:references:mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=hc9TCmCdzZIh4zPH5iZp6kpIpENpi+oTPmxpfv6YZPE=; b=kEz+HNYApr3qkjZZwyuAY3RSCY4hl8opHL2NjuFld98PtDXzi5jmJhXv4ggL0LthPQ1VNvK3cIDcDqRrRgs8kp1K4UD9lIbTEJe/5YEF1uW6EiBNL6OTa8G1mnUuJBtMpQy+LeDh/eVGGO/ZuPG5nN5qvOlpR+wOWgfQvynoANc= 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 4D6EC86DC1; Sun, 21 Jul 2019 15:51:07 -0400 (EDT) (envelope-from kyle@kyleam.com) From: Kyle Meyer To: 36752@debbugs.gnu.org Subject: [PATCH 1/2] gnu: git-annex: Don't patch shebang used in hooks. Date: Sun, 21 Jul 2019 15:50:57 -0400 Message-Id: <20190721195058.11263-1-kyle@kyleam.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190721194626.10944-1-kyle@kyleam.com> References: <20190721194626.10944-1-kyle@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Pobox-Relay-ID: E181CE5A-ABF0-11E9-842C-B0405B776F7B-24757444!pb-smtp20.pobox.com Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 36752 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: -1.7 (-) git-annex relies on configuring Git's pre-commit and post-receive hooks. Avoid patching the shebang that git-annex embeds when generating these ho= oks so that the hooks don't fail if garbage collection claims the bash that w= as current when the annex repository was initialized. * gnu/packages/haskell-apps.scm (git-annex):[arguments]: Patch hook sheba= ngs only temporarily for tests. --- gnu/packages/haskell-apps.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.sc= m index d675863090..15a6686ed6 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -6,6 +6,7 @@ ;;; Copyright =C2=A9 2018 Arun Isaac ;;; Copyright =C2=A9 2016, 2017 Leo Famulari ;;; Copyright =C2=A9 2015 Paul van der Walt +;;; Copyright =C2=A9 2019 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -158,8 +159,13 @@ (define-public git-annex '("--flags=3D-Android -Assistant -Pairing -S3 -Webapp -WebDAV") #:phases (modify-phases %standard-phases - (add-before 'configure 'patch-shell + (add-before 'configure 'patch-shell-for-tests (lambda _ + ;; Shell.hs defines "/bin/sh" that is used in Git hooks. W= e + ;; shouldn't patch hooks with Guix's current bash because t= he + ;; hooks can exist after that bash is garbage collected, bu= t + ;; let's temporarily patch it so that we can run the tests. + (copy-file "Utility/Shell.hs" "/tmp/Shell.hs") (substitute* "Utility/Shell.hs" (("/bin/sh") (which "sh"))) #t)) @@ -193,6 +199,11 @@ (define-public git-annex (symlink "git-annex" "git-annex-shell")) (invoke "git-annex" "test") #t)) + (add-after 'check 'unpatch-shell-and-rebuild + (lambda args + ;; Undo `patch-shell-for-tests'. + (copy-file "/tmp/Shell.hs" "Utility/Shell.hs") + (apply (assoc-ref %standard-phases 'build) args))) (add-after 'install 'install-symlinks (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) --=20 2.22.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 21 15:51:20 2019 Received: (at 36752) by debbugs.gnu.org; 21 Jul 2019 19:51:20 +0000 Received: from localhost ([127.0.0.1]:59545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hpHrc-0001Qw-8J for submit@debbugs.gnu.org; Sun, 21 Jul 2019 15:51:20 -0400 Received: from pb-smtp20.pobox.com ([173.228.157.52]:54169) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hpHra-0001Ql-06 for 36752@debbugs.gnu.org; Sun, 21 Jul 2019 15:51:18 -0400 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 8EFE286DC6; Sun, 21 Jul 2019 15:51:17 -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:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=DY3RLgaA00NIsPLR2jnFYzXEy 98=; b=FJ4HiT5j8if+GfTvojUBq37QyZWRYKo02I5cSei2zpuuskUAqRJYt8KSx qvkZTRVl5dlQjUaEWZZEbzFMWHbs5F9xtahG1AYz4VVW/i58EMavv48o9VfvXhHN cGGQcUh7lqH2GaX35CYJCPrftiqfuKKxLXaui3buHhO9wVPTg0= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 87AA086DC5; Sun, 21 Jul 2019 15:51:17 -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:in-reply-to:references:mime-version:content-transfer-encoding; s=mesmtp; bh=kPPnxCmy69qi5DttPCySMoxl1U9nFyFXQeDzIFlEjpk=; b=jk54AFOvXPqkBIlEH6qQurgJhIVtY4sYv3NqCJcUuc79V6E7DUKTo5DD9LYJP7/rELrppfhTd19kIWGCpoYgJqUz1m2trEd8WxTnzjiY1mW80t620iRLSEJLEKsRgel9V+Xr60dIUFvmgPMbP+WLVt1tp0Qq7jtfL/hUZTx14BI= 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 965A886DC4; Sun, 21 Jul 2019 15:51:12 -0400 (EDT) (envelope-from kyle@kyleam.com) From: Kyle Meyer To: 36752@debbugs.gnu.org Subject: [PATCH 2/2] gnu: git-annex: Update to 7.20190708. Date: Sun, 21 Jul 2019 15:50:58 -0400 Message-Id: <20190721195058.11263-2-kyle@kyleam.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190721195058.11263-1-kyle@kyleam.com> References: <20190721194626.10944-1-kyle@kyleam.com> <20190721195058.11263-1-kyle@kyleam.com> MIME-Version: 1.0 X-Pobox-Relay-ID: E5430220-ABF0-11E9-B8D3-B0405B776F7B-24757444!pb-smtp20.pobox.com Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 36752 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: -1.7 (-) * gnu/packages/haskell-apps.scm (git-annex): Update to 7.20190708. [inputs]: Add new dependency, ghc-concurrent-output. --- gnu/packages/haskell-apps.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.sc= m index 15a6686ed6..fa0111796d 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -144,7 +144,7 @@ (define-public darcs (define-public git-annex (package (name "git-annex") - (version "6.20180926") + (version "7.20190708") (source (origin (method url-fetch) @@ -152,7 +152,7 @@ (define-public git-annex "git-annex/git-annex-" version ".tar.gz")) (sha256 (base32 - "1251rj8h63y30sfqk0zh670yhz14p256y59n3590pg015pf3575d")))) + "18s563swrp8mx479995pdhhmn40y3xwlbm1z3w63qsnjqmj7zlij")))) (build-system haskell-build-system) (arguments `(#:configure-flags @@ -220,6 +220,7 @@ (define-public git-annex ("ghc-bloomfilter" ,ghc-bloomfilter) ("ghc-byteable" ,ghc-byteable) ("ghc-case-insensitive" ,ghc-case-insensitive) + ("ghc-concurrent-output" ,ghc-concurrent-output) ("ghc-crypto-api" ,ghc-crypto-api) ("ghc-cryptonite" ,ghc-cryptonite) ("ghc-data-default" ,ghc-data-default) --=20 2.22.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 22 22:47:24 2019 Received: (at 36752) by debbugs.gnu.org; 23 Jul 2019 02:47:24 +0000 Received: from localhost ([127.0.0.1]:33829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hpkpo-0002xl-Aj for submit@debbugs.gnu.org; Mon, 22 Jul 2019 22:47:24 -0400 Received: from pb-smtp2.pobox.com ([64.147.108.71]:52102) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hpkpk-0002xa-Pk for 36752@debbugs.gnu.org; Mon, 22 Jul 2019 22:47:22 -0400 Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 8CF39169DFF; Mon, 22 Jul 2019 22:47:19 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type; s=sasl; bh=iL9egY5TPJmnLr58FIpyl0Z7sfs=; b=pgr/WV cykTT6vHezjnHNXYK5jmZPS0+M1DRrOQjrOQrykAXMbSsutOP68gwrKxmOhAF0rp I5I0/U/b4hNWr2qldQ/ZDZuOYhMRdMMlfSYvxCuMnzA7/UGT1pY5utWq4zYjihHl JDE6Ze+c4cowl7AJS9+7WkkqTHiCxiJzKvmOE= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 84D22169DFE; Mon, 22 Jul 2019 22:47:19 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:in-reply-to:references:date:message-id:mime-version:content-type; s=mesmtp; bh=KKbkTyPndzSC43eLitkMzfyxsOo6pgeVL6NV+yP87Kg=; b=Ui2UnPAKJqqtJUDGI1IEMfipzvUL3+SIQd13OeZwklFmmPeaR+ShMAvkpTQlDREPsvztO0FnzbHRSOMDfPoswIVmYODh3dnLMFb+FsccgmHk7kn3JsfeCXptz6dP4MqQbGWpxDsM05gjgz4L3G1eyBlCwlUXCX333LQy+kNCaIg= Received: from localhost (unknown [71.233.97.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id EF13D169DFD; Mon, 22 Jul 2019 22:47:18 -0400 (EDT) From: Kyle Meyer To: 36752@debbugs.gnu.org Subject: Re: [PATCH 1/2] gnu: git-annex: Don't patch shebang used in hooks. In-Reply-To: <20190721195058.11263-1-kyle@kyleam.com> References: <20190721194626.10944-1-kyle@kyleam.com> <20190721195058.11263-1-kyle@kyleam.com> Date: Mon, 22 Jul 2019 22:47:18 -0400 Message-ID: <878sspwjpl.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 3011253A-ACF4-11E9-BD0C-72EEE64BB12D-24757444!pb-smtp2.pobox.com X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 36752 Cc: Timothy Sample 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: -1.7 (-) Kyle Meyer writes: > * gnu/packages/haskell-apps.scm (git-annex):[arguments]: Patch hook shebangs > only temporarily for tests. Oops, a stray ":" slipped in there. If a reroll doesn't end up being needed for other reasons, I'd appreciate if that could be touched up when applying. From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 08 14:22:15 2019 Received: (at 36752-done) by debbugs.gnu.org; 8 Aug 2019 18:22:15 +0000 Received: from localhost ([127.0.0.1]:41696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hvn3G-0000kw-Lw for submit@debbugs.gnu.org; Thu, 08 Aug 2019 14:22:15 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:45221) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hvn3D-0000kc-PE for 36752-done@debbugs.gnu.org; Thu, 08 Aug 2019 14:22:13 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id ADD1120D12; Thu, 8 Aug 2019 14:22:06 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 08 Aug 2019 14:22:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm3; bh=k/vCSm11urwo7lckWfj+y5V498 30zZ1Q+Kmhy5lNf/c=; b=Ztwcx7XOZ6bWAOhoSBEQdhHw0E3x+VbLFoIHbdOrK1 0UuauKfA6oPhDyJEdSFbTPgiOzt+i91lx6zBUlEoLINE/IOpaQGXL0JtAwXTJdsO qJn5o8mF33kSYDhOcXIPuyjWkO+R9tLm1LzOZQJuSt7zdDnhdAgbNRXFUH1HFGXY UGpLHWcDrBGwatctFgw+EwN0alMhBoQ/EKNEnbGkOvV6yRtiEsT4KF0zKPQp6rwA Otih3WvI8H00B/kDuhJbTwGq/Zy/CLc//plCLtgWOq5kqp9AfjGQ0fRuoXsDmS+G /MQWl/gAwRIq2038Z2AoEG+QE80ukAQxEOvcyT6Bk7Gg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=k/vCSm 11urwo7lckWfj+y5V49830zZ1Q+Kmhy5lNf/c=; b=CiVWpZt1q44tHKfZNIzC35 UY/jK0f2q9vJIUP31DHbaidDeu2RhphVM4/JS0Iv0zq/FPhtLm0ukyCLFe+fDhLp /ZHxCYQZUe0tMZSOGcZY5hI2ZZuIXBKbRRh0t9d9PcvfVL/4qeYLWIMuzyKTOfRU yHXg7l6Ad62B8JOWgbXrj98dsHsogtS2mq1E9y6VH6SBZ7XIGUPBzdpAXgDBShpZ x1ztssRk2zAU2w/N372l3FynPT8qfwbpWxnGs/pF071uUilsqBouapa9UwwLMBXW tSf6nY12yW1MJ/nFTbt4rMAPj2ykc96tUvgRcyORr7O/RHwUACelPbp3jbfv5E9A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrudduhedguddvgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffujghffgffkfggtgesghdtreertdertdenucfhrhhomhepofgrrhhi uhhsuceurghkkhgvuceomhgsrghkkhgvsehfrghsthhmrghilhdrtghomheqnecuffhomh grihhnpehgnhhurdhorhhgnecukfhppeeivddrudeirddvvdeirddugedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmnecuvehluh hsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 13D068005C; Thu, 8 Aug 2019 14:22:05 -0400 (EDT) From: Marius Bakke To: Kyle Meyer , 36752-done@debbugs.gnu.org Subject: Re: [bug#36752] [PATCH 0/2] git-annex: Don't patch hook shebangs and update version In-Reply-To: <20190721194626.10944-1-kyle@kyleam.com> References: <20190721194626.10944-1-kyle@kyleam.com> User-Agent: Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu) Date: Thu, 08 Aug 2019 20:22:04 +0200 Message-ID: <87blwzikkz.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 36752-done 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: -1.7 (-) --=-=-= Content-Type: text/plain Kyle Meyer writes: > The git-annex definition patches the snippet that git-annex uses as the > shebang when creating its Git hooks. As discussed previously [1], this is > 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 shebang > because the hooks of course can't find the unpatched "/bin/sh" in the build > 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 you > 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. Thank you for fixing the shebang bug, and for updating the package. Applied both, thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl1MaEwACgkQoqBt8qM6 VPr0KQf+L+gAzsBayY57FKbIG/1DZ/LG0LbBm0HR0m84OGA3WV//G3alp8NzvGPW hZpb+wwUE6Kd61zzJD3Jp+92GYuAMBi6mkXiDYjDxt/ApH8rK8hIol3ONEeBF/Tl SIajvk5OQkjDlGZE3DV0gTR/3tZXLupB4pA3fMxbZhLQl97VeHb1jAviS6QsXrBI mv25PEvpt8O61FfFZfDV41hTkCbf71esYjgZJNK2y44u0MEIzQZ+5qJxKvIjVKoj ev4WuOggs+1A1PyB1lDoOSTglAAq81y1AWqX8/YbXzTLy5iKmYQ3M75CQDOMYMfy EOfOnsf+VFKVZCfD66j7ANQgIJqLeg== =MZuy -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 20 07:28:35 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 06 Sep 2019 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator