diff mbox series

[bug#67599] guix: import: Fix parsing Cabal files that import many stanzas

Message ID 0fa77b21d07755ba61d46740254f04ff697fd08f.1701596707.git.saku@laesvuori.fi
State New
Headers show
Series [bug#67599] guix: import: Fix parsing Cabal files that import many stanzas | expand

Commit Message

Saku Laesvuori Dec. 3, 2023, 9:45 a.m. UTC 
* 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(-)


base-commit: 5bd00bb54235856dddd11e9f0d03481c5469ca63

Comments

Lars-Dominik Braun Dec. 3, 2023, 3:16 p.m. UTC | #1 
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
diff mbox series

Patch

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")