From 294386674c417355a24586fab5528c643d495b86 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Thu, 28 Nov 2024 09:46:49 +0100 Subject: [PATCH] import: egg: Fix recursive imports. Fixes #74565. * guix/import/egg.scm (egg-recursive-import) <#:repo->guix-package>: Add `#:allow-other-keys`. Change-Id: I97ad2d1aaf664c8dc18965eb2a497aa0a76062d7 --- guix/import/egg.scm | 8 +++++--- 1 file 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 ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Hartmut Goebel +;;; Copyright © 2024 Ekaitz Zarraga ;;; ;;; 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))