civodul pushed a commit to branch master
in repository guix.
commit 39eb9b5a5cc1ea1224609ea20eaaaf3972c280f0
Author: Ludovic Courtès <[email protected]>
AuthorDate: Thu May 4 12:30:30 2023 +0200
import: elpa: Use the expected repo in recursive imports.
* guix/import/elpa.scm (elpa-recursive-import): Pass REPO in calls to
'elpa->guix-package'.
---
guix/import/elpa.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index 7285500775..760969d70e 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Federico Beffa <[email protected]>
-;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Ludovic Courtès
<[email protected]>
+;;; Copyright © 2015-2018, 2020-2021, 2023 Ludovic Courtès <[email protected]>
;;; Copyright © 2018 Oleg Pykhalov <[email protected]>
;;; Copyright © 2020 Martin Becze <[email protected]>
;;; Copyright © 2020 Ricardo Wurmus <[email protected]>
@@ -456,8 +456,11 @@ type '<elpa-package>'."
(define* (elpa-recursive-import package-name #:optional (repo 'gnu))
(recursive-import package-name
- #:repo repo
- #:repo->guix-package elpa->guix-package
+ #:repo->guix-package
+ (lambda (name . rest)
+ (apply elpa->guix-package name
+ #:repo repo
+ rest))
#:guix-name elpa-guix-name))
;;; elpa.scm ends here