diff options
| author | Ekaitz Zarraga <ekaitz@elenq.tech> | 2024-11-28 09:46:49 +0100 |
|---|---|---|
| committer | Ekaitz Zarraga <ekaitz@elenq.tech> | 2024-11-28 19:44:54 +0100 |
| commit | 294386674c417355a24586fab5528c643d495b86 (patch) | |
| tree | b12b91fc085f77a1768e78f3ca0908ee4895983f | |
| parent | 369d2698b0bfc3726f8e6d232d43d0dda832225f (diff) | |
| download | guix-294386674c417355a24586fab5528c643d495b86.tar.gz guix-294386674c417355a24586fab5528c643d495b86.zip | |
import: egg: Fix recursive imports.
Fixes #74565.
* guix/import/egg.scm (egg-recursive-import) <#:repo->guix-package>: Add
`#:allow-other-keys`.
Change-Id: I97ad2d1aaf664c8dc18965eb2a497aa0a76062d7
| -rw-r--r-- | guix/import/egg.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/guix/import/egg.scm b/guix/import/egg.scm index e3bc158475..a87de1453e 100644 --- a/guix/import/egg.scm +++ b/guix/import/egg.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com> +;;; Copyright © 2024 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; ;;; This file is part of GNU Guix. ;;; @@ -239,7 +240,7 @@ not work." (if system? (prettify-system-dependency name) (maybe-symbol->string name))) - + (let ((name (prettify-name (extract-name name)))) ;; Dependencies are sometimes specified as symbols and sometimes ;; as strings @@ -322,8 +323,9 @@ not work." (define* (egg-recursive-import package-name #:optional version) (recursive-import package-name #:version version - #:repo->guix-package (lambda* (name #:key version repo) - (egg->guix-package/m name version)) + #:repo->guix-package + (lambda* (name #:key version repo #:allow-other-keys) + (egg->guix-package/m name version)) #:guix-name egg-name->guix-name)) |