From patchwork Fri Jun 25 12:27:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 30706 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 9246427BC81; Fri, 25 Jun 2021 13:28:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,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 588AC27BC78 for ; Fri, 25 Jun 2021 13:28:35 +0100 (BST) Received: from localhost ([::1]:44106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwkwj-0000h2-M8 for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 08:28:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwkwR-0000a8-9z for guix-patches@gnu.org; Fri, 25 Jun 2021 08:28:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwkwR-0004Dn-2G for guix-patches@gnu.org; Fri, 25 Jun 2021 08:28:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwkwR-0000SV-0T for guix-patches@gnu.org; Fri, 25 Jun 2021 08:28:15 -0400 Subject: bug#48943: [PATCH] import: hackage: Support "common" field and imports Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 12:28:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 48943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Philip Munksgaard Cc: 48943-done@debbugs.gnu.org Mail-Followup-To: 48943@debbugs.gnu.org, ludo@gnu.org, philip@munksgaard.me Received: via spool by 48943-done@debbugs.gnu.org id=D48943.16246240761702 (code D ref 48943); Fri, 25 Jun 2021 12:28:14 +0000 Received: (at 48943-done) by debbugs.gnu.org; 25 Jun 2021 12:27:56 +0000 Received: from localhost ([127.0.0.1]:45063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwkvx-0000RC-AN for submit@debbugs.gnu.org; Fri, 25 Jun 2021 08:27:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwkvv-0000Qy-8V for 48943-done@debbugs.gnu.org; Fri, 25 Jun 2021 08:27:43 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44586) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwkvp-0003u5-RE; Fri, 25 Jun 2021 08:27:37 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=42468 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwkvp-0000y8-Is; Fri, 25 Jun 2021 08:27:37 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20210610083953.664318-1-philip@munksgaard.me> <20210618124813.844948-1-philip@munksgaard.me> Date: Fri, 25 Jun 2021 14:27:35 +0200 In-Reply-To: <20210618124813.844948-1-philip@munksgaard.me> (Philip Munksgaard's message of "Fri, 18 Jun 2021 14:48:13 +0200") Message-ID: <87y2ay2kp4.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) 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" X-getmail-retrieved-from-mailbox: Patches Hi, Philip Munksgaard skribis: > Fixes . > > * guix/import/cabal.scm (make-cabal-parser): Modify. > (is-common): New variable. > (lex-common): New procedure. > (is-id): Modify. > (eval-cabal): Modify. > * tests/hackage.scm ("hackage->guix-package test cabal import") New test. Applied with the change below (‘cut’ is for procedures but ‘match’ is a macro). Thanks! Ludo’. diff --git a/guix/import/cabal.scm b/guix/import/cabal.scm index 22b5d164d0..e9a0179b3d 100644 --- a/guix/import/cabal.scm +++ b/guix/import/cabal.scm @@ -809,10 +809,10 @@ the ordering operation and the version." (if (eq? value 'false) #f #t))) (define common-stanzas - (filter-map (cut match <> - (('section 'common common-name common) - (cons common-name common)) - (_ #f)) + (filter-map (match-lambda + (('section 'common common-name common) + (cons common-name common)) + (_ #f)) cabal-sexp)) (define (eval sexp)