[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/09: import/cran: Add vignette builder to native inputs.
From: |
guix-commits |
Subject: |
07/09: import/cran: Add vignette builder to native inputs. |
Date: |
Sat, 7 Mar 2020 13:43:21 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit c363722e81a8aa54f64468db9fcc42ef8dd74944
Author: Ricardo Wurmus <address@hidden>
AuthorDate: Sat Mar 7 19:30:51 2020 +0100
import/cran: Add vignette builder to native inputs.
* guix/import/cran.scm (needs-knitr?): New procedure.
(description->package): Use it.
---
guix/import/cran.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index bcb37ed..bb8226f 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus
<address@hidden>
;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <address@hidden>
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;;
@@ -385,6 +385,9 @@ reference the pkg-config tool."
(tarball-needs-pkg-config? thing)
(directory-needs-pkg-config? thing)))
+(define (needs-knitr? meta)
+ (member "knitr" (listify meta "VignetteBuilder")))
+
;; XXX adapted from (guix scripts hash)
(define (file-hash file select? recursive?)
;; Compute the hash of FILE.
@@ -486,7 +489,9 @@ from the alist META, which was derived from the R package's
DESCRIPTION file."
`(,@(if (needs-fortran? source (not git?))
'("gfortran") '())
,@(if (needs-pkg-config? source (not git?))
- '("pkg-config") '()))
+ '("pkg-config") '())
+ ,@(if (needs-knitr? meta)
+ '("r-knitr") '()))
'native-inputs)
(home-page ,(if (string-null? home-page)
(string-append base-url name)
- branch master updated (9eed0a7 -> d56553e), guix-commits, 2020/03/07
- 01/09: gnu: r-vsn: Add r-knitr., guix-commits, 2020/03/07
- 02/09: gnu: r-viridis: Add r-knitr., guix-commits, 2020/03/07
- 03/09: gnu: r-yamss: Update to 1.12.1., guix-commits, 2020/03/07
- 04/09: gnu: r-xcms: Update to 3.8.2., guix-commits, 2020/03/07
- 05/09: gnu: r-depecher: Update to 1.2.2., guix-commits, 2020/03/07
- 06/09: gnu: r-multiassayexperiment: Update to 1.12.4., guix-commits, 2020/03/07
- 08/09: gnu: r-ggrepel: Add r-knitr., guix-commits, 2020/03/07
- 07/09: import/cran: Add vignette builder to native inputs.,
guix-commits <=
- 09/09: gnu: r-methylkit: Add r-knitr., guix-commits, 2020/03/07