From unknown Sun Jun 22 08:08:58 2025 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= From: Saku Laesvuori Date: Fri, 1 Dec 2023 11:24:57 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) 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 -- 2.41.0 From unknown Sun Jun 22 08:08:58 2025 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= From: Saku Laesvuori 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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(-) 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) base-commit: cd46757c1a0f886848fbb6828c028dd2a2532767 -- 2.41.0 From unknown Sun Jun 22 08:08:58 2025 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= From: Saku Laesvuori 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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))) ;;; -- 2.41.0 From unknown Sun Jun 22 08:08:58 2025 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= From: Saku Laesvuori 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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))))) -- 2.41.0 From unknown Sun Jun 22 08:08:58 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67564] [PATCH 0/3] Fixes for haskell importers Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 15:08: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: Saku Laesvuori Cc: 67564@debbugs.gnu.org Received: via spool by 67564-submit@debbugs.gnu.org id=B67564.170144322823349 (code B ref 67564); Fri, 01 Dec 2023 15:08:02 +0000 Received: (at 67564) by debbugs.gnu.org; 1 Dec 2023 15:07:08 +0000 Received: from localhost ([127.0.0.1]:55943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r956i-00064X-9e for submit@debbugs.gnu.org; Fri, 01 Dec 2023 10:07:08 -0500 Received: from mout-p-103.mailbox.org ([2001:67c:2050:0:465::103]:36244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r956f-000640-6S for 67564@debbugs.gnu.org; Fri, 01 Dec 2023 10:07:06 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4Shbxf6SyWz9sky; Fri, 1 Dec 2023 16:06:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1701443207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=2/uQC2JUv3WkgOjOE6XWify0TICiLNuFMHd+XaBkrNs=; b=T9Ianr+H/uylW4rq7eduiiBxiFHGUuHsYzAvCHDkNuPCUJwDL3OdANMm09X7xttJ1vXsdf q9dmCcdfqgzBnOUvA3EtYum5WbQ05V6XZmHuRorjyhOz6rHZDIeIrhL5KoCG8g59g2kcBN BLENO0qZE9Tx/L2jR6AtUfBbIkv4ABzwtA65omnwz9s9sRkgn5qZBShy1C+PgQGKvBE0UK O4xRTSnRcyJeL+6mJYj+0o4q2yx7qL5fP5gy8h1Gpbyu2PF/c4y8o6JRAavZrlIhaCrijJ QRxv2YfV4C3AAbTEzOQWXM1oUV3xDsBnHM94eJ34w5IRJ1s0c19BUNhhhCKBhg== Date: Fri, 1 Dec 2023 16:06:45 +0100 From: Lars-Dominik Braun Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4Shbxf6SyWz9sky X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, > 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. which seven packages in Guix are affected? Could you also adapt the testcases in tests/hackage.scm and add new ones checking the expected behavior? Thanks, Lars From unknown Sun Jun 22 08:08:58 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67564] [PATCH v2 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: Sat, 02 Dec 2023 17:24:01 +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.170153781530785 (code B ref 67564); Sat, 02 Dec 2023 17:24:01 +0000 Received: (at 67564) by debbugs.gnu.org; 2 Dec 2023 17:23:35 +0000 Received: from localhost ([127.0.0.1]:58550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9TiI-00080T-Jk for submit@debbugs.gnu.org; Sat, 02 Dec 2023 12:23:34 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:49808 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9TiF-00080J-SS for 67564@debbugs.gnu.org; Sat, 02 Dec 2023 12:23:33 -0500 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 6AA2334009D; Sat, 2 Dec 2023 18:23:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701537801; bh=yEi7TA5KZvgKENmRqaf/k65wMTMrljAOUBUZBSe42Jo=; h=From:To:Cc:Subject:Date; b=c1lWK9slxTxNPaPrgyKUz+2Iu2pXeD4HFa7GfVNhlpFtZakAzSN1Ksl1/iDEb2zif O9OU/jVRQYnlYJQKvHVwYjV3E5+AAOQHEHYLX7W4fmQiOZFqa21HpfdXGkuT6qpl1d A/Z/MNf7gNlw2BG4RPD8ye/EQVwC7lQW+fobAOWc= From: Saku Laesvuori Date: Sat, 2 Dec 2023 19:23:04 +0200 Message-ID: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701537651.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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(-) 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) base-commit: cd46757c1a0f886848fbb6828c028dd2a2532767 -- 2.41.0 From unknown Sun Jun 22 08:08:58 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67564] [PATCH v2 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: Sat, 02 Dec 2023 17:24: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.170153782030804 (code B ref 67564); Sat, 02 Dec 2023 17:24:02 +0000 Received: (at 67564) by debbugs.gnu.org; 2 Dec 2023 17:23:40 +0000 Received: from localhost ([127.0.0.1]:58553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9TiN-00080m-VJ for submit@debbugs.gnu.org; Sat, 02 Dec 2023 12:23:40 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:39760 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9TiL-00080c-GD for 67564@debbugs.gnu.org; Sat, 02 Dec 2023 12:23:37 -0500 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 86A3034009D; Sat, 2 Dec 2023 18:23:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701537808; bh=Fz49Q5sHHdurKSL1aoQia0H1mbbCEvGjhlHcwnSq4kE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QddE4HEACvJUfCeB0v1YWu2lsuTVnQrTYKVJ28fU9yRSjhx5apzYOu+h6IIZB5s3Q it6G8K+X2TDhSK3pvbqqlRLtFZFdCqkjxd+GwXBA4qKwNxhsMzTlqK0X6V3ItiyrTl lnR8WOM5ChnmfZk5dQ9OcdzwgcoDqUztK76/zIJ4= From: Saku Laesvuori Date: Sat, 2 Dec 2023 19:23:05 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701537651.git.saku@laesvuori.fi> References: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701537651.git.saku@laesvuori.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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))) ;;; -- 2.41.0 From unknown Sun Jun 22 08:08:58 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67564] [PATCH v2 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: Sat, 02 Dec 2023 17:24: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.170153782430825 (code B ref 67564); Sat, 02 Dec 2023 17:24:02 +0000 Received: (at 67564) by debbugs.gnu.org; 2 Dec 2023 17:23:44 +0000 Received: from localhost ([127.0.0.1]:58556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9TiS-000817-A8 for submit@debbugs.gnu.org; Sat, 02 Dec 2023 12:23:44 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:53662 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9TiQ-00080x-Tc for 67564@debbugs.gnu.org; Sat, 02 Dec 2023 12:23:43 -0500 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 62F0B34009D; Sat, 2 Dec 2023 18:23:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701537813; bh=JIgKensBOTLMfGtHPiHDyIQFD/7LHDMhGBoebfmrGtc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NvEdBYHI3BeLgjcipSZWvwnrXztpnePjf0YN+Jlhq0SrhA64eD01G9seNfmKQJLql NSVffDBO8oQwJAJgnY9PIbZYGslF+wy6xFfU18ir6b5UDL78ddzrMKf152CkLAbWrI 7rh7P72A3yBiauA3kmDeqhdrXVj5ux9n2+8nRRa4= From: Saku Laesvuori Date: Sat, 2 Dec 2023 19:23:06 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701537651.git.saku@laesvuori.fi> References: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701537651.git.saku@laesvuori.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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. * tests/hackage.scm (hackage->guix-package test mixed layout): Expect to pass. Change-Id: I3a1495b1588a022fabbfe8dad9f3231e578af4f3 --- guix/import/cabal.scm | 42 +++++++++++++++++++----------------------- tests/hackage.scm | 2 -- 2 files changed, 19 insertions(+), 25 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))))) diff --git a/tests/hackage.scm b/tests/hackage.scm index 8eea818ebd..32e5f39329 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -306,8 +306,6 @@ (define test-cabal-mixed-layout ghc-options: -Wall ") -;; Fails: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=35743 -(test-expect-fail 1) (test-assert "hackage->guix-package test mixed layout" (eval-test-with-cabal test-cabal-mixed-layout match-ghc-foo)) -- 2.41.0 From unknown Sun Jun 22 08:08:58 2025 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: guix-patches@gnu.org Resent-Date: Sat, 02 Dec 2023 17:28:01 +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: Lars-Dominik Braun Cc: 67564@debbugs.gnu.org Received: via spool by 67564-submit@debbugs.gnu.org id=B67564.170153806431241 (code B ref 67564); Sat, 02 Dec 2023 17:28:01 +0000 Received: (at 67564) by debbugs.gnu.org; 2 Dec 2023 17:27:44 +0000 Received: from localhost ([127.0.0.1]:58574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9TmJ-00087p-RF for submit@debbugs.gnu.org; Sat, 02 Dec 2023 12:27:44 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:58362 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9TmH-00087e-Fr for 67564@debbugs.gnu.org; Sat, 02 Dec 2023 12:27:42 -0500 Received: from X-kone (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 6B58C34009D; Sat, 2 Dec 2023 18:27:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701538052; bh=j/LlZRNHjJWI7sjbsj4Qj+SBrOYEq0cFkdZSf/kCQac=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=AVWHMQq4j5Emr79aEXighTkMC7++3VpwVGggzX0B13VDHIsFj80CPmpAIwm/LNH5U z1u2S216Hoc6Gd5qL99wnTEhrwPPRs/f30H+GIDnaBG0XqFhANkZgO6GP1goNiVoFS /BNnX7AGCuYff/WLBI7x5sHKIyGeMn23oD+hoA0Q= Date: Sat, 2 Dec 2023 19:27:28 +0200 From: Saku Laesvuori Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="crpmjy2mij4vtsvm" Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --crpmjy2mij4vtsvm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > > 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. >=20 > which seven packages in Guix are affected? - ghc-conduit - ghc-warp - ghc-wai-logger - ghc-streaming-commons - ghc-persistent-test - ghc-language-c - ghc-hasktags > Could you also adapt the testcases in tests/hackage.scm and add new > ones checking the expected behavior? Done in v2. There was already a test for this that was expected to fail. I just marked it to be expected to pass instead. - Saku --crpmjy2mij4vtsvm Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoMkZR3NPB29fCOn/JX0oSiodOjIFAmVraP8ACgkQJX0oSiod OjLuDBAAgvLLOR3mx+SscRc8AWw+RGSFylHWrlVdf3H6lUGfLnTN2l1XvDNisM/1 F8pGmIllgb/PjEEszyJeAlmgeYWMUJvdWx5V4sY6kgB0qz/J3J5f4eJleE8RIohy F4dB7TH9B6YzLrrruoUMeYbSpH0kumMhT3nRR9iOr7Kmrj1Cv24yjwrPGolt5dkX Jtm0vjAw5FJOCb5s5h7j5C46SyFqerOi5pD+Ud6alW7AHJDZ74ER9p+hSnc2pCcc 9IsJCNENokNlmIGnzXDUZxW7BSOeIi7mgxC52u7Bx94pHjEmBsrfOXXCyNubWPnh ch0VPAd/BnlDHWZ8toaCeEYq61PyAu9/04qa+OPN3pjEIPx9JphnnuCXenEzLZ9p 20L3zyHvJnAfLeXC9U6zO6gHVBgsoetIzWgqUZoZ1adnC5nPMdqQ/T8Q95OF6D2+ OrN8MeROisRV2K2GwCMnrft9wNbZNN0qpE4PJMexNUH7SZJjwSc4fLD9DYokPamg W8ji458muKl0eBYaISQcO/+9kOCviIbVpl4bPBqPP/Ki1Wj7HMbxG4ff1feRJdXJ BYsL8W6ADok6os/kGwYFgq071W3HJIvJVqp0c/nGyeirf1inowB2nT2yFr0TwP2c BQnr71GM0HCyoUqrjkN7J5by49hhwUvarM4dq5I8KMfEvsdCUTM= =Or4G -----END PGP SIGNATURE----- --crpmjy2mij4vtsvm-- From unknown Sun Jun 22 08:08:58 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Saku Laesvuori Subject: bug#67564: closed (Re: [bug#67564] [PATCH 0/3] Fixes for haskell importers) Message-ID: References: X-Gnu-PR-Message: they-closed 67564 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 67564@debbugs.gnu.org Date: Sun, 03 Dec 2023 08:15:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1701591302-12083-1" This is a multi-part message in MIME format... ------------=_1701591302-12083-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #67564: [PATCH 0/3] Fixes for haskell importers which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 67564@debbugs.gnu.org. --=20 67564: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D67564 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1701591302-12083-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 67564-done) by debbugs.gnu.org; 3 Dec 2023 08:14:11 +0000 Received: from localhost ([127.0.0.1]:59091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9hcB-00037n-1Y for submit@debbugs.gnu.org; Sun, 03 Dec 2023 03:14:11 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:53226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9hc8-00037Z-UU for 67564-done@debbugs.gnu.org; Sun, 03 Dec 2023 03:14:10 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4SjfhH18sQz9spR; Sun, 3 Dec 2023 09:13:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1701591231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eCxgRf9k8wJvHiiUYlxo2xPGM6VWnd/0heIji5r9jZo=; b=wdztkspltgBT87493SoxT40tOOQfAKFFu1d3rLucmDee/b0wR0DFlCas9rbvmjLsy+EQcH eqf5ZOS+puVpvCduYJ/x7Gl3l6WjnNfrebEpcfiaN4MmiN9bWHZeuuo4ei/gs3ViEo3Dcp Mbj2al0rPrSu2uQgyy/KxdCl/KuJPacxMetpU1dok1gDYKes+wXd8Cew1PI01PP1A4hBt6 XMEsCTLEjPjBd4EhEhdZu/rgfXD1x0+mvAWEXnrxICHb1OHXGZ9tKYdzyIjOY6Q9AMvn8D XNbh3S6IkxlZlGSOwqxLiFFqYt7ycJoCPY5+7D9TA5Fi7ar01sjy2Yu7W6+NVA== Date: Sun, 3 Dec 2023 09:13:46 +0100 From: Lars-Dominik Braun To: Saku Laesvuori Subject: Re: [bug#67564] [PATCH 0/3] Fixes for haskell importers Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: 4SjfhH18sQz9spR X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67564-done Cc: 67564-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, > Done in v2. There was already a test for this that was expected to fail. > I just marked it to be expected to pass instead. yes, you’re right. Merged as: 5bd00bb54235856dddd11e9f0d03481c5469ca63 guix: import: Parse cabal layout blocks correctly acef524961d4da3464dbc392699fbe7deb0a467b guix: import: stackage: Fix crash on recursive import 160385c013b0403af427b61b1d1cc9a75bc3315d guix: import: hackage: Fix crash on recursive import Thanks you very much! Lars ------------=_1701591302-12083-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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= From: Saku Laesvuori To: guix-patches@gnu.org Subject: [PATCH 0/3] Fixes for haskell importers Date: Fri, 1 Dec 2023 11:24:57 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Saku Laesvuori X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) 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 -- 2.41.0 ------------=_1701591302-12083-1--