From unknown Fri Jun 20 07:23:41 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#67599 <67599@debbugs.gnu.org> To: bug#67599 <67599@debbugs.gnu.org> Subject: Status: [PATCH] guix: import: Fix parsing Cabal files that import many stanzas Reply-To: bug#67599 <67599@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:23:41 +0000 retitle 67599 [PATCH] guix: import: Fix parsing Cabal files that import man= y stanzas reassign 67599 guix-patches submitter 67599 Saku Laesvuori severity 67599 normal tag 67599 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 03 04:46:23 2023 Received: (at submit) by debbugs.gnu.org; 3 Dec 2023 09:46:23 +0000 Received: from localhost ([127.0.0.1]:59151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9j3P-000844-3N for submit@debbugs.gnu.org; Sun, 03 Dec 2023 04:46:23 -0500 Received: from lists.gnu.org ([2001:470:142::17]:60108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9j3N-00083n-5s for submit@debbugs.gnu.org; Sun, 03 Dec 2023 04:46:21 -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 1r9j2v-0001xI-Tc for guix-patches@gnu.org; Sun, 03 Dec 2023 04:46:04 -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 1r9j2u-00037m-0t for guix-patches@gnu.org; Sun, 03 Dec 2023 04:45:53 -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 24C253400B0; Sun, 3 Dec 2023 10:45:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701596750; bh=W87d1yaeVo19wux4gI7D5rodDlfGhNqLuI5OtFQx4KU=; h=From:To:Cc:Subject:Date; b=Y4YC8V+E7CG9DEiN5C5qLWg59UG0multdIpeoOukxKPBLo8rpitPb1K/wmnLfzql3 d3q5VmPSKHkM1lu9aYNv5ZXk7lzuOkcOeTbe7XcUuCvIPkQ8T8P1I86RI8y8x3vcTA CYXpXhma6WVWhU08IUEyHuIUiuN72P2ivl0YDe08= From: Saku Laesvuori To: guix-patches@gnu.org Subject: [PATCH] guix: import: Fix parsing Cabal files that import many stanzas Date: Sun, 3 Dec 2023 11:45:07 +0200 Message-ID: <0fa77b21d07755ba61d46740254f04ff697fd08f.1701596707.git.saku@laesvuori.fi> 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 (/) * guix/import/cabal.scm (eval-cabal)[eval]: Split imports to a normalized list before mapping over it. * tests/hackage.scm: Test it. Change-Id: I39ece019251b6a23a937c8562d2d4a545a6bc7df --- This fixes at least `guix import hackage --recursive haskell-language-server` guix/import/cabal.scm | 11 ++++++++++- tests/hackage.scm | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/guix/import/cabal.scm b/guix/import/cabal.scm index b969197455..d32c1c15fe 100644 --- a/guix/import/cabal.scm +++ b/guix/import/cabal.scm @@ -865,7 +865,16 @@ (define (eval-cabal cabal-sexp env) (((? string? name) values) (list name values)) ((("import" imports) rest ...) - (eval (append (append-map (cut assoc-ref common-stanzas <>) imports) + (eval (append (append-map + ;; The imports are (at least sometimes) a list with one string + ;; containing all the names separeted by commas. This splits + ;; those strings to a list of strings in the same format that is + ;; used in common-stanzas. + (cut assoc-ref common-stanzas <>) + (append-map (lambda (imports-string) + (map (compose string-downcase string-trim-both) + (string-split imports-string #\,))) + imports)) rest))) ((element rest ...) (cons (eval element) (eval rest))) diff --git a/tests/hackage.scm b/tests/hackage.scm index 32e5f39329..403f587c41 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -622,4 +622,49 @@ (define-package-matcher match-ghc-foo-import (test-assert "hackage->guix-package test cabal import" (eval-test-with-cabal test-cabal-import match-ghc-foo-import)) +(define test-cabal-multiple-imports + "name: foo +version: 1.0.0 +homepage: http://test.org +synopsis: synopsis +description: description +license: BSD3 +common commons + build-depends: + HTTP >= 4000.2.5 && < 4000.3, + mtl >= 2.0 && < 3 + +common others + build-depends: + base == 4.16.*, + stm-chans == 3.0.* + +executable cabal + import: + commons + , others +") + +(define-package-matcher match-ghc-foo-multiple-imports + ('package + ('name "ghc-foo") + ('version "1.0.0") + ('source + ('origin + ('method 'url-fetch) + ('uri ('hackage-uri "foo" 'version)) + ('sha256 + ('base32 + (? string? hash))))) + ('build-system 'haskell-build-system) + ('properties '(quote ((upstream-name . "foo")))) + ('inputs ('list 'ghc-http 'ghc-stm-chans)) + ('home-page "http://test.org") + ('synopsis (? string?)) + ('description (? string?)) + ('license 'license:bsd-3))) + +(test-assert "hackage->guix-package test cabal multiple imports" + (eval-test-with-cabal test-cabal-multiple-imports match-ghc-foo-multiple-imports)) + (test-end "hackage") base-commit: 5bd00bb54235856dddd11e9f0d03481c5469ca63 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 03 10:17:20 2023 Received: (at 67599-done) by debbugs.gnu.org; 3 Dec 2023 15:17:20 +0000 Received: from localhost ([127.0.0.1]:60599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9oDg-0003Wl-B7 for submit@debbugs.gnu.org; Sun, 03 Dec 2023 10:17:20 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:44192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9oDZ-0003WT-Oj for 67599-done@debbugs.gnu.org; Sun, 03 Dec 2023 10:17:18 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (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 4Sjr4S0N92z9scM; Sun, 3 Dec 2023 16:16:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1701616616; 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=gjOURFD7NP9kkXGhwC5jL/xt3vKrURgUjd00yDlalME=; b=N8LkPyiddAP9z3HA3lrCOEZudz9/sViXIbfe2lH+zE5GWxPFbj01f0CBZC1QhcnluYlcFc JOuJytxBSdIpPKbg/AWH2dEQEMTYapEAQam+lXBn9IeQp71dnbbbHqKXdbjVS2ZCVQ+w+X D/SqvwvOsbr3LkICKPLtTqyBmvbcNUZGkeQDDtzt96rzvV7KSFNSpKIqZpgrCNbImG9bjn qyqW1NZA+eurYIhRd7piw5f99jDFeatF9zi6+mWD5vrZifFUy9lgML19l80eysSlk5NSD3 sX5jN0djuEnffNThL27H4c1sUGrfQWF6lGY3gHFp8j0xj6GA6zlFePMuPdGgnw== Date: Sun, 3 Dec 2023 16:16:51 +0100 From: Lars-Dominik Braun To: Saku Laesvuori Subject: Re: [bug#67599] [PATCH] guix: import: Fix parsing Cabal files that import many stanzas Message-ID: References: <0fa77b21d07755ba61d46740254f04ff697fd08f.1701596707.git.saku@laesvuori.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0fa77b21d07755ba61d46740254f04ff697fd08f.1701596707.git.saku@laesvuori.fi> X-Rspamd-Queue-Id: 4Sjr4S0N92z9scM X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 67599-done Cc: 67599-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, > * guix/import/cabal.scm (eval-cabal)[eval]: Split imports to a > normalized list before mapping over it. > * tests/hackage.scm: Test it. > > Change-Id: I39ece019251b6a23a937c8562d2d4a545a6bc7df > --- > This fixes at least `guix import hackage --recursive haskell-language-server` looks good to me. Pushed as ab8612d99eca5c25ecbefe026b04ed9f00e3f8b5 guix: import: Fix parsing Cabal files that import many stanzas Thanks! Lars From unknown Fri Jun 20 07:23:41 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 01 Jan 2024 12:24:13 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator