Updated patch attached. 2015-09-14 17:06 GMT-03:00 Vicente Vera <vicente...@gmail.com>: > Hello, > > I'm not sure if it's correct, but I changed the license from gpl3+ to > gpl2+ to keep it consistent with the r-markdown package > (https://www.gnu.org/licenses/gpl-faq.html#v2v3Compatibility). Thanks > for figuring that out. > > New patch attached. > > 2015-09-14 8:17 GMT-03:00 Ricardo Wurmus <ricardo.wur...@mdc-berlin.de>: >> Hi Vicente, >> >>> From 36f94f07cba5edea4897ac36b92a73bfc6a3258b Mon Sep 17 00:00:00 2001 >>> From: Vicente Vera Parra <vicente...@gmail.com> >>> Date: Sun, 13 Sep 2015 13:20:29 -0300 >>> Subject: [PATCH 11/19] gnu: Add r-knitr. >> >>> * gnu/packages/statistics.scm (r-knitr): New variable. >> >> [...] >> >>> + (synopsis "General-Purpose Package for Dynamic Report Generation in R") >>> + (description >>> + "Provides a general-purpose tool for dynamic report generation in >>> +R using Literate Programming techniques.") >> >> As before, please provide a better description (at least by replacing >> “Provides” in the first sentence with “This package provides”); and use >> lower-case in the synopsis. >> >>> + (license license:gpl3+))) >> >> I don’t think this is correct. The package actually doesn’t declare the >> version of the GPL. There are no license headers I could find and all >> it says is >> >> “This package is free and open source software, licensed under GPL.” >> >> Furthermore, as noted before, there might be a license conflict when >> combining “r-knitr” with “r-markdown”, because the latter is released >> under “GPLv2 only”. >> >> I just asked the author about what version of the GPL was intended >> here[1]. >> >> ~~ Ricardo >> >> [1]: https://github.com/yihui/knitr/issues/566#issuecomment-140042571
From 730f8b640d70e9693bce65ded47ba91d4b6af233 Mon Sep 17 00:00:00 2001 From: Vicente Vera Parra <vicente...@gmail.com> Date: Tue, 15 Sep 2015 14:20:13 -0300 Subject: [PATCH 11/19] gnu: Add r-knitr.
* gnu/packages/statistics.scm (r-knitr): New variable. --- gnu/packages/statistics.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 050a507..e5b71f9 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -731,3 +731,32 @@ http://en.wikipedia.org/wiki/Markdown for more information about Markdown.") "This package implements the libyaml YAML 1.1 parser and emitter (http://pyyaml.org/wiki/LibYAML) for R.") (license license:bsd-3))) + +(define-public r-knitr + (package + (name "r-knitr") + (version "1.11") + (source (origin + (method url-fetch) + (uri (string-append "mirror://cran/src/contrib/knitr_" + version ".tar.gz")) + (sha256 + (base32 + "1ikjla0hnpjfkdbydqhhqypc0aiizbi4nyn8c694sdk9ca4jasdd")))) + (build-system r-build-system) + (propagated-inputs + `(("r-evaluate" ,r-evaluate) + ("r-digest" ,r-digest) + ("r-formatr" ,r-formatr) + ("r-highr" ,r-highr) + ("r-markdown" ,r-markdown) + ("r-stringr" ,r-stringr) + ("r-yaml" ,r-yaml))) + (home-page + "http://yihui.name/knitr/";) + (synopsis + "General-purpose package for dynamic report generation in R") + (description + "This package provides a general-purpose tool for dynamic report +generation in R using Literate Programming techniques.") + (license license:gpl2+))) -- 2.5.2
