diff mbox series

[bug#69576] scripts: import: elpa: Unquote-splice package sexp contents.

Message ID 9987708eab34f87efd3fedb39086d88b337267f3.1709703534.git.carlo@zancanaro.id.au
State New
Headers show
Series [bug#69576] scripts: import: elpa: Unquote-splice package sexp contents. | expand

Commit Message

Carlo Zancanaro March 6, 2024, 5:38 a.m. UTC
* guix/scripts/import/elpa.scm (guix-import-elpa): Unquote-splice the contents
of the package sexp so the matched package definition is returned unchanged.

Change-Id: Iaaa7e72390c73c6d6671811fe9ac284d599b44c6
---

Without this change the elpa importer doesn't work for me. Importing
anything fails. As an example, try "guix import elpa dash".

With this change, it works for me.

 guix/scripts/import/elpa.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: f18d13b5f89c161c6ee88d15ecdaa8d973ee4503

Comments

Ricardo Wurmus March 6, 2024, 11:49 a.m. UTC | #1
Carlo Zancanaro <carlo@zancanaro.id.au> writes:

> * guix/scripts/import/elpa.scm (guix-import-elpa): Unquote-splice the contents
> of the package sexp so the matched package definition is returned unchanged.
>
> Change-Id: Iaaa7e72390c73c6d6671811fe9ac284d599b44c6

Applied.  Thank you!

> Without this change the elpa importer doesn't work for me. Importing
> anything fails. As an example, try "guix import elpa dash".
>
> With this change, it works for me.

I had run into the same problem a few days ago, so I'm happy that you
came up with a fix so soon.  Thanks again!
diff mbox series

Patch

diff --git a/guix/scripts/import/elpa.scm b/guix/scripts/import/elpa.scm
index f587eeb243..7f77beaac0 100644
--- a/guix/scripts/import/elpa.scm
+++ b/guix/scripts/import/elpa.scm
@@ -104,7 +104,7 @@  (define (guix-import-elpa . args)
                                       #:repo (assoc-ref opts 'repo)))
          ((or #f '())
           (leave (G_ "failed to download meta-data for package '~a'~%") package-name))
-         (('package etc ...) `(package ,etc))
+         (('package etc ...) `(package ,@etc))
          ((? list? sexps) (map
                            (match-lambda
                              ((and ('package ('name name) . rest) pkg)