05/212: import/cran: Process all vignette builders.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 271c0bfcf2dcea967f9baf02baf179677d179190
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Fri Feb 17 22:22:42 2023 +0100

    import/cran: Process all vignette builders.
    
    * guix/import/cran.scm (needs-knitr?): Remove procedure.
    (vignette-builders): New procedure.
    (description->package): Use vignette-builders instead of needs-knitr?.
---
 guix/import/cran.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index b8cc4f1ef0..ebd340ecfa 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -502,8 +502,8 @@ by TARBALL?"
        (source-dir->dependencies dir)))
     (source-dir->dependencies source)))
 
-(define (needs-knitr? meta)
-  (member "knitr" (listify meta "VignetteBuilder")))
+(define (vignette-builders meta)
+  (map cran-guix-name (listify meta "VignetteBuilder")))
 
 (define* (description->package repository meta #:key (license-prefix identity)
                                (download-source download))
@@ -617,8 +617,7 @@ from the alist META, which was derived from the R package's 
DESCRIPTION file."
               ,@(maybe-inputs (map cran-guix-name propagate) 
'propagated-inputs)
               ,@(maybe-inputs
                  `(,@source-native-inputs
-                   ,@(if (needs-knitr? meta)
-                         '("r-knitr") '()))
+                   ,@(vignette-builders meta))
                  'native-inputs)
               (home-page ,(if (string-null? home-page)
                               (string-append base-url name)