[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/07: import: elpa: Use the expected repo in recursive imports.
From: |
guix-commits |
Subject: |
04/07: import: elpa: Use the expected repo in recursive imports. |
Date: |
Thu, 4 May 2023 07:12:10 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 39eb9b5a5cc1ea1224609ea20eaaaf3972c280f0
Author: Ludovic Courtès <ludo@gnu.org>
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 <beffa@fbengineering.ch>
-;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Ludovic Courtès
<ludo@gnu.org>
+;;; Copyright © 2015-2018, 2020-2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
@@ -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
- branch master updated (7a0a186a32 -> 916c6e5716), guix-commits, 2023/05/04
- 03/07: import: elpa: 'elpa->guix-package' accepts other keyword arguments., guix-commits, 2023/05/04
- 02/07: gnu: dune-common: Skip tests that fail on aarch64-linux., guix-commits, 2023/05/04
- 04/07: import: elpa: Use the expected repo in recursive imports.,
guix-commits <=
- 05/07: import: Cosmetic tweaks to 'recursive-import'., guix-commits, 2023/05/04
- 01/07: ftp-client: 'connect*' retries until the timeout has expired., guix-commits, 2023/05/04
- 06/07: import: elpa: Standardize warning message., guix-commits, 2023/05/04
- 07/07: profiles: 'texlive-font-maps' gracefully handles lack of texlive inputs., guix-commits, 2023/05/04