diff options
| author | Glenn Johnson <glenn-johnson@uiowa.edu> | 2020-10-12 06:22:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 13:22:41 +0200 |
| commit | eb03e648ecbbd04e2e547fa06518ea4460b5b8a6 (patch) | |
| tree | 79203ce8e44ccedeb6e47f766d84b0283e09e7a7 | |
| parent | d431fcd9044d7536a53a0a5e6d8b71ba1f7c775b (diff) | |
| download | spack-eb03e648ecbbd04e2e547fa06518ea4460b5b8a6.tar.gz spack-eb03e648ecbbd04e2e547fa06518ea4460b5b8a6.tar.bz2 spack-eb03e648ecbbd04e2e547fa06518ea4460b5b8a6.tar.xz spack-eb03e648ecbbd04e2e547fa06518ea4460b5b8a6.zip | |
Fix r-devtools package (#18981)
The r-devtools package was not installable due to a few issues.
- The rstudioapi spec was for 0.11.0 but the rstudioapi version is
actually 0.11. This caused an error during concretization.
- Set r-usethis to depend on rlang@0.4.3: rather than r-lang@0.4.3.
- Set r-usethis to depend on r-gh@1.1.0: rather than r-gh@1.1.0.
- Added version r-gh-1.1.0 as it is not currently present in spack.
| -rw-r--r-- | var/spack/repos/builtin/packages/r-devtools/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/r-gh/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/r-usethis/package.py | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/r-devtools/package.py b/var/spack/repos/builtin/packages/r-devtools/package.py index 280769399e..385be67559 100644 --- a/var/spack/repos/builtin/packages/r-devtools/package.py +++ b/var/spack/repos/builtin/packages/r-devtools/package.py @@ -52,7 +52,7 @@ class RDevtools(RPackage): depends_on('r-roxygen2@6.1.1:', when='@2.0.0:', type=('build', 'run')) depends_on('r-roxygen2@7.1.0:', when='@2.3.0:', type=('build', 'run')) depends_on('r-rstudioapi@0.7.0:', type=('build', 'run')) - depends_on('r-rstudioapi@0.11.0:', when='@2.3.0:', type=('build', 'run')) + depends_on('r-rstudioapi@0.11:', when='@2.3.0:', type=('build', 'run')) depends_on('r-rversions@2.0.1:', when='@2.3.0:', type=('build', 'run')) depends_on('r-sessioninfo@1.1.1:', when='@2.0.0:', type=('build', 'run')) depends_on('r-testthat@2.1.1:', when='@2.0.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-gh/package.py b/var/spack/repos/builtin/packages/r-gh/package.py index 5f63852ce6..d7d6fc6fb2 100644 --- a/var/spack/repos/builtin/packages/r-gh/package.py +++ b/var/spack/repos/builtin/packages/r-gh/package.py @@ -13,8 +13,11 @@ class RGh(RPackage): url = "https://cloud.r-project.org/src/contrib/gh_1.0.1.tar.gz" list_url = "https://cloud.r-project.org/src/contrib/Archive/gh" + version('1.1.0', sha256='de9faf383c3fe5e87a75391d82cf71b1331b3c80cd00c4203146a303825d89ad') version('1.0.1', sha256='f3c02b16637ae390c3599265852d94b3de3ef585818b260d00e7812595b391d2') depends_on('r-ini', type=('build', 'run')) depends_on('r-jsonlite', type=('build', 'run')) depends_on('r-httr', type=('build', 'run')) + depends_on('r-httr@1.2:', when='@1.1.0:', type=('build', 'run')) + depends_on('r-cli', when='@1.1.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/r-usethis/package.py b/var/spack/repos/builtin/packages/r-usethis/package.py index 43567532f4..105efb3fc9 100644 --- a/var/spack/repos/builtin/packages/r-usethis/package.py +++ b/var/spack/repos/builtin/packages/r-usethis/package.py @@ -28,13 +28,13 @@ class RUsethis(RPackage): depends_on('r-desc', type=('build', 'run')) depends_on('r-fs@1.3.0:', type=('build', 'run')) depends_on('r-gh', type=('build', 'run')) - depends_on('r-gh@1.1.0', when='@1.6.1:', type=('build', 'run')) + depends_on('r-gh@1.1.0:', when='@1.6.1:', type=('build', 'run')) depends_on('r-git2r@0.23:', type=('build', 'run')) depends_on('r-glue@1.3.0:', type=('build', 'run')) depends_on('r-purrr', type=('build', 'run')) depends_on('r-rematch2', when='@1.6.1:', type=('build', 'run')) depends_on('r-rlang', type=('build', 'run')) - depends_on('r-rlang@0.4.3', when='@1.6.1:', type=('build', 'run')) + depends_on('r-rlang@0.4.3:', when='@1.6.1:', type=('build', 'run')) depends_on('r-rprojroot@1.2:', type=('build', 'run')) depends_on('r-rstudioapi', type=('build', 'run')) depends_on('r-whisker', type=('build', 'run')) |