From 3dd4a01a5e737a08a211f4e0f58da0a725e70818 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Wed, 4 Jan 2017 21:24:07 -0500 Subject: [PATCH] Standardize package names: lower-case, not Mixed_CASE (#2475) * Rename packages * Upcasing depends_on() in packages. * Downcased extends('r') * Fixed erroneously changed URL that had slipped through. * Fixed typo * Fixed link from documentation into package source code. * Fixed another doc problem. * Changed underscores to dashes in package names. * Added test to enforce lowercase, no-underscore naming convention. * Fix r-xgboost * Downcase more instances of 'R' in package auto-creation. * Fix test. * Converted unit test packages to use dashes not underscores * Downcase `r` in the docs. * Update module_file_support.rst Fix r->R for class R. --- lib/spack/docs/module_file_support.rst | 10 +++++----- lib/spack/spack/cmd/create.py | 6 +++--- lib/spack/spack/test/build_system_guess.py | 2 +- lib/spack/spack/test/concretize.py | 2 +- lib/spack/spack/test/install.py | 2 +- lib/spack/spack/test/mirror.py | 4 ++-- lib/spack/spack/test/package_sanity.py | 11 +++++++++++ lib/spack/spack/test/packages.py | 6 +++--- .../{direct_mpich => direct-mpich}/package.py | 0 .../{indirect_mpich => indirect-mpich}/package.py | 2 +- .../package.py | 0 .../package.py | 0 .../repos/builtin/packages/cleverleaf/package.py | 2 +- .../builtin/packages/{etsf_io => etsf-io}/package.py | 0 .../{fastx_toolkit => fastx-toolkit}/package.py | 0 .../{globus_toolkit => globus-toolkit}/package.py | 0 var/spack/repos/builtin/packages/gource/package.py | 2 +- .../packages/{ImageMagick => image-magick}/package.py | 2 +- var/spack/repos/builtin/packages/julia/package.py | 2 +- .../builtin/packages/{libNBC => libnbc}/package.py | 0 .../builtin/packages/{LuaJIT => lua-jit}/package.py | 2 +- .../builtin/packages/{Mitos => mitos}/package.py | 0 var/spack/repos/builtin/packages/octave/package.py | 4 ++-- var/spack/repos/builtin/packages/octopus/package.py | 4 ++-- .../{pmgr_collective => pmgr-collective}/package.py | 0 var/spack/repos/builtin/packages/py-csvkit/package.py | 2 +- .../repos/builtin/packages/py-matplotlib/package.py | 2 +- .../{py-SQLAlchemy => py-sqlalchemy}/package.py | 0 var/spack/repos/builtin/packages/r-abind/package.py | 2 +- .../repos/builtin/packages/r-assertthat/package.py | 2 +- .../repos/builtin/packages/r-base64enc/package.py | 2 +- var/spack/repos/builtin/packages/r-bh/package.py | 2 +- .../{r-BiocGenerics => r-biocgenerics}/package.py | 2 +- var/spack/repos/builtin/packages/r-bitops/package.py | 2 +- var/spack/repos/builtin/packages/r-boot/package.py | 2 +- var/spack/repos/builtin/packages/r-brew/package.py | 2 +- var/spack/repos/builtin/packages/r-c50/package.py | 2 +- var/spack/repos/builtin/packages/r-car/package.py | 2 +- var/spack/repos/builtin/packages/r-caret/package.py | 2 +- var/spack/repos/builtin/packages/r-catools/package.py | 2 +- var/spack/repos/builtin/packages/r-chron/package.py | 2 +- var/spack/repos/builtin/packages/r-class/package.py | 2 +- var/spack/repos/builtin/packages/r-cluster/package.py | 2 +- .../repos/builtin/packages/r-codetools/package.py | 2 +- .../repos/builtin/packages/r-colorspace/package.py | 2 +- var/spack/repos/builtin/packages/r-crayon/package.py | 2 +- .../repos/builtin/packages/r-cubature/package.py | 2 +- var/spack/repos/builtin/packages/r-curl/package.py | 2 +- .../repos/builtin/packages/r-datatable/package.py | 2 +- var/spack/repos/builtin/packages/r-dbi/package.py | 2 +- var/spack/repos/builtin/packages/r-deoptim/package.py | 2 +- .../repos/builtin/packages/r-devtools/package.py | 2 +- .../repos/builtin/packages/r-diagrammer/package.py | 2 +- .../repos/builtin/packages/r-dichromat/package.py | 2 +- var/spack/repos/builtin/packages/r-digest/package.py | 2 +- .../repos/builtin/packages/r-doparallel/package.py | 2 +- var/spack/repos/builtin/packages/r-dplyr/package.py | 4 ++-- var/spack/repos/builtin/packages/r-dt/package.py | 2 +- .../repos/builtin/packages/r-dygraphs/package.py | 2 +- var/spack/repos/builtin/packages/r-e1071/package.py | 2 +- .../repos/builtin/packages/r-evaluate/package.py | 2 +- .../repos/builtin/packages/r-filehash/package.py | 2 +- var/spack/repos/builtin/packages/r-foreach/package.py | 2 +- var/spack/repos/builtin/packages/r-foreign/package.py | 2 +- var/spack/repos/builtin/packages/r-formatr/package.py | 2 +- var/spack/repos/builtin/packages/r-formula/package.py | 2 +- var/spack/repos/builtin/packages/r-gdata/package.py | 2 +- .../repos/builtin/packages/r-geosphere/package.py | 2 +- var/spack/repos/builtin/packages/r-ggmap/package.py | 2 +- var/spack/repos/builtin/packages/r-ggplot2/package.py | 2 +- var/spack/repos/builtin/packages/r-ggvis/package.py | 2 +- var/spack/repos/builtin/packages/r-gistr/package.py | 2 +- var/spack/repos/builtin/packages/r-git2r/package.py | 2 +- var/spack/repos/builtin/packages/r-glmnet/package.py | 2 +- .../repos/builtin/packages/r-googlevis/package.py | 2 +- .../repos/builtin/packages/r-gridbase/package.py | 2 +- .../repos/builtin/packages/r-gridextra/package.py | 2 +- var/spack/repos/builtin/packages/r-gtable/package.py | 2 +- var/spack/repos/builtin/packages/r-gtools/package.py | 2 +- var/spack/repos/builtin/packages/r-hexbin/package.py | 2 +- var/spack/repos/builtin/packages/r-highr/package.py | 2 +- .../repos/builtin/packages/r-htmltools/package.py | 2 +- .../repos/builtin/packages/r-htmlwidgets/package.py | 2 +- var/spack/repos/builtin/packages/r-httpuv/package.py | 2 +- var/spack/repos/builtin/packages/r-httr/package.py | 4 ++-- var/spack/repos/builtin/packages/r-igraph/package.py | 2 +- .../repos/builtin/packages/r-influencer/package.py | 2 +- var/spack/repos/builtin/packages/r-inline/package.py | 2 +- .../repos/builtin/packages/r-irdisplay/package.py | 2 +- .../repos/builtin/packages/r-irkernel/package.py | 2 +- var/spack/repos/builtin/packages/r-irlba/package.py | 2 +- .../repos/builtin/packages/r-iterators/package.py | 2 +- var/spack/repos/builtin/packages/r-jpeg/package.py | 2 +- .../repos/builtin/packages/r-jsonlite/package.py | 2 +- var/spack/repos/builtin/packages/r-knitr/package.py | 2 +- .../repos/builtin/packages/r-labeling/package.py | 2 +- var/spack/repos/builtin/packages/r-lattice/package.py | 2 +- .../repos/builtin/packages/r-lazyeval/package.py | 2 +- var/spack/repos/builtin/packages/r-leaflet/package.py | 2 +- var/spack/repos/builtin/packages/r-lme4/package.py | 2 +- var/spack/repos/builtin/packages/r-lmtest/package.py | 2 +- .../repos/builtin/packages/r-lubridate/package.py | 2 +- var/spack/repos/builtin/packages/r-magic/package.py | 2 +- .../repos/builtin/packages/r-magrittr/package.py | 2 +- var/spack/repos/builtin/packages/r-mapproj/package.py | 2 +- var/spack/repos/builtin/packages/r-maps/package.py | 2 +- .../repos/builtin/packages/r-maptools/package.py | 2 +- .../repos/builtin/packages/r-markdown/package.py | 2 +- var/spack/repos/builtin/packages/r-mass/package.py | 2 +- var/spack/repos/builtin/packages/r-matrix/package.py | 2 +- .../repos/builtin/packages/r-matrixmodels/package.py | 2 +- var/spack/repos/builtin/packages/r-memoise/package.py | 2 +- var/spack/repos/builtin/packages/r-mgcv/package.py | 2 +- var/spack/repos/builtin/packages/r-mime/package.py | 2 +- var/spack/repos/builtin/packages/r-minqa/package.py | 2 +- .../repos/builtin/packages/r-multcomp/package.py | 2 +- var/spack/repos/builtin/packages/r-munsell/package.py | 2 +- var/spack/repos/builtin/packages/r-mvtnorm/package.py | 2 +- var/spack/repos/builtin/packages/r-ncdf4/package.py | 2 +- .../repos/builtin/packages/r-networkd3/package.py | 2 +- var/spack/repos/builtin/packages/r-nlme/package.py | 2 +- var/spack/repos/builtin/packages/r-nloptr/package.py | 2 +- var/spack/repos/builtin/packages/r-nmf/package.py | 2 +- var/spack/repos/builtin/packages/r-nnet/package.py | 2 +- var/spack/repos/builtin/packages/r-np/package.py | 2 +- var/spack/repos/builtin/packages/r-openssl/package.py | 2 +- var/spack/repos/builtin/packages/r-packrat/package.py | 2 +- .../repos/builtin/packages/r-partykit/package.py | 2 +- var/spack/repos/builtin/packages/r-pbdzmq/package.py | 4 ++-- .../repos/builtin/packages/r-pbkrtest/package.py | 2 +- .../repos/builtin/packages/r-pkgmaker/package.py | 2 +- var/spack/repos/builtin/packages/r-plotrix/package.py | 2 +- var/spack/repos/builtin/packages/r-plyr/package.py | 2 +- var/spack/repos/builtin/packages/r-png/package.py | 2 +- var/spack/repos/builtin/packages/r-praise/package.py | 2 +- var/spack/repos/builtin/packages/r-proto/package.py | 2 +- var/spack/repos/builtin/packages/r-pryr/package.py | 2 +- .../repos/builtin/packages/r-quantmod/package.py | 2 +- .../repos/builtin/packages/r-quantreg/package.py | 2 +- .../repos/builtin/packages/{r-R6 => r-r6}/package.py | 2 +- .../repos/builtin/packages/r-randomforest/package.py | 2 +- var/spack/repos/builtin/packages/r-raster/package.py | 2 +- var/spack/repos/builtin/packages/r-rbokeh/package.py | 2 +- .../repos/builtin/packages/r-rcolorbrewer/package.py | 2 +- var/spack/repos/builtin/packages/r-rcpp/package.py | 2 +- .../repos/builtin/packages/r-rcppeigen/package.py | 2 +- .../repos/builtin/packages/r-registry/package.py | 2 +- var/spack/repos/builtin/packages/r-repr/package.py | 2 +- .../repos/builtin/packages/r-reshape2/package.py | 2 +- .../repos/builtin/packages/r-rgooglemaps/package.py | 2 +- var/spack/repos/builtin/packages/r-rinside/package.py | 2 +- var/spack/repos/builtin/packages/r-rjava/package.py | 2 +- var/spack/repos/builtin/packages/r-rjson/package.py | 2 +- var/spack/repos/builtin/packages/r-rjsonio/package.py | 2 +- .../repos/builtin/packages/r-rmarkdown/package.py | 2 +- var/spack/repos/builtin/packages/r-rmysql/package.py | 2 +- .../repos/builtin/packages/r-rngtools/package.py | 2 +- var/spack/repos/builtin/packages/r-rodbc/package.py | 2 +- .../repos/builtin/packages/r-roxygen2/package.py | 2 +- .../repos/builtin/packages/r-rpostgresql/package.py | 2 +- var/spack/repos/builtin/packages/r-rsnns/package.py | 2 +- var/spack/repos/builtin/packages/r-rsqlite/package.py | 2 +- var/spack/repos/builtin/packages/r-rstan/package.py | 2 +- .../repos/builtin/packages/r-rstudioapi/package.py | 2 +- var/spack/repos/builtin/packages/r-rzmq/package.py | 2 +- .../repos/builtin/packages/r-sandwich/package.py | 2 +- var/spack/repos/builtin/packages/r-scales/package.py | 2 +- var/spack/repos/builtin/packages/r-shiny/package.py | 4 ++-- var/spack/repos/builtin/packages/r-sp/package.py | 2 +- var/spack/repos/builtin/packages/r-sparsem/package.py | 2 +- .../repos/builtin/packages/r-stanheaders/package.py | 2 +- var/spack/repos/builtin/packages/r-stringi/package.py | 2 +- var/spack/repos/builtin/packages/r-stringr/package.py | 2 +- var/spack/repos/builtin/packages/r-survey/package.py | 2 +- .../repos/builtin/packages/r-survival/package.py | 2 +- var/spack/repos/builtin/packages/r-tarifx/package.py | 2 +- var/spack/repos/builtin/packages/r-testit/package.py | 2 +- .../repos/builtin/packages/r-testthat/package.py | 4 ++-- var/spack/repos/builtin/packages/r-thdata/package.py | 2 +- var/spack/repos/builtin/packages/r-threejs/package.py | 2 +- var/spack/repos/builtin/packages/r-tibble/package.py | 2 +- var/spack/repos/builtin/packages/r-tidyr/package.py | 2 +- var/spack/repos/builtin/packages/r-ttr/package.py | 2 +- var/spack/repos/builtin/packages/r-uuid/package.py | 2 +- var/spack/repos/builtin/packages/r-vcd/package.py | 2 +- .../repos/builtin/packages/r-visnetwork/package.py | 2 +- var/spack/repos/builtin/packages/r-whisker/package.py | 2 +- var/spack/repos/builtin/packages/r-withr/package.py | 2 +- var/spack/repos/builtin/packages/r-xgboost/package.py | 2 +- .../repos/builtin/packages/r-xlconnect/package.py | 2 +- .../repos/builtin/packages/r-xlconnectjars/package.py | 2 +- var/spack/repos/builtin/packages/r-xlsx/package.py | 2 +- .../repos/builtin/packages/r-xlsxjars/package.py | 2 +- var/spack/repos/builtin/packages/r-xml/package.py | 2 +- var/spack/repos/builtin/packages/r-xtable/package.py | 2 +- var/spack/repos/builtin/packages/r-xts/package.py | 2 +- var/spack/repos/builtin/packages/r-yaml/package.py | 2 +- var/spack/repos/builtin/packages/r-zoo/package.py | 2 +- var/spack/repos/builtin/packages/{R => r}/package.py | 0 .../packages/{SAMRAI => samrai}/no-tool-build.patch | 0 .../builtin/packages/{SAMRAI => samrai}/package.py | 0 .../packages/{sdl2_image => sdl2-image}/package.py | 0 .../package.py | 0 .../package.py | 0 var/spack/repos/builtin/packages/uberftp/package.py | 2 +- 205 files changed, 215 insertions(+), 204 deletions(-) rename var/spack/repos/builtin.mock/packages/{direct_mpich => direct-mpich}/package.py (100%) rename var/spack/repos/builtin.mock/packages/{indirect_mpich => indirect-mpich}/package.py (98%) rename var/spack/repos/builtin.mock/packages/{simple_inheritance => simple-inheritance}/package.py (100%) rename var/spack/repos/builtin.mock/packages/{trivial_install_test_package => trivial-install-test-package}/package.py (100%) rename var/spack/repos/builtin/packages/{etsf_io => etsf-io}/package.py (100%) rename var/spack/repos/builtin/packages/{fastx_toolkit => fastx-toolkit}/package.py (100%) rename var/spack/repos/builtin/packages/{globus_toolkit => globus-toolkit}/package.py (100%) rename var/spack/repos/builtin/packages/{ImageMagick => image-magick}/package.py (98%) rename var/spack/repos/builtin/packages/{libNBC => libnbc}/package.py (100%) rename var/spack/repos/builtin/packages/{LuaJIT => lua-jit}/package.py (98%) rename var/spack/repos/builtin/packages/{Mitos => mitos}/package.py (100%) rename var/spack/repos/builtin/packages/{pmgr_collective => pmgr-collective}/package.py (100%) rename var/spack/repos/builtin/packages/{py-SQLAlchemy => py-sqlalchemy}/package.py (100%) rename var/spack/repos/builtin/packages/{r-BiocGenerics => r-biocgenerics}/package.py (99%) rename var/spack/repos/builtin/packages/{r-R6 => r-r6}/package.py (99%) rename var/spack/repos/builtin/packages/{R => r}/package.py (100%) rename var/spack/repos/builtin/packages/{SAMRAI => samrai}/no-tool-build.patch (100%) rename var/spack/repos/builtin/packages/{SAMRAI => samrai}/package.py (100%) rename var/spack/repos/builtin/packages/{sdl2_image => sdl2-image}/package.py (100%) rename var/spack/repos/builtin/packages/{the_platinum_searcher => the-platinum-searcher}/package.py (100%) rename var/spack/repos/builtin/packages/{the_silver_searcher => the-silver-searcher}/package.py (100%) diff --git a/lib/spack/docs/module_file_support.rst b/lib/spack/docs/module_file_support.rst index 5db2ca02857..93c2ee33c65 100644 --- a/lib/spack/docs/module_file_support.rst +++ b/lib/spack/docs/module_file_support.rst @@ -353,9 +353,9 @@ and has similar effects on module file of dependees. Even in this case ``run_env`` must be filled with the desired list of environment modifications. .. note:: - The ``R`` package and callback APIs + The ``r`` package and callback APIs A typical example in which overriding both methods prove to be useful - is given by the ``R`` package. This package installs libraries and headers + is given by the ``r`` package. This package installs libraries and headers in non-standard locations and it is possible to prepend the appropriate directory to the corresponding environment variables: @@ -367,14 +367,14 @@ and has similar effects on module file of dependees. Even in this case with the following snippet: - .. literalinclude:: ../../../var/spack/repos/builtin/packages/R/package.py + .. literalinclude:: ../../../var/spack/repos/builtin/packages/r/package.py :pyobject: R.setup_environment - The ``R`` package also knows which environment variable should be modified + The ``r`` package also knows which environment variable should be modified to make language extensions provided by other packages available, and modifies it appropriately in the override of the second method: - .. literalinclude:: ../../../var/spack/repos/builtin/packages/R/package.py + .. literalinclude:: ../../../var/spack/repos/builtin/packages/r/package.py :lines: 128-129,146-151 .. _modules-yaml: diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py index bee75cec4b3..f1a5bc5cdb7 100644 --- a/lib/spack/spack/cmd/create.py +++ b/lib/spack/spack/cmd/create.py @@ -215,7 +215,7 @@ def __init__(self, name, *args): class RGuess(DefaultGuess): """Provides appropriate overrides for R extensions""" dependencies = """\ - extends('R') + extends('r') # FIXME: Add additional dependencies if required. # depends_on('r-foo', type=nolink)""" @@ -283,7 +283,7 @@ class BuildSystemGuesser(object): 'scons': SconsGuess, 'bazel': BazelGuess, 'python': PythonGuess, - 'R': RGuess, + 'r': RGuess, 'octave': OctaveGuess } @@ -306,7 +306,7 @@ def __call__(self, stage, url): (r'/CMakeLists.txt$', 'cmake'), (r'/SConstruct$', 'scons'), (r'/setup.py$', 'python'), - (r'/NAMESPACE$', 'R'), + (r'/NAMESPACE$', 'r'), (r'/WORKSPACE$', 'bazel') ] diff --git a/lib/spack/spack/test/build_system_guess.py b/lib/spack/spack/test/build_system_guess.py index 97a9d67b47f..86c1c9da135 100644 --- a/lib/spack/spack/test/build_system_guess.py +++ b/lib/spack/spack/test/build_system_guess.py @@ -36,7 +36,7 @@ ('CMakeLists.txt', 'cmake'), ('SConstruct', 'scons'), ('setup.py', 'python'), - ('NAMESPACE', 'R'), + ('NAMESPACE', 'r'), ('foobar', 'unknown') ] ) diff --git a/lib/spack/spack/test/concretize.py b/lib/spack/spack/test/concretize.py index 3cc5c70a5f7..b7cad503a33 100644 --- a/lib/spack/spack/test/concretize.py +++ b/lib/spack/spack/test/concretize.py @@ -240,7 +240,7 @@ def test_virtual_is_fully_expanded_for_mpileaks( assert 'mpi' in spec def test_my_dep_depends_on_provider_of_my_virtual_dep(self): - spec = Spec('indirect_mpich') + spec = Spec('indirect-mpich') spec.normalize() spec.concretize() diff --git a/lib/spack/spack/test/install.py b/lib/spack/spack/test/install.py index d2ebf8dfb45..f10c3a37e99 100644 --- a/lib/spack/spack/test/install.py +++ b/lib/spack/spack/test/install.py @@ -60,7 +60,7 @@ def fake_fetchify(url, pkg): @pytest.mark.usefixtures('install_mockery') def test_install_and_uninstall(mock_archive): # Get a basic concrete spec for the trivial install package. - spec = Spec('trivial_install_test_package') + spec = Spec('trivial-install-test-package') spec.concretize() assert spec.concrete diff --git a/lib/spack/spack/test/mirror.py b/lib/spack/spack/test/mirror.py index 13219ef878a..e5e60e3045c 100644 --- a/lib/spack/spack/test/mirror.py +++ b/lib/spack/spack/test/mirror.py @@ -129,7 +129,7 @@ def test_hg_mirror(self, mock_hg_repository): repos.clear() def test_url_mirror(self, mock_archive): - set_up_package('trivial_install_test_package', mock_archive, 'url') + set_up_package('trivial-install-test-package', mock_archive, 'url') check_mirror() repos.clear() @@ -143,6 +143,6 @@ def test_all_mirror( set_up_package('git-test', mock_git_repository, 'git') set_up_package('svn-test', mock_svn_repository, 'svn') set_up_package('hg-test', mock_hg_repository, 'hg') - set_up_package('trivial_install_test_package', mock_archive, 'url') + set_up_package('trivial-install-test-package', mock_archive, 'url') check_mirror() repos.clear() diff --git a/lib/spack/spack/test/package_sanity.py b/lib/spack/spack/test/package_sanity.py index c3c3923855c..c75d7cdcc70 100644 --- a/lib/spack/spack/test/package_sanity.py +++ b/lib/spack/spack/test/package_sanity.py @@ -26,6 +26,7 @@ This test does sanity checks on Spack's builtin package database. """ import unittest +import re import spack from spack.repository import RepoPath @@ -57,3 +58,13 @@ def test_url_versions(self): # If there is a url for the version check it. v_url = pkg.url_for_version(v) self.assertEqual(vattrs['url'], v_url) + + def test_all_versions_are_lowercase(self): + """Spack package names must be lowercase, and use `-` instead of `_`. + """ + errors = [] + for name in spack.repo.all_package_names(): + if re.search(r'[_A-Z]', name): + errors.append(name) + + self.assertEqual([], errors) diff --git a/lib/spack/spack/test/packages.py b/lib/spack/spack/test/packages.py index 39bbe4a9541..6ae8a33a247 100644 --- a/lib/spack/spack/test/packages.py +++ b/lib/spack/spack/test/packages.py @@ -83,7 +83,7 @@ def test_import_package_as(builtin_mock): def test_inheritance_of_diretives(): - p = spack.repo.get('simple_inheritance') + p = spack.repo.get('simple-inheritance') # Check dictionaries that should have been filled by directives assert len(p.dependencies) == 3 @@ -93,14 +93,14 @@ def test_inheritance_of_diretives(): assert len(p.provided) == 2 # Check that Spec instantiation behaves as we expect - s = Spec('simple_inheritance') + s = Spec('simple-inheritance') s.concretize() assert '^cmake' in s assert '^openblas' in s assert '+openblas' in s assert 'mpi' in s - s = Spec('simple_inheritance~openblas') + s = Spec('simple-inheritance~openblas') s.concretize() assert '^cmake' in s assert '^openblas' not in s diff --git a/var/spack/repos/builtin.mock/packages/direct_mpich/package.py b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py similarity index 100% rename from var/spack/repos/builtin.mock/packages/direct_mpich/package.py rename to var/spack/repos/builtin.mock/packages/direct-mpich/package.py diff --git a/var/spack/repos/builtin.mock/packages/indirect_mpich/package.py b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py similarity index 98% rename from var/spack/repos/builtin.mock/packages/indirect_mpich/package.py rename to var/spack/repos/builtin.mock/packages/indirect-mpich/package.py index bbbf196129b..77b8022b1c4 100644 --- a/var/spack/repos/builtin.mock/packages/indirect_mpich/package.py +++ b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py @@ -36,7 +36,7 @@ class IndirectMpich(Package): version(1.0, 'foobarbaz') depends_on('mpi') - depends_on('direct_mpich') + depends_on('direct-mpich') def install(self, spec, prefix): pass diff --git a/var/spack/repos/builtin.mock/packages/simple_inheritance/package.py b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py similarity index 100% rename from var/spack/repos/builtin.mock/packages/simple_inheritance/package.py rename to var/spack/repos/builtin.mock/packages/simple-inheritance/package.py diff --git a/var/spack/repos/builtin.mock/packages/trivial_install_test_package/package.py b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py similarity index 100% rename from var/spack/repos/builtin.mock/packages/trivial_install_test_package/package.py rename to var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py diff --git a/var/spack/repos/builtin/packages/cleverleaf/package.py b/var/spack/repos/builtin/packages/cleverleaf/package.py index 61e6dca4333..3bd1f0b5d06 100644 --- a/var/spack/repos/builtin/packages/cleverleaf/package.py +++ b/var/spack/repos/builtin/packages/cleverleaf/package.py @@ -40,7 +40,7 @@ class Cleverleaf(Package): version('develop', git='https://github.com/UK-MAC/CleverLeaf_ref.git', branch='develop') - depends_on("SAMRAI@3.8.0:") + depends_on("samrai@3.8.0:") depends_on("hdf5+mpi") depends_on("boost") depends_on('cmake', type='build') diff --git a/var/spack/repos/builtin/packages/etsf_io/package.py b/var/spack/repos/builtin/packages/etsf-io/package.py similarity index 100% rename from var/spack/repos/builtin/packages/etsf_io/package.py rename to var/spack/repos/builtin/packages/etsf-io/package.py diff --git a/var/spack/repos/builtin/packages/fastx_toolkit/package.py b/var/spack/repos/builtin/packages/fastx-toolkit/package.py similarity index 100% rename from var/spack/repos/builtin/packages/fastx_toolkit/package.py rename to var/spack/repos/builtin/packages/fastx-toolkit/package.py diff --git a/var/spack/repos/builtin/packages/globus_toolkit/package.py b/var/spack/repos/builtin/packages/globus-toolkit/package.py similarity index 100% rename from var/spack/repos/builtin/packages/globus_toolkit/package.py rename to var/spack/repos/builtin/packages/globus-toolkit/package.py diff --git a/var/spack/repos/builtin/packages/gource/package.py b/var/spack/repos/builtin/packages/gource/package.py index d8ae8b6506d..dda00420a38 100644 --- a/var/spack/repos/builtin/packages/gource/package.py +++ b/var/spack/repos/builtin/packages/gource/package.py @@ -47,7 +47,7 @@ class Gource(Package): depends_on('libpng') depends_on('pcre') depends_on('sdl2') - depends_on('sdl2_image') + depends_on('sdl2-image') def install(self, spec, prefix): make_args = ['--prefix=%s' % prefix, diff --git a/var/spack/repos/builtin/packages/ImageMagick/package.py b/var/spack/repos/builtin/packages/image-magick/package.py similarity index 98% rename from var/spack/repos/builtin/packages/ImageMagick/package.py rename to var/spack/repos/builtin/packages/image-magick/package.py index 0b474285ce5..9efb0cd3686 100644 --- a/var/spack/repos/builtin/packages/ImageMagick/package.py +++ b/var/spack/repos/builtin/packages/image-magick/package.py @@ -25,7 +25,7 @@ from spack import * -class Imagemagick(Package): +class ImageMagick(Package): """ImageMagick is a software suite to create, edit, compose, or convert bitmap images.""" diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py index 3725724ee34..89db570b81e 100644 --- a/var/spack/repos/builtin/packages/julia/package.py +++ b/var/spack/repos/builtin/packages/julia/package.py @@ -222,7 +222,7 @@ def install(self, spec, prefix): if "+plot" in spec: julia("-e", 'Pkg.add("PyPlot"); using PyPlot') julia("-e", 'Pkg.add("Colors"); using Colors') - # These require maybe Gtk and ImageMagick + # These require maybe gtk and image-magick julia("-e", 'Pkg.add("Plots"); using Plots') julia("-e", 'Pkg.add("PlotRecipes"); using PlotRecipes') julia("-e", 'Pkg.add("UnicodePlots"); using UnicodePlots') diff --git a/var/spack/repos/builtin/packages/libNBC/package.py b/var/spack/repos/builtin/packages/libnbc/package.py similarity index 100% rename from var/spack/repos/builtin/packages/libNBC/package.py rename to var/spack/repos/builtin/packages/libnbc/package.py diff --git a/var/spack/repos/builtin/packages/LuaJIT/package.py b/var/spack/repos/builtin/packages/lua-jit/package.py similarity index 98% rename from var/spack/repos/builtin/packages/LuaJIT/package.py rename to var/spack/repos/builtin/packages/lua-jit/package.py index 244c63c8fb6..5f7de8ff06b 100644 --- a/var/spack/repos/builtin/packages/LuaJIT/package.py +++ b/var/spack/repos/builtin/packages/lua-jit/package.py @@ -26,7 +26,7 @@ from spack import * -class Luajit(Package): +class LuaJit(Package): """Flast flexible JITed lua""" homepage = "http://www.luajit.org" url = "http://luajit.org/download/LuaJIT-2.0.4.tar.gz" diff --git a/var/spack/repos/builtin/packages/Mitos/package.py b/var/spack/repos/builtin/packages/mitos/package.py similarity index 100% rename from var/spack/repos/builtin/packages/Mitos/package.py rename to var/spack/repos/builtin/packages/mitos/package.py diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index aa521899e5c..df144c8bbbd 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -85,7 +85,7 @@ class Octave(Package): depends_on('glpk', when='+glpk') depends_on('gl2ps', when='+gl2ps') depends_on('gnuplot', when='+gnuplot') - depends_on('ImageMagick', when='+magick') + depends_on('image-magick', when='+magick') depends_on('hdf5', when='+hdf5') depends_on('jdk', when='+jdk') depends_on('llvm', when='+llvm') @@ -162,7 +162,7 @@ def install(self, spec, prefix): if '+magick' in spec: config_args.append("--with-magick=%s" - % spec['ImageMagick'].prefix.lib) + % spec['image-magick'].prefix.lib) if '+hdf5' in spec: config_args.extend([ diff --git a/var/spack/repos/builtin/packages/octopus/package.py b/var/spack/repos/builtin/packages/octopus/package.py index adb760f06d7..a100f7896a2 100644 --- a/var/spack/repos/builtin/packages/octopus/package.py +++ b/var/spack/repos/builtin/packages/octopus/package.py @@ -42,8 +42,8 @@ class Octopus(Package): depends_on('fftw+mpi') # optional dependencies: - # TODO: scalapack, metis, parmetis, netcdf, etsf_io, SPARSKIT, ARPACK, - # FEAST, Libfm, PFFT, ISF, PNFFT + # TODO: scalapack, metis, parmetis, netcdf, etsf-io, sparskit, arpack, + # feast, libfm, pfft, isf, pnfft def install(self, spec, prefix): lapack = spec['lapack'].lapack_libs diff --git a/var/spack/repos/builtin/packages/pmgr_collective/package.py b/var/spack/repos/builtin/packages/pmgr-collective/package.py similarity index 100% rename from var/spack/repos/builtin/packages/pmgr_collective/package.py rename to var/spack/repos/builtin/packages/pmgr-collective/package.py diff --git a/var/spack/repos/builtin/packages/py-csvkit/package.py b/var/spack/repos/builtin/packages/py-csvkit/package.py index 5b0394a1381..904f138d12b 100644 --- a/var/spack/repos/builtin/packages/py-csvkit/package.py +++ b/var/spack/repos/builtin/packages/py-csvkit/package.py @@ -39,7 +39,7 @@ class PyCsvkit(Package): depends_on('py-dateutil', type=nolink) depends_on('py-dbf', type=nolink) depends_on('py-xlrd', type=nolink) - depends_on('py-SQLAlchemy', type=nolink) + depends_on('py-sqlalchemy', type=nolink) depends_on('py-six', type=nolink) depends_on('py-openpyxl', type=nolink) diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index 38859ebe157..8661a3f7215 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -76,7 +76,7 @@ class PyMatplotlib(Package): # --------- Optional external programs # ffmpeg/avconv or mencoder - depends_on('ImageMagick', when='+animation') + depends_on('image-magick', when='+animation') # --------- Optional dependencies depends_on('pkg-config', type='build') # why not... diff --git a/var/spack/repos/builtin/packages/py-SQLAlchemy/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py similarity index 100% rename from var/spack/repos/builtin/packages/py-SQLAlchemy/package.py rename to var/spack/repos/builtin/packages/py-sqlalchemy/package.py diff --git a/var/spack/repos/builtin/packages/r-abind/package.py b/var/spack/repos/builtin/packages/r-abind/package.py index 96f623a0963..f691ae13ea6 100644 --- a/var/spack/repos/builtin/packages/r-abind/package.py +++ b/var/spack/repos/builtin/packages/r-abind/package.py @@ -37,7 +37,7 @@ class RAbind(Package): version('1.4-3', '10fcf80c677b991bf263d38be35a1fc5') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-assertthat/package.py b/var/spack/repos/builtin/packages/r-assertthat/package.py index 4070b6fe8d7..fe0c400aaa2 100644 --- a/var/spack/repos/builtin/packages/r-assertthat/package.py +++ b/var/spack/repos/builtin/packages/r-assertthat/package.py @@ -36,7 +36,7 @@ class RAssertthat(Package): version('0.1', '59f9d7f7c00077ea54d763b78eeb5798') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-base64enc/package.py b/var/spack/repos/builtin/packages/r-base64enc/package.py index 4c5d14a90f4..2289f40e4f9 100644 --- a/var/spack/repos/builtin/packages/r-base64enc/package.py +++ b/var/spack/repos/builtin/packages/r-base64enc/package.py @@ -35,7 +35,7 @@ class RBase64enc(Package): version('0.1-3', '0f476dacdd11a3e0ad56d13f5bc2f190') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-bh/package.py b/var/spack/repos/builtin/packages/r-bh/package.py index a0f30b779f3..4b2b4ca11da 100644 --- a/var/spack/repos/builtin/packages/r-bh/package.py +++ b/var/spack/repos/builtin/packages/r-bh/package.py @@ -47,7 +47,7 @@ class RBh(Package): version('1.60.0-2', 'b50fdc85285da05add4e9da664a2d551') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-BiocGenerics/package.py b/var/spack/repos/builtin/packages/r-biocgenerics/package.py similarity index 99% rename from var/spack/repos/builtin/packages/r-BiocGenerics/package.py rename to var/spack/repos/builtin/packages/r-biocgenerics/package.py index 5a6ce72a4bd..ce933565412 100644 --- a/var/spack/repos/builtin/packages/r-BiocGenerics/package.py +++ b/var/spack/repos/builtin/packages/r-biocgenerics/package.py @@ -36,7 +36,7 @@ class RBiocgenerics(Package): git='https://github.com/Bioconductor-mirror/BiocGenerics.git', branch='release-3.2') - extends('R') + extends('r') def validate(self, spec): """ diff --git a/var/spack/repos/builtin/packages/r-bitops/package.py b/var/spack/repos/builtin/packages/r-bitops/package.py index 6399202abab..7421ea46582 100644 --- a/var/spack/repos/builtin/packages/r-bitops/package.py +++ b/var/spack/repos/builtin/packages/r-bitops/package.py @@ -35,7 +35,7 @@ class RBitops(Package): version('1.0-6', 'fba16485a51b1ccd354abde5816b6bdd') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-boot/package.py b/var/spack/repos/builtin/packages/r-boot/package.py index 1f2f541fec6..0b78c202b87 100644 --- a/var/spack/repos/builtin/packages/r-boot/package.py +++ b/var/spack/repos/builtin/packages/r-boot/package.py @@ -36,7 +36,7 @@ class RBoot(Package): version('1.3-18', '711dd58af14e1027eb8377d9202e9b6f') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-brew/package.py b/var/spack/repos/builtin/packages/r-brew/package.py index 111606d5769..10bbccf1de1 100644 --- a/var/spack/repos/builtin/packages/r-brew/package.py +++ b/var/spack/repos/builtin/packages/r-brew/package.py @@ -36,7 +36,7 @@ class RBrew(Package): version('1.0-6', '4aaca5e6ec145e0fc0fe6375ce1f3806') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-c50/package.py b/var/spack/repos/builtin/packages/r-c50/package.py index e9b582b52ff..6ce917521d6 100644 --- a/var/spack/repos/builtin/packages/r-c50/package.py +++ b/var/spack/repos/builtin/packages/r-c50/package.py @@ -35,7 +35,7 @@ class RC50(Package): version('0.1.0-24', '42631e65c5c579532cc6edf5ea175949') - extends('R') + extends('r') depends_on('r-partykit', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-car/package.py b/var/spack/repos/builtin/packages/r-car/package.py index f4a3824983f..fa2cc407b88 100644 --- a/var/spack/repos/builtin/packages/r-car/package.py +++ b/var/spack/repos/builtin/packages/r-car/package.py @@ -35,7 +35,7 @@ class RCar(Package): version('2.1-2', '0f78ad74ef7130126d319acec23951a0') - extends('R') + extends('r') depends_on('r-mass', type=nolink) depends_on('r-mgcv', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-caret/package.py b/var/spack/repos/builtin/packages/r-caret/package.py index 460526c7d32..bfc2db5780d 100644 --- a/var/spack/repos/builtin/packages/r-caret/package.py +++ b/var/spack/repos/builtin/packages/r-caret/package.py @@ -35,7 +35,7 @@ class RCaret(Package): version('6.0-70', '202d7abb6a679af716ea69fb2573f108') - extends('R') + extends('r') depends_on('r-lattice', type=nolink) depends_on('r-ggplot2', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-catools/package.py b/var/spack/repos/builtin/packages/r-catools/package.py index adc64e269cf..b2daa14c6bb 100644 --- a/var/spack/repos/builtin/packages/r-catools/package.py +++ b/var/spack/repos/builtin/packages/r-catools/package.py @@ -38,7 +38,7 @@ class RCatools(Package): version('1.17.1', '5c872bbc78b177b306f36709deb44498') - extends('R') + extends('r') depends_on('r-bitops', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-chron/package.py b/var/spack/repos/builtin/packages/r-chron/package.py index 9cd9d76e9e6..9393ac416f2 100644 --- a/var/spack/repos/builtin/packages/r-chron/package.py +++ b/var/spack/repos/builtin/packages/r-chron/package.py @@ -34,7 +34,7 @@ class RChron(Package): version('2.3-47', 'b8890cdc5f2337f8fd775b0becdcdd1f') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-class/package.py b/var/spack/repos/builtin/packages/r-class/package.py index f541ea36113..627cce808c6 100644 --- a/var/spack/repos/builtin/packages/r-class/package.py +++ b/var/spack/repos/builtin/packages/r-class/package.py @@ -35,7 +35,7 @@ class RClass(Package): version('7.3-14', '6a21dd206fe4ea29c55faeb65fb2b71e') - extends('R') + extends('r') depends_on('r-mass', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-cluster/package.py b/var/spack/repos/builtin/packages/r-cluster/package.py index 0fdf2ce5de1..2deb0533220 100644 --- a/var/spack/repos/builtin/packages/r-cluster/package.py +++ b/var/spack/repos/builtin/packages/r-cluster/package.py @@ -36,7 +36,7 @@ class RCluster(Package): version('2.0.4', 'bb4deceaafb1c42bb1278d5d0dc11e59') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-codetools/package.py b/var/spack/repos/builtin/packages/r-codetools/package.py index bea2f78c829..206e4c09a55 100644 --- a/var/spack/repos/builtin/packages/r-codetools/package.py +++ b/var/spack/repos/builtin/packages/r-codetools/package.py @@ -34,7 +34,7 @@ class RCodetools(Package): version('0.2-14', '7ec41d4f8bd6ba85facc8c5e6adc1f4d') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-colorspace/package.py b/var/spack/repos/builtin/packages/r-colorspace/package.py index a7622cad951..48c50191acb 100644 --- a/var/spack/repos/builtin/packages/r-colorspace/package.py +++ b/var/spack/repos/builtin/packages/r-colorspace/package.py @@ -37,7 +37,7 @@ class RColorspace(Package): version('1.2-6', 'a30191e9caf66f77ff4e99c062e9dce1') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-crayon/package.py b/var/spack/repos/builtin/packages/r-crayon/package.py index 1e0befbca91..f0578a7c814 100644 --- a/var/spack/repos/builtin/packages/r-crayon/package.py +++ b/var/spack/repos/builtin/packages/r-crayon/package.py @@ -38,7 +38,7 @@ class RCrayon(Package): version('1.3.2', 'fe29c6204d2d6ff4c2f9d107a03d0cb9') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-cubature/package.py b/var/spack/repos/builtin/packages/r-cubature/package.py index 1d8f837922b..4ae21947ae4 100644 --- a/var/spack/repos/builtin/packages/r-cubature/package.py +++ b/var/spack/repos/builtin/packages/r-cubature/package.py @@ -34,7 +34,7 @@ class RCubature(Package): version('1.1-2', '5617e1d82baa803a3814d92461da45c9') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-curl/package.py b/var/spack/repos/builtin/packages/r-curl/package.py index 24c0eadb2d5..71f28d46097 100644 --- a/var/spack/repos/builtin/packages/r-curl/package.py +++ b/var/spack/repos/builtin/packages/r-curl/package.py @@ -43,7 +43,7 @@ class RCurl(Package): version('1.0', '93d34926d6071e1fba7e728b482f0dd9') version('0.9.7', 'a101f7de948cb828fef571c730f39217') - extends('R') + extends('r') depends_on('curl') diff --git a/var/spack/repos/builtin/packages/r-datatable/package.py b/var/spack/repos/builtin/packages/r-datatable/package.py index fb0b2f1053b..f0d2247d36e 100644 --- a/var/spack/repos/builtin/packages/r-datatable/package.py +++ b/var/spack/repos/builtin/packages/r-datatable/package.py @@ -37,7 +37,7 @@ class RDatatable(Package): version('1.9.6', 'b1c0c7cce490bdf42ab288541cc55372') - extends('R') + extends('r') depends_on('r-chron', type='nolink') diff --git a/var/spack/repos/builtin/packages/r-dbi/package.py b/var/spack/repos/builtin/packages/r-dbi/package.py index a1e06d51002..b0146ffb27d 100644 --- a/var/spack/repos/builtin/packages/r-dbi/package.py +++ b/var/spack/repos/builtin/packages/r-dbi/package.py @@ -36,7 +36,7 @@ class RDbi(Package): version('0.4-1', 'c7ee8f1c5037c2284e99c62698d0f087') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-deoptim/package.py b/var/spack/repos/builtin/packages/r-deoptim/package.py index 16aacccd0e3..9f5302ce16c 100644 --- a/var/spack/repos/builtin/packages/r-deoptim/package.py +++ b/var/spack/repos/builtin/packages/r-deoptim/package.py @@ -36,7 +36,7 @@ class RDeoptim(Package): version('2.2-3', 'ed406e6790f8f1568aa9bec159f80326') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-devtools/package.py b/var/spack/repos/builtin/packages/r-devtools/package.py index 75506dd257d..01adc6e327f 100644 --- a/var/spack/repos/builtin/packages/r-devtools/package.py +++ b/var/spack/repos/builtin/packages/r-devtools/package.py @@ -34,7 +34,7 @@ class RDevtools(Package): version('1.11.1', '242672ee27d24dddcbdaac88c586b6c2') - extends('R') + extends('r') depends_on('r-httr', type=nolink) depends_on('r-memoise', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-diagrammer/package.py b/var/spack/repos/builtin/packages/r-diagrammer/package.py index 7ff3b8548b6..420e4d803a8 100644 --- a/var/spack/repos/builtin/packages/r-diagrammer/package.py +++ b/var/spack/repos/builtin/packages/r-diagrammer/package.py @@ -34,7 +34,7 @@ class RDiagrammer(Package): version('0.8.4', '9ee295c744f5d4ba9a84289ca7bdaf1a') - extends('R') + extends('r') depends_on('r-htmlwidgets', type=nolink) depends_on('r-igraph', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-dichromat/package.py b/var/spack/repos/builtin/packages/r-dichromat/package.py index 663e5295af7..240bfc3be7c 100644 --- a/var/spack/repos/builtin/packages/r-dichromat/package.py +++ b/var/spack/repos/builtin/packages/r-dichromat/package.py @@ -35,7 +35,7 @@ class RDichromat(Package): version('2.0-0', '84e194ac95a69763d740947a7ee346a6') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-digest/package.py b/var/spack/repos/builtin/packages/r-digest/package.py index 1d11afb139e..f573638b1b5 100644 --- a/var/spack/repos/builtin/packages/r-digest/package.py +++ b/var/spack/repos/builtin/packages/r-digest/package.py @@ -49,7 +49,7 @@ class RDigest(Package): version('0.6.9', '48048ce6c466bdb124716e45ba4a0e83') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-doparallel/package.py b/var/spack/repos/builtin/packages/r-doparallel/package.py index 7cebfd9e58e..c78624d6d83 100644 --- a/var/spack/repos/builtin/packages/r-doparallel/package.py +++ b/var/spack/repos/builtin/packages/r-doparallel/package.py @@ -35,7 +35,7 @@ class RDoparallel(Package): version('1.0.10', 'd9fbde8f315d98d055483ee3493c9b43') - extends('R') + extends('r') depends_on('r-foreach', type=nolink) depends_on('r-iterators', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-dplyr/package.py b/var/spack/repos/builtin/packages/r-dplyr/package.py index ded76512783..2e0f43b7269 100644 --- a/var/spack/repos/builtin/packages/r-dplyr/package.py +++ b/var/spack/repos/builtin/packages/r-dplyr/package.py @@ -35,10 +35,10 @@ class RDplyr(Package): version('0.5.0', '1fcafcacca70806eea2e6d465cdb94ef') - extends('R') + extends('r') depends_on('r-assertthat', type=nolink) - depends_on('r-R6', type=nolink) + depends_on('r-r6', type=nolink) depends_on('r-rcpp', type=nolink) depends_on('r-tibble', type=nolink) depends_on('r-magrittr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-dt/package.py b/var/spack/repos/builtin/packages/r-dt/package.py index f134ee8913f..2612ce3a570 100644 --- a/var/spack/repos/builtin/packages/r-dt/package.py +++ b/var/spack/repos/builtin/packages/r-dt/package.py @@ -36,7 +36,7 @@ class RDt(Package): version('0.1', '5c8df984921fa484784ec4b8a4fb6f3c') - extends('R') + extends('r') depends_on('r-htmltools', type=nolink) depends_on('r-htmlwidgets', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-dygraphs/package.py b/var/spack/repos/builtin/packages/r-dygraphs/package.py index 9b01d7aa180..94441dd6d5f 100644 --- a/var/spack/repos/builtin/packages/r-dygraphs/package.py +++ b/var/spack/repos/builtin/packages/r-dygraphs/package.py @@ -38,7 +38,7 @@ class RDygraphs(Package): version('0.9', '7f0ce4312bcd3f0a58b8c03b2772f833') - extends('R') + extends('r') depends_on('r-magrittr', type=nolink) depends_on('r-htmlwidgets', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-e1071/package.py b/var/spack/repos/builtin/packages/r-e1071/package.py index c2e71664037..ef29cc33186 100644 --- a/var/spack/repos/builtin/packages/r-e1071/package.py +++ b/var/spack/repos/builtin/packages/r-e1071/package.py @@ -36,7 +36,7 @@ class RE1071(Package): version('1.6-7', 'd109a7e3dd0c905d420e327a9a921f5a') - extends('R') + extends('r') depends_on('r-class', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-evaluate/package.py b/var/spack/repos/builtin/packages/r-evaluate/package.py index 5583c0ed68f..c9a980a2c51 100644 --- a/var/spack/repos/builtin/packages/r-evaluate/package.py +++ b/var/spack/repos/builtin/packages/r-evaluate/package.py @@ -37,7 +37,7 @@ class REvaluate(Package): version('0.9', '877d89ce8a9ef7f403b1089ca1021775') - extends('R') + extends('r') depends_on('r-stringr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-filehash/package.py b/var/spack/repos/builtin/packages/r-filehash/package.py index a09b458eaf2..2b92013db81 100644 --- a/var/spack/repos/builtin/packages/r-filehash/package.py +++ b/var/spack/repos/builtin/packages/r-filehash/package.py @@ -42,7 +42,7 @@ class RFilehash(Package): version('2.3', '01fffafe09b148ccadc9814c103bdc2f') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-foreach/package.py b/var/spack/repos/builtin/packages/r-foreach/package.py index 2a7324ae993..7f2b1e63a87 100644 --- a/var/spack/repos/builtin/packages/r-foreach/package.py +++ b/var/spack/repos/builtin/packages/r-foreach/package.py @@ -40,7 +40,7 @@ class RForeach(Package): version('1.4.3', 'ef45768126661b259f9b8994462c49a0') - extends('R') + extends('r') depends_on('r-codetools', type=nolink) depends_on('r-iterators', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-foreign/package.py b/var/spack/repos/builtin/packages/r-foreign/package.py index df38fc56803..a248518f586 100644 --- a/var/spack/repos/builtin/packages/r-foreign/package.py +++ b/var/spack/repos/builtin/packages/r-foreign/package.py @@ -36,7 +36,7 @@ class RForeign(Package): version('0.8-66', 'ff12190f4631dca31e30ca786c2c8f62') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-formatr/package.py b/var/spack/repos/builtin/packages/r-formatr/package.py index 4c92e1f34be..3935ee90006 100644 --- a/var/spack/repos/builtin/packages/r-formatr/package.py +++ b/var/spack/repos/builtin/packages/r-formatr/package.py @@ -39,7 +39,7 @@ class RFormatr(Package): version('1.4', '98b9b64b2785b35f9df403e1aab6c73c') - extends('R') + extends('r') depends_on('r-codetools', type=nolink) depends_on('r-shiny', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-formula/package.py b/var/spack/repos/builtin/packages/r-formula/package.py index 3c4347ee500..cd5b0b41e93 100644 --- a/var/spack/repos/builtin/packages/r-formula/package.py +++ b/var/spack/repos/builtin/packages/r-formula/package.py @@ -36,7 +36,7 @@ class RFormula(Package): version('1.2-1', '2afb31e637cecd0c1106317aca1e4849') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-gdata/package.py b/var/spack/repos/builtin/packages/r-gdata/package.py index 0a09a1145bd..2897ad922d0 100644 --- a/var/spack/repos/builtin/packages/r-gdata/package.py +++ b/var/spack/repos/builtin/packages/r-gdata/package.py @@ -50,7 +50,7 @@ class RGdata(Package): version('2.17.0', 'c716b663b9dc16ad8cafe6acc781a75f') - extends('R') + extends('r') depends_on('r-gtools', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-geosphere/package.py b/var/spack/repos/builtin/packages/r-geosphere/package.py index 21ae07fd41f..dec9a3939e9 100644 --- a/var/spack/repos/builtin/packages/r-geosphere/package.py +++ b/var/spack/repos/builtin/packages/r-geosphere/package.py @@ -36,7 +36,7 @@ class RGeosphere(Package): version('1.5-5', '28efb7a8e266c7f076cdbcf642455f3e') - extends('R') + extends('r') depends_on('r-sp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-ggmap/package.py b/var/spack/repos/builtin/packages/r-ggmap/package.py index 2dfca19b51d..d6c6d53c210 100644 --- a/var/spack/repos/builtin/packages/r-ggmap/package.py +++ b/var/spack/repos/builtin/packages/r-ggmap/package.py @@ -37,7 +37,7 @@ class RGgmap(Package): version('2.6.1', '25ad414a3a1c6d59a227a9f22601211a') - extends('R') + extends('r') depends_on('r-ggplot2', type=nolink) depends_on('r-proto', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-ggplot2/package.py b/var/spack/repos/builtin/packages/r-ggplot2/package.py index a8cf21930fe..c0c37d91644 100644 --- a/var/spack/repos/builtin/packages/r-ggplot2/package.py +++ b/var/spack/repos/builtin/packages/r-ggplot2/package.py @@ -40,7 +40,7 @@ class RGgplot2(Package): version('2.1.0', '771928cfb97c649c720423deb3ec7fd3') - extends('R') + extends('r') depends_on('r-digest', type=nolink) depends_on('r-gtable', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-ggvis/package.py b/var/spack/repos/builtin/packages/r-ggvis/package.py index 29b2069ae9c..9c6720b4aa8 100644 --- a/var/spack/repos/builtin/packages/r-ggvis/package.py +++ b/var/spack/repos/builtin/packages/r-ggvis/package.py @@ -36,7 +36,7 @@ class RGgvis(Package): version('0.4.2', '039f45e5c7f1e0652779163d7d99f922') - extends('R') + extends('r') depends_on('r-assertthat', type=nolink) depends_on('r-jsonlite', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-gistr/package.py b/var/spack/repos/builtin/packages/r-gistr/package.py index 646299b97b9..08910b0fe12 100644 --- a/var/spack/repos/builtin/packages/r-gistr/package.py +++ b/var/spack/repos/builtin/packages/r-gistr/package.py @@ -40,7 +40,7 @@ class RGistr(Package): version('0.3.6', '49d548cb3eca0e66711aece37757a2c0') - extends('R') + extends('r') depends_on('r-jsonlite', type=nolink) depends_on('r-httr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-git2r/package.py b/var/spack/repos/builtin/packages/r-git2r/package.py index 1f08379d6ed..1387581306f 100644 --- a/var/spack/repos/builtin/packages/r-git2r/package.py +++ b/var/spack/repos/builtin/packages/r-git2r/package.py @@ -36,7 +36,7 @@ class RGit2r(Package): version('0.15.0', '57658b3298f9b9aadc0dd77b4ef6a1e1') - extends('R') + extends('r') depends_on('zlib') depends_on('openssl') diff --git a/var/spack/repos/builtin/packages/r-glmnet/package.py b/var/spack/repos/builtin/packages/r-glmnet/package.py index af6e1d1b637..895c066e57d 100644 --- a/var/spack/repos/builtin/packages/r-glmnet/package.py +++ b/var/spack/repos/builtin/packages/r-glmnet/package.py @@ -39,7 +39,7 @@ class RGlmnet(Package): version('2.0-5', '049b18caa29529614cd684db3beaec2a') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) depends_on('r-foreach', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-googlevis/package.py b/var/spack/repos/builtin/packages/r-googlevis/package.py index bcb7caa0fbd..54e1d397a6e 100644 --- a/var/spack/repos/builtin/packages/r-googlevis/package.py +++ b/var/spack/repos/builtin/packages/r-googlevis/package.py @@ -38,7 +38,7 @@ class RGooglevis(Package): version('0.6.0', 'ec36fd2a6884ddc7baa894007d0d0468') - extends('R') + extends('r') depends_on('r-jsonlite', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-gridbase/package.py b/var/spack/repos/builtin/packages/r-gridbase/package.py index a2f55b44703..1afc1af3acb 100644 --- a/var/spack/repos/builtin/packages/r-gridbase/package.py +++ b/var/spack/repos/builtin/packages/r-gridbase/package.py @@ -34,7 +34,7 @@ class RGridbase(Package): version('0.4-7', '6d5064a85f5c966a92ee468ae44c5f1f') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-gridextra/package.py b/var/spack/repos/builtin/packages/r-gridextra/package.py index 537426d42f5..582cd39b851 100644 --- a/var/spack/repos/builtin/packages/r-gridextra/package.py +++ b/var/spack/repos/builtin/packages/r-gridextra/package.py @@ -35,7 +35,7 @@ class RGridextra(Package): version('2.2.1', '7076c2122d387c7ef3add69a1c4fc1b2') - extends('R') + extends('r') depends_on('r-gtable', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-gtable/package.py b/var/spack/repos/builtin/packages/r-gtable/package.py index 74dee0b3d54..a633e8273f0 100644 --- a/var/spack/repos/builtin/packages/r-gtable/package.py +++ b/var/spack/repos/builtin/packages/r-gtable/package.py @@ -34,7 +34,7 @@ class RGtable(Package): version('0.2.0', '124090ae40b2dd3170ae11180e0d4cab') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-gtools/package.py b/var/spack/repos/builtin/packages/r-gtools/package.py index 367bb30f870..6676ec1be3f 100644 --- a/var/spack/repos/builtin/packages/r-gtools/package.py +++ b/var/spack/repos/builtin/packages/r-gtools/package.py @@ -53,7 +53,7 @@ class RGtools(Package): version('3.5.0', '45f8800c0336d35046641fbacc56bdbb') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-hexbin/package.py b/var/spack/repos/builtin/packages/r-hexbin/package.py index 5d2972ff96d..b9a7e612c33 100644 --- a/var/spack/repos/builtin/packages/r-hexbin/package.py +++ b/var/spack/repos/builtin/packages/r-hexbin/package.py @@ -36,7 +36,7 @@ class RHexbin(Package): version('1.27.1', '7f380390c6511e97df10a810a3b3bb7c') - extends('R') + extends('r') depends_on('r-lattice', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-highr/package.py b/var/spack/repos/builtin/packages/r-highr/package.py index f977a7302f4..e9fb7c34d53 100644 --- a/var/spack/repos/builtin/packages/r-highr/package.py +++ b/var/spack/repos/builtin/packages/r-highr/package.py @@ -37,7 +37,7 @@ class RHighr(Package): version('0.6', 'bf47388c5f57dc61962362fb7e1d8b16') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-htmltools/package.py b/var/spack/repos/builtin/packages/r-htmltools/package.py index 21cdbe9184d..aa776f3929b 100644 --- a/var/spack/repos/builtin/packages/r-htmltools/package.py +++ b/var/spack/repos/builtin/packages/r-htmltools/package.py @@ -34,7 +34,7 @@ class RHtmltools(Package): version('0.3.5', '5f001aff4a39e329f7342dcec5139724') - extends('R') + extends('r') depends_on('r-digest', type=nolink) depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py index 8090776f06f..615936c5853 100644 --- a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py +++ b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py @@ -36,7 +36,7 @@ class RHtmlwidgets(Package): version('0.6', '7fa522d2eda97593978021bda9670c0e') - extends('R') + extends('r') depends_on('r-htmltools', type=nolink) depends_on('r-jsonlite', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-httpuv/package.py b/var/spack/repos/builtin/packages/r-httpuv/package.py index 57025d3a3cc..c353dacc5f5 100644 --- a/var/spack/repos/builtin/packages/r-httpuv/package.py +++ b/var/spack/repos/builtin/packages/r-httpuv/package.py @@ -40,7 +40,7 @@ class RHttpuv(Package): version('1.3.3', 'c78ae068cf59e949b9791be987bb4489') - extends('R') + extends('r') depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-httr/package.py b/var/spack/repos/builtin/packages/r-httr/package.py index 227594fc0d5..bf7ce4dccbb 100644 --- a/var/spack/repos/builtin/packages/r-httr/package.py +++ b/var/spack/repos/builtin/packages/r-httr/package.py @@ -36,13 +36,13 @@ class RHttr(Package): version('1.1.0', '5ffbbc5c2529e49f00aaa521a2b35600') - extends('R') + extends('r') depends_on('r-jsonlite', type=nolink) depends_on('r-mime', type=nolink) depends_on('r-curl', type=nolink) depends_on('r-openssl', type=nolink) - depends_on('r-R6', type=nolink) + depends_on('r-r6', type=nolink) def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-igraph/package.py b/var/spack/repos/builtin/packages/r-igraph/package.py index 37925d4e028..8c1a6252ba7 100644 --- a/var/spack/repos/builtin/packages/r-igraph/package.py +++ b/var/spack/repos/builtin/packages/r-igraph/package.py @@ -36,7 +36,7 @@ class RIgraph(Package): version('1.0.1', 'ea33495e49adf4a331e4ba60ba559065') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) depends_on('r-magrittr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-influencer/package.py b/var/spack/repos/builtin/packages/r-influencer/package.py index dd525daf2b9..8102954daad 100644 --- a/var/spack/repos/builtin/packages/r-influencer/package.py +++ b/var/spack/repos/builtin/packages/r-influencer/package.py @@ -40,7 +40,7 @@ class RInfluencer(Package): version('0.1.0', '6c8b6decd78c341364b5811fb3050ba5') - extends('R') + extends('r') depends_on('r-igraph', type=nolink) depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-inline/package.py b/var/spack/repos/builtin/packages/r-inline/package.py index 35eb8ca76fd..0694af6d34a 100644 --- a/var/spack/repos/builtin/packages/r-inline/package.py +++ b/var/spack/repos/builtin/packages/r-inline/package.py @@ -36,7 +36,7 @@ class RInline(Package): version('0.3.14', '9fe304a6ebf0e3889c4c6a7ad1c50bca') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-irdisplay/package.py b/var/spack/repos/builtin/packages/r-irdisplay/package.py index a3c49feb93e..00de6b35acd 100644 --- a/var/spack/repos/builtin/packages/r-irdisplay/package.py +++ b/var/spack/repos/builtin/packages/r-irdisplay/package.py @@ -36,7 +36,7 @@ class RIrdisplay(Package): version('0.4.4', '5be672fb82185b90f23bd99ac1e1cdb6') - extends('R') + extends('r') depends_on('r-repr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-irkernel/package.py b/var/spack/repos/builtin/packages/r-irkernel/package.py index 34b5c3c363f..4890d95b3ef 100644 --- a/var/spack/repos/builtin/packages/r-irkernel/package.py +++ b/var/spack/repos/builtin/packages/r-irkernel/package.py @@ -35,7 +35,7 @@ class RIrkernel(Package): version('master', git='https://github.com/IRkernel/IRkernel.git', tag='0.7') - extends('R') + extends('r') depends_on('r-repr', type=nolink) depends_on('r-irdisplay', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-irlba/package.py b/var/spack/repos/builtin/packages/r-irlba/package.py index 42cc142e8ab..caae09930cd 100644 --- a/var/spack/repos/builtin/packages/r-irlba/package.py +++ b/var/spack/repos/builtin/packages/r-irlba/package.py @@ -36,7 +36,7 @@ class RIrlba(Package): version('2.0.0', '557674cf8b68fea5b9f231058c324d26') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-iterators/package.py b/var/spack/repos/builtin/packages/r-iterators/package.py index f5a3489e7d2..7e6fb9890dc 100644 --- a/var/spack/repos/builtin/packages/r-iterators/package.py +++ b/var/spack/repos/builtin/packages/r-iterators/package.py @@ -35,7 +35,7 @@ class RIterators(Package): version('1.0.8', '2ded7f82cddd8174f1ec98607946c6ee') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-jpeg/package.py b/var/spack/repos/builtin/packages/r-jpeg/package.py index ef940720f83..2ec11e744b0 100644 --- a/var/spack/repos/builtin/packages/r-jpeg/package.py +++ b/var/spack/repos/builtin/packages/r-jpeg/package.py @@ -36,7 +36,7 @@ class RJpeg(Package): version('0.1-8', '696007451d14395b1ed1d0e9af667a57') - extends('R') + extends('r') depends_on('jpeg') diff --git a/var/spack/repos/builtin/packages/r-jsonlite/package.py b/var/spack/repos/builtin/packages/r-jsonlite/package.py index d1cb4b52c14..d01caf1f95b 100644 --- a/var/spack/repos/builtin/packages/r-jsonlite/package.py +++ b/var/spack/repos/builtin/packages/r-jsonlite/package.py @@ -44,7 +44,7 @@ class RJsonlite(Package): version('1.0', 'c8524e086de22ab39b8ac8000220cc87') version('0.9.21', '4fc382747f88a79ff0718a0d06bed45d') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-knitr/package.py b/var/spack/repos/builtin/packages/r-knitr/package.py index 4976e12b45f..4ad22cf33f4 100644 --- a/var/spack/repos/builtin/packages/r-knitr/package.py +++ b/var/spack/repos/builtin/packages/r-knitr/package.py @@ -37,7 +37,7 @@ class RKnitr(Package): version('1.14', 'ef0fbeaa9372f99ffbc57212a7781511') version('0.6' , 'c67d6db84cd55594a9e870c90651a3db') - extends('R') + extends('r') depends_on('r-evaluate', type=nolink) depends_on('r-digest', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-labeling/package.py b/var/spack/repos/builtin/packages/r-labeling/package.py index 02e5da9d858..daf971bf440 100644 --- a/var/spack/repos/builtin/packages/r-labeling/package.py +++ b/var/spack/repos/builtin/packages/r-labeling/package.py @@ -34,7 +34,7 @@ class RLabeling(Package): version('0.3', 'ccd7082ec0b211aba8a89d85176bb534') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-lattice/package.py b/var/spack/repos/builtin/packages/r-lattice/package.py index a798b1ce658..9308a869a2b 100644 --- a/var/spack/repos/builtin/packages/r-lattice/package.py +++ b/var/spack/repos/builtin/packages/r-lattice/package.py @@ -37,7 +37,7 @@ class RLattice(Package): version('0.20-34', 'c2a648b22d4206ae7526fb70b8e90fed') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-lazyeval/package.py b/var/spack/repos/builtin/packages/r-lazyeval/package.py index f80fb4d2727..138691759f9 100644 --- a/var/spack/repos/builtin/packages/r-lazyeval/package.py +++ b/var/spack/repos/builtin/packages/r-lazyeval/package.py @@ -36,7 +36,7 @@ class RLazyeval(Package): version('0.2.0', 'df1daac908dcf02ae7e12f4335b1b13b') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-leaflet/package.py b/var/spack/repos/builtin/packages/r-leaflet/package.py index 2a91100c348..ab7fd2c48af 100644 --- a/var/spack/repos/builtin/packages/r-leaflet/package.py +++ b/var/spack/repos/builtin/packages/r-leaflet/package.py @@ -36,7 +36,7 @@ class RLeaflet(Package): version('1.0.1', '7f3d8b17092604d87d4eeb579f73d5df') - extends('R') + extends('r') depends_on('r-base64enc', type=nolink) depends_on('r-htmlwidgets', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-lme4/package.py b/var/spack/repos/builtin/packages/r-lme4/package.py index c52d9d0e27c..2f9ee3e48fc 100644 --- a/var/spack/repos/builtin/packages/r-lme4/package.py +++ b/var/spack/repos/builtin/packages/r-lme4/package.py @@ -37,7 +37,7 @@ class RLme4(Package): version('1.1-12', 'da8aaebb67477ecb5631851c46207804') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) depends_on('r-mass', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-lmtest/package.py b/var/spack/repos/builtin/packages/r-lmtest/package.py index 31a36f1f7e4..ff98eeadcf9 100644 --- a/var/spack/repos/builtin/packages/r-lmtest/package.py +++ b/var/spack/repos/builtin/packages/r-lmtest/package.py @@ -36,7 +36,7 @@ class RLmtest(Package): version('0.9-34', 'fcdf7286bb5ccc2ca46be00bf25ac2fe') - extends('R') + extends('r') depends_on('r-zoo', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-lubridate/package.py b/var/spack/repos/builtin/packages/r-lubridate/package.py index 2e5661fa4d3..125762de1ed 100644 --- a/var/spack/repos/builtin/packages/r-lubridate/package.py +++ b/var/spack/repos/builtin/packages/r-lubridate/package.py @@ -39,7 +39,7 @@ class RLubridate(Package): version('1.5.6', 'a5dc44817548ee219d26a10bae92e611') - extends('R') + extends('r') depends_on('r-stringr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-magic/package.py b/var/spack/repos/builtin/packages/r-magic/package.py index 2b8f95351a1..ff329031254 100644 --- a/var/spack/repos/builtin/packages/r-magic/package.py +++ b/var/spack/repos/builtin/packages/r-magic/package.py @@ -37,7 +37,7 @@ class RMagic(Package): version('1.5-6', 'a68e5ced253b2196af842e1fc84fd029') - extends('R') + extends('r') depends_on('r-abind', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-magrittr/package.py b/var/spack/repos/builtin/packages/r-magrittr/package.py index 11476c3d1e3..c41f4eff8f6 100644 --- a/var/spack/repos/builtin/packages/r-magrittr/package.py +++ b/var/spack/repos/builtin/packages/r-magrittr/package.py @@ -38,7 +38,7 @@ class RMagrittr(Package): version('1.5', 'e74ab7329f2b9833f0c3c1216f86d65a') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-mapproj/package.py b/var/spack/repos/builtin/packages/r-mapproj/package.py index 0f8bbe199b4..bace22a1256 100644 --- a/var/spack/repos/builtin/packages/r-mapproj/package.py +++ b/var/spack/repos/builtin/packages/r-mapproj/package.py @@ -34,7 +34,7 @@ class RMapproj(Package): version('1.2-4', '10e22bde1c790e1540672f15ddcaee71') - extends('R') + extends('r') depends_on('r-maps', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-maps/package.py b/var/spack/repos/builtin/packages/r-maps/package.py index 1e0bfd2d437..8cbb6466435 100644 --- a/var/spack/repos/builtin/packages/r-maps/package.py +++ b/var/spack/repos/builtin/packages/r-maps/package.py @@ -35,7 +35,7 @@ class RMaps(Package): version('3.1.1', 'ff045eccb6d5a658db5a539116ddf764') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-maptools/package.py b/var/spack/repos/builtin/packages/r-maptools/package.py index 8d045a4ed44..df9254e1875 100644 --- a/var/spack/repos/builtin/packages/r-maptools/package.py +++ b/var/spack/repos/builtin/packages/r-maptools/package.py @@ -38,7 +38,7 @@ class RMaptools(Package): version('0.8-39', '3690d96afba8ef22c8e27ae540ffb836') - extends('R') + extends('r') depends_on('r-sp', type=nolink) depends_on('r-foreign', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-markdown/package.py b/var/spack/repos/builtin/packages/r-markdown/package.py index c34727d2b05..9648412e504 100644 --- a/var/spack/repos/builtin/packages/r-markdown/package.py +++ b/var/spack/repos/builtin/packages/r-markdown/package.py @@ -38,7 +38,7 @@ class RMarkdown(Package): version('0.7.7', '72deca9c675c7cc9343048edbc29f7ff') - extends('R') + extends('r') depends_on('r-mime', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-mass/package.py b/var/spack/repos/builtin/packages/r-mass/package.py index 1ab01d22561..eda7dccabfa 100644 --- a/var/spack/repos/builtin/packages/r-mass/package.py +++ b/var/spack/repos/builtin/packages/r-mass/package.py @@ -35,7 +35,7 @@ class RMass(Package): version('7.3-45', 'aba3d12fab30f1793bee168a1efea88b') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-matrix/package.py b/var/spack/repos/builtin/packages/r-matrix/package.py index 1b45dc55caa..02f193dd9b9 100644 --- a/var/spack/repos/builtin/packages/r-matrix/package.py +++ b/var/spack/repos/builtin/packages/r-matrix/package.py @@ -35,7 +35,7 @@ class RMatrix(Package): version('1.2-6', 'f545307fb1284861e9266c4e9712c55e') - extends('R') + extends('r') depends_on('r-lattice', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-matrixmodels/package.py b/var/spack/repos/builtin/packages/r-matrixmodels/package.py index 3cdce6fea63..62adab7f15c 100644 --- a/var/spack/repos/builtin/packages/r-matrixmodels/package.py +++ b/var/spack/repos/builtin/packages/r-matrixmodels/package.py @@ -35,7 +35,7 @@ class RMatrixmodels(Package): version('0.4-1', '65b3ab56650c62bf1046a3eb1f1e19a0') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-memoise/package.py b/var/spack/repos/builtin/packages/r-memoise/package.py index 81f3ff1dab2..da931315545 100644 --- a/var/spack/repos/builtin/packages/r-memoise/package.py +++ b/var/spack/repos/builtin/packages/r-memoise/package.py @@ -35,7 +35,7 @@ class RMemoise(Package): version('1.0.0', 'd31145292e2a88ae9a504cab1602e4ac') - extends('R') + extends('r') depends_on('r-digest', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-mgcv/package.py b/var/spack/repos/builtin/packages/r-mgcv/package.py index 4c49462ba23..5b8f04a84c4 100644 --- a/var/spack/repos/builtin/packages/r-mgcv/package.py +++ b/var/spack/repos/builtin/packages/r-mgcv/package.py @@ -37,7 +37,7 @@ class RMgcv(Package): version('1.8-13', '30607be3aaf44b13bd8c81fc32e8c984') - extends('R') + extends('r') depends_on('r-nlme', type=nolink) depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-mime/package.py b/var/spack/repos/builtin/packages/r-mime/package.py index 5e78889a76b..55d40c56639 100644 --- a/var/spack/repos/builtin/packages/r-mime/package.py +++ b/var/spack/repos/builtin/packages/r-mime/package.py @@ -36,7 +36,7 @@ class RMime(Package): version('0.5', '87e00b6d57b581465c19ae869a723c4d') version('0.4', '789cb33e41db2206c6fc7c3e9fbc2c02') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-minqa/package.py b/var/spack/repos/builtin/packages/r-minqa/package.py index 16cff20b410..a38f00f9abb 100644 --- a/var/spack/repos/builtin/packages/r-minqa/package.py +++ b/var/spack/repos/builtin/packages/r-minqa/package.py @@ -35,7 +35,7 @@ class RMinqa(Package): version('1.2.4', 'bcaae4fdba60a33528f2116e2fd51105') - extends('R') + extends('r') depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-multcomp/package.py b/var/spack/repos/builtin/packages/r-multcomp/package.py index 54416502d95..b32bea62496 100644 --- a/var/spack/repos/builtin/packages/r-multcomp/package.py +++ b/var/spack/repos/builtin/packages/r-multcomp/package.py @@ -38,7 +38,7 @@ class RMultcomp(Package): version('1.4-6', 'f1353ede2ed78b23859a7f1f1f9ebe88') - extends('R') + extends('r') depends_on('r-mvtnorm', type=nolink) depends_on('r-survival', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-munsell/package.py b/var/spack/repos/builtin/packages/r-munsell/package.py index b96b90f9c7e..4250b00ec20 100644 --- a/var/spack/repos/builtin/packages/r-munsell/package.py +++ b/var/spack/repos/builtin/packages/r-munsell/package.py @@ -38,7 +38,7 @@ class RMunsell(Package): version('0.4.3', 'ebd205323dc37c948f499ee08be9c476') - extends('R') + extends('r') depends_on('r-colorspace', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-mvtnorm/package.py b/var/spack/repos/builtin/packages/r-mvtnorm/package.py index b3f7db60c60..956ae6bc44c 100644 --- a/var/spack/repos/builtin/packages/r-mvtnorm/package.py +++ b/var/spack/repos/builtin/packages/r-mvtnorm/package.py @@ -35,7 +35,7 @@ class RMvtnorm(Package): version('1.0-5', '5894dd3969bbfa26f4862c45f9a48a52') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-ncdf4/package.py b/var/spack/repos/builtin/packages/r-ncdf4/package.py index 11bf7abb38d..3949967022e 100644 --- a/var/spack/repos/builtin/packages/r-ncdf4/package.py +++ b/var/spack/repos/builtin/packages/r-ncdf4/package.py @@ -47,7 +47,7 @@ class RNcdf4(Package): version('1.15', 'cd60dadbae3be31371e1ed40ddeb420a') - extends('R') + extends('r') depends_on('netcdf') diff --git a/var/spack/repos/builtin/packages/r-networkd3/package.py b/var/spack/repos/builtin/packages/r-networkd3/package.py index 8884f7cf1b1..2374b78d7bd 100644 --- a/var/spack/repos/builtin/packages/r-networkd3/package.py +++ b/var/spack/repos/builtin/packages/r-networkd3/package.py @@ -35,7 +35,7 @@ class RNetworkd3(Package): version('0.2.12', '356fe4be59698e6fb052644bd9659d84') - extends('R') + extends('r') depends_on('r-htmlwidgets', type=nolink) depends_on('r-igraph', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-nlme/package.py b/var/spack/repos/builtin/packages/r-nlme/package.py index 1b6bb114e1b..02a0836fd8f 100644 --- a/var/spack/repos/builtin/packages/r-nlme/package.py +++ b/var/spack/repos/builtin/packages/r-nlme/package.py @@ -34,7 +34,7 @@ class RNlme(Package): version('3.1-128', '3d75ae7380bf123761b95a073eb55008') - extends('R') + extends('r') depends_on('r-lattice', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-nloptr/package.py b/var/spack/repos/builtin/packages/r-nloptr/package.py index 58cb585c491..8b5e947710f 100644 --- a/var/spack/repos/builtin/packages/r-nloptr/package.py +++ b/var/spack/repos/builtin/packages/r-nloptr/package.py @@ -40,7 +40,7 @@ class RNloptr(Package): version('1.0.4', '9af69a613349b236fd377d0a107f484c') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-nmf/package.py b/var/spack/repos/builtin/packages/r-nmf/package.py index c30a1ac1012..e33a9364d43 100644 --- a/var/spack/repos/builtin/packages/r-nmf/package.py +++ b/var/spack/repos/builtin/packages/r-nmf/package.py @@ -39,7 +39,7 @@ class RNmf(Package): version('0.20.6', '81df07b3bf710a611db5af24730ff3d0') - extends('R') + extends('r') depends_on('r-pkgmaker', type=nolink) depends_on('r-registry', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-nnet/package.py b/var/spack/repos/builtin/packages/r-nnet/package.py index be048f5ad04..6f5e7d65040 100644 --- a/var/spack/repos/builtin/packages/r-nnet/package.py +++ b/var/spack/repos/builtin/packages/r-nnet/package.py @@ -35,7 +35,7 @@ class RNnet(Package): version('7.3-12', 'dc7c6f0d0de53d8fc72b44554400a74e') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-np/package.py b/var/spack/repos/builtin/packages/r-np/package.py index bff7d0f1952..1ee6105576f 100644 --- a/var/spack/repos/builtin/packages/r-np/package.py +++ b/var/spack/repos/builtin/packages/r-np/package.py @@ -40,7 +40,7 @@ class RNp(Package): version('0.60-2', 'e094d52ddff7280272b41e6cb2c74389') - extends('R') + extends('r') depends_on('r-boot', type=nolink) depends_on('r-cubature', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-openssl/package.py b/var/spack/repos/builtin/packages/r-openssl/package.py index 3e77923d76b..f5442b102fb 100644 --- a/var/spack/repos/builtin/packages/r-openssl/package.py +++ b/var/spack/repos/builtin/packages/r-openssl/package.py @@ -43,7 +43,7 @@ class ROpenssl(Package): version('0.9.4', '82a890e71ed0e74499878bedacfb8ccb') - extends('R') + extends('r') depends_on('openssl') diff --git a/var/spack/repos/builtin/packages/r-packrat/package.py b/var/spack/repos/builtin/packages/r-packrat/package.py index 9520952bd7b..f978b9f7797 100644 --- a/var/spack/repos/builtin/packages/r-packrat/package.py +++ b/var/spack/repos/builtin/packages/r-packrat/package.py @@ -35,7 +35,7 @@ class RPackrat(Package): version('0.4.7-1', '80c2413269b292ade163a70ba5053e84') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-partykit/package.py b/var/spack/repos/builtin/packages/r-partykit/package.py index dff9099c07a..ab994ce4d26 100644 --- a/var/spack/repos/builtin/packages/r-partykit/package.py +++ b/var/spack/repos/builtin/packages/r-partykit/package.py @@ -42,7 +42,7 @@ class RPartykit(Package): version('1.1-1', '8fcb31d73ec1b8cd3bcd9789639a9277') - extends('R') + extends('r') depends_on('r-survival', type=nolink) depends_on('r-formula', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-pbdzmq/package.py b/var/spack/repos/builtin/packages/r-pbdzmq/package.py index b5a95461243..e6c546e9211 100644 --- a/var/spack/repos/builtin/packages/r-pbdzmq/package.py +++ b/var/spack/repos/builtin/packages/r-pbdzmq/package.py @@ -41,9 +41,9 @@ class RPbdzmq(Package): version('0.2-4', 'e5afb70199aa54d737ee7a0e26bde060') - extends('R') + extends('r') - depends_on('r-R6', type=nolink) + depends_on('r-r6', type=nolink) depends_on('zeromq') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/r-pbkrtest/package.py b/var/spack/repos/builtin/packages/r-pbkrtest/package.py index 40b6f96927f..0bd749abe1c 100644 --- a/var/spack/repos/builtin/packages/r-pbkrtest/package.py +++ b/var/spack/repos/builtin/packages/r-pbkrtest/package.py @@ -38,7 +38,7 @@ class RPbkrtest(Package): version('0.4-6', '0a7d9ff83b8d131af9b2335f35781ef9') - extends('R') + extends('r') depends_on('r-lme4', type=nolink) depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-pkgmaker/package.py b/var/spack/repos/builtin/packages/r-pkgmaker/package.py index 87daec5ad00..5c9e5496e71 100644 --- a/var/spack/repos/builtin/packages/r-pkgmaker/package.py +++ b/var/spack/repos/builtin/packages/r-pkgmaker/package.py @@ -40,7 +40,7 @@ class RPkgmaker(Package): version('0.22', '73a0c6d3e84c6dadf3de7582ef7e88a4') - extends('R') + extends('r') depends_on('r-registry', type=nolink) depends_on('r-codetools', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-plotrix/package.py b/var/spack/repos/builtin/packages/r-plotrix/package.py index d1d61dbc4dd..ec02193d403 100644 --- a/var/spack/repos/builtin/packages/r-plotrix/package.py +++ b/var/spack/repos/builtin/packages/r-plotrix/package.py @@ -34,7 +34,7 @@ class RPlotrix(Package): version('3.6-3', '23e3e022a13a596e9b77b40afcb4a2ef') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-plyr/package.py b/var/spack/repos/builtin/packages/r-plyr/package.py index fe4512347ab..cc9c19b98ac 100644 --- a/var/spack/repos/builtin/packages/r-plyr/package.py +++ b/var/spack/repos/builtin/packages/r-plyr/package.py @@ -40,7 +40,7 @@ class RPlyr(Package): version('1.8.4', 'ef455cf7fc06e34837692156b7b2587b') - extends('R') + extends('r') depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-png/package.py b/var/spack/repos/builtin/packages/r-png/package.py index d3a80a4e16b..aa3d4f3c69a 100644 --- a/var/spack/repos/builtin/packages/r-png/package.py +++ b/var/spack/repos/builtin/packages/r-png/package.py @@ -36,7 +36,7 @@ class RPng(Package): version('0.1-7', '1ebc8b8aa5979b12c5ec2384b30d649f') - extends('R') + extends('r') depends_on('libpng') diff --git a/var/spack/repos/builtin/packages/r-praise/package.py b/var/spack/repos/builtin/packages/r-praise/package.py index 102d86d2fad..dba2289311e 100644 --- a/var/spack/repos/builtin/packages/r-praise/package.py +++ b/var/spack/repos/builtin/packages/r-praise/package.py @@ -34,7 +34,7 @@ class RPraise(Package): version('1.0.0', '9318724cec0454884b5f762bee2da6a1') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-proto/package.py b/var/spack/repos/builtin/packages/r-proto/package.py index 07ace3ad296..109ea5fe4f8 100644 --- a/var/spack/repos/builtin/packages/r-proto/package.py +++ b/var/spack/repos/builtin/packages/r-proto/package.py @@ -35,7 +35,7 @@ class RProto(Package): version('0.3-10', 'd5523943a5be6ca2f0ab557c900f8212') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-pryr/package.py b/var/spack/repos/builtin/packages/r-pryr/package.py index acd502b536d..e9cbab3878a 100644 --- a/var/spack/repos/builtin/packages/r-pryr/package.py +++ b/var/spack/repos/builtin/packages/r-pryr/package.py @@ -36,7 +36,7 @@ class RPryr(Package): version('0.1.2', '66b597a762aa15a3b7037779522983b6') - extends('R') + extends('r') depends_on('r-stringr', type=nolink) depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-quantmod/package.py b/var/spack/repos/builtin/packages/r-quantmod/package.py index ecfbf490554..bf27e1a41bc 100644 --- a/var/spack/repos/builtin/packages/r-quantmod/package.py +++ b/var/spack/repos/builtin/packages/r-quantmod/package.py @@ -35,7 +35,7 @@ class RQuantmod(Package): version('0.4-5', 'cab3c409e4de3df98a20f1ded60f3631') - extends('R') + extends('r') depends_on('r-xts', type=nolink) depends_on('r-zoo', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-quantreg/package.py b/var/spack/repos/builtin/packages/r-quantreg/package.py index 89a26070ba2..81aa242ee81 100644 --- a/var/spack/repos/builtin/packages/r-quantreg/package.py +++ b/var/spack/repos/builtin/packages/r-quantreg/package.py @@ -39,7 +39,7 @@ class RQuantreg(Package): version('5.26', '1d89ed932fb4d67ae2d5da0eb8c2989f') - extends('R') + extends('r') depends_on('r-sparsem', type=nolink) depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-R6/package.py b/var/spack/repos/builtin/packages/r-r6/package.py similarity index 99% rename from var/spack/repos/builtin/packages/r-R6/package.py rename to var/spack/repos/builtin/packages/r-r6/package.py index 0b75888e793..cb5593f6fc5 100644 --- a/var/spack/repos/builtin/packages/r-R6/package.py +++ b/var/spack/repos/builtin/packages/r-r6/package.py @@ -39,7 +39,7 @@ class RR6(Package): version('2.1.2', 'b6afb9430e48707be87638675390e457') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-randomforest/package.py b/var/spack/repos/builtin/packages/r-randomforest/package.py index 1066c217f44..4d56210c99d 100644 --- a/var/spack/repos/builtin/packages/r-randomforest/package.py +++ b/var/spack/repos/builtin/packages/r-randomforest/package.py @@ -35,7 +35,7 @@ class RRandomforest(Package): version('4.6-12', '071c03af974198e861f1475c5bab9e7a') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-raster/package.py b/var/spack/repos/builtin/packages/r-raster/package.py index 39f4256703c..017838428cd 100644 --- a/var/spack/repos/builtin/packages/r-raster/package.py +++ b/var/spack/repos/builtin/packages/r-raster/package.py @@ -36,7 +36,7 @@ class RRaster(Package): version('2.5-8', '2a7db931c74d50516e82d04687c0a577') - extends('R') + extends('r') depends_on('r-sp', type=nolink) depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rbokeh/package.py b/var/spack/repos/builtin/packages/r-rbokeh/package.py index 074c5455340..c410acaba2c 100644 --- a/var/spack/repos/builtin/packages/r-rbokeh/package.py +++ b/var/spack/repos/builtin/packages/r-rbokeh/package.py @@ -36,7 +36,7 @@ class RRbokeh(Package): version('0.5.0', '4e14778c3fbd9286460ca28c68f57d10') - extends('R') + extends('r') depends_on('r-htmlwidgets', type=nolink) depends_on('r-maps', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py b/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py index b81ec2561cf..4734a1674f9 100644 --- a/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py +++ b/var/spack/repos/builtin/packages/r-rcolorbrewer/package.py @@ -35,7 +35,7 @@ class RRcolorbrewer(Package): version('1.1-2', '66054d83eade4dff8a43ad4732691182') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-rcpp/package.py b/var/spack/repos/builtin/packages/r-rcpp/package.py index 94580a87008..1637faca030 100644 --- a/var/spack/repos/builtin/packages/r-rcpp/package.py +++ b/var/spack/repos/builtin/packages/r-rcpp/package.py @@ -43,7 +43,7 @@ class RRcpp(Package): version('0.12.6', 'db4280fb0a79cd19be73a662c33b0a8b') version('0.12.5', 'f03ec05b4e391cc46e7ce330e82ff5e2') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-rcppeigen/package.py b/var/spack/repos/builtin/packages/r-rcppeigen/package.py index ecf9256ab3a..f0aebb54f0c 100644 --- a/var/spack/repos/builtin/packages/r-rcppeigen/package.py +++ b/var/spack/repos/builtin/packages/r-rcppeigen/package.py @@ -46,7 +46,7 @@ class RRcppeigen(Package): version('0.3.2.8.1', '4146e06e4fdf7f4d08db7839069d479f') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-registry/package.py b/var/spack/repos/builtin/packages/r-registry/package.py index 119a84718ad..89402cfbff4 100644 --- a/var/spack/repos/builtin/packages/r-registry/package.py +++ b/var/spack/repos/builtin/packages/r-registry/package.py @@ -34,7 +34,7 @@ class RRegistry(Package): version('0.3', '85345b334ec81eb3da6edcbb27c5f421') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-repr/package.py b/var/spack/repos/builtin/packages/r-repr/package.py index 2e1f6126f9f..11d43cf7ea4 100644 --- a/var/spack/repos/builtin/packages/r-repr/package.py +++ b/var/spack/repos/builtin/packages/r-repr/package.py @@ -36,7 +36,7 @@ class RRepr(Package): version('0.9', 'db5ff74893063b492f684e42283070bd') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-reshape2/package.py b/var/spack/repos/builtin/packages/r-reshape2/package.py index 769e82aff9d..1fd8067bbec 100644 --- a/var/spack/repos/builtin/packages/r-reshape2/package.py +++ b/var/spack/repos/builtin/packages/r-reshape2/package.py @@ -35,7 +35,7 @@ class RReshape2(Package): version('1.4.1', '41e9dffdf5c6fa830321ac9c8ebffe00') - extends('R') + extends('r') depends_on('r-plyr', type=nolink) depends_on('r-stringr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py index 0d28b68b940..0e0d94a3d3b 100644 --- a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py +++ b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py @@ -37,7 +37,7 @@ class RRgooglemaps(Package): version('1.2.0.7', '2e1df804f0331b4122d841105f0c7ea5') - extends('R') + extends('r') depends_on('r-png', type=nolink) depends_on('r-rjsonio', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rinside/package.py b/var/spack/repos/builtin/packages/r-rinside/package.py index 41af3a4392a..e18fc2499c1 100644 --- a/var/spack/repos/builtin/packages/r-rinside/package.py +++ b/var/spack/repos/builtin/packages/r-rinside/package.py @@ -48,7 +48,7 @@ class RRinside(Package): version('0.2.13', '2e3c35a7bd648e9bef98d0afcc02cf88') - extends('R') + extends('r') depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rjava/package.py b/var/spack/repos/builtin/packages/r-rjava/package.py index 47804bd7fc1..e1de4b77ff6 100644 --- a/var/spack/repos/builtin/packages/r-rjava/package.py +++ b/var/spack/repos/builtin/packages/r-rjava/package.py @@ -35,7 +35,7 @@ class RRjava(Package): version('0.9-8', '51ae0d690ceed056ebe7c4be71fc6c7a') - extends('R') + extends('r') depends_on('jdk') diff --git a/var/spack/repos/builtin/packages/r-rjson/package.py b/var/spack/repos/builtin/packages/r-rjson/package.py index 94ca45f485d..db25a92916f 100644 --- a/var/spack/repos/builtin/packages/r-rjson/package.py +++ b/var/spack/repos/builtin/packages/r-rjson/package.py @@ -34,7 +34,7 @@ class RRjson(Package): version('0.2.15', '87d0e29bc179c6aeaf312b138089f8e9') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-rjsonio/package.py b/var/spack/repos/builtin/packages/r-rjsonio/package.py index b56dfbe21d3..a62f17abf76 100644 --- a/var/spack/repos/builtin/packages/r-rjsonio/package.py +++ b/var/spack/repos/builtin/packages/r-rjsonio/package.py @@ -48,7 +48,7 @@ class RRjsonio(Package): version('1.3-0', '72c395622ba8d1435ec43849fd32c830') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-rmarkdown/package.py b/var/spack/repos/builtin/packages/r-rmarkdown/package.py index c3793883140..c65ff7df9b9 100644 --- a/var/spack/repos/builtin/packages/r-rmarkdown/package.py +++ b/var/spack/repos/builtin/packages/r-rmarkdown/package.py @@ -35,7 +35,7 @@ class RRmarkdown(Package): version('1.0', '264aa6a59e9680109e38df8270e14c58') - extends('R') + extends('r') depends_on('r-knitr', type=nolink) depends_on('r-yaml', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rmysql/package.py b/var/spack/repos/builtin/packages/r-rmysql/package.py index bc42c51ca9b..4164dd37219 100644 --- a/var/spack/repos/builtin/packages/r-rmysql/package.py +++ b/var/spack/repos/builtin/packages/r-rmysql/package.py @@ -34,7 +34,7 @@ class RRmysql(Package): version('0.10.9', '3628200a1864ac3005cfd55cc7cde17a') - extends('R') + extends('r') depends_on('r-dbi', type=nolink) depends_on('mariadb') diff --git a/var/spack/repos/builtin/packages/r-rngtools/package.py b/var/spack/repos/builtin/packages/r-rngtools/package.py index 2f33cd9f88c..2c06306f317 100644 --- a/var/spack/repos/builtin/packages/r-rngtools/package.py +++ b/var/spack/repos/builtin/packages/r-rngtools/package.py @@ -38,7 +38,7 @@ class RRngtools(Package): version('1.2.4', '715967f8b3af2848a76593a7c718c1cd') - extends('R') + extends('r') depends_on('r-pkgmaker', type=nolink) depends_on('r-stringr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rodbc/package.py b/var/spack/repos/builtin/packages/r-rodbc/package.py index 11fe0ace56e..af142c841ab 100644 --- a/var/spack/repos/builtin/packages/r-rodbc/package.py +++ b/var/spack/repos/builtin/packages/r-rodbc/package.py @@ -34,7 +34,7 @@ class RRodbc(Package): version('1.3-13', 'c52ef9139c2ed85adc53ad6effa7d68e') - extends('R') + extends('r') depends_on('unixodbc') diff --git a/var/spack/repos/builtin/packages/r-roxygen2/package.py b/var/spack/repos/builtin/packages/r-roxygen2/package.py index 4f4b8dcafaa..1c017d78982 100644 --- a/var/spack/repos/builtin/packages/r-roxygen2/package.py +++ b/var/spack/repos/builtin/packages/r-roxygen2/package.py @@ -35,7 +35,7 @@ class RRoxygen2(Package): version('5.0.1', 'df5bdbc12fda372e427710ef1cd92ed7') - extends('R') + extends('r') depends_on('r-stringr', type=nolink) depends_on('r-stringi', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rpostgresql/package.py b/var/spack/repos/builtin/packages/r-rpostgresql/package.py index 999fb4a1b9b..3f7b64693fd 100644 --- a/var/spack/repos/builtin/packages/r-rpostgresql/package.py +++ b/var/spack/repos/builtin/packages/r-rpostgresql/package.py @@ -42,7 +42,7 @@ class RRpostgresql(Package): version('0.4-1', 'e7b22e212afbb2cbb88bab937f93e55a') - extends('R') + extends('r') depends_on('r-dbi', type=nolink) depends_on('postgresql') diff --git a/var/spack/repos/builtin/packages/r-rsnns/package.py b/var/spack/repos/builtin/packages/r-rsnns/package.py index 7684792ba10..fad75827d4a 100644 --- a/var/spack/repos/builtin/packages/r-rsnns/package.py +++ b/var/spack/repos/builtin/packages/r-rsnns/package.py @@ -41,7 +41,7 @@ class RRsnns(Package): version('0.4-7', 'ade7736611c456effb5f72e0ce0a1e6f') - extends('R') + extends('r') depends_on('r-rcpp', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rsqlite/package.py b/var/spack/repos/builtin/packages/r-rsqlite/package.py index c7d41f0fb37..a22421ed87a 100644 --- a/var/spack/repos/builtin/packages/r-rsqlite/package.py +++ b/var/spack/repos/builtin/packages/r-rsqlite/package.py @@ -36,7 +36,7 @@ class RRsqlite(Package): version('1.0.0', 'e6cbe2709612b687c13a10d30c7bad45') - extends('R') + extends('r') depends_on('r-dbi', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rstan/package.py b/var/spack/repos/builtin/packages/r-rstan/package.py index 1d0052563b7..4f580d7853d 100644 --- a/var/spack/repos/builtin/packages/r-rstan/package.py +++ b/var/spack/repos/builtin/packages/r-rstan/package.py @@ -42,7 +42,7 @@ class RRstan(Package): version('2.10.1', 'f5d212f6f8551bdb91fe713d05d4052a') - extends('R') + extends('r') depends_on('r-ggplot2', type=nolink) depends_on('r-stanheaders', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-rstudioapi/package.py b/var/spack/repos/builtin/packages/r-rstudioapi/package.py index bf9b35fe5b9..1a20fc226b5 100644 --- a/var/spack/repos/builtin/packages/r-rstudioapi/package.py +++ b/var/spack/repos/builtin/packages/r-rstudioapi/package.py @@ -36,7 +36,7 @@ class RRstudioapi(Package): version('0.6', 'fdb13bf46aab02421557e713fceab66b') version('0.5', '6ce1191da74e7bcbf06b61339486b3ba') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-rzmq/package.py b/var/spack/repos/builtin/packages/r-rzmq/package.py index 472e706e725..d013c8889c9 100644 --- a/var/spack/repos/builtin/packages/r-rzmq/package.py +++ b/var/spack/repos/builtin/packages/r-rzmq/package.py @@ -37,7 +37,7 @@ class RRzmq(Package): depends_on('zeromq') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-sandwich/package.py b/var/spack/repos/builtin/packages/r-sandwich/package.py index ffd62b1b147..a9d39d37f9d 100644 --- a/var/spack/repos/builtin/packages/r-sandwich/package.py +++ b/var/spack/repos/builtin/packages/r-sandwich/package.py @@ -35,7 +35,7 @@ class RSandwich(Package): version('2.3-4', 'a621dbd8a57b6e1e036496642aadc2e5') - extends('R') + extends('r') depends_on('r-zoo', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-scales/package.py b/var/spack/repos/builtin/packages/r-scales/package.py index 44bd5a5a2a7..0072de8f5f6 100644 --- a/var/spack/repos/builtin/packages/r-scales/package.py +++ b/var/spack/repos/builtin/packages/r-scales/package.py @@ -35,7 +35,7 @@ class RScales(Package): version('0.4.0', '7b5602d9c55595901192248bca25c099') - extends('R') + extends('r') depends_on('r-rcolorbrewer', type=nolink) depends_on('r-dichromat', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-shiny/package.py b/var/spack/repos/builtin/packages/r-shiny/package.py index a80860f4a53..4617e8a0b22 100644 --- a/var/spack/repos/builtin/packages/r-shiny/package.py +++ b/var/spack/repos/builtin/packages/r-shiny/package.py @@ -37,7 +37,7 @@ class RShiny(Package): version('0.13.2', 'cb5bff7a28ad59ec2883cd0912ca9611') - extends('R') + extends('r') depends_on('r-httpuv', type=nolink) depends_on('r-mime', type=nolink) @@ -45,7 +45,7 @@ class RShiny(Package): depends_on('r-xtable', type=nolink) depends_on('r-digest', type=nolink) depends_on('r-htmltools', type=nolink) - depends_on('r-R6', type=nolink) + depends_on('r-r6', type=nolink) def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-sp/package.py b/var/spack/repos/builtin/packages/r-sp/package.py index bb7589d4906..ecb75203bb4 100644 --- a/var/spack/repos/builtin/packages/r-sp/package.py +++ b/var/spack/repos/builtin/packages/r-sp/package.py @@ -37,7 +37,7 @@ class RSp(Package): version('1.2-3', 'f0e24d993dec128642ee66b6b47b10c1') - extends('R') + extends('r') depends_on('r-lattice', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-sparsem/package.py b/var/spack/repos/builtin/packages/r-sparsem/package.py index c4dabf5c153..1bd8835d5a5 100644 --- a/var/spack/repos/builtin/packages/r-sparsem/package.py +++ b/var/spack/repos/builtin/packages/r-sparsem/package.py @@ -36,7 +36,7 @@ class RSparsem(Package): version('1.7', '7b5b0ab166a0929ef6dcfe1d97643601') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-stanheaders/package.py b/var/spack/repos/builtin/packages/r-stanheaders/package.py index c77b5aa8b6a..681969f18da 100644 --- a/var/spack/repos/builtin/packages/r-stanheaders/package.py +++ b/var/spack/repos/builtin/packages/r-stanheaders/package.py @@ -48,7 +48,7 @@ class RStanheaders(Package): version('2.10.0-2', '9d09b1e9278f08768f7a988ad9082d57') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-stringi/package.py b/var/spack/repos/builtin/packages/r-stringi/package.py index cc57caf8cd2..5a5f4ee18a7 100644 --- a/var/spack/repos/builtin/packages/r-stringi/package.py +++ b/var/spack/repos/builtin/packages/r-stringi/package.py @@ -42,7 +42,7 @@ class RStringi(Package): version('1.1.1', '32b919ee3fa8474530c4942962a6d8d9') - extends('R') + extends('r') depends_on('icu4c') diff --git a/var/spack/repos/builtin/packages/r-stringr/package.py b/var/spack/repos/builtin/packages/r-stringr/package.py index 08ded958339..43bae9bbf07 100644 --- a/var/spack/repos/builtin/packages/r-stringr/package.py +++ b/var/spack/repos/builtin/packages/r-stringr/package.py @@ -38,7 +38,7 @@ class RStringr(Package): version('1.0.0', '5ca977c90351f78b1b888b379114a7b4') - extends('R') + extends('r') depends_on('r-stringi', type=nolink) depends_on('r-magrittr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-survey/package.py b/var/spack/repos/builtin/packages/r-survey/package.py index 646793f7a44..619f22cb59a 100644 --- a/var/spack/repos/builtin/packages/r-survey/package.py +++ b/var/spack/repos/builtin/packages/r-survey/package.py @@ -40,7 +40,7 @@ class RSurvey(Package): version('3.30-3', 'c70cdae9cb43d35abddd11173d64cad0') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-survival/package.py b/var/spack/repos/builtin/packages/r-survival/package.py index cfba9298fe1..71652c2bcc5 100644 --- a/var/spack/repos/builtin/packages/r-survival/package.py +++ b/var/spack/repos/builtin/packages/r-survival/package.py @@ -36,7 +36,7 @@ class RSurvival(Package): version('2.39-5', 'a3cc6b5762e8c5c0bb9e64a276710be2') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-tarifx/package.py b/var/spack/repos/builtin/packages/r-tarifx/package.py index a85aa8baefe..a6b5fbddd34 100644 --- a/var/spack/repos/builtin/packages/r-tarifx/package.py +++ b/var/spack/repos/builtin/packages/r-tarifx/package.py @@ -34,7 +34,7 @@ class RTarifx(Package): version('1.0.6', '7e782e04bd69d929b29f91553382e6a2') - extends('R') + extends('r') depends_on('r-reshape2', type=nolink) depends_on('r-plyr', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-testit/package.py b/var/spack/repos/builtin/packages/r-testit/package.py index a10b55d66c2..2f2b0f3c4fa 100644 --- a/var/spack/repos/builtin/packages/r-testit/package.py +++ b/var/spack/repos/builtin/packages/r-testit/package.py @@ -36,7 +36,7 @@ class RTestit(Package): version('0.5', 'f206d3cbdc5174e353d2d05ba6a12e59') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-testthat/package.py b/var/spack/repos/builtin/packages/r-testthat/package.py index 60dfd2afcd5..8d4d1741289 100644 --- a/var/spack/repos/builtin/packages/r-testthat/package.py +++ b/var/spack/repos/builtin/packages/r-testthat/package.py @@ -35,13 +35,13 @@ class RTestthat(Package): version('1.0.2', '6c6a90c8db860292df5784a70e07b8dc') - extends('R') + extends('r') depends_on('r-digest', type=nolink) depends_on('r-crayon', type=nolink) depends_on('r-praise', type=nolink) depends_on('r-magrittr', type=nolink) - depends_on('r-R6', type=nolink) + depends_on('r-r6', type=nolink) def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-thdata/package.py b/var/spack/repos/builtin/packages/r-thdata/package.py index e1cf0501811..a389da3045d 100644 --- a/var/spack/repos/builtin/packages/r-thdata/package.py +++ b/var/spack/repos/builtin/packages/r-thdata/package.py @@ -34,7 +34,7 @@ class RThdata(Package): version('1.0-7', '3e8b6b1a4699544f175215aed7039a94') - extends('R') + extends('r') depends_on('r-survival', type=nolink) depends_on('r-mass', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-threejs/package.py b/var/spack/repos/builtin/packages/r-threejs/package.py index 89ecce8bfc7..e3aa271b3ec 100644 --- a/var/spack/repos/builtin/packages/r-threejs/package.py +++ b/var/spack/repos/builtin/packages/r-threejs/package.py @@ -35,7 +35,7 @@ class RThreejs(Package): version('0.2.2', '35c179b10813c5e4bd3e7827fae6627b') - extends('R') + extends('r') depends_on('r-htmlwidgets', type=nolink) depends_on('r-base64enc', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-tibble/package.py b/var/spack/repos/builtin/packages/r-tibble/package.py index c601de3c880..6d59a401477 100644 --- a/var/spack/repos/builtin/packages/r-tibble/package.py +++ b/var/spack/repos/builtin/packages/r-tibble/package.py @@ -35,7 +35,7 @@ class RTibble(Package): version('1.1', '2fe9f806109d0b7fadafb1ffafea4cb8') - extends('R') + extends('r') depends_on('r-assertthat', type=nolink) depends_on('r-lazyeval', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-tidyr/package.py b/var/spack/repos/builtin/packages/r-tidyr/package.py index d82ae278fe0..c83d75b6fde 100644 --- a/var/spack/repos/builtin/packages/r-tidyr/package.py +++ b/var/spack/repos/builtin/packages/r-tidyr/package.py @@ -36,7 +36,7 @@ class RTidyr(Package): version('0.5.1', '3cadc869510c054ed93d374ab44120bd') - extends('R') + extends('r') depends_on('r-tibble', type=nolink) depends_on('r-dplyr', type=nolink) depends_on('r-stringi', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-ttr/package.py b/var/spack/repos/builtin/packages/r-ttr/package.py index c9b40a8262d..355ba6ca3cf 100644 --- a/var/spack/repos/builtin/packages/r-ttr/package.py +++ b/var/spack/repos/builtin/packages/r-ttr/package.py @@ -34,7 +34,7 @@ class RTtr(Package): version('0.23-1', '35f693ac0d97e8ec742ebea2da222986') - extends('R') + extends('r') depends_on('r-xts', type=nolink) depends_on('r-zoo', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-uuid/package.py b/var/spack/repos/builtin/packages/r-uuid/package.py index 97541bc3b8e..9a2455017be 100644 --- a/var/spack/repos/builtin/packages/r-uuid/package.py +++ b/var/spack/repos/builtin/packages/r-uuid/package.py @@ -36,7 +36,7 @@ class RUuid(Package): version('0.1-2', 'f97d000c0b16bca455fb5bf2cd668ddf') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-vcd/package.py b/var/spack/repos/builtin/packages/r-vcd/package.py index 06e609b1efd..f7c0b253692 100644 --- a/var/spack/repos/builtin/packages/r-vcd/package.py +++ b/var/spack/repos/builtin/packages/r-vcd/package.py @@ -39,7 +39,7 @@ class RVcd(Package): version('1.4-1', '7db150a77f173f85b69a1f86f73f8f02') - extends('R') + extends('r') depends_on('r-mass', type=nolink) depends_on('r-colorspace', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-visnetwork/package.py b/var/spack/repos/builtin/packages/r-visnetwork/package.py index 90d55bbb2fb..6cce369325d 100644 --- a/var/spack/repos/builtin/packages/r-visnetwork/package.py +++ b/var/spack/repos/builtin/packages/r-visnetwork/package.py @@ -35,7 +35,7 @@ class RVisnetwork(Package): version('1.0.1', 'dfc9664a5165134d8dbdcd949ad73cf7') - extends('R') + extends('r') depends_on('r-htmlwidgets', type=nolink) depends_on('r-htmltools', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-whisker/package.py b/var/spack/repos/builtin/packages/r-whisker/package.py index f338d150f1e..8edea7e840a 100644 --- a/var/spack/repos/builtin/packages/r-whisker/package.py +++ b/var/spack/repos/builtin/packages/r-whisker/package.py @@ -35,7 +35,7 @@ class RWhisker(Package): version('0.3-2', 'c4b9bf9a22e69ce003fe68663ab5e8e6') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-withr/package.py b/var/spack/repos/builtin/packages/r-withr/package.py index 5ce7437c84f..92b941b32fa 100644 --- a/var/spack/repos/builtin/packages/r-withr/package.py +++ b/var/spack/repos/builtin/packages/r-withr/package.py @@ -37,7 +37,7 @@ class RWithr(Package): version('1.0.1', 'ac38af2c6f74027c9592dd8f0acb7598') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-xgboost/package.py b/var/spack/repos/builtin/packages/r-xgboost/package.py index 458045ff74b..586a99f76f7 100644 --- a/var/spack/repos/builtin/packages/r-xgboost/package.py +++ b/var/spack/repos/builtin/packages/r-xgboost/package.py @@ -42,7 +42,7 @@ class RXgboost(Package): version('0.4-4', 'c24d3076058101a71de4b8af8806697c') - extends('R') + extends('r') depends_on('r-matrix', type=nolink) depends_on('r-datatable', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-xlconnect/package.py b/var/spack/repos/builtin/packages/r-xlconnect/package.py index 332c80fb92d..64b95f84e0c 100644 --- a/var/spack/repos/builtin/packages/r-xlconnect/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnect/package.py @@ -36,7 +36,7 @@ class RXlconnect(Package): version('0.2-12', '3340d05d259f0a41262eab4ed32617ad') version('0.2-11', '9d1769a103cda05665df399cc335017d') - extends('R') + extends('r') depends_on('r-xlconnectjars', type=nolink) depends_on('r-rjava', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py index 26e822d2b77..37dbed27839 100644 --- a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py @@ -35,7 +35,7 @@ class RXlconnectjars(Package): version('0.2-12', '6984e5140cd1c887c017ef6f88cbba81') version('0.2-9', 'e6d6b1acfede26acaa616ee421bd30fb') - extends('R') + extends('r') depends_on('r-rjava', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-xlsx/package.py b/var/spack/repos/builtin/packages/r-xlsx/package.py index 6fed09296d6..4c7b8ee15d6 100644 --- a/var/spack/repos/builtin/packages/r-xlsx/package.py +++ b/var/spack/repos/builtin/packages/r-xlsx/package.py @@ -35,7 +35,7 @@ class RXlsx(Package): version('0.5.7', '36b1b16f29c54b6089b1dae923180dd5') - extends('R') + extends('r') depends_on('r-rjava', type=nolink) depends_on('r-xlsxjars', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-xlsxjars/package.py b/var/spack/repos/builtin/packages/r-xlsxjars/package.py index 19f0006ce98..22bda6e83f4 100644 --- a/var/spack/repos/builtin/packages/r-xlsxjars/package.py +++ b/var/spack/repos/builtin/packages/r-xlsxjars/package.py @@ -35,7 +35,7 @@ class RXlsxjars(Package): version('0.6.1', '5a1721d5733cb42f3a29e3f353e39166') - extends('R') + extends('r') depends_on('r-rjava', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-xml/package.py b/var/spack/repos/builtin/packages/r-xml/package.py index 5affe7f08a4..416491cbe6d 100644 --- a/var/spack/repos/builtin/packages/r-xml/package.py +++ b/var/spack/repos/builtin/packages/r-xml/package.py @@ -37,7 +37,7 @@ class RXml(Package): version('3.98-1.5', 'd1cfcd56f7aec96a84ffca91aea507ee') version('3.98-1.4', '1a7f3ce6f264eeb109bfa57bedb26c14') - extends('R') + extends('r') depends_on('libxml2') diff --git a/var/spack/repos/builtin/packages/r-xtable/package.py b/var/spack/repos/builtin/packages/r-xtable/package.py index 46434b48420..8c675e1b3bb 100644 --- a/var/spack/repos/builtin/packages/r-xtable/package.py +++ b/var/spack/repos/builtin/packages/r-xtable/package.py @@ -34,7 +34,7 @@ class RXtable(Package): version('1.8-2', '239e4825cd046156a67efae3aac01d86') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-xts/package.py b/var/spack/repos/builtin/packages/r-xts/package.py index d8a4b62d27e..678a9f4bf44 100644 --- a/var/spack/repos/builtin/packages/r-xts/package.py +++ b/var/spack/repos/builtin/packages/r-xts/package.py @@ -37,7 +37,7 @@ class RXts(Package): version('0.9-7', 'a232e94aebfa654653a7d88a0503537b') - extends('R') + extends('r') depends_on('r-zoo', type=nolink) diff --git a/var/spack/repos/builtin/packages/r-yaml/package.py b/var/spack/repos/builtin/packages/r-yaml/package.py index b68f26e9b87..d8a3c9bacc9 100644 --- a/var/spack/repos/builtin/packages/r-yaml/package.py +++ b/var/spack/repos/builtin/packages/r-yaml/package.py @@ -35,7 +35,7 @@ class RYaml(Package): version('2.1.13', 'f2203ea395adaff6bd09134666191d9a') - extends('R') + extends('r') def install(self, spec, prefix): R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir), diff --git a/var/spack/repos/builtin/packages/r-zoo/package.py b/var/spack/repos/builtin/packages/r-zoo/package.py index d889cacbeee..27295c7afcc 100644 --- a/var/spack/repos/builtin/packages/r-zoo/package.py +++ b/var/spack/repos/builtin/packages/r-zoo/package.py @@ -38,7 +38,7 @@ class RZoo(Package): version('1.7-13', '99521dfa4c668e692720cefcc5a1bf30') - extends('R') + extends('r') depends_on('r-lattice', type=nolink) diff --git a/var/spack/repos/builtin/packages/R/package.py b/var/spack/repos/builtin/packages/r/package.py similarity index 100% rename from var/spack/repos/builtin/packages/R/package.py rename to var/spack/repos/builtin/packages/r/package.py diff --git a/var/spack/repos/builtin/packages/SAMRAI/no-tool-build.patch b/var/spack/repos/builtin/packages/samrai/no-tool-build.patch similarity index 100% rename from var/spack/repos/builtin/packages/SAMRAI/no-tool-build.patch rename to var/spack/repos/builtin/packages/samrai/no-tool-build.patch diff --git a/var/spack/repos/builtin/packages/SAMRAI/package.py b/var/spack/repos/builtin/packages/samrai/package.py similarity index 100% rename from var/spack/repos/builtin/packages/SAMRAI/package.py rename to var/spack/repos/builtin/packages/samrai/package.py diff --git a/var/spack/repos/builtin/packages/sdl2_image/package.py b/var/spack/repos/builtin/packages/sdl2-image/package.py similarity index 100% rename from var/spack/repos/builtin/packages/sdl2_image/package.py rename to var/spack/repos/builtin/packages/sdl2-image/package.py diff --git a/var/spack/repos/builtin/packages/the_platinum_searcher/package.py b/var/spack/repos/builtin/packages/the-platinum-searcher/package.py similarity index 100% rename from var/spack/repos/builtin/packages/the_platinum_searcher/package.py rename to var/spack/repos/builtin/packages/the-platinum-searcher/package.py diff --git a/var/spack/repos/builtin/packages/the_silver_searcher/package.py b/var/spack/repos/builtin/packages/the-silver-searcher/package.py similarity index 100% rename from var/spack/repos/builtin/packages/the_silver_searcher/package.py rename to var/spack/repos/builtin/packages/the-silver-searcher/package.py diff --git a/var/spack/repos/builtin/packages/uberftp/package.py b/var/spack/repos/builtin/packages/uberftp/package.py index b1b7dada6f4..b0c6c8a42f0 100644 --- a/var/spack/repos/builtin/packages/uberftp/package.py +++ b/var/spack/repos/builtin/packages/uberftp/package.py @@ -35,7 +35,7 @@ class Uberftp(Package): version('2_7', 'faaea2d6e1958c1105cfc9147824e03c') version('2_6', '784210976f259f9d19c0798c19778d34') - depends_on('globus_toolkit') + depends_on('globus-toolkit') def install(self, spec, prefix): configure('--prefix={0}'.format(prefix))