From patchwork Sat Feb 11 10:07:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46817 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 16B311661E; Sat, 11 Feb 2023 10:10:11 +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 8601816615 for ; Sat, 11 Feb 2023 10:10:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004sj-4C; Sat, 11 Feb 2023 05:09:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQmoY-0004nF-T8 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQmoY-00008c-Kg for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoY-0004Br-HF for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 01/31] import: hackage: Allow version at the beginning of cabal file. References: In-Reply-To: Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61420@debbugs.gnu.org Cc: Lars-Dominik Braun Received: via spool by 61420-submit@debbugs.gnu.org id=B61420.167611012715851 (code B ref 61420); Sat, 11 Feb 2023 10:09:02 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:47 +0000 Received: from localhost ([127.0.0.1]:38824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoH-000472-V0 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:47 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:57618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoG-00046J-2M for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:45 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PDRBq1lH7z9sTS; Sat, 11 Feb 2023 11:08:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=I6qko26I/iq5k8U8aBIo08sEGGTpyiqbw833ZyXWY+E=; b=FhdHdYCJT0ZbiGGO4Y6yH26UyRsD9qX9IvXgBBffsjDV/TV4X04bA0clYfDe1+2UFqU3cE 96ocgz0hUely/6TUdjhQS/N2JG46A/v3XYLNM33sk0ebCVvuxXFvwY4BFhS1Gf/oULMSmR UqEFruVnF5evbS0+sSUTIceTzK7DLEsNCSlCDL8Bj6ZH6yljpOrTE7oy2jQMwKRzv0W3Uw hzH+ciXAZIy8PjMZB5WzGFeqZsXZrAQTQ5ZsZCkoDLvyftWCIkmVAL7wkyxHoSNws4jX/j IkJO5aY6duesO3aeDy0qtgJzS+pkjHxd2wqx8CqnkCOuMBIzddwZqdtIMyaLEg== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:07:58 +0100 Message-Id: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Fix a corner case, uncovered by the hedgehog package, which has the version field at the beginning of its cabal file. This causes a pattern match failure. * guix/import/hackage.scm (latest-release): Match version at beginning of expression too. --- guix/import/hackage.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 7bc2908405..e915aac58d 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -378,7 +378,10 @@ (define* (latest-release package #:key (version #f)) "warning: failed to parse ~a~%" (hackage-cabal-url hackage-name)) #f) - ((_ *** ("version" (version))) + ;; Cabal files have no particular order and while usually the version + ;; as somewhere in the middle it can also be at the beginning, + ;; requiring two pattern. + ((or (_ *** ("version" (version))) (("version" (version)) _ ...)) (let ((url (hackage-uri hackage-name version))) (upstream-source (package (package-name package))