[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/212: import/cran: Process all vignette builders.
From: |
guix-commits |
Subject: |
05/212: import/cran: Process all vignette builders. |
Date: |
Sat, 18 Feb 2023 14:00:44 -0500 (EST) |
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)
- branch master updated (b795976778 -> 0ba69c1ee2), guix-commits, 2023/02/18
- 01/212: gnu: r-liger: Rename to r-rliger., guix-commits, 2023/02/18
- 05/212: import/cran: Process all vignette builders.,
guix-commits <=
- 07/212: import/cran: Remove directory-needs-zlib? in favor of needed-libraries-in-directory., guix-commits, 2023/02/18
- 02/212: gnu: r-readods: Update to 1.8.0., guix-commits, 2023/02/18
- 04/212: import/cran: Add name mapping for libjpeg., guix-commits, 2023/02/18
- 03/212: import/cran: Add directory-needs-esbuild?., guix-commits, 2023/02/18
- 06/212: import/cran: Add generic way to detect needed libraries., guix-commits, 2023/02/18
- 08/212: gnu: r-flexdashboard: Update to 0.6.1., guix-commits, 2023/02/18
- 11/212: gnu: Add r-gfonts., guix-commits, 2023/02/18
- 13/212: gnu: r-d3r: Update to 1.0.1., guix-commits, 2023/02/18
- 14/212: gnu: r-wgcna: Update to 1.72-1., guix-commits, 2023/02/18
- 15/212: gnu: r-abn: Update to 2.7-3., guix-commits, 2023/02/18