From d2c3fb5e450fe9e0592ac84d5e767e7a99dcaad8 Mon Sep 17 00:00:00 2001 From: Glenn Johnson Date: Fri, 15 Jan 2021 03:44:54 -0600 Subject: [PATCH] add version 2.6 to r-rmarkdown (#20838) --- .../builtin/packages/r-rmarkdown/package.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/var/spack/repos/builtin/packages/r-rmarkdown/package.py b/var/spack/repos/builtin/packages/r-rmarkdown/package.py index 5f859db396..0984fca4b3 100644 --- a/var/spack/repos/builtin/packages/r-rmarkdown/package.py +++ b/var/spack/repos/builtin/packages/r-rmarkdown/package.py @@ -8,12 +8,15 @@ class RRmarkdown(RPackage): - """Convert R Markdown documents into a variety of formats.""" + """Dynamic Documents for R + + Convert R Markdown documents into a variety of formats.""" homepage = "http://rmarkdown.rstudio.com/" url = "https://cloud.r-project.org/src/contrib/rmarkdown_1.0.tar.gz" list_url = "https://cloud.r-project.org/src/contrib/Archive/rmarkdown" + version('2.6', sha256='e6e799c472de11e079bc752cca4b4dbd6803650649457bb6ae836cb1edcdf6b0') version('1.14', sha256='f636b1048c5be56e06aa0b2b4342ad5c8192734f1e9b27468fef62be672edc61') version('1.13', sha256='96fb6b08d27bbb8054145e0a55721f905341941d4f6691480a2a234e2d5a63ef') version('1.7', sha256='c3191db65b9ad41b6dbb77aff53487701032d306e92b208ef7515b747931fe63') @@ -24,12 +27,14 @@ class RRmarkdown(RPackage): depends_on('r-yaml@2.1.19:', type=('build', 'run')) depends_on('r-htmltools@0.3.5:', type=('build', 'run')) depends_on('r-evaluate@0.13:', type=('build', 'run')) - depends_on('r-base64enc', type=('build', 'run')) depends_on('r-jsonlite', type=('build', 'run')) - depends_on('r-rprojroot', when='@1.3:1.7', type=('build', 'run')) - depends_on('r-mime', when='@1.8:', type=('build', 'run')) - depends_on('r-stringr@1.2.0:', when='@1.6:', type=('build', 'run')) - depends_on('r-catools', when='@:1.7', type=('build', 'run')) depends_on('r-tinytex@0.11:', when='@1.10:', type=('build', 'run')) depends_on('r-xfun', when='@1.13:', type=('build', 'run')) + depends_on('r-xfun@0.15:', when='@2.6:', type=('build', 'run')) + depends_on('r-stringr@1.2.0:', when='@1.6:', type=('build', 'run')) + depends_on('r-rprojroot', when='@1.3:1.7', type=('build', 'run')) + depends_on('r-mime', when='@1.8:1.14', type=('build', 'run')) + depends_on('r-catools', when='@:1.7', type=('build', 'run')) + depends_on('r-base64enc', when='@:1.14', type=('build', 'run')) depends_on('pandoc@1.12.3:') + depends_on('pandoc@1.14:', when='@2.6:')