From patchwork Fri Dec 1 09:29:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57168 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 7FF0727BBEC; Fri, 1 Dec 2023 09:32:29 +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 E19AA27BBEA for ; Fri, 1 Dec 2023 09:32:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8zsM-0002LD-94; Fri, 01 Dec 2023 04:31:58 -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 1r8zsI-0002Ja-2k for guix-patches@gnu.org; Fri, 01 Dec 2023 04:31:54 -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 1r8zsH-0007Xf-G0 for guix-patches@gnu.org; Fri, 01 Dec 2023 04:31:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8zsQ-0008Ld-1Z; Fri, 01 Dec 2023 04:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67564] [PATCH 1/3] guix: import: hackage: Fix crash on recursive import References: In-Reply-To: Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 09:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 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-Xcc: Lars-Dominik Braun Received: via spool by 67564-submit@debbugs.gnu.org id=B67564.170142307732007 (code B ref 67564); Fri, 01 Dec 2023 09:32:02 +0000 Received: (at 67564) by debbugs.gnu.org; 1 Dec 2023 09:31:17 +0000 Received: from localhost ([127.0.0.1]:55084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8zrh-0008KB-B1 for submit@debbugs.gnu.org; Fri, 01 Dec 2023 04:31:17 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:56730 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8zrf-0008Jz-Bo for 67564@debbugs.gnu.org; Fri, 01 Dec 2023 04:31:15 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.61]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 320E7340103; Fri, 1 Dec 2023 10:31:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701423067; bh=yEi7TA5KZvgKENmRqaf/k65wMTMrljAOUBUZBSe42Jo=; h=From:To:Cc:Subject:Date; b=GKvW32XEL1dZdhbJvQfxUU1j7EZDPZ46ePJ/e4xGfKl5pUD8YlCxKCLZ8aZ81Hh7P la6zmwx3BJpKgph9HCLYQDKEOLQLpubkzZPI47ittAfh/GPGzDZoRwtMH6Bo2w1Ml3 ljuauPB7CuS3iQXNmqrrtx2nRBhLWnlQGeLqAjQk= Date: Fri, 1 Dec 2023 11:29:46 +0200 Message-ID: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701422983.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 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: , 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 Fixes: https://issues.guix.gnu.org/64734 * guix/import/hackage.scm (hackage-module->sexp): Return package names instead of records. Change-Id: Id428a8b903b4b59d44205ca366324a0a69a4e05b --- guix/import/hackage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: cd46757c1a0f886848fbb6828c028dd2a2532767 diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 9333bedbbd..bbaee73a06 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -335,7 +335,7 @@ (define* (hackage-module->sexp cabal cabal-hash (synopsis ,(cabal-package-synopsis cabal)) (description ,(beautify-description (cabal-package-description cabal))) (license ,(string->license (cabal-package-license cabal)))) - inputs))) + (map upstream-input-name inputs)))) (define* (hackage->guix-package package-name #:key (include-test-dependencies? #t) From patchwork Fri Dec 1 09:29:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57170 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 7D6EE27BBE9; Fri, 1 Dec 2023 09:32:43 +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=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 5AFAB27BBE2 for ; Fri, 1 Dec 2023 09:32:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8zsP-0002Qa-Qx; Fri, 01 Dec 2023 04:32:01 -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 1r8zsJ-0002Ju-32 for guix-patches@gnu.org; Fri, 01 Dec 2023 04:31: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 1r8zsI-0007Yy-FH for guix-patches@gnu.org; Fri, 01 Dec 2023 04:31:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8zsQ-0008Ll-HM; Fri, 01 Dec 2023 04:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67564] [PATCH 2/3] guix: import: stackage: Fix crash on recursive import Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 09:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 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-Xcc: Lars-Dominik Braun Received: via spool by 67564-submit@debbugs.gnu.org id=B67564.170142308232028 (code B ref 67564); Fri, 01 Dec 2023 09:32:02 +0000 Received: (at 67564) by debbugs.gnu.org; 1 Dec 2023 09:31:22 +0000 Received: from localhost ([127.0.0.1]:55087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8zrl-0008KW-Lq for submit@debbugs.gnu.org; Fri, 01 Dec 2023 04:31:21 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:56744 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8zrj-0008KO-OU for 67564@debbugs.gnu.org; Fri, 01 Dec 2023 04:31:20 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.61]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 90C2D340103; Fri, 1 Dec 2023 10:31:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701423071; bh=Fz49Q5sHHdurKSL1aoQia0H1mbbCEvGjhlHcwnSq4kE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=n5iPokfv7JH+alXT6aIcJybUhtmabqo8bf//jEl9cIU9Cdl3JAqibeaLxA5EUxMF7 aJxyUwRHRMneJ3+WAQd9Iu1/9fpdiFaXmTdkrFOVSUc6lc9gHxwejNKn9j4hCbxn45 Ew4VDaMEdE5N2uuL48CaYrnmC0ovAIl6fmR6m9T8= Date: Fri, 1 Dec 2023 11:29:47 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701422983.git.saku@laesvuori.fi> References: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701422983.git.saku@laesvuori.fi> 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: , 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 * guix/import/stackage.scm (lts-package-version): Call stackage-package-version only when the package is found. Change-Id: Ic8d7c1b7a42a9c1a6cbba567e148706507a53ee3 --- guix/import/stackage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index 00814c7d46..f801835b33 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -92,7 +92,7 @@ (define (lts-package-version packages name) "Return the version of the package with upstream NAME included in PACKAGES." (let ((pkg (find (lambda (pkg) (string=? (stackage-package-name pkg) name)) packages))) - (stackage-package-version pkg))) + (and=> pkg stackage-package-version))) ;;; From patchwork Fri Dec 1 09:29:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57169 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 66EBC27BBE2; Fri, 1 Dec 2023 09:32:31 +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=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 BA37C27BBE9 for ; Fri, 1 Dec 2023 09:32:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8zsN-0002M1-1o; Fri, 01 Dec 2023 04:31:59 -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 1r8zsJ-0002Jt-3K for guix-patches@gnu.org; Fri, 01 Dec 2023 04:31: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 1r8zsI-0007Yl-ES for guix-patches@gnu.org; Fri, 01 Dec 2023 04:31:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8zsR-0008Ls-0K; Fri, 01 Dec 2023 04:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67564] [PATCH 3/3] guix: import: Parse cabal layout blocks correctly Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 09:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 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-Xcc: Lars-Dominik Braun Received: via spool by 67564-submit@debbugs.gnu.org id=B67564.170142308632046 (code B ref 67564); Fri, 01 Dec 2023 09:32:02 +0000 Received: (at 67564) by debbugs.gnu.org; 1 Dec 2023 09:31:26 +0000 Received: from localhost ([127.0.0.1]:55090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8zrp-0008Kn-Vo for submit@debbugs.gnu.org; Fri, 01 Dec 2023 04:31:26 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:45130 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8zro-0008Kf-Bl for 67564@debbugs.gnu.org; Fri, 01 Dec 2023 04:31:24 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.61]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 38BAA340103; Fri, 1 Dec 2023 10:31:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701423076; bh=3hcxiB02MU/TpYxdH8n+9sIJfpDv6n3meccA95np8RA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=T2QsP9pMoI5B2G67bBoY20iIyKJJRrMjqGfJ5eEVUsoZgLNwdc8SD0wyNpsB9wOhz KrX+dr2ebq+Jhxrb7pRpJYO7A8SITwNOvXqKmvdPyNkcCECqgpzimkKZwaFahSZQtA KVAGP1DQn4T2F4ygcAeDuoJBYFpOyJhBdXLXCqhw= Date: Fri, 1 Dec 2023 11:29:48 +0200 Message-ID: <541836669e170dcef15c5e73a5413592d3fbcc25.1701422983.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 In-Reply-To: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701422983.git.saku@laesvuori.fi> References: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701422983.git.saku@laesvuori.fi> 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: , 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 Cabal consideres lines to be part of a layout block if they are indented at least one space more than the field line the block belongs to. Previously Guix considered lines to be a part of the block if they were indented at least as much as the first line in it. This also makes a workaround that enabled if statements to have multiple elses redundant and removes it. Fixes: https://issues.guix.gnu.org/35743 * guix/import/cabal.scm (current-indentation*): Renamed from current-indentation. (previous-indentation, current-indentation): New variables. (make-cabal-parser): Remove outdated comment. [open]: Use previous-indentation + 1 instead of current-indentation. [elif-else]: Split to elif and else to allow only one ELSE in an if statement. (read-cabal)[parameterize]: Use current-indentation* and previous-indentation. Change-Id: I3a1495b1588a022fabbfe8dad9f3231e578af4f3 --- Fixed packages include conduit and warp, for example. guix/import/cabal.scm | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/guix/import/cabal.scm b/guix/import/cabal.scm index fe03c30254..b969197455 100644 --- a/guix/import/cabal.scm +++ b/guix/import/cabal.scm @@ -130,8 +130,17 @@ (define (context-stack-pop!) ((context-stack) 'pop!)) (define (context-stack-clear!) ((context-stack) 'clear!)) -;; Indentation of the line being parsed. -(define current-indentation (make-parameter 0)) +;; Indentation of the line being parsed and that of the previous line. +(define current-indentation* (make-parameter 0)) + +(define previous-indentation (make-parameter 0)) + +(define* (current-indentation #:optional value) + (if value + (begin + (previous-indentation (current-indentation*)) + (current-indentation* value)) + (current-indentation*))) ;; Signal to reprocess the beginning of line, in case we need to close more ;; than one indentation level. @@ -196,27 +205,13 @@ (define (make-cabal-parser) (exprs elif-else) : (append $1 (list ($2 '(())))) (elif-else) : (list ($1 '(())))) ;; LALR(1) parsers prefer to be left-recursive, which make if-statements slightly involved. - ;; XXX: This technically allows multiple else statements. - (elif-else (elif-else ELIF tests OCURLY exprs CCURLY) : (lambda (y) ($1 (list (append (list 'if $3 $5) y)))) - (elif-else ELIF tests open exprs close) : (lambda (y) ($1 (list (append (list 'if $3 $5) y)))) - (elif-else ELSE OCURLY exprs CCURLY) : (lambda (y) ($1 (list $4))) - ;; The 'open' token after 'tests' is shifted after an 'exprs' - ;; is found. This is because, instead of 'exprs' a 'OCURLY' - ;; token is a valid alternative. For this reason, 'open' - ;; pushes a with a line indentation equal to - ;; the indentation of 'exprs'. - ;; - ;; Differently from this, without the rule above this - ;; comment, when an 'ELSE' token is found, the 'open' token - ;; following the 'ELSE' would be shifted immediately, before - ;; the 'exprs' is found (because there are no other valid - ;; tokens). The 'open' would therefore create a - ;; with the indentation of 'ELSE' and not - ;; 'exprs', creating an inconsistency. We therefore allow - ;; mixed style conditionals. - (elif-else ELSE open exprs close) : (lambda (y) ($1 (list $4))) + (elif (elif ELIF tests OCURLY exprs CCURLY) : (lambda (y) ($1 (list (append (list 'if $3 $5) y)))) + (elif ELIF tests open exprs close) : (lambda (y) ($1 (list (append (list 'if $3 $5) y)))) ;; Terminating rule. (if-then) : (lambda (y) (append $1 y))) + (elif-else (elif ELSE OCURLY exprs CCURLY) : (lambda (y) ($1 (list $4))) + (elif ELSE open exprs close) : (lambda (y) ($1 (list $4))) + (elif) : $1) (if-then (IF tests OCURLY exprs CCURLY) : (list 'if $2 $4) (IF tests open exprs close) : (list 'if $2 $4)) (tests (TEST OPAREN ID CPAREN) : `(,$1 ,$3) @@ -237,7 +232,7 @@ (define (make-cabal-parser) (OPAREN tests CPAREN) : $2) (open () : (context-stack-push! (make-parse-context (context layout) - (current-indentation)))) + (+ 1 (previous-indentation))))) (close (VCCURLY)))) (define (peek-next-line-indent port) @@ -655,7 +650,8 @@ (define* (read-cabal #:optional (port (current-input-port)) (let ((cabal-parser (make-cabal-parser))) (parameterize ((cabal-file-name (or file-name (port-filename port) "standard input")) - (current-indentation 0) + (current-indentation* 0) + (previous-indentation 0) (check-bol? #f) (context-stack (make-stack))) (cabal-parser (make-lexer port) (errorp)))))