From patchwork Fri Nov 20 02:45:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 25196 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EBEB927BBF6; Fri, 20 Nov 2020 02:47:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AEE0C27BBF5 for ; Fri, 20 Nov 2020 02:47:24 +0000 (GMT) Received: from localhost ([::1]:55408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfwSJ-0007hn-Qr for patchwork@mira.cbaines.net; Thu, 19 Nov 2020 21:47:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfwS3-0007ft-Cg for guix-patches@gnu.org; Thu, 19 Nov 2020 21:47:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58214) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kfwRy-0000fM-1T for guix-patches@gnu.org; Thu, 19 Nov 2020 21:47:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kfwRx-00021f-WC for guix-patches@gnu.org; Thu, 19 Nov 2020 21:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44752] [PATCH 4/4] gnu: git-annex: Update to 8.20201116. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Nov 2020 02:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44752 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44752@debbugs.gnu.org Received: via spool by 44752-submit@debbugs.gnu.org id=B44752.16058403667720 (code B ref 44752); Fri, 20 Nov 2020 02:47:01 +0000 Received: (at 44752) by debbugs.gnu.org; 20 Nov 2020 02:46:06 +0000 Received: from localhost ([127.0.0.1]:41526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfwR4-00020R-5c for submit@debbugs.gnu.org; Thu, 19 Nov 2020 21:46:06 -0500 Received: from pb-smtp1.pobox.com ([64.147.108.70]:54692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kfwR3-00020L-DV for 44752@debbugs.gnu.org; Thu, 19 Nov 2020 21:46:05 -0500 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 350208460B; Thu, 19 Nov 2020 21:46:05 -0500 (EST) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=KD8Mr/l5ifmFWPe2+sKz8rjeQ Eg=; b=Rvm6NVjsnBEIvnTubS0u6egNiR7kEj9H+6JkGN+jDRRRSvmE6EpYs7jRh E8hUjKy46D+svJZpmNXIbnLxbg8tdG+iBvXmRD2+jMdYMY/9SaBM8xZNuXQWDY0X RPAyYjUV+x8xpxawYOD8/hBvJyLdRWgvw3iOwXeG3iB/HWoFZs= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 1AE998460A; Thu, 19 Nov 2020 21:46:05 -0500 (EST) (envelope-from kyle@kyleam.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:subject:date:message-id:in-reply-to:references:mime-version:content-transfer-encoding; s=mesmtp; bh=3jHx4elZYq5IUX1dVTUpgEzBFl5gd8hfu4kqbSPO3kA=; b=Hl5/RknWXVDeqsRe8krKoAFtGWatdTyLeoxBSQH3pID4MK6VHIvDzS+MiCSdIKM6gOFw27ncGLeN0QkIqMnkQqLJWanTnDeEhzPGeqRkuv1yhs2hNkAhCRq6I6J2P6DpTHTiBEQnSjwb1TxrCKXHfc50EpBFteEREWgx7RzeIgg= Received: from localhost (unknown [45.33.91.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 64BB184609; Thu, 19 Nov 2020 21:46:04 -0500 (EST) (envelope-from kyle@kyleam.com) From: Kyle Meyer Date: Thu, 19 Nov 2020 21:45:39 -0500 Message-Id: <20201120024539.8539-4-kyle@kyleam.com> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2 In-Reply-To: <20201120024244.8187-1-kyle@kyleam.com> References: <20201120024244.8187-1-kyle@kyleam.com> MIME-Version: 1.0 X-Pobox-Relay-ID: 8862078A-2ADA-11EB-88C5-D152C8D8090B-24757444!pb-smtp1.pobox.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches If ghc-torrent isn't available, git-annex will fall back to custom legacy code. However, this older code path has a build failure in the 8.20201116 release, and in general it'd be better to rely on the preferred, more exercised code path. * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20201116. [inputs]: Add ghc-torrent. --- 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.scm index 1339536954..c6045279c0 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -339,14 +339,14 @@ (define-public ghcid (define-public git-annex (package (name "git-annex") - (version "8.20201103") + (version "8.20201116") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "1z9ikpsz3by48yfw87qav5dy7j4k9ky4a7nqnasl15kdm3lav9pl")))) + (base32 "0xv7n9f6l90l4k964675v0lgs22gcy97ic86mbfb40rl0fk0jalr")))) (build-system haskell-build-system) (arguments `(#:configure-flags @@ -487,6 +487,7 @@ (define-public git-annex ("ghc-split" ,ghc-split) ("ghc-stm-chans" ,ghc-stm-chans) ("ghc-tagsoup" ,ghc-tagsoup) + ("ghc-torrent" ,ghc-torrent) ("ghc-unix-compat" ,ghc-unix-compat) ("ghc-unordered-containers" ,ghc-unordered-containers) ("ghc-utf8-string" ,ghc-utf8-string)