~ruther/guix-local: import: texlive: Take different package database as optional argument.

424f2c92b4043c13165beb2f746ab5c10f8ddf83 — Ricardo Wurmus 4 years ago a030511

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.

patch browse .tar.gz .zip

1 files changed, 4 insertions(+), 4 deletions(-)

M guix/import/texlive.scm

M guix/import/texlive.scm => guix/import/texlive.scm +4 -4

@@ 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