From patchwork Wed Nov 24 01:15:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 34780 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 383DE27BBEA; Wed, 24 Nov 2021 01:16:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EDEB027BBE9 for ; Wed, 24 Nov 2021 01:16:22 +0000 (GMT) Received: from localhost ([::1]:45624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpgta-0004wU-6g for patchwork@mira.cbaines.net; Tue, 23 Nov 2021 20:16:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpgtH-0004wJ-Bl for guix-patches@gnu.org; Tue, 23 Nov 2021 20:16:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpgtG-0000Ee-RO for guix-patches@gnu.org; Tue, 23 Nov 2021 20:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpgtG-0004P2-Mu for guix-patches@gnu.org; Tue, 23 Nov 2021 20:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52070] [PATCH] gnu: git-annex: Update to 8.20211123. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Nov 2021 01:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52070 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52070@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163771654116885 (code B ref -1); Wed, 24 Nov 2021 01:16:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Nov 2021 01:15:41 +0000 Received: from localhost ([127.0.0.1]:52551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpgsu-0004OH-Nk for submit@debbugs.gnu.org; Tue, 23 Nov 2021 20:15:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:47280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpgss-0004O8-0i for submit@debbugs.gnu.org; Tue, 23 Nov 2021 20:15:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpgsr-0004ud-TZ for guix-patches@gnu.org; Tue, 23 Nov 2021 20:15:37 -0500 Received: from out0.migadu.com ([94.23.1.103]:35468) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpgsp-0000B3-85 for guix-patches@gnu.org; Tue, 23 Nov 2021 20:15:37 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1637716529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=P34DT5j5jXR7Iz4EHf8kwO3txINNqOyMh8dk1K4YPcI=; b=yzp/nQttAaUn6raAeckqM+/AgkxjxJDKhRDYAFaNDd4UCeCu49wdKFweiesPEssbWp6bxn vDvEoVNqJ8a/4S+lpHDo5ZfduIZFZjRlnlD0v92qOhpWB6pPbxGEKsPzLuazf7iMgm5Cor U7doT7PF8k/STrP+3kGhlsPZOowkms/k8eDm2LuR7g7hSv0yaacWCbTS8AtEwCY0yAIqoj VzguD1cdlRvoBnsA9mSzTWxZW1rSYuEFeU8qYpnh3VGyn/0vE4k/6UabVhldIjC+3i7LB4 NlCYfZsYFl4sL8t1AvnNcuEo4JP+Ifxpx0Gyv38gjJpXtZxzaT2sINo5wsV2tA== From: Kyle Meyer Date: Tue, 23 Nov 2021 20:15:20 -0500 Message-Id: <20211124011520.1427156-1-kyle@kyleam.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: kyle@kyleam.com Received-SPF: pass client-ip=94.23.1.103; envelope-from=kyle@kyleam.com; helo=out0.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20211123. --- Note: git-annex's build started to fail [*] when Guix's Git was updated to 2.34.0 due to incompatibilities with the Git's new default merge strategy. This release resolves that issue. [*] example: https://ci.guix.gnu.org/build/1651455/log/raw gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: d48b404cf577cbfcd29b294e193a4db0c3e580b1 diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 5dcf6c1cb2..2a07aa547d 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -316,14 +316,14 @@ (define-public ghcid (define-public git-annex (package (name "git-annex") - (version "8.20211028") + (version "8.20211123") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "0bff1bchp60hbslb9yaagvd7hym26w0c3gkkssm7sildwqazwpng")))) + (base32 "0i9dhh601axv0b1i56yzn6jnfp160z530fp9pd557kpq4nbvg5kl")))) (build-system haskell-build-system) (arguments `(#:configure-flags