From patchwork Fri Dec 1 09:24:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 2018 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 C404C27BBEA; Fri, 1 Dec 2023 09:27:12 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 A7DF727BBE2 for ; Fri, 1 Dec 2023 09:27:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8znU-0001Ns-7S; Fri, 01 Dec 2023 04:26:56 -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 1r8znT-0001NW-8r for guix-patches@gnu.org; Fri, 01 Dec 2023 04:26:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r8znT-0004fm-06 for guix-patches@gnu.org; Fri, 01 Dec 2023 04:26:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8zna-0008CI-Lj; Fri, 01 Dec 2023 04:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67564] [PATCH 0/3] Fixes for haskell importers Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 09:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67564 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67564@debbugs.gnu.org Cc: Saku Laesvuori , Lars-Dominik Braun X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Lars-Dominik Braun Received: via spool by submit@debbugs.gnu.org id=B.170142276531444 (code B ref -1); Fri, 01 Dec 2023 09:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Dec 2023 09:26:05 +0000 Received: from localhost ([127.0.0.1]:55071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8zmf-0008B5-6n for submit@debbugs.gnu.org; Fri, 01 Dec 2023 04:26:05 -0500 Received: from lists.gnu.org ([2001:470:142::17]:54076) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8zmc-0008Aa-NA for submit@debbugs.gnu.org; Fri, 01 Dec 2023 04:26:03 -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 1r8zmN-0001Cq-P6 for guix-patches@gnu.org; Fri, 01 Dec 2023 04:25:47 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101] helo=mail.laesvuori.fi) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r8zmK-0003pY-Px for guix-patches@gnu.org; Fri, 01 Dec 2023 04:25:46 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.61]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 98F57340103; Fri, 1 Dec 2023 10:25:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701422741; bh=hPt1C5TCxIRItmcuOYrO0VB3ARjWjnhgmCDrTKwVRN8=; h=From:To:Cc:Subject:Date; b=eVoF9LrZ2a7UZ/AdrLSEiFo7s1YgSiqJ2dLsqXryAeAK3CEuetA1TZDpemkHJWuQC Z0nZAGzFRe900/kPoUpaCziKBcQTvGYaNtctlsP0iQsRd7mBJUI4h29k/JkOKishHo Acdm7NFOY2BfJO9KJaBvfPQuBPAE5BPL+6H5+q68= Date: Fri, 1 Dec 2023 11:24:57 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=75.119.130.101; envelope-from=saku@laesvuori.fi; helo=mail.laesvuori.fi X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori 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 The first two patches fix crashes in the hackage[1] and stackage importers. The third patch improves the cabal file parser so that it can parse a larger subset of valid cabal files[2]. It fixes guix refresh for 7 packages in Guix. [1]: https://issues.guix.gnu.org/64734 [2]: https://issues.guix.gnu.org/35743 Saku Laesvuori (3): guix: import: hackage: Fix crash on recursive import guix: import: stackage: Fix crash on recursive import guix: import: Parse cabal layout blocks correctly guix/import/cabal.scm | 42 ++++++++++++++++++---------------------- guix/import/hackage.scm | 2 +- guix/import/stackage.scm | 2 +- 3 files changed, 21 insertions(+), 25 deletions(-) base-commit: cd46757c1a0f886848fbb6828c028dd2a2532767