summaryrefslogtreecommitdiff
path: root/guix/import
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2023-02-17 22:22:42 +0100
committerRicardo Wurmus <rekado@elephly.net>2023-02-18 19:56:30 +0100
commit271c0bfcf2dcea967f9baf02baf179677d179190 (patch)
tree9b03e5b740ea153f8b886ee8bf5d9ff4369ceb4f /guix/import
parentc0507e9f1e358ba7069bc1c7e771730872cfdfeb (diff)
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?.
Diffstat (limited to 'guix/import')
-rw-r--r--guix/import/cran.scm7
1 files 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)