rekado pushed a commit to branch master
in repository guix.
commit 424f2c92b4043c13165beb2f746ab5c10f8ddf83
Author: Ricardo Wurmus <[email protected]>
AuthorDate: Wed Nov 17 21:38:24 2021 +0000
import: texlive: Take different package database as optional argument.
* guix/import/texlive.scm (tlpdb->package): Expect PACKAGE-DATABASE as
argument.
(texlive->guix-package): Accept PACKAGE-DATABASE keyword.
---
guix/import/texlive.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 15afc78..bdef9f5 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -203,8 +203,8 @@
files)
equal?)))
-(define (tlpdb->package name)
- (and-let* ((data (assoc-ref (tlpdb) name))
+(define (tlpdb->package name package-database)
+ (and-let* ((data (assoc-ref package-database name))
(dirs (files->directories
(map (lambda (dir)
(string-drop dir (string-length "texmf-dist/")))
@@ -254,10 +254,10 @@
(define texlive->guix-package
(memoize
- (lambda* (name #:key repo version)
+ (lambda* (name #:key repo version (package-database tlpdb))
"Find the metadata for NAME in the tlpdb and return the `package'
s-expression corresponding to that package, or #f on failure."
- (tlpdb->package name))))
+ (tlpdb->package name (package-database)))))
(define (texlive-recursive-import name)
(recursive-import name
