diff options
| author | Glenn Johnson <glenn-johnson@uiowa.edu> | 2021-01-18 12:55:33 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 12:55:33 -0600 |
| commit | 415cff5061846e034f468219b13b030324f33d96 (patch) | |
| tree | 92762b567a0f7e0925a818376a2dacbcf84ce8f6 | |
| parent | 91fcd49484db06f8a534a002ca86f412f35527b2 (diff) | |
| download | spack-415cff5061846e034f468219b13b030324f33d96.tar.gz spack-415cff5061846e034f468219b13b030324f33d96.tar.bz2 spack-415cff5061846e034f468219b13b030324f33d96.tar.xz spack-415cff5061846e034f468219b13b030324f33d96.zip | |
add version 1.30 to r-knitr (#21061)
* add version 1.30 to r-knitr
* Fix version constraints
- r-digest
- r-formatr
The version constraints on those packages should actually be in the `when`
clause.
| -rw-r--r-- | var/spack/repos/builtin/packages/r-knitr/package.py | 12 |
1 files changed, 8 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 4c165ec512..ff3fe39149 100644 --- a/var/spack/repos/builtin/packages/r-knitr/package.py +++ b/var/spack/repos/builtin/packages/r-knitr/package.py @@ -8,13 +8,16 @@ from spack import * class RKnitr(RPackage): - """Provides a general-purpose tool for dynamic report generation in R using + """A General-Purpose Package for Dynamic Report Generation in R + + 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" + version('1.30', sha256='3aabb13566a234131ba18b78d690104f9468a982dc711f81344a985318c7c93e') version('1.28', sha256='05ee01da31d715bf24793efb3e4ef3bb3101ef1e1ab2d760c645fc5b9d40232a') version('1.24', sha256='e80c2043b445a7e576b62ae8510cce89322660fe388881d799a706d35cd27b89') version('1.23', sha256='063bfb3300fc9f3e7d223c346e19b93beced0e6784470b9bef2524868a206a99') @@ -26,10 +29,11 @@ class RKnitr(RPackage): depends_on('r@3.1.0:', when='@1.15:1.22', type=('build', 'run')) depends_on('r@3.2.3:', when='@1.23:', type=('build', 'run')) depends_on('r-evaluate@0.10:', type=('build', 'run')) - depends_on('r-digest@:1.17', when='@:1.24', type=('build', 'run')) - depends_on('r-formatr@:1.14', when='@:1.24', type=('build', 'run')) depends_on('r-highr', type=('build', 'run')) - depends_on('r-stringr@0.6:', type=('build', 'run')) depends_on('r-markdown', type=('build', 'run')) + 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-digest', when='@:1.17', type=('build', 'run')) + depends_on('r-formatr', when='@:1.14', type=('build', 'run')) |