summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2021-11-17 21:38:24 +0000
committerRicardo Wurmus <rekado@elephly.net>2021-11-18 13:17:57 +0000
commit424f2c92b4043c13165beb2f746ab5c10f8ddf83 (patch)
tree4bf21e69e44644383d20f5d0d01e620c376a9bf1
parenta030511fd9933c52cbffe298f68a375594bb84a4 (diff)
downloadguix-424f2c92b4043c13165beb2f746ab5c10f8ddf83.tar.gz
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.
-rw-r--r--guix/import/texlive.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 15afc781ff..bdef9f58b0 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