From 2b1916d8450ec7168ee18f45f9e95a7a78ec866d Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Sat, 26 Jun 2021 11:26:46 +0200 Subject: [PATCH] r-knitr: add 1.33 (#24537) --- var/spack/repos/builtin/packages/r-knitr/package.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/r-knitr/package.py b/var/spack/repos/builtin/packages/r-knitr/package.py index ff3fe39149..1ee8f556d9 100644 --- a/var/spack/repos/builtin/packages/r-knitr/package.py +++ b/var/spack/repos/builtin/packages/r-knitr/package.py @@ -13,10 +13,10 @@ class RKnitr(RPackage): Provides a general-purpose tool for dynamic report generation in R using Literate Programming techniques.""" - homepage = "https://cloud.r-project.org/package=knitr" - url = "https://cloud.r-project.org/src/contrib/knitr_1.14.tar.gz" - list_url = "https://cloud.r-project.org/src/contrib/Archive/knitr" + homepage = "https://yihui.org/knitr/" + cran = "knitr" + version('1.33', sha256='2f83332b0a880de6eae522271bda7f862c97693fba45c23ab1f772028f6c0909') version('1.30', sha256='3aabb13566a234131ba18b78d690104f9468a982dc711f81344a985318c7c93e') version('1.28', sha256='05ee01da31d715bf24793efb3e4ef3bb3101ef1e1ab2d760c645fc5b9d40232a') version('1.24', sha256='e80c2043b445a7e576b62ae8510cce89322660fe388881d799a706d35cd27b89') @@ -34,6 +34,8 @@ class RKnitr(RPackage): depends_on('r-stringr@0.6:', type=('build', 'run')) depends_on('r-yaml@2.1.19:', type=('build', 'run')) depends_on('r-xfun', when='@1.23:', type=('build', 'run')) - depends_on('r-xfun@0.15:', when='@1.30:', type=('build', 'run')) + depends_on('r-xfun@0.15:', when='@1.30', type=('build', 'run')) + depends_on('r-xfun@0.19:', when='@1.31', type=('build', 'run')) + depends_on('r-xfun@0.21:', when='@1.32:', type=('build', 'run')) depends_on('r-digest', when='@:1.17', type=('build', 'run')) depends_on('r-formatr', when='@:1.14', type=('build', 'run'))