mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 13:36:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

import: egg: Fix recursive imports.

Browse source 
Fixes #74565.

* guix/import/egg.scm (egg-recursive-import) <#:repo->guix-package>: Add
`#:allow-other-keys`.

Change-Id: I97ad2d1aaf664c8dc18965eb2a497aa0a76062d7
This commit is contained in:
Ekaitz Zarraga 2024-11-28 09:46:49 +01:00
parent 369d2698b0
commit 294386674c
No known key found for this signature in database
GPG key ID: FDB952BD3F7356D6
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
guix/import/egg.scm
View file

@ -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 @@ (define (prettify-name name)
(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 @@ (define egg->guix-package/m ;memoized variant
(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))