From 271c0bfcf2dcea967f9baf02baf179677d179190 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 17 Feb 2023 22:22:42 +0100 Subject: 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(-) (limited to 'guix/import/cran.scm') 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 @@ (define (source->dependencies source 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 @@ (define* (description->package repository meta #:key (license-prefix identity) ,@(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) -- cgit v1.2.3