Get Rid of nobuild, nolink, and alldeps (#2765)

* Removing the nobuild, nolink, and alldeps dependency types in favor of being explicit.
* This will help with maintenance going forward, as adding more dependency types won't affect existing declared dependencies in weird ways.
* default deptype is still `('build', 'link')`

177 files changed, 499 insertions, 495 deletions

diff --git a/var/spack/repos/builtin/packages/antlr/package.py b/var/spack/repos/builtin/packages/antlr/package.py
index 87c0119fef..88653a8ea9 100644
--- a/var/spack/repos/builtin/packages/antlr/package.py
+++ b/var/spack/repos/builtin/packages/antlr/package.py
@@ -54,7 +54,7 @@ class Antlr(AutotoolsPackage):
     variant('python', default=False, description='Enable ANTLR for Python')
 
     extends('python', when='+python')
-    depends_on('jdk', type='nolink', when='+java')
+    depends_on('jdk', type=('build', 'run'), when='+java')
 
     def configure_args(self):
         spec = self.spec
diff --git a/var/spack/repos/builtin/packages/cantera/package.py b/var/spack/repos/builtin/packages/cantera/package.py
index 66e1197669..5cd9fcdd17 100644
--- a/var/spack/repos/builtin/packages/cantera/package.py
+++ b/var/spack/repos/builtin/packages/cantera/package.py
@@ -57,10 +57,10 @@ class Cantera(Package):
 
     # Python module dependencies
     extends('python', when='+python')
-    depends_on('py-numpy',  when='+python', type=nolink)
-    depends_on('py-scipy',  when='+python', type=nolink)
-    depends_on('py-cython', when='+python', type=nolink)
-    depends_on('py-3to2',   when='+python', type=nolink)
+    depends_on('py-numpy',  when='+python', type=('build', 'run'))
+    depends_on('py-scipy',  when='+python', type=('build', 'run'))
+    depends_on('py-cython', when='+python', type=('build', 'run'))
+    depends_on('py-3to2',   when='+python', type=('build', 'run'))
     # TODO: these "when" specs don't actually work
     # depends_on('py-unittest2',     when='+python^python@2.6')
     # depends_on('py-unittest2py3k', when='+python^python@3.1')
diff --git a/var/spack/repos/builtin/packages/cask/package.py b/var/spack/repos/builtin/packages/cask/package.py
index 5a5bfaa5f1..b48365b61d 100644
--- a/var/spack/repos/builtin/packages/cask/package.py
+++ b/var/spack/repos/builtin/packages/cask/package.py
@@ -41,7 +41,7 @@ class Cask(Package):
     # version 0.8.0 is broken
     version('0.7.4', 'c973a7db43bc980dd83759a5864a1260')
 
-    depends_on('emacs', type=nolink)
+    depends_on('emacs', type=('build', 'run'))
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin/packages/cmor/package.py b/var/spack/repos/builtin/packages/cmor/package.py
index 1cbf068493..b5debf9537 100644
--- a/var/spack/repos/builtin/packages/cmor/package.py
+++ b/var/spack/repos/builtin/packages/cmor/package.py
@@ -47,7 +47,7 @@ class Cmor(AutotoolsPackage):
 
     extends('python', when='+python')
     depends_on('python@:2.7', when='+python')
-    depends_on('py-numpy', type=nolink, when='+python')
+    depends_on('py-numpy', type=('build', 'run'), when='+python')
 
     @AutotoolsPackage.precondition('configure')
     def validate(self):
diff --git a/var/spack/repos/builtin/packages/environment-modules/package.py b/var/spack/repos/builtin/packages/environment-modules/package.py
index 335fa1a3fe..11ddb12876 100644
--- a/var/spack/repos/builtin/packages/environment-modules/package.py
+++ b/var/spack/repos/builtin/packages/environment-modules/package.py
@@ -36,7 +36,7 @@ class EnvironmentModules(Package):
     version('3.2.10', '8b097fdcb90c514d7540bb55a3cb90fb')
 
     # Dependencies:
-    depends_on('tcl', type=alldeps)
+    depends_on('tcl', type=('build', 'link', 'run'))
 
     def install(self, spec, prefix):
         tcl_spec = spec['tcl']
diff --git a/var/spack/repos/builtin/packages/espressopp/package.py b/var/spack/repos/builtin/packages/espressopp/package.py
index ddc98f07c5..21e1cc1317 100644
--- a/var/spack/repos/builtin/packages/espressopp/package.py
+++ b/var/spack/repos/builtin/packages/espressopp/package.py
@@ -49,8 +49,8 @@ class Espressopp(CMakePackage):
     depends_on("boost+serialization+filesystem+system+python+mpi", when='@1.9.4:')
     extends("python")
     depends_on("python@2:2.7.13")
-    depends_on("py-mpi4py@2.0.0:", when='@1.9.4', type='nolink')
-    depends_on("py-mpi4py@1.3.1:", when='@1.9.4.1:', type='nolink')
+    depends_on("py-mpi4py@2.0.0:", when='@1.9.4', type=('build', 'run'))
+    depends_on("py-mpi4py@1.3.1:", when='@1.9.4.1:', type=('build', 'run'))
     depends_on("fftw")
     depends_on("py-sphinx", when="+ug", type='build')
     depends_on("py-sphinx", when="+pdf", type='build')
diff --git a/var/spack/repos/builtin/packages/fenics/package.py b/var/spack/repos/builtin/packages/fenics/package.py
index 1dc302fdff..4be94a96b8 100644
--- a/var/spack/repos/builtin/packages/fenics/package.py
+++ b/var/spack/repos/builtin/packages/fenics/package.py
@@ -83,12 +83,12 @@ class Fenics(Package):
     depends_on('suite-sparse', when='+suite-sparse')
     depends_on('qt', when='+qt')
 
-    depends_on('py-ply', type=nolink)
-    depends_on('py-six', type=nolink)
-    depends_on('py-numpy', type=nolink)
-    depends_on('py-sympy', type=nolink)
-    depends_on('swig@3.0.3:', type=nolink)
-    depends_on('cmake@2.8.12:', type=nolink)
+    depends_on('py-ply', type=('build', 'run'))
+    depends_on('py-six', type=('build', 'run'))
+    depends_on('py-numpy', type=('build', 'run'))
+    depends_on('py-sympy', type=('build', 'run'))
+    depends_on('swig@3.0.3:', type=('build', 'run'))
+    depends_on('cmake@2.8.12:', type=('build', 'run'))
 
     depends_on('py-setuptools', type='build')
     depends_on('py-sphinx@1.0.1:', when='+doc', type='build')
diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py
index a1acddc210..b52b1f1038 100644
--- a/var/spack/repos/builtin/packages/gdal/package.py
+++ b/var/spack/repos/builtin/packages/gdal/package.py
@@ -63,7 +63,7 @@ class Gdal(Package):
     depends_on("libpng")
     depends_on("zlib")
     depends_on("proj")
-    depends_on("py-numpy", type=nolink)
+    depends_on("py-numpy", type=('build', 'run'))
 
     parallel = False
 
diff --git a/var/spack/repos/builtin/packages/global/package.py b/var/spack/repos/builtin/packages/global/package.py
index f832834a28..fedf41c829 100644
--- a/var/spack/repos/builtin/packages/global/package.py
+++ b/var/spack/repos/builtin/packages/global/package.py
@@ -34,7 +34,7 @@ class Global(Package):
 
     version('6.5', 'dfec818b4f53d91721e247cf7b218078')
 
-    depends_on('exuberant-ctags', type=nolink)
+    depends_on('exuberant-ctags', type=('build', 'run'))
     depends_on('ncurses')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/go-bootstrap/package.py b/var/spack/repos/builtin/packages/go-bootstrap/package.py
index 050feab24d..b497144f2f 100644
--- a/var/spack/repos/builtin/packages/go-bootstrap/package.py
+++ b/var/spack/repos/builtin/packages/go-bootstrap/package.py
@@ -53,7 +53,7 @@ class GoBootstrap(Package):
 
     provides('golang@:1.4-bootstrap-20161024')
 
-    depends_on('git', type='alldeps')
+    depends_on('git', type=('build', 'link', 'run'))
 
     # NOTE: Older versions of Go attempt to download external files that have
     # since been moved while running the test suite.  This patch modifies the
diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py
index 2d797a3734..ad1436c0c3 100644
--- a/var/spack/repos/builtin/packages/go/package.py
+++ b/var/spack/repos/builtin/packages/go/package.py
@@ -58,7 +58,7 @@ class Go(Package):
 
     provides('golang')
 
-    depends_on('git', type='alldeps')
+    depends_on('git', type=('build', 'link', 'run'))
     # TODO: Make non-c self-hosting compilers feasible without backflips
     # should be a dep on external go compiler
     depends_on('go-bootstrap', type='build')
diff --git a/var/spack/repos/builtin/packages/hoomd-blue/package.py b/var/spack/repos/builtin/packages/hoomd-blue/package.py
index 79e99e7b89..5e27f6aead 100644
--- a/var/spack/repos/builtin/packages/hoomd-blue/package.py
+++ b/var/spack/repos/builtin/packages/hoomd-blue/package.py
@@ -46,7 +46,7 @@ class HoomdBlue(Package):
     variant('doc',  default=True, description='Generate documentation')
 
     extends('python')
-    depends_on('py-numpy', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
     depends_on('boost+python')
     depends_on('cmake', type='build')
     depends_on('mpi', when='+mpi')
diff --git a/var/spack/repos/builtin/packages/ibmisc/package.py b/var/spack/repos/builtin/packages/ibmisc/package.py
index 8409da6b22..7365eac46a 100644
--- a/var/spack/repos/builtin/packages/ibmisc/package.py
+++ b/var/spack/repos/builtin/packages/ibmisc/package.py
@@ -59,8 +59,8 @@ class Ibmisc(CMakePackage):
     depends_on('netcdf-cxx4', when='+netcdf')
     depends_on('udunits2', when='+udunits2')
     depends_on('googletest', when='+googletest', type='build')
-    depends_on('py-cython', when='+python', type=nolink)
-    depends_on('py-numpy', when='+python', type=nolink)
+    depends_on('py-cython', when='+python', type=('build', 'run'))
+    depends_on('py-numpy', when='+python', type=('build', 'run'))
     depends_on('boost', when='+boost')
 
     # Build dependencies
diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py
index c2daca80a5..9ac270bab5 100644
--- a/var/spack/repos/builtin/packages/lmod/package.py
+++ b/var/spack/repos/builtin/packages/lmod/package.py
@@ -44,9 +44,9 @@ class Lmod(Package):
     version('6.0.1', '91abf52fe5033bd419ffe2842ebe7af9')
 
     depends_on('lua@5.2:')
-    depends_on('lua-luaposix', type=nolink)
-    depends_on('lua-luafilesystem', type=nolink)
-    depends_on('tcl', type=nolink)
+    depends_on('lua-luaposix', type=('build', 'run'))
+    depends_on('lua-luafilesystem', type=('build', 'run'))
+    depends_on('tcl', type=('build', 'run'))
 
     parallel = False
 
diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py
index 4da2c99e04..357e2cc03a 100644
--- a/var/spack/repos/builtin/packages/lua/package.py
+++ b/var/spack/repos/builtin/packages/lua/package.py
@@ -88,7 +88,8 @@ class Lua(Package):
 
     def setup_dependent_environment(self, spack_env, run_env, extension_spec):
         lua_paths = []
-        for d in extension_spec.traverse(deptypes=nolink, deptype_query='run'):
+        for d in extension_spec.traverse(
+                deptypes=('build', 'run'), deptype_query='run'):
             if d.package.extends(self.spec):
                 lua_paths.append(os.path.join(d.prefix, self.lua_lib_dir))
                 lua_paths.append(os.path.join(d.prefix, self.lua_share_dir))
diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py
index a8b9f3d3e2..556dba34c2 100644
--- a/var/spack/repos/builtin/packages/nwchem/package.py
+++ b/var/spack/repos/builtin/packages/nwchem/package.py
@@ -41,7 +41,7 @@ class Nwchem(Package):
     depends_on('mpi')
     depends_on('scalapack')
 
-    depends_on('python@2.7:2.8', type=nolink)
+    depends_on('python@2.7:2.8', type=('build', 'run'))
 
     # patches for 6.6-27746:
     urls_for_patches = {
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py
index 03cc7ba427..8a721032a6 100644
--- a/var/spack/repos/builtin/packages/opencv/package.py
+++ b/var/spack/repos/builtin/packages/opencv/package.py
@@ -76,7 +76,7 @@ class Opencv(Package):
     depends_on('vtk', when='+vtk')
     depends_on('qt', when='+qt')
     depends_on('jdk', when='+java')
-    depends_on('py-numpy', when='+python', type='nolink')
+    depends_on('py-numpy', when='+python', type=('build', 'run'))
 
     extends('python', when='+python')
 
diff --git a/var/spack/repos/builtin/packages/psi4/package.py b/var/spack/repos/builtin/packages/psi4/package.py
index 566aa50f44..4248c24646 100644
--- a/var/spack/repos/builtin/packages/psi4/package.py
+++ b/var/spack/repos/builtin/packages/psi4/package.py
@@ -50,7 +50,7 @@ class Psi4(Package):
                '+thread')
     depends_on('python')
     depends_on('cmake', type='build')
-    depends_on('py-numpy', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
 
     # Optional dependencies
     # TODO: add packages for these
diff --git a/var/spack/repos/builtin/packages/py-astroid/package.py b/var/spack/repos/builtin/packages/py-astroid/package.py
index ff5683c705..a42d936f05 100644
--- a/var/spack/repos/builtin/packages/py-astroid/package.py
+++ b/var/spack/repos/builtin/packages/py-astroid/package.py
@@ -22,7 +22,7 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-from spack import depends_on, extends, version, nolink
+from spack import depends_on, extends, version
 from spack import Package
 
 
@@ -37,9 +37,9 @@ class PyAstroid(Package):
     version('1.4.1', 'ed70bfed5e4b25be4292e7fe72da2c02')
 
     extends('python')
-    depends_on('py-logilab-common', type=nolink)
+    depends_on('py-logilab-common', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
-    depends_on('py-six', type=nolink)
+    depends_on('py-six', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-astropy/package.py b/var/spack/repos/builtin/packages/py-astropy/package.py
index 1565db0bdd..193add18ef 100644
--- a/var/spack/repos/builtin/packages/py-astropy/package.py
+++ b/var/spack/repos/builtin/packages/py-astropy/package.py
@@ -38,18 +38,18 @@ class PyAstropy(Package):
 
     # Required dependencies
     extends('python')
-    depends_on('py-numpy', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
 
     # Optional dependencies
-    depends_on('py-h5py', type=nolink)
-    depends_on('py-beautifulsoup4', type=nolink)
-    depends_on('py-pyyaml', type=nolink)
-    depends_on('py-scipy', type=nolink)
+    depends_on('py-h5py', type=('build', 'run'))
+    depends_on('py-beautifulsoup4', type=('build', 'run'))
+    depends_on('py-pyyaml', type=('build', 'run'))
+    depends_on('py-scipy', type=('build', 'run'))
     depends_on('libxml2')
-    depends_on('py-matplotlib', type=nolink)
-    depends_on('py-pytz', type=nolink)
-    depends_on('py-scikit-image', type=nolink)
-    depends_on('py-pandas', type=nolink)
+    depends_on('py-matplotlib', type=('build', 'run'))
+    depends_on('py-pytz', type=('build', 'run'))
+    depends_on('py-scikit-image', type=('build', 'run'))
+    depends_on('py-pandas', type=('build', 'run'))
 
     # System dependencies
     depends_on('cfitsio')
diff --git a/var/spack/repos/builtin/packages/py-autopep8/package.py b/var/spack/repos/builtin/packages/py-autopep8/package.py
index 6d093f32f6..629a3b515e 100644
--- a/var/spack/repos/builtin/packages/py-autopep8/package.py
+++ b/var/spack/repos/builtin/packages/py-autopep8/package.py
@@ -38,7 +38,7 @@ class PyAutopep8(Package):
     extends('python', ignore='bin/pep8')
     depends_on('python@2.6:2.7,3.2:')
 
-    depends_on('py-pycodestyle@1.5.7:1.7.0', type=nolink)
+    depends_on('py-pycodestyle@1.5.7:1.7.0', type=('build', 'run'))
 
     depends_on('py-setuptools', type='build')
 
diff --git a/var/spack/repos/builtin/packages/py-babel/package.py b/var/spack/repos/builtin/packages/py-babel/package.py
index 8beb216fd3..12d7ff84b6 100644
--- a/var/spack/repos/builtin/packages/py-babel/package.py
+++ b/var/spack/repos/builtin/packages/py-babel/package.py
@@ -39,7 +39,7 @@ class PyBabel(Package):
     extends('python')
 
     depends_on('py-setuptools', type='build')
-    depends_on('py-pytz',       type=nolink)
+    depends_on('py-pytz',       type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py
index 3f5bf989c1..d69051037b 100644
--- a/var/spack/repos/builtin/packages/py-basemap/package.py
+++ b/var/spack/repos/builtin/packages/py-basemap/package.py
@@ -37,9 +37,9 @@ class PyBasemap(Package):
 
     extends('python')
     depends_on('py-setuptools', type='build')
-    depends_on('py-numpy', type=nolink)
-    depends_on('py-matplotlib', type=nolink)
-    depends_on('pil', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
+    depends_on('py-matplotlib', type=('build', 'run'))
+    depends_on('pil', type=('build', 'run'))
     depends_on("geos")
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-biopython/package.py b/var/spack/repos/builtin/packages/py-biopython/package.py
index 9e1b693a0d..83ede166d6 100644
--- a/var/spack/repos/builtin/packages/py-biopython/package.py
+++ b/var/spack/repos/builtin/packages/py-biopython/package.py
@@ -37,8 +37,8 @@ class PyBiopython(Package):
     version('1.65', '143e7861ade85c0a8b5e2bbdd1da1f67')
 
     extends('python')
-    depends_on('py-mx', type=nolink)
-    depends_on('py-numpy', type=nolink)
+    depends_on('py-mx', type=('build', 'run'))
+    depends_on('py-numpy', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-bottleneck/package.py b/var/spack/repos/builtin/packages/py-bottleneck/package.py
index 20d78846bb..d2d258105d 100644
--- a/var/spack/repos/builtin/packages/py-bottleneck/package.py
+++ b/var/spack/repos/builtin/packages/py-bottleneck/package.py
@@ -33,7 +33,7 @@ class PyBottleneck(Package):
     version('1.0.0', '380fa6f275bd24f27e7cf0e0d752f5d2')
 
     extends('python')
-    depends_on('py-numpy', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-cclib/package.py b/var/spack/repos/builtin/packages/py-cclib/package.py
index 33b1d25c7e..f06a8cbc37 100644
--- a/var/spack/repos/builtin/packages/py-cclib/package.py
+++ b/var/spack/repos/builtin/packages/py-cclib/package.py
@@ -36,7 +36,7 @@ class PyCclib(Package):
 
     extends('python')
 
-    depends_on('py-numpy@1.5:', type=nolink)
+    depends_on('py-numpy@1.5:', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-cdo/package.py b/var/spack/repos/builtin/packages/py-cdo/package.py
index b52d3223eb..c74a3f7c33 100644
--- a/var/spack/repos/builtin/packages/py-cdo/package.py
+++ b/var/spack/repos/builtin/packages/py-cdo/package.py
@@ -40,8 +40,8 @@ class PyCdo(Package):
     depends_on('cdo')
 
     depends_on('py-setuptools', type='build')
-    depends_on('py-scipy', type=nolink)
-    depends_on('py-netcdf', type=nolink)   
+    depends_on('py-scipy', type=('build', 'run'))
+    depends_on('py-netcdf', type=('build', 'run'))   
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-cffi/package.py b/var/spack/repos/builtin/packages/py-cffi/package.py
index 5cd983b343..f2f7646687 100644
--- a/var/spack/repos/builtin/packages/py-cffi/package.py
+++ b/var/spack/repos/builtin/packages/py-cffi/package.py
@@ -37,7 +37,7 @@ class PyCffi(Package):
 
     extends('python')
     depends_on('py-setuptools', type='build')
-    depends_on('py-pycparser', type=nolink)
+    depends_on('py-pycparser', type=('build', 'run'))
     depends_on('libffi')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-configparser/package.py b/var/spack/repos/builtin/packages/py-configparser/package.py
index 1ad4ed619e..6885d6bd93 100644
--- a/var/spack/repos/builtin/packages/py-configparser/package.py
+++ b/var/spack/repos/builtin/packages/py-configparser/package.py
@@ -38,7 +38,7 @@ class PyConfigparser(Package):
     extends('python')
     depends_on('python@2.6:2.7,3.4:')
 
-    depends_on('py-ordereddict', when='^python@2.6:2.6.999', type=nolink)
+    depends_on('py-ordereddict', when='^python@2.6:2.6.999', type=('build', 'run'))
 
     depends_on('py-setuptools', type='build')
 
diff --git a/var/spack/repos/builtin/packages/py-csvkit/package.py b/var/spack/repos/builtin/packages/py-csvkit/package.py
index 904f138d12..ceb220eef7 100644
--- a/var/spack/repos/builtin/packages/py-csvkit/package.py
+++ b/var/spack/repos/builtin/packages/py-csvkit/package.py
@@ -36,12 +36,12 @@ class PyCsvkit(Package):
 
     extends('python')
 
-    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-six', type=nolink)
-    depends_on('py-openpyxl', type=nolink)
+    depends_on('py-dateutil', type=('build', 'run'))
+    depends_on('py-dbf', type=('build', 'run'))
+    depends_on('py-xlrd', type=('build', 'run'))
+    depends_on('py-sqlalchemy', type=('build', 'run'))
+    depends_on('py-six', type=('build', 'run'))
+    depends_on('py-openpyxl', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-cycler/package.py b/var/spack/repos/builtin/packages/py-cycler/package.py
index 16da057f21..dff307cddd 100644
--- a/var/spack/repos/builtin/packages/py-cycler/package.py
+++ b/var/spack/repos/builtin/packages/py-cycler/package.py
@@ -36,7 +36,7 @@ class PyCycler(Package):
     extends('python')
 
     depends_on('py-setuptools', type='build')
-    depends_on('py-six',        type=nolink)
+    depends_on('py-six',        type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-dateutil/package.py b/var/spack/repos/builtin/packages/py-dateutil/package.py
index f147e2357b..c9e77b3b08 100644
--- a/var/spack/repos/builtin/packages/py-dateutil/package.py
+++ b/var/spack/repos/builtin/packages/py-dateutil/package.py
@@ -36,7 +36,7 @@ class PyDateutil(Package):
 
     extends('python')
     depends_on('py-setuptools', type='build')
-    depends_on('py-six', type=nolink)
+    depends_on('py-six', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-emcee/package.py b/var/spack/repos/builtin/packages/py-emcee/package.py
index 2045ec9d59..d3627b32c5 100644
--- a/var/spack/repos/builtin/packages/py-emcee/package.py
+++ b/var/spack/repos/builtin/packages/py-emcee/package.py
@@ -35,7 +35,7 @@ class PyEmcee(Package):
     version('2.1.0', 'c6b6fad05c824d40671d4a4fc58dfff7')
 
     extends('python')
-    depends_on('py-numpy', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-enum34/package.py b/var/spack/repos/builtin/packages/py-enum34/package.py
index 2f294bac12..584572b47d 100644
--- a/var/spack/repos/builtin/packages/py-enum34/package.py
+++ b/var/spack/repos/builtin/packages/py-enum34/package.py
@@ -37,7 +37,7 @@ class PyEnum34(Package):
     extends('python')
     depends_on('python@2.4:2.8,3.3:')
 
-    depends_on('py-ordereddict', when='^python@:2.6.999', type=nolink)
+    depends_on('py-ordereddict', when='^python@:2.6.999', type=('build', 'run'))
 
     depends_on('py-setuptools', type='build')
 
diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py
index 8bb36bc02f..4515f68e0a 100644
--- a/var/spack/repos/builtin/packages/py-flake8/package.py
+++ b/var/spack/repos/builtin/packages/py-flake8/package.py
@@ -40,25 +40,25 @@ class PyFlake8(Package):
 
     # Most Python packages only require py-setuptools as a build dependency.
     # However, py-flake8 requires py-setuptools during runtime as well.
-    depends_on('py-setuptools', type=nolink)
+    depends_on('py-setuptools', type=('build', 'run'))
 
     # pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.3.0
-    depends_on('py-pyflakes@0.8.1:1.1.0,1.2.3:1.2.3', when='@3.0.4', type=nolink)  # noqa
+    depends_on('py-pyflakes@0.8.1:1.1.0,1.2.3:1.2.3', when='@3.0.4', type=('build', 'run'))  # noqa
     # pyflakes >= 0.8.1, < 1.1
-    depends_on('py-pyflakes@0.8.1:1.0.0', when='@2.5.4', type=nolink)
+    depends_on('py-pyflakes@0.8.1:1.0.0', when='@2.5.4', type=('build', 'run'))
 
     # pycodestyle >= 2.0.0, < 2.1.0
-    depends_on('py-pycodestyle@2.0.0:2.0.999', when='@3.0.4', type=nolink)
+    depends_on('py-pycodestyle@2.0.0:2.0.999', when='@3.0.4', type=('build', 'run'))
     # pep8 >= 1.5.7, != 1.6.0, != 1.6.1, != 1.6.2
-    depends_on('py-pycodestyle@1.5.7,1.7.0:', when='@2.5.4', type=nolink)
+    depends_on('py-pycodestyle@1.5.7,1.7.0:', when='@2.5.4', type=('build', 'run'))
 
     # mccabe >= 0.5.0, < 0.6.0
-    depends_on('py-mccabe@0.5.0:0.5.999', when='@3.0.4', type=nolink)
+    depends_on('py-mccabe@0.5.0:0.5.999', when='@3.0.4', type=('build', 'run'))
     # mccabe >= 0.2.1, < 0.5
-    depends_on('py-mccabe@0.2.1:0.4.0', when='@2.5.4', type=nolink)
+    depends_on('py-mccabe@0.2.1:0.4.0', when='@2.5.4', type=('build', 'run'))
 
-    depends_on('py-configparser', when='^python@:3.3.999', type=nolink)
-    depends_on('py-enum34', when='^python@:3.1.999', type=nolink)
+    depends_on('py-configparser', when='^python@:3.3.999', type=('build', 'run'))
+    depends_on('py-enum34', when='^python@:3.1.999', type=('build', 'run'))
 
     # TODO: Add test dependencies
     # depends_on('py-nose', type='test')
diff --git a/var/spack/repos/builtin/packages/py-gnuplot/package.py b/var/spack/repos/builtin/packages/py-gnuplot/package.py
index cc273103f2..f7b88d00fe 100644
--- a/var/spack/repos/builtin/packages/py-gnuplot/package.py
+++ b/var/spack/repos/builtin/packages/py-gnuplot/package.py
@@ -34,7 +34,7 @@ class PyGnuplot(Package):
     version('1.8', 'abd6f571e7aec68ae7db90a5217cd5b1')
 
     extends('python')
-    depends_on('py-numpy', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py
index 85c3996051..dffd2463d3 100644
--- a/var/spack/repos/builtin/packages/py-h5py/package.py
+++ b/var/spack/repos/builtin/packages/py-h5py/package.py
@@ -50,10 +50,10 @@ class PyH5py(Package):
     depends_on('py-mpi4py', when='+mpi')
 
     # Build and runtime dependencies
-    depends_on('py-numpy@1.6.1:', type=nolink)
+    depends_on('py-numpy@1.6.1:', type=('build', 'run'))
 
     # Runtime dependencies
-    depends_on('py-six', type=nolink)
+    depends_on('py-six', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('configure', '--hdf5={0}'.format(spec['hdf5'].prefix))
diff --git a/var/spack/repos/builtin/packages/py-iminuit/package.py b/var/spack/repos/builtin/packages/py-iminuit/package.py
index c58b722e3b..3162b41316 100644
--- a/var/spack/repos/builtin/packages/py-iminuit/package.py
+++ b/var/spack/repos/builtin/packages/py-iminuit/package.py
@@ -38,8 +38,8 @@ class PyIminuit(Package):
     depends_on('py-setuptools', type='build')
 
     # Optional dependencies
-    depends_on('py-numpy', type=nolink)
-    depends_on('py-matplotlib', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
+    depends_on('py-matplotlib', type=('build', 'run'))
     depends_on('py-cython', type='build')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py
index 0c7cb7ab67..b8ad5bf03a 100644
--- a/var/spack/repos/builtin/packages/py-ipython/package.py
+++ b/var/spack/repos/builtin/packages/py-ipython/package.py
@@ -36,8 +36,8 @@ class PyIpython(Package):
     version('2.3.1', '2b7085525dac11190bfb45bb8ec8dcbf')
 
     extends('python')
-    depends_on('py-pygments', type=nolink)
-    depends_on('py-setuptools', type=nolink)
+    depends_on('py-pygments', type=('build', 'run'))
+    depends_on('py-setuptools', type=('build', 'run'))
     depends_on('py-backports-shutil-get-terminal-size', when="^python@:3.2.999")
     depends_on('py-pathlib2', when="^python@:3.3.999")
     depends_on('py-pickleshare')
diff --git a/var/spack/repos/builtin/packages/py-jinja2/package.py b/var/spack/repos/builtin/packages/py-jinja2/package.py
index 8ef4f568c5..d9191952ee 100644
--- a/var/spack/repos/builtin/packages/py-jinja2/package.py
+++ b/var/spack/repos/builtin/packages/py-jinja2/package.py
@@ -42,8 +42,8 @@ class PyJinja2(Package):
     extends('python')
 
     depends_on('py-setuptools', type='build')
-    depends_on('py-markupsafe', type=nolink)
-    depends_on('py-babel@0.8:', type=nolink)  # optional, required for i18n
+    depends_on('py-markupsafe', type=('build', 'run'))
+    depends_on('py-babel@0.8:', type=('build', 'run'))  # optional, required for i18n
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-logilab-common/package.py b/var/spack/repos/builtin/packages/py-logilab-common/package.py
index b8ca85eb3b..e8c52493b5 100644
--- a/var/spack/repos/builtin/packages/py-logilab-common/package.py
+++ b/var/spack/repos/builtin/packages/py-logilab-common/package.py
@@ -22,7 +22,7 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
-from spack import depends_on, extends, version, nolink
+from spack import depends_on, extends, version
 from spack import Package
 
 
@@ -35,7 +35,7 @@ class PyLogilabCommon(Package):
 
     extends('python', ignore=r'bin/pytest')
     depends_on("py-setuptools", type='build')
-    depends_on("py-six", type=nolink)
+    depends_on("py-six", type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-macs2/package.py b/var/spack/repos/builtin/packages/py-macs2/package.py
index df5b00555f..09cb76c3d3 100644
--- a/var/spack/repos/builtin/packages/py-macs2/package.py
+++ b/var/spack/repos/builtin/packages/py-macs2/package.py
@@ -39,8 +39,8 @@ class PyMacs2(Package):
 
     # Most Python packages only require py-setuptools as a build dependency.
     # However, py-macs2 requires py-setuptools during runtime as well.
-    depends_on('py-setuptools', type=nolink)
-    depends_on('py-numpy@1.6:', type=nolink)
+    depends_on('py-setuptools', type=('build', 'run'))
+    depends_on('py-numpy@1.6:', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-mako/package.py b/var/spack/repos/builtin/packages/py-mako/package.py
index 460666081e..799bc7b5d9 100644
--- a/var/spack/repos/builtin/packages/py-mako/package.py
+++ b/var/spack/repos/builtin/packages/py-mako/package.py
@@ -40,7 +40,7 @@ class PyMako(Package):
     depends_on('py-setuptools', type='build')
     # depends_on('py-mock',   type='test')  # TODO: Add test deptype
     # depends_on('py-pytest', type='test')  # TODO: Add test deptype
-    depends_on('py-markupsafe@0.9.2:', type=nolink)
+    depends_on('py-markupsafe@0.9.2:', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py
index 8661a3f721..cac4da9e79 100644
--- a/var/spack/repos/builtin/packages/py-matplotlib/package.py
+++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py
@@ -63,16 +63,16 @@ class PyMatplotlib(Package):
     depends_on('libpng@1.2:')
     depends_on('freetype@2.3:')
 
-    depends_on('py-numpy@1.6:', type=nolink)
-    depends_on('py-dateutil@1.1:', type=nolink)
-    depends_on('py-pyparsing', type=nolink)
-    depends_on('py-pytz', type=nolink)
-    depends_on('py-cycler@0.9:', type=nolink)
+    depends_on('py-numpy@1.6:', type=('build', 'run'))
+    depends_on('py-dateutil@1.1:', type=('build', 'run'))
+    depends_on('py-pyparsing', type=('build', 'run'))
+    depends_on('py-pytz', type=('build', 'run'))
+    depends_on('py-cycler@0.9:', type=('build', 'run'))
 
     # ------ Optional GUI frameworks
     depends_on('tk@8.3:', when='+tk')  # not 8.6.0 or 8.6.1
     depends_on('qt', when='+qt')
-    depends_on('py-pyside', when='+qt', type=nolink)
+    depends_on('py-pyside', when='+qt', type=('build', 'run'))
 
     # --------- Optional external programs
     # ffmpeg/avconv or mencoder
@@ -80,7 +80,7 @@ class PyMatplotlib(Package):
 
     # --------- Optional dependencies
     depends_on('pkg-config', type='build')    # why not...
-    depends_on('py-pillow', when='+image', type=nolink)
+    depends_on('py-pillow', when='+image', type=('build', 'run'))
     depends_on('py-ipython', when='+ipython')
     depends_on('ghostscript', when='+latex', type='run')
     depends_on('texlive', when='+latex', type='run')
@@ -93,7 +93,7 @@ class PyMatplotlib(Package):
     # depends_on('agg@2.4:')
     depends_on('qhull@2012.1:')
     # depends_on('ttconv')
-    depends_on('py-six@1.9.0:', type=nolink)
+    depends_on('py-six@1.9.0:', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('build')
diff --git a/var/spack/repos/builtin/packages/py-meep/package.py b/var/spack/repos/builtin/packages/py-meep/package.py
index 269ac55c67..a0d57e7373 100644
--- a/var/spack/repos/builtin/packages/py-meep/package.py
+++ b/var/spack/repos/builtin/packages/py-meep/package.py
@@ -37,9 +37,9 @@ class PyMeep(Package):
     variant('mpi', default=True, description='Enable MPI support')
 
     extends('python')
-    depends_on('py-numpy', type=nolink)
-    depends_on('py-scipy', type=nolink)
-    depends_on('py-matplotlib', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
+    depends_on('py-scipy', type=('build', 'run'))
+    depends_on('py-matplotlib', type=('build', 'run'))
 
     depends_on('mpi', when='+mpi')
     depends_on('meep~mpi', when='~mpi')
diff --git a/var/spack/repos/builtin/packages/py-mock/package.py b/var/spack/repos/builtin/packages/py-mock/package.py
index d397b72329..b33dfe7379 100644
--- a/var/spack/repos/builtin/packages/py-mock/package.py
+++ b/var/spack/repos/builtin/packages/py-mock/package.py
@@ -36,7 +36,7 @@ class PyMock(Package):
     version('1.3.0', '73ee8a4afb3ff4da1b4afa287f39fdeb')
 
     extends('python')
-    depends_on('py-pbr', type=nolink)
+    depends_on('py-pbr', type=('build', 'run'))
     depends_on('py-setuptools@17.1:', type='build')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-nestle/package.py b/var/spack/repos/builtin/packages/py-nestle/package.py
index 03096586b9..a2ce2f514f 100644
--- a/var/spack/repos/builtin/packages/py-nestle/package.py
+++ b/var/spack/repos/builtin/packages/py-nestle/package.py
@@ -35,10 +35,10 @@ class PyNestle(Package):
 
     # Required dependencies
     extends('python')
-    depends_on('py-numpy', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
 
     # Optional dependencies
-    depends_on('py-scipy', type=nolink)
+    depends_on('py-scipy', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-netcdf/package.py b/var/spack/repos/builtin/packages/py-netcdf/package.py
index d238855d1e..967b8e0613 100644
--- a/var/spack/repos/builtin/packages/py-netcdf/package.py
+++ b/var/spack/repos/builtin/packages/py-netcdf/package.py
@@ -33,9 +33,9 @@ class PyNetcdf(Package):
     version('1.2.3.1', '4fc4320d4f2a77b894ebf8da1c9895af')
 
     extends('python')
-    depends_on('py-numpy', type=nolink)
-    depends_on('py-cython', type=nolink)
-    depends_on('py-setuptools', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
+    depends_on('py-cython', type=('build', 'run'))
+    depends_on('py-setuptools', type=('build', 'run'))
     depends_on('netcdf')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-networkx/package.py b/var/spack/repos/builtin/packages/py-networkx/package.py
index aaeaac9674..3086709a79 100644
--- a/var/spack/repos/builtin/packages/py-networkx/package.py
+++ b/var/spack/repos/builtin/packages/py-networkx/package.py
@@ -35,7 +35,7 @@ class PyNetworkx(Package):
 
     extends('python')
 
-    depends_on('py-decorator', type=nolink)
+    depends_on('py-decorator', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-numexpr/package.py b/var/spack/repos/builtin/packages/py-numexpr/package.py
index 51b4ef2e92..b8e1ca5e0c 100644
--- a/var/spack/repos/builtin/packages/py-numexpr/package.py
+++ b/var/spack/repos/builtin/packages/py-numexpr/package.py
@@ -34,7 +34,7 @@ class PyNumexpr(Package):
     version('2.5', '84f66cced45ba3e30dcf77a937763aaa')
 
     extends('python')
-    depends_on('py-numpy', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-openpyxl/package.py b/var/spack/repos/builtin/packages/py-openpyxl/package.py
index 94949076ef..b9d8636742 100644
--- a/var/spack/repos/builtin/packages/py-openpyxl/package.py
+++ b/var/spack/repos/builtin/packages/py-openpyxl/package.py
@@ -35,7 +35,7 @@ class PyOpenpyxl(Package):
 
     extends('python')
 
-    depends_on('py-jdcal', type=nolink)
+    depends_on('py-jdcal', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-pandas/package.py b/var/spack/repos/builtin/packages/py-pandas/package.py
index ae797cee40..eb2d948f22 100644
--- a/var/spack/repos/builtin/packages/py-pandas/package.py
+++ b/var/spack/repos/builtin/packages/py-pandas/package.py
@@ -43,12 +43,12 @@ class PyPandas(Package):
     version('0.18.0', 'f143762cd7a59815e348adf4308d2cf6')
 
     extends('python')
-    depends_on('py-dateutil', type=nolink)
-    depends_on('py-numpy', type=nolink)
+    depends_on('py-dateutil', type=('build', 'run'))
+    depends_on('py-numpy', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
-    depends_on('py-pytz', type=nolink)
-    depends_on('py-numexpr', type=nolink)
-    depends_on('py-bottleneck', type=nolink)
+    depends_on('py-pytz', type=('build', 'run'))
+    depends_on('py-numexpr', type=('build', 'run'))
+    depends_on('py-bottleneck', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-periodictable/package.py b/var/spack/repos/builtin/packages/py-periodictable/package.py
index 4a5b015e60..d4f732a587 100644
--- a/var/spack/repos/builtin/packages/py-periodictable/package.py
+++ b/var/spack/repos/builtin/packages/py-periodictable/package.py
@@ -34,8 +34,8 @@ class PyPeriodictable(Package):
 
     version('1.4.1', '7246b63cc0b6b1be6e86b6616f9e866e')
 
-    depends_on('py-numpy', type=nolink)
-    depends_on('py-pyparsing', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
+    depends_on('py-pyparsing', type=('build', 'run'))
     extends('python')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-phonopy/package.py b/var/spack/repos/builtin/packages/py-phonopy/package.py
index a4ad03f34d..748f0dd36b 100644
--- a/var/spack/repos/builtin/packages/py-phonopy/package.py
+++ b/var/spack/repos/builtin/packages/py-phonopy/package.py
@@ -34,10 +34,10 @@ class PyPhonopy(Package):
     version('1.10.0', '973ed1bcea46e21b9bf747aab9061ff6')
 
     extends('python')
-    depends_on('py-numpy', type=nolink)
-    depends_on('py-scipy', type=nolink)
-    depends_on('py-matplotlib', type=nolink)
-    depends_on('py-pyyaml', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
+    depends_on('py-scipy', type=('build', 'run'))
+    depends_on('py-matplotlib', type=('build', 'run'))
+    depends_on('py-pyyaml', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--home=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-pudb/package.py b/var/spack/repos/builtin/packages/py-pudb/package.py
index dd2c751389..d9c2d3e0a4 100644
--- a/var/spack/repos/builtin/packages/py-pudb/package.py
+++ b/var/spack/repos/builtin/packages/py-pudb/package.py
@@ -37,8 +37,8 @@ class PyPudb(Package):
     extends('python')
 
     depends_on('py-setuptools', type='build')
-    depends_on('py-urwid@1.1.1:', type=nolink)
-    depends_on('py-pygments@1.0:', type=nolink)
+    depends_on('py-urwid@1.1.1:', type=('build', 'run'))
+    depends_on('py-pygments@1.0:', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-pycodestyle/package.py b/var/spack/repos/builtin/packages/py-pycodestyle/package.py
index 964822aac9..9feb5eb8f6 100644
--- a/var/spack/repos/builtin/packages/py-pycodestyle/package.py
+++ b/var/spack/repos/builtin/packages/py-pycodestyle/package.py
@@ -46,7 +46,7 @@ class PyPycodestyle(Package):
 
     # Most Python packages only require py-setuptools as a build dependency.
     # However, py-pycodestyle requires py-setuptools during runtime as well.
-    depends_on('py-setuptools', type=nolink)
+    depends_on('py-setuptools', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-pyflakes/package.py b/var/spack/repos/builtin/packages/py-pyflakes/package.py
index 50bc8ab462..fc904d5334 100644
--- a/var/spack/repos/builtin/packages/py-pyflakes/package.py
+++ b/var/spack/repos/builtin/packages/py-pyflakes/package.py
@@ -46,7 +46,7 @@ class PyPyflakes(Package):
 
     # Most Python packages only require py-setuptools as a build dependency.
     # However, py-pyflakes requires py-setuptools during runtime as well.
-    depends_on('py-setuptools', type=nolink)
+    depends_on('py-setuptools', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py
index 8b7c52c740..c0c31a7686 100644
--- a/var/spack/repos/builtin/packages/py-pylint/package.py
+++ b/var/spack/repos/builtin/packages/py-pylint/package.py
@@ -34,9 +34,9 @@ class PyPylint(Package):
     version('1.4.3', '5924c1c7ca5ca23647812f5971d0ea44')
 
     extends('python', ignore=r'bin/pytest')
-    depends_on('py-six', type=nolink)
-    depends_on('py-astroid', type=nolink)
-    depends_on('py-logilab-common', type=nolink)
+    depends_on('py-six', type=('build', 'run'))
+    depends_on('py-astroid', type=('build', 'run'))
+    depends_on('py-logilab-common', type=('build', 'run'))
     depends_on('py-nose', type='build')
     depends_on('py-setuptools', type='build')
 
diff --git a/var/spack/repos/builtin/packages/py-pyqt/package.py b/var/spack/repos/builtin/packages/py-pyqt/package.py
index 43f2e2630b..e1e87880e0 100644
--- a/var/spack/repos/builtin/packages/py-pyqt/package.py
+++ b/var/spack/repos/builtin/packages/py-pyqt/package.py
@@ -35,7 +35,7 @@ class PyPyqt(Package):
     version('4.11.3', '997c3e443165a89a559e0d96b061bf70')
 
     extends('python')
-    depends_on('py-sip', type=nolink)
+    depends_on('py-sip', type=('build', 'run'))
 
     # TODO: allow qt5 when conditional deps are supported.
     # TODO: Fix version matching so that @4 works like @:4
diff --git a/var/spack/repos/builtin/packages/py-pyside/package.py b/var/spack/repos/builtin/packages/py-pyside/package.py
index e6c115027e..ab8c70140c 100644
--- a/var/spack/repos/builtin/packages/py-pyside/package.py
+++ b/var/spack/repos/builtin/packages/py-pyside/package.py
@@ -38,7 +38,7 @@ class PyPyside(Package):
 
     extends('python')
     depends_on('py-setuptools', type='build')
-    depends_on('py-sphinx', type=nolink)
+    depends_on('py-sphinx', type=('build', 'run'))
     depends_on('qt@4.5:4.9')
     depends_on('libxml2@2.6.32:')
     depends_on('libxslt@1.1.19:')
diff --git a/var/spack/repos/builtin/packages/py-pytables/package.py b/var/spack/repos/builtin/packages/py-pytables/package.py
index 30d8fab87a..110d13f355 100644
--- a/var/spack/repos/builtin/packages/py-pytables/package.py
+++ b/var/spack/repos/builtin/packages/py-pytables/package.py
@@ -37,9 +37,9 @@ class PyPytables(Package):
 
     extends('python')
     depends_on('hdf5')
-    depends_on('py-numpy', type=nolink)
-    depends_on('py-numexpr', type=nolink)
-    depends_on('py-cython', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
+    depends_on('py-numexpr', type=('build', 'run'))
+    depends_on('py-cython', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py
index 4208b9d3ec..1ad356ff4b 100644
--- a/var/spack/repos/builtin/packages/py-pytest/package.py
+++ b/var/spack/repos/builtin/packages/py-pytest/package.py
@@ -37,7 +37,7 @@ class PyPytest(Package):
     extends('python')
 
     depends_on('py-setuptools', type='build')
-    depends_on('py-py@1.4.29:', type=nolink)
+    depends_on('py-py@1.4.29:', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-python-daemon/package.py b/var/spack/repos/builtin/packages/py-python-daemon/package.py
index c696b7490b..f8532c9175 100644
--- a/var/spack/repos/builtin/packages/py-python-daemon/package.py
+++ b/var/spack/repos/builtin/packages/py-python-daemon/package.py
@@ -44,7 +44,7 @@ class PyPythonDaemon(Package):
 
     extends("python")
     depends_on("py-setuptools", type='build')
-    depends_on("py-lockfile", type=nolink)
+    depends_on("py-lockfile", type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-restview/package.py b/var/spack/repos/builtin/packages/py-restview/package.py
index 9b0bd437c0..1aaf5d8f8a 100644
--- a/var/spack/repos/builtin/packages/py-restview/package.py
+++ b/var/spack/repos/builtin/packages/py-restview/package.py
@@ -34,8 +34,8 @@ class PyRestview(Package):
     version('2.6.1', 'ac8b70e15b8f1732d1733d674813666b')
 
     extends('python')
-    depends_on('py-docutils', type=nolink)
-    depends_on('py-pygments', type=nolink)
+    depends_on('py-docutils', type=('build', 'run'))
+    depends_on('py-pygments', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-rpy2/package.py b/var/spack/repos/builtin/packages/py-rpy2/package.py
index ec3ced22f1..6308afd3dd 100644
--- a/var/spack/repos/builtin/packages/py-rpy2/package.py
+++ b/var/spack/repos/builtin/packages/py-rpy2/package.py
@@ -39,7 +39,7 @@ class PyRpy2(Package):
     version('2.5.6', 'a36e758b633ce6aec6a5f450bfee980f')
 
     extends('python')
-    depends_on('py-six', type=nolink)
+    depends_on('py-six', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
 
     depends_on('R')
diff --git a/var/spack/repos/builtin/packages/py-scikit-image/package.py b/var/spack/repos/builtin/packages/py-scikit-image/package.py
index 124d2ec4b7..9ea21bdbdf 100644
--- a/var/spack/repos/builtin/packages/py-scikit-image/package.py
+++ b/var/spack/repos/builtin/packages/py-scikit-image/package.py
@@ -36,12 +36,12 @@ class PyScikitImage(Package):
 
     extends('python', ignore=r'bin/.*\.py$')
 
-    depends_on('py-dask', type=nolink)
-    depends_on('pil', type=nolink)
-    depends_on('py-networkx', type=nolink)
-    depends_on('py-six', type=nolink)
-    depends_on('py-scipy', type=nolink)
-    depends_on('py-matplotlib', type=nolink)
+    depends_on('py-dask', type=('build', 'run'))
+    depends_on('pil', type=('build', 'run'))
+    depends_on('py-networkx', type=('build', 'run'))
+    depends_on('py-six', type=('build', 'run'))
+    depends_on('py-scipy', type=('build', 'run'))
+    depends_on('py-matplotlib', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-scikit-learn/package.py b/var/spack/repos/builtin/packages/py-scikit-learn/package.py
index 09318a6c56..4a713e6565 100644
--- a/var/spack/repos/builtin/packages/py-scikit-learn/package.py
+++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py
@@ -37,8 +37,8 @@ class PyScikitLearn(Package):
     extends('python')
 
     depends_on('py-setuptools', type='build')
-    depends_on('py-numpy', type=nolink)
-    depends_on('py-scipy', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
+    depends_on('py-scipy', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py
index 71bf83c3f0..509a1f8b94 100644
--- a/var/spack/repos/builtin/packages/py-scipy/package.py
+++ b/var/spack/repos/builtin/packages/py-scipy/package.py
@@ -44,7 +44,7 @@ class PyScipy(Package):
     depends_on('py-nose', type='build')
     # Known not to work with 2.23, 2.25
     depends_on('binutils@2.26:', type='build')
-    depends_on('py-numpy@1.7.1:+blas+lapack', type=nolink)
+    depends_on('py-numpy@1.7.1:+blas+lapack', type=('build', 'run'))
     depends_on('blas')
     depends_on('lapack')
 
diff --git a/var/spack/repos/builtin/packages/py-sncosmo/package.py b/var/spack/repos/builtin/packages/py-sncosmo/package.py
index d5e32fd5e2..6a1fb7c557 100644
--- a/var/spack/repos/builtin/packages/py-sncosmo/package.py
+++ b/var/spack/repos/builtin/packages/py-sncosmo/package.py
@@ -37,15 +37,15 @@ class PySncosmo(Package):
     # Required dependencies
     # py-sncosmo binaries are duplicates of those from py-astropy
     extends('python', ignore=r'bin/.*')
-    depends_on('py-numpy', type=nolink)
-    depends_on('py-scipy', type=nolink)
-    depends_on('py-astropy', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
+    depends_on('py-scipy', type=('build', 'run'))
+    depends_on('py-astropy', type=('build', 'run'))
 
     # Recommended dependencies
-    depends_on('py-matplotlib', type=nolink)
-    depends_on('py-iminuit', type=nolink)
-    depends_on('py-emcee', type=nolink)
-    depends_on('py-nestle', type=nolink)
+    depends_on('py-matplotlib', type=('build', 'run'))
+    depends_on('py-iminuit', type=('build', 'run'))
+    depends_on('py-emcee', type=('build', 'run'))
+    depends_on('py-nestle', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py
index 923962a2dc..48b19d4d7b 100644
--- a/var/spack/repos/builtin/packages/py-sphinx/package.py
+++ b/var/spack/repos/builtin/packages/py-sphinx/package.py
@@ -38,17 +38,17 @@ class PySphinx(Package):
 
     # Most Python packages only require py-setuptools as a build dependency.
     # However, py-sphinx requires py-setuptools during runtime as well.
-    depends_on('py-setuptools',              type=nolink)
+    depends_on('py-setuptools',              type=('build', 'run'))
 
-    depends_on('py-six@1.4:',                type=nolink)
-    depends_on('py-jinja2@2.3:',             type=nolink)
-    depends_on('py-pygments@2.0:',           type=nolink)
-    depends_on('py-docutils@0.11:',          type=nolink)
-    depends_on('py-snowballstemmer@1.1:',    type=nolink)
-    depends_on('py-babel@1.3:',              type=nolink)  # not 2.0
-    depends_on('py-alabaster@0.7:',          type=nolink)
-    depends_on('py-imagesize', when='@1.4:', type=nolink)
-    depends_on('py-sphinx-rtd-theme@0.1:',   type=nolink)  # optional as of 1.4
+    depends_on('py-six@1.4:',                type=('build', 'run'))
+    depends_on('py-jinja2@2.3:',             type=('build', 'run'))
+    depends_on('py-pygments@2.0:',           type=('build', 'run'))
+    depends_on('py-docutils@0.11:',          type=('build', 'run'))
+    depends_on('py-snowballstemmer@1.1:',    type=('build', 'run'))
+    depends_on('py-babel@1.3:',              type=('build', 'run'))  # not 2.0
+    depends_on('py-alabaster@0.7:',          type=('build', 'run'))
+    depends_on('py-imagesize', when='@1.4:', type=('build', 'run'))
+    depends_on('py-sphinx-rtd-theme@0.1:',   type=('build', 'run'))  # optional as of 1.4
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-traitlets/package.py b/var/spack/repos/builtin/packages/py-traitlets/package.py
index c414dba758..2a087dffb9 100644
--- a/var/spack/repos/builtin/packages/py-traitlets/package.py
+++ b/var/spack/repos/builtin/packages/py-traitlets/package.py
@@ -38,12 +38,12 @@ class PyTraitlets(Package):
     version('4.2.0', '53553a10d124e264fd2e234d0571b7d0')
     version('4.1.0', 'd5bc75c7bd529afb40afce86c2facc3a')
     version('4.0.0', 'b5b95ea5941fd9619b4704dfd8201568')
-    version('4.0'  , '14544e25ccf8e920ed1cbf833852481f')
+    version('4.0',   '14544e25ccf8e920ed1cbf833852481f')
 
     extends('python')
 
     depends_on('py-setuptools', type='build')
-    depends_on('py-decorator', type=nolink)
+    depends_on('py-decorator', type=('build', 'run'))
     depends_on('py-ipython-genutils')
     depends_on('py-enum34', when='^python@:3.3')
 
diff --git a/var/spack/repos/builtin/packages/py-tuiview/package.py b/var/spack/repos/builtin/packages/py-tuiview/package.py
index e20de3ff79..5ce2043fb3 100644
--- a/var/spack/repos/builtin/packages/py-tuiview/package.py
+++ b/var/spack/repos/builtin/packages/py-tuiview/package.py
@@ -36,8 +36,8 @@ class PyTuiview(Package):
     version('1.1.7', '4b3b38a820cc239c8ab4a181ac5d4c30')
 
     extends("python")
-    depends_on("py-pyqt", type=nolink)
-    depends_on("py-numpy", type=nolink)
+    depends_on("py-pyqt", type=('build', 'run'))
+    depends_on("py-numpy", type=('build', 'run'))
     depends_on("gdal")
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-wcsaxes/package.py b/var/spack/repos/builtin/packages/py-wcsaxes/package.py
index ddc10d3e22..f7b5c13a13 100644
--- a/var/spack/repos/builtin/packages/py-wcsaxes/package.py
+++ b/var/spack/repos/builtin/packages/py-wcsaxes/package.py
@@ -35,9 +35,9 @@ class PyWcsaxes(Package):
     version('0.8', 'de1c60fdae4c330bf5ddb9f1ab5ab920')
 
     extends('python', ignore=r'bin/pbr')
-    depends_on('py-numpy', type=nolink)
-    depends_on('py-matplotlib', type=nolink)
-    depends_on('py-astropy', type=nolink)
+    depends_on('py-numpy', type=('build', 'run'))
+    depends_on('py-matplotlib', type=('build', 'run'))
+    depends_on('py-astropy', type=('build', 'run'))
 
     def install(self, spec, prefix):
         setup_py('install', '--prefix={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py
index 646bd4db2f..cf35912191 100644
--- a/var/spack/repos/builtin/packages/py-yt/package.py
+++ b/var/spack/repos/builtin/packages/py-yt/package.py
@@ -56,15 +56,15 @@ class PyYt(Package):
 
     extends("python")
 
-    depends_on("py-astropy", type="nolink", when="+astropy")
-    depends_on("py-cython", type="nolink")
-    depends_on("py-h5py", type="nolink", when="+h5py")
-    depends_on("py-ipython", type="nolink")
-    depends_on("py-matplotlib", type="nolink")
-    depends_on("py-numpy", type="nolink")
-    depends_on("py-scipy", type="nolink", when="+scipy")
+    depends_on("py-astropy", type=('build', 'run'), when="+astropy")
+    depends_on("py-cython", type=('build', 'run'))
+    depends_on("py-h5py", type=('build', 'run'), when="+h5py")
+    depends_on("py-ipython", type=('build', 'run'))
+    depends_on("py-matplotlib", type=('build', 'run'))
+    depends_on("py-numpy", type=('build', 'run'))
+    depends_on("py-scipy", type=('build', 'run'), when="+scipy")
     depends_on("py-setuptools", type="build")
-    depends_on("py-sympy", type="nolink")
+    depends_on("py-sympy", type=('build', 'run'))
     depends_on("python @2.7:2.999,3.4:")
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py
index f9b953a009..7a5904ddd9 100644
--- a/var/spack/repos/builtin/packages/python/package.py
+++ b/var/spack/repos/builtin/packages/python/package.py
@@ -347,7 +347,8 @@ class Python(Package):
         spack_env.set('PYTHONHOME', prefix.strip('\n'))
 
         python_paths = []
-        for d in extension_spec.traverse(deptype=nolink, deptype_query='run'):
+        for d in extension_spec.traverse(
+                deptype=('build', 'run'), deptype_query='run'):
             if d.package.extends(self.spec):
                 python_paths.append(join_path(d.prefix,
                                               self.site_packages_dir))
diff --git a/var/spack/repos/builtin/packages/r-c50/package.py b/var/spack/repos/builtin/packages/r-c50/package.py
index 6fc5b60fdc..571f8f461b 100644
--- a/var/spack/repos/builtin/packages/r-c50/package.py
+++ b/var/spack/repos/builtin/packages/r-c50/package.py
@@ -35,4 +35,4 @@ class RC50(RPackage):
 
     version('0.1.0-24', '42631e65c5c579532cc6edf5ea175949')
 
-    depends_on('r-partykit', type=nolink)
+    depends_on('r-partykit', type=('build','run'))
diff --git a/var/spack/repos/builtin/packages/r-car/package.py b/var/spack/repos/builtin/packages/r-car/package.py
index b6232d6297..80a0206a8a 100644
--- a/var/spack/repos/builtin/packages/r-car/package.py
+++ b/var/spack/repos/builtin/packages/r-car/package.py
@@ -35,8 +35,8 @@ class RCar(RPackage):
 
     version('2.1-2', '0f78ad74ef7130126d319acec23951a0')
 
-    depends_on('r-mass', type=nolink)
-    depends_on('r-mgcv', type=nolink)
-    depends_on('r-nnet', type=nolink)
-    depends_on('r-pbkrtest', type=nolink)
-    depends_on('r-quantreg', type=nolink)
+    depends_on('r-mass', type=('build','run'))
+    depends_on('r-mgcv', type=('build','run'))
+    depends_on('r-nnet', type=('build','run'))
+    depends_on('r-pbkrtest', type=('build','run'))
+    depends_on('r-quantreg', type=('build','run'))
diff --git a/var/spack/repos/builtin/packages/r-caret/package.py b/var/spack/repos/builtin/packages/r-caret/package.py
index f98cebcff8..d795cfa204 100644
--- a/var/spack/repos/builtin/packages/r-caret/package.py
+++ b/var/spack/repos/builtin/packages/r-caret/package.py
@@ -35,10 +35,10 @@ class RCaret(RPackage):
 
     version('6.0-70', '202d7abb6a679af716ea69fb2573f108')
 
-    depends_on('r-lattice', type=nolink)
-    depends_on('r-ggplot2', type=nolink)
-    depends_on('r-car', type=nolink)
-    depends_on('r-foreach', type=nolink)
-    depends_on('r-plyr', type=nolink)
-    depends_on('r-nlme', type=nolink)
-    depends_on('r-reshape2', type=nolink)
+    depends_on('r-lattice', type=('build','run'))
+    depends_on('r-ggplot2', type=('build','run'))
+    depends_on('r-car', type=('build','run'))
+    depends_on('r-foreach', type=('build','run'))
+    depends_on('r-plyr', type=('build','run'))
+    depends_on('r-nlme', type=('build','run'))
+    depends_on('r-reshape2', type=('build','run'))
diff --git a/var/spack/repos/builtin/packages/r-catools/package.py b/var/spack/repos/builtin/packages/r-catools/package.py
index 57e9c17f24..7b82a19c01 100644
--- a/var/spack/repos/builtin/packages/r-catools/package.py
+++ b/var/spack/repos/builtin/packages/r-catools/package.py
@@ -38,4 +38,4 @@ class RCatools(RPackage):
 
     version('1.17.1', '5c872bbc78b177b306f36709deb44498')
 
-    depends_on('r-bitops', type=nolink)
+    depends_on('r-bitops', type=('build','run'))
diff --git a/var/spack/repos/builtin/packages/r-class/package.py b/var/spack/repos/builtin/packages/r-class/package.py
index d455deb303..de81e7588e 100644
--- a/var/spack/repos/builtin/packages/r-class/package.py
+++ b/var/spack/repos/builtin/packages/r-class/package.py
@@ -35,4 +35,4 @@ class RClass(RPackage):
 
     version('7.3-14', '6a21dd206fe4ea29c55faeb65fb2b71e')
 
-    depends_on('r-mass', type=nolink)
+    depends_on('r-mass', type=('build','run'))
diff --git a/var/spack/repos/builtin/packages/r-datatable/package.py b/var/spack/repos/builtin/packages/r-datatable/package.py
index fecde7ede2..23802524e8 100644
--- a/var/spack/repos/builtin/packages/r-datatable/package.py
+++ b/var/spack/repos/builtin/packages/r-datatable/package.py
@@ -37,4 +37,4 @@ class RDatatable(RPackage):
 
     version('1.9.6', 'b1c0c7cce490bdf42ab288541cc55372')
 
-    depends_on('r-chron', type='nolink')
+    depends_on('r-chron', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-devtools/package.py b/var/spack/repos/builtin/packages/r-devtools/package.py
index 4a8a8e3026..9895a3b390 100644
--- a/var/spack/repos/builtin/packages/r-devtools/package.py
+++ b/var/spack/repos/builtin/packages/r-devtools/package.py
@@ -34,11 +34,11 @@ class RDevtools(RPackage):
 
     version('1.11.1', '242672ee27d24dddcbdaac88c586b6c2')
 
-    depends_on('r-httr', type=nolink)
-    depends_on('r-memoise', type=nolink)
-    depends_on('r-whisker', type=nolink)
-    depends_on('r-digest', type=nolink)
-    depends_on('r-rstudioapi', type=nolink)
-    depends_on('r-jsonlite', type=nolink)
-    depends_on('r-git2r', type=nolink)
-    depends_on('r-withr', type=nolink)
+    depends_on('r-httr', type=('build', 'run'))
+    depends_on('r-memoise', type=('build', 'run'))
+    depends_on('r-whisker', type=('build', 'run'))
+    depends_on('r-digest', type=('build', 'run'))
+    depends_on('r-rstudioapi', type=('build', 'run'))
+    depends_on('r-jsonlite', type=('build', 'run'))
+    depends_on('r-git2r', type=('build', 'run'))
+    depends_on('r-withr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-diagrammer/package.py b/var/spack/repos/builtin/packages/r-diagrammer/package.py
index f99e146724..5f8e27a102 100644
--- a/var/spack/repos/builtin/packages/r-diagrammer/package.py
+++ b/var/spack/repos/builtin/packages/r-diagrammer/package.py
@@ -34,10 +34,10 @@ class RDiagrammer(RPackage):
 
     version('0.8.4', '9ee295c744f5d4ba9a84289ca7bdaf1a')
 
-    depends_on('r-htmlwidgets', type=nolink)
-    depends_on('r-igraph', type=nolink)
-    depends_on('r-influencer', type=nolink)
-    depends_on('r-rstudioapi@0.6:', type=nolink)
-    depends_on('r-stringr', type=nolink)
-    depends_on('r-visnetwork', type=nolink)
-    depends_on('r-scales', type=nolink)
+    depends_on('r-htmlwidgets', type=('build', 'run'))
+    depends_on('r-igraph', type=('build', 'run'))
+    depends_on('r-influencer', type=('build', 'run'))
+    depends_on('r-rstudioapi@0.6:', type=('build', 'run'))
+    depends_on('r-stringr', type=('build', 'run'))
+    depends_on('r-visnetwork', type=('build', 'run'))
+    depends_on('r-scales', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-doparallel/package.py b/var/spack/repos/builtin/packages/r-doparallel/package.py
index f74b23aae0..fa039568c6 100644
--- a/var/spack/repos/builtin/packages/r-doparallel/package.py
+++ b/var/spack/repos/builtin/packages/r-doparallel/package.py
@@ -35,5 +35,5 @@ class RDoparallel(RPackage):
 
     version('1.0.10', 'd9fbde8f315d98d055483ee3493c9b43')
 
-    depends_on('r-foreach', type=nolink)
-    depends_on('r-iterators', type=nolink)
+    depends_on('r-foreach', type=('build', 'run'))
+    depends_on('r-iterators', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-dplyr/package.py b/var/spack/repos/builtin/packages/r-dplyr/package.py
index 77877a0e02..6ffa48adc8 100644
--- a/var/spack/repos/builtin/packages/r-dplyr/package.py
+++ b/var/spack/repos/builtin/packages/r-dplyr/package.py
@@ -35,11 +35,11 @@ class RDplyr(RPackage):
 
     version('0.5.0', '1fcafcacca70806eea2e6d465cdb94ef')
 
-    depends_on('r-assertthat', 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)
-    depends_on('r-lazyeval', type=nolink)
-    depends_on('r-dbi', type=nolink)
-    depends_on('r-bh', type=nolink)
+    depends_on('r-assertthat', type=('build', 'run'))
+    depends_on('r-r6', type=('build', 'run'))
+    depends_on('r-rcpp', type=('build', 'run'))
+    depends_on('r-tibble', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
+    depends_on('r-lazyeval', type=('build', 'run'))
+    depends_on('r-dbi', type=('build', 'run'))
+    depends_on('r-bh', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-dt/package.py b/var/spack/repos/builtin/packages/r-dt/package.py
index d5680bee99..85e6fee837 100644
--- a/var/spack/repos/builtin/packages/r-dt/package.py
+++ b/var/spack/repos/builtin/packages/r-dt/package.py
@@ -36,6 +36,6 @@ class RDt(RPackage):
 
     version('0.1', '5c8df984921fa484784ec4b8a4fb6f3c')
 
-    depends_on('r-htmltools', type=nolink)
-    depends_on('r-htmlwidgets', type=nolink)
-    depends_on('r-magrittr', type=nolink)
+    depends_on('r-htmltools', type=('build', 'run'))
+    depends_on('r-htmlwidgets', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-dygraphs/package.py b/var/spack/repos/builtin/packages/r-dygraphs/package.py
index 80aedda6d6..323fb6d584 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(RPackage):
 
     version('0.9', '7f0ce4312bcd3f0a58b8c03b2772f833')
 
-    depends_on('r-magrittr', type=nolink)
-    depends_on('r-htmlwidgets', type=nolink)
-    depends_on('r-zoo', type=nolink)
-    depends_on('r-xts', type=nolink)
+    depends_on('r-magrittr', type=('build', 'run'))
+    depends_on('r-htmlwidgets', type=('build', 'run'))
+    depends_on('r-zoo', type=('build', 'run'))
+    depends_on('r-xts', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-e1071/package.py b/var/spack/repos/builtin/packages/r-e1071/package.py
index f9ba6854cc..4d79fcccd7 100644
--- a/var/spack/repos/builtin/packages/r-e1071/package.py
+++ b/var/spack/repos/builtin/packages/r-e1071/package.py
@@ -36,4 +36,4 @@ class RE1071(RPackage):
 
     version('1.6-7', 'd109a7e3dd0c905d420e327a9a921f5a')
 
-    depends_on('r-class', type=nolink)
+    depends_on('r-class', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-evaluate/package.py b/var/spack/repos/builtin/packages/r-evaluate/package.py
index 5516cc8697..cf6c72dc62 100644
--- a/var/spack/repos/builtin/packages/r-evaluate/package.py
+++ b/var/spack/repos/builtin/packages/r-evaluate/package.py
@@ -37,4 +37,4 @@ class REvaluate(RPackage):
 
     version('0.9', '877d89ce8a9ef7f403b1089ca1021775')
 
-    depends_on('r-stringr', type=nolink)
+    depends_on('r-stringr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-foreach/package.py b/var/spack/repos/builtin/packages/r-foreach/package.py
index 85f76b4779..78efe02188 100644
--- a/var/spack/repos/builtin/packages/r-foreach/package.py
+++ b/var/spack/repos/builtin/packages/r-foreach/package.py
@@ -40,5 +40,5 @@ class RForeach(RPackage):
 
     version('1.4.3', 'ef45768126661b259f9b8994462c49a0')
 
-    depends_on('r-codetools', type=nolink)
-    depends_on('r-iterators', type=nolink)
+    depends_on('r-codetools', type=('build', 'run'))
+    depends_on('r-iterators', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-formatr/package.py b/var/spack/repos/builtin/packages/r-formatr/package.py
index db812b3eb6..011111af07 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(RPackage):
 
     version('1.4', '98b9b64b2785b35f9df403e1aab6c73c')
 
-    depends_on('r-codetools', type=nolink)
-    depends_on('r-shiny', type=nolink)
-    depends_on('r-testit', type=nolink)
-    # depends_on('r-knitr', type=nolink) - mutual dependency
+    depends_on('r-codetools', type=('build', 'run'))
+    depends_on('r-shiny', type=('build', 'run'))
+    depends_on('r-testit', type=('build', 'run'))
+    # depends_on('r-knitr', type=('build', 'run')) - mutual dependency
diff --git a/var/spack/repos/builtin/packages/r-gdata/package.py b/var/spack/repos/builtin/packages/r-gdata/package.py
index 591d9cf18a..ef001699bb 100644
--- a/var/spack/repos/builtin/packages/r-gdata/package.py
+++ b/var/spack/repos/builtin/packages/r-gdata/package.py
@@ -50,4 +50,4 @@ class RGdata(RPackage):
 
     version('2.17.0', 'c716b663b9dc16ad8cafe6acc781a75f')
 
-    depends_on('r-gtools', type=nolink)
+    depends_on('r-gtools', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-geosphere/package.py b/var/spack/repos/builtin/packages/r-geosphere/package.py
index 5722fc1f31..d90594a3e0 100644
--- a/var/spack/repos/builtin/packages/r-geosphere/package.py
+++ b/var/spack/repos/builtin/packages/r-geosphere/package.py
@@ -36,4 +36,4 @@ class RGeosphere(RPackage):
 
     version('1.5-5', '28efb7a8e266c7f076cdbcf642455f3e')
 
-    depends_on('r-sp', type=nolink)
+    depends_on('r-sp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-ggmap/package.py b/var/spack/repos/builtin/packages/r-ggmap/package.py
index be611e3562..65a69553a1 100644
--- a/var/spack/repos/builtin/packages/r-ggmap/package.py
+++ b/var/spack/repos/builtin/packages/r-ggmap/package.py
@@ -37,15 +37,15 @@ class RGgmap(RPackage):
 
     version('2.6.1', '25ad414a3a1c6d59a227a9f22601211a')
 
-    depends_on('r-ggplot2', type=nolink)
-    depends_on('r-proto', type=nolink)
-    depends_on('r-rgooglemaps', type=nolink)
-    depends_on('r-png', type=nolink)
-    depends_on('r-plyr', type=nolink)
-    depends_on('r-reshape2', type=nolink)
-    depends_on('r-rjson', type=nolink)
-    depends_on('r-mapproj', type=nolink)
-    depends_on('r-jpeg', type=nolink)
-    depends_on('r-geosphere', type=nolink)
-    depends_on('r-digest', type=nolink)
-    depends_on('r-scales', type=nolink)
+    depends_on('r-ggplot2', type=('build', 'run'))
+    depends_on('r-proto', type=('build', 'run'))
+    depends_on('r-rgooglemaps', type=('build', 'run'))
+    depends_on('r-png', type=('build', 'run'))
+    depends_on('r-plyr', type=('build', 'run'))
+    depends_on('r-reshape2', type=('build', 'run'))
+    depends_on('r-rjson', type=('build', 'run'))
+    depends_on('r-mapproj', type=('build', 'run'))
+    depends_on('r-jpeg', type=('build', 'run'))
+    depends_on('r-geosphere', type=('build', 'run'))
+    depends_on('r-digest', type=('build', 'run'))
+    depends_on('r-scales', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-ggplot2/package.py b/var/spack/repos/builtin/packages/r-ggplot2/package.py
index 19da1eee9e..3b4c437f0c 100644
--- a/var/spack/repos/builtin/packages/r-ggplot2/package.py
+++ b/var/spack/repos/builtin/packages/r-ggplot2/package.py
@@ -40,9 +40,9 @@ class RGgplot2(RPackage):
 
     version('2.1.0', '771928cfb97c649c720423deb3ec7fd3')
 
-    depends_on('r-digest', type=nolink)
-    depends_on('r-gtable', type=nolink)
-    depends_on('r-mass', type=nolink)
-    depends_on('r-plyr', type=nolink)
-    depends_on('r-reshape2', type=nolink)
-    depends_on('r-scales', type=nolink)
+    depends_on('r-digest', type=('build', 'run'))
+    depends_on('r-gtable', type=('build', 'run'))
+    depends_on('r-mass', type=('build', 'run'))
+    depends_on('r-plyr', type=('build', 'run'))
+    depends_on('r-reshape2', type=('build', 'run'))
+    depends_on('r-scales', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-ggvis/package.py b/var/spack/repos/builtin/packages/r-ggvis/package.py
index 3eb27d8483..5acbff04b0 100644
--- a/var/spack/repos/builtin/packages/r-ggvis/package.py
+++ b/var/spack/repos/builtin/packages/r-ggvis/package.py
@@ -36,10 +36,10 @@ class RGgvis(RPackage):
 
     version('0.4.2', '039f45e5c7f1e0652779163d7d99f922')
 
-    depends_on('r-assertthat', type=nolink)
-    depends_on('r-jsonlite', type=nolink)
-    depends_on('r-shiny', type=nolink)
-    depends_on('r-magrittr', type=nolink)
-    depends_on('r-dplyr', type=nolink)
-    depends_on('r-lazyeval', type=nolink)
-    depends_on('r-htmltools', type=nolink)
+    depends_on('r-assertthat', type=('build', 'run'))
+    depends_on('r-jsonlite', type=('build', 'run'))
+    depends_on('r-shiny', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
+    depends_on('r-dplyr', type=('build', 'run'))
+    depends_on('r-lazyeval', type=('build', 'run'))
+    depends_on('r-htmltools', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-gistr/package.py b/var/spack/repos/builtin/packages/r-gistr/package.py
index b939fdfe5b..67c34cfffc 100644
--- a/var/spack/repos/builtin/packages/r-gistr/package.py
+++ b/var/spack/repos/builtin/packages/r-gistr/package.py
@@ -40,10 +40,10 @@ class RGistr(RPackage):
 
     version('0.3.6', '49d548cb3eca0e66711aece37757a2c0')
 
-    depends_on('r-jsonlite', type=nolink)
-    depends_on('r-httr', type=nolink)
-    depends_on('r-magrittr', type=nolink)
-    depends_on('r-assertthat', type=nolink)
-    depends_on('r-knitr', type=nolink)
-    depends_on('r-rmarkdown', type=nolink)
-    depends_on('r-dplyr', type=nolink)
+    depends_on('r-jsonlite', type=('build', 'run'))
+    depends_on('r-httr', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
+    depends_on('r-assertthat', type=('build', 'run'))
+    depends_on('r-knitr', type=('build', 'run'))
+    depends_on('r-rmarkdown', type=('build', 'run'))
+    depends_on('r-dplyr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-glmnet/package.py b/var/spack/repos/builtin/packages/r-glmnet/package.py
index 1b56d9b5ef..ac44d42c12 100644
--- a/var/spack/repos/builtin/packages/r-glmnet/package.py
+++ b/var/spack/repos/builtin/packages/r-glmnet/package.py
@@ -39,5 +39,5 @@ class RGlmnet(RPackage):
 
     version('2.0-5', '049b18caa29529614cd684db3beaec2a')
 
-    depends_on('r-matrix', type=nolink)
-    depends_on('r-foreach', type=nolink)
+    depends_on('r-matrix', type=('build', 'run'))
+    depends_on('r-foreach', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-googlevis/package.py b/var/spack/repos/builtin/packages/r-googlevis/package.py
index 1d86dd7592..29916965b4 100644
--- a/var/spack/repos/builtin/packages/r-googlevis/package.py
+++ b/var/spack/repos/builtin/packages/r-googlevis/package.py
@@ -38,4 +38,4 @@ class RGooglevis(RPackage):
 
     version('0.6.0', 'ec36fd2a6884ddc7baa894007d0d0468')
 
-    depends_on('r-jsonlite', type=nolink)
+    depends_on('r-jsonlite', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-gridextra/package.py b/var/spack/repos/builtin/packages/r-gridextra/package.py
index 77808b5e4c..304035dc06 100644
--- a/var/spack/repos/builtin/packages/r-gridextra/package.py
+++ b/var/spack/repos/builtin/packages/r-gridextra/package.py
@@ -35,4 +35,4 @@ class RGridextra(RPackage):
 
     version('2.2.1', '7076c2122d387c7ef3add69a1c4fc1b2')
 
-    depends_on('r-gtable', type=nolink)
+    depends_on('r-gtable', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-hexbin/package.py b/var/spack/repos/builtin/packages/r-hexbin/package.py
index 5e336c021a..0a5c66c1a3 100644
--- a/var/spack/repos/builtin/packages/r-hexbin/package.py
+++ b/var/spack/repos/builtin/packages/r-hexbin/package.py
@@ -36,4 +36,4 @@ class RHexbin(RPackage):
 
     version('1.27.1', '7f380390c6511e97df10a810a3b3bb7c')
 
-    depends_on('r-lattice', type=nolink)
+    depends_on('r-lattice', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-htmltools/package.py b/var/spack/repos/builtin/packages/r-htmltools/package.py
index 7da66f3314..9374e1f9cc 100644
--- a/var/spack/repos/builtin/packages/r-htmltools/package.py
+++ b/var/spack/repos/builtin/packages/r-htmltools/package.py
@@ -34,5 +34,5 @@ class RHtmltools(RPackage):
 
     version('0.3.5', '5f001aff4a39e329f7342dcec5139724')
 
-    depends_on('r-digest', type=nolink)
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-digest', type=('build', 'run'))
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py
index 69f64c2a31..85ab593245 100644
--- a/var/spack/repos/builtin/packages/r-htmlwidgets/package.py
+++ b/var/spack/repos/builtin/packages/r-htmlwidgets/package.py
@@ -36,6 +36,6 @@ class RHtmlwidgets(RPackage):
 
     version('0.6', '7fa522d2eda97593978021bda9670c0e')
 
-    depends_on('r-htmltools', type=nolink)
-    depends_on('r-jsonlite', type=nolink)
-    depends_on('r-yaml', type=nolink)
+    depends_on('r-htmltools', type=('build', 'run'))
+    depends_on('r-jsonlite', type=('build', 'run'))
+    depends_on('r-yaml', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-httpuv/package.py b/var/spack/repos/builtin/packages/r-httpuv/package.py
index b700cd1510..e4b60893b6 100644
--- a/var/spack/repos/builtin/packages/r-httpuv/package.py
+++ b/var/spack/repos/builtin/packages/r-httpuv/package.py
@@ -40,4 +40,4 @@ class RHttpuv(RPackage):
 
     version('1.3.3', 'c78ae068cf59e949b9791be987bb4489')
 
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-httr/package.py b/var/spack/repos/builtin/packages/r-httr/package.py
index 826e4a298b..55a5b0efab 100644
--- a/var/spack/repos/builtin/packages/r-httr/package.py
+++ b/var/spack/repos/builtin/packages/r-httr/package.py
@@ -36,8 +36,8 @@ class RHttr(RPackage):
 
     version('1.1.0', '5ffbbc5c2529e49f00aaa521a2b35600')
 
-    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-jsonlite', type=('build', 'run'))
+    depends_on('r-mime', type=('build', 'run'))
+    depends_on('r-curl', type=('build', 'run'))
+    depends_on('r-openssl', type=('build', 'run'))
+    depends_on('r-r6', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-igraph/package.py b/var/spack/repos/builtin/packages/r-igraph/package.py
index 991cc424c0..993a80ae1c 100644
--- a/var/spack/repos/builtin/packages/r-igraph/package.py
+++ b/var/spack/repos/builtin/packages/r-igraph/package.py
@@ -36,9 +36,9 @@ class RIgraph(RPackage):
 
     version('1.0.1', 'ea33495e49adf4a331e4ba60ba559065')
 
-    depends_on('r-matrix', type=nolink)
-    depends_on('r-magrittr', type=nolink)
-    depends_on('r-nmf', type=nolink)
-    depends_on('r-irlba', type=nolink)
+    depends_on('r-matrix', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
+    depends_on('r-nmf', type=('build', 'run'))
+    depends_on('r-irlba', type=('build', 'run'))
     depends_on('gmp')
     depends_on('libxml2')
diff --git a/var/spack/repos/builtin/packages/r-influencer/package.py b/var/spack/repos/builtin/packages/r-influencer/package.py
index 04a7b27679..bbfed54e25 100644
--- a/var/spack/repos/builtin/packages/r-influencer/package.py
+++ b/var/spack/repos/builtin/packages/r-influencer/package.py
@@ -40,5 +40,5 @@ class RInfluencer(RPackage):
 
     version('0.1.0', '6c8b6decd78c341364b5811fb3050ba5')
 
-    depends_on('r-igraph', type=nolink)
-    depends_on('r-matrix', type=nolink)
+    depends_on('r-igraph', type=('build', 'run'))
+    depends_on('r-matrix', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-irdisplay/package.py b/var/spack/repos/builtin/packages/r-irdisplay/package.py
index 0c36be25c3..f02c00d8ba 100644
--- a/var/spack/repos/builtin/packages/r-irdisplay/package.py
+++ b/var/spack/repos/builtin/packages/r-irdisplay/package.py
@@ -36,4 +36,4 @@ class RIrdisplay(RPackage):
 
     version('0.4.4', '5be672fb82185b90f23bd99ac1e1cdb6')
 
-    depends_on('r-repr', type=nolink)
+    depends_on('r-repr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-irkernel/package.py b/var/spack/repos/builtin/packages/r-irkernel/package.py
index 68f62f2801..e69b77f9f0 100644
--- a/var/spack/repos/builtin/packages/r-irkernel/package.py
+++ b/var/spack/repos/builtin/packages/r-irkernel/package.py
@@ -35,11 +35,11 @@ class RIrkernel(RPackage):
     version('master', git='https://github.com/IRkernel/IRkernel.git',
         tag='0.7')
 
-    depends_on('r-repr', type=nolink)
-    depends_on('r-irdisplay', type=nolink)
-    depends_on('r-evaluate', type=nolink)
-    depends_on('r-crayon', type=nolink)
-    depends_on('r-pbdzmq', type=nolink)
-    depends_on('r-devtools', type=nolink)
-    depends_on('r-uuid', type=nolink)
-    depends_on('r-digest', type=nolink)
+    depends_on('r-repr', type=('build', 'run'))
+    depends_on('r-irdisplay', type=('build', 'run'))
+    depends_on('r-evaluate', type=('build', 'run'))
+    depends_on('r-crayon', type=('build', 'run'))
+    depends_on('r-pbdzmq', type=('build', 'run'))
+    depends_on('r-devtools', type=('build', 'run'))
+    depends_on('r-uuid', type=('build', 'run'))
+    depends_on('r-digest', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-irlba/package.py b/var/spack/repos/builtin/packages/r-irlba/package.py
index 2028afcd34..e0d1b32565 100644
--- a/var/spack/repos/builtin/packages/r-irlba/package.py
+++ b/var/spack/repos/builtin/packages/r-irlba/package.py
@@ -36,4 +36,4 @@ class RIrlba(RPackage):
 
     version('2.0.0', '557674cf8b68fea5b9f231058c324d26')
 
-    depends_on('r-matrix', type=nolink)
+    depends_on('r-matrix', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-knitr/package.py b/var/spack/repos/builtin/packages/r-knitr/package.py
index 7ed6562428..dd92474944 100644
--- a/var/spack/repos/builtin/packages/r-knitr/package.py
+++ b/var/spack/repos/builtin/packages/r-knitr/package.py
@@ -37,10 +37,10 @@ class RKnitr(RPackage):
     version('1.14', 'ef0fbeaa9372f99ffbc57212a7781511')
     version('0.6',  'c67d6db84cd55594a9e870c90651a3db')
 
-    depends_on('r-evaluate', type=nolink)
-    depends_on('r-digest', type=nolink)
-    depends_on('r-formatr', type=nolink)
-    depends_on('r-highr', type=nolink)
-    depends_on('r-stringr', type=nolink)
-    depends_on('r-markdown', type=nolink)
-    depends_on('r-yaml', type=nolink)
+    depends_on('r-evaluate', type=('build', 'run'))
+    depends_on('r-digest', type=('build', 'run'))
+    depends_on('r-formatr', type=('build', 'run'))
+    depends_on('r-highr', type=('build', 'run'))
+    depends_on('r-stringr', type=('build', 'run'))
+    depends_on('r-markdown', type=('build', 'run'))
+    depends_on('r-yaml', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-leaflet/package.py b/var/spack/repos/builtin/packages/r-leaflet/package.py
index 740c3f60bb..62c2cf3c7c 100644
--- a/var/spack/repos/builtin/packages/r-leaflet/package.py
+++ b/var/spack/repos/builtin/packages/r-leaflet/package.py
@@ -36,13 +36,13 @@ class RLeaflet(RPackage):
 
     version('1.0.1', '7f3d8b17092604d87d4eeb579f73d5df')
 
-    depends_on('r-base64enc', type=nolink)
-    depends_on('r-htmlwidgets', type=nolink)
-    depends_on('r-htmltools', type=nolink)
-    depends_on('r-magrittr', type=nolink)
-    depends_on('r-markdown', type=nolink)
-    depends_on('r-png', type=nolink)
-    depends_on('r-rcolorbrewer', type=nolink)
-    depends_on('r-raster', type=nolink)
-    depends_on('r-scales', type=nolink)
-    depends_on('r-sp', type=nolink)
+    depends_on('r-base64enc', type=('build', 'run'))
+    depends_on('r-htmlwidgets', type=('build', 'run'))
+    depends_on('r-htmltools', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
+    depends_on('r-markdown', type=('build', 'run'))
+    depends_on('r-png', type=('build', 'run'))
+    depends_on('r-rcolorbrewer', type=('build', 'run'))
+    depends_on('r-raster', type=('build', 'run'))
+    depends_on('r-scales', type=('build', 'run'))
+    depends_on('r-sp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-lme4/package.py b/var/spack/repos/builtin/packages/r-lme4/package.py
index bddc35fad2..0ca545ced9 100644
--- a/var/spack/repos/builtin/packages/r-lme4/package.py
+++ b/var/spack/repos/builtin/packages/r-lme4/package.py
@@ -37,11 +37,11 @@ class RLme4(RPackage):
 
     version('1.1-12', 'da8aaebb67477ecb5631851c46207804')
 
-    depends_on('r-matrix', type=nolink)
-    depends_on('r-mass', type=nolink)
-    depends_on('r-lattice', type=nolink)
-    depends_on('r-nlme', type=nolink)
-    depends_on('r-minqa', type=nolink)
-    depends_on('r-nloptr', type=nolink)
-    depends_on('r-rcpp', type=nolink)
-    depends_on('r-rcppeigen', type=nolink)
+    depends_on('r-matrix', type=('build', 'run'))
+    depends_on('r-mass', type=('build', 'run'))
+    depends_on('r-lattice', type=('build', 'run'))
+    depends_on('r-nlme', type=('build', 'run'))
+    depends_on('r-minqa', type=('build', 'run'))
+    depends_on('r-nloptr', type=('build', 'run'))
+    depends_on('r-rcpp', type=('build', 'run'))
+    depends_on('r-rcppeigen', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-lmtest/package.py b/var/spack/repos/builtin/packages/r-lmtest/package.py
index b52bfd6861..3d17dd2a7e 100644
--- a/var/spack/repos/builtin/packages/r-lmtest/package.py
+++ b/var/spack/repos/builtin/packages/r-lmtest/package.py
@@ -36,4 +36,4 @@ class RLmtest(RPackage):
 
     version('0.9-34', 'fcdf7286bb5ccc2ca46be00bf25ac2fe')
 
-    depends_on('r-zoo', type=nolink)
+    depends_on('r-zoo', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-lubridate/package.py b/var/spack/repos/builtin/packages/r-lubridate/package.py
index 8705ce805f..159e84e292 100644
--- a/var/spack/repos/builtin/packages/r-lubridate/package.py
+++ b/var/spack/repos/builtin/packages/r-lubridate/package.py
@@ -39,4 +39,4 @@ class RLubridate(RPackage):
 
     version('1.5.6', 'a5dc44817548ee219d26a10bae92e611')
 
-    depends_on('r-stringr', type=nolink)
+    depends_on('r-stringr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-magic/package.py b/var/spack/repos/builtin/packages/r-magic/package.py
index d58ab5bacc..b0987adcd7 100644
--- a/var/spack/repos/builtin/packages/r-magic/package.py
+++ b/var/spack/repos/builtin/packages/r-magic/package.py
@@ -37,4 +37,4 @@ class RMagic(RPackage):
 
     version('1.5-6', 'a68e5ced253b2196af842e1fc84fd029')
 
-    depends_on('r-abind', type=nolink)
+    depends_on('r-abind', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-mapproj/package.py b/var/spack/repos/builtin/packages/r-mapproj/package.py
index 5aaac4fe11..3475868abd 100644
--- a/var/spack/repos/builtin/packages/r-mapproj/package.py
+++ b/var/spack/repos/builtin/packages/r-mapproj/package.py
@@ -34,4 +34,4 @@ class RMapproj(RPackage):
 
     version('1.2-4', '10e22bde1c790e1540672f15ddcaee71')
 
-    depends_on('r-maps', type=nolink)
+    depends_on('r-maps', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-maptools/package.py b/var/spack/repos/builtin/packages/r-maptools/package.py
index 799125a7c9..74d0673aea 100644
--- a/var/spack/repos/builtin/packages/r-maptools/package.py
+++ b/var/spack/repos/builtin/packages/r-maptools/package.py
@@ -38,6 +38,6 @@ class RMaptools(RPackage):
 
     version('0.8-39', '3690d96afba8ef22c8e27ae540ffb836')
 
-    depends_on('r-sp', type=nolink)
-    depends_on('r-foreign', type=nolink)
-    depends_on('r-lattice', type=nolink)
+    depends_on('r-sp', type=('build', 'run'))
+    depends_on('r-foreign', type=('build', 'run'))
+    depends_on('r-lattice', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-markdown/package.py b/var/spack/repos/builtin/packages/r-markdown/package.py
index 544c002d52..c0e03fef0a 100644
--- a/var/spack/repos/builtin/packages/r-markdown/package.py
+++ b/var/spack/repos/builtin/packages/r-markdown/package.py
@@ -38,4 +38,4 @@ class RMarkdown(RPackage):
 
     version('0.7.7', '72deca9c675c7cc9343048edbc29f7ff')
 
-    depends_on('r-mime', type=nolink)
+    depends_on('r-mime', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-matrix/package.py b/var/spack/repos/builtin/packages/r-matrix/package.py
index 12614014de..07c2eaf9da 100644
--- a/var/spack/repos/builtin/packages/r-matrix/package.py
+++ b/var/spack/repos/builtin/packages/r-matrix/package.py
@@ -35,4 +35,4 @@ class RMatrix(RPackage):
 
     version('1.2-6', 'f545307fb1284861e9266c4e9712c55e')
 
-    depends_on('r-lattice', type=nolink)
+    depends_on('r-lattice', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-matrixmodels/package.py b/var/spack/repos/builtin/packages/r-matrixmodels/package.py
index 3b4d465132..0958de49a3 100644
--- a/var/spack/repos/builtin/packages/r-matrixmodels/package.py
+++ b/var/spack/repos/builtin/packages/r-matrixmodels/package.py
@@ -35,4 +35,4 @@ class RMatrixmodels(RPackage):
 
     version('0.4-1', '65b3ab56650c62bf1046a3eb1f1e19a0')
 
-    depends_on('r-matrix', type=nolink)
+    depends_on('r-matrix', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-memoise/package.py b/var/spack/repos/builtin/packages/r-memoise/package.py
index c92daf6652..76c207dc04 100644
--- a/var/spack/repos/builtin/packages/r-memoise/package.py
+++ b/var/spack/repos/builtin/packages/r-memoise/package.py
@@ -35,4 +35,4 @@ class RMemoise(RPackage):
 
     version('1.0.0', 'd31145292e2a88ae9a504cab1602e4ac')
 
-    depends_on('r-digest', type=nolink)
+    depends_on('r-digest', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-mgcv/package.py b/var/spack/repos/builtin/packages/r-mgcv/package.py
index 5d5940129c..c8cb067275 100644
--- a/var/spack/repos/builtin/packages/r-mgcv/package.py
+++ b/var/spack/repos/builtin/packages/r-mgcv/package.py
@@ -37,5 +37,5 @@ class RMgcv(RPackage):
 
     version('1.8-13', '30607be3aaf44b13bd8c81fc32e8c984')
 
-    depends_on('r-nlme', type=nolink)
-    depends_on('r-matrix', type=nolink)
+    depends_on('r-nlme', type=('build', 'run'))
+    depends_on('r-matrix', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-minqa/package.py b/var/spack/repos/builtin/packages/r-minqa/package.py
index 211694cc38..7a9032a546 100644
--- a/var/spack/repos/builtin/packages/r-minqa/package.py
+++ b/var/spack/repos/builtin/packages/r-minqa/package.py
@@ -35,4 +35,4 @@ class RMinqa(RPackage):
 
     version('1.2.4', 'bcaae4fdba60a33528f2116e2fd51105')
 
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-multcomp/package.py b/var/spack/repos/builtin/packages/r-multcomp/package.py
index c24f74de38..70704a9c61 100644
--- a/var/spack/repos/builtin/packages/r-multcomp/package.py
+++ b/var/spack/repos/builtin/packages/r-multcomp/package.py
@@ -38,8 +38,8 @@ class RMultcomp(RPackage):
 
     version('1.4-6', 'f1353ede2ed78b23859a7f1f1f9ebe88')
 
-    depends_on('r-mvtnorm', type=nolink)
-    depends_on('r-survival', type=nolink)
-    depends_on('r-thdata', type=nolink)
-    depends_on('r-sandwich', type=nolink)
-    depends_on('r-codetools', type=nolink)
+    depends_on('r-mvtnorm', type=('build', 'run'))
+    depends_on('r-survival', type=('build', 'run'))
+    depends_on('r-thdata', type=('build', 'run'))
+    depends_on('r-sandwich', type=('build', 'run'))
+    depends_on('r-codetools', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-munsell/package.py b/var/spack/repos/builtin/packages/r-munsell/package.py
index acc126a960..670fed41e2 100644
--- a/var/spack/repos/builtin/packages/r-munsell/package.py
+++ b/var/spack/repos/builtin/packages/r-munsell/package.py
@@ -38,4 +38,4 @@ class RMunsell(RPackage):
 
     version('0.4.3', 'ebd205323dc37c948f499ee08be9c476')
 
-    depends_on('r-colorspace', type=nolink)
+    depends_on('r-colorspace', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-networkd3/package.py b/var/spack/repos/builtin/packages/r-networkd3/package.py
index fafd3b3dde..e881394538 100644
--- a/var/spack/repos/builtin/packages/r-networkd3/package.py
+++ b/var/spack/repos/builtin/packages/r-networkd3/package.py
@@ -35,6 +35,6 @@ class RNetworkd3(RPackage):
 
     version('0.2.12', '356fe4be59698e6fb052644bd9659d84')
 
-    depends_on('r-htmlwidgets', type=nolink)
-    depends_on('r-igraph', type=nolink)
-    depends_on('r-magrittr', type=nolink)
+    depends_on('r-htmlwidgets', type=('build', 'run'))
+    depends_on('r-igraph', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-nlme/package.py b/var/spack/repos/builtin/packages/r-nlme/package.py
index 3c9056ec66..869e03ab51 100644
--- a/var/spack/repos/builtin/packages/r-nlme/package.py
+++ b/var/spack/repos/builtin/packages/r-nlme/package.py
@@ -34,4 +34,4 @@ class RNlme(RPackage):
 
     version('3.1-128', '3d75ae7380bf123761b95a073eb55008')
 
-    depends_on('r-lattice', type=nolink)
+    depends_on('r-lattice', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-nmf/package.py b/var/spack/repos/builtin/packages/r-nmf/package.py
index 59defb441a..78347ea615 100644
--- a/var/spack/repos/builtin/packages/r-nmf/package.py
+++ b/var/spack/repos/builtin/packages/r-nmf/package.py
@@ -39,16 +39,16 @@ class RNmf(RPackage):
 
     version('0.20.6', '81df07b3bf710a611db5af24730ff3d0')
 
-    depends_on('r-pkgmaker', type=nolink)
-    depends_on('r-registry', type=nolink)
-    depends_on('r-rngtools', type=nolink)
-    depends_on('r-cluster', type=nolink)
-    depends_on('r-stringr', type=nolink)
-    depends_on('r-digest', type=nolink)
-    depends_on('r-gridbase', type=nolink)
-    depends_on('r-colorspace', type=nolink)
-    depends_on('r-rcolorbrewer', type=nolink)
-    depends_on('r-foreach', type=nolink)
-    depends_on('r-doparallel', type=nolink)
-    depends_on('r-ggplot2', type=nolink)
-    depends_on('r-reshape2', type=nolink)
+    depends_on('r-pkgmaker', type=('build', 'run'))
+    depends_on('r-registry', type=('build', 'run'))
+    depends_on('r-rngtools', type=('build', 'run'))
+    depends_on('r-cluster', type=('build', 'run'))
+    depends_on('r-stringr', type=('build', 'run'))
+    depends_on('r-digest', type=('build', 'run'))
+    depends_on('r-gridbase', type=('build', 'run'))
+    depends_on('r-colorspace', type=('build', 'run'))
+    depends_on('r-rcolorbrewer', type=('build', 'run'))
+    depends_on('r-foreach', type=('build', 'run'))
+    depends_on('r-doparallel', type=('build', 'run'))
+    depends_on('r-ggplot2', type=('build', 'run'))
+    depends_on('r-reshape2', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-np/package.py b/var/spack/repos/builtin/packages/r-np/package.py
index 924472b526..e15cb7efcb 100644
--- a/var/spack/repos/builtin/packages/r-np/package.py
+++ b/var/spack/repos/builtin/packages/r-np/package.py
@@ -40,5 +40,5 @@ class RNp(RPackage):
 
     version('0.60-2', 'e094d52ddff7280272b41e6cb2c74389')
 
-    depends_on('r-boot', type=nolink)
-    depends_on('r-cubature', type=nolink)
+    depends_on('r-boot', type=('build', 'run'))
+    depends_on('r-cubature', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-partykit/package.py b/var/spack/repos/builtin/packages/r-partykit/package.py
index 70dac90d99..8773dace22 100644
--- a/var/spack/repos/builtin/packages/r-partykit/package.py
+++ b/var/spack/repos/builtin/packages/r-partykit/package.py
@@ -42,5 +42,5 @@ class RPartykit(RPackage):
 
     version('1.1-1', '8fcb31d73ec1b8cd3bcd9789639a9277')
 
-    depends_on('r-survival', type=nolink)
-    depends_on('r-formula', type=nolink)
+    depends_on('r-survival', type=('build', 'run'))
+    depends_on('r-formula', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-pbdzmq/package.py b/var/spack/repos/builtin/packages/r-pbdzmq/package.py
index 02b1073ab4..f602e50723 100644
--- a/var/spack/repos/builtin/packages/r-pbdzmq/package.py
+++ b/var/spack/repos/builtin/packages/r-pbdzmq/package.py
@@ -41,5 +41,5 @@ class RPbdzmq(RPackage):
 
     version('0.2-4', 'e5afb70199aa54d737ee7a0e26bde060')
 
-    depends_on('r-r6', type=nolink)
+    depends_on('r-r6', type=('build', 'run'))
     depends_on('zeromq')
diff --git a/var/spack/repos/builtin/packages/r-pbkrtest/package.py b/var/spack/repos/builtin/packages/r-pbkrtest/package.py
index 6910cad38b..2d51d2b958 100644
--- a/var/spack/repos/builtin/packages/r-pbkrtest/package.py
+++ b/var/spack/repos/builtin/packages/r-pbkrtest/package.py
@@ -38,6 +38,6 @@ class RPbkrtest(RPackage):
 
     version('0.4-6', '0a7d9ff83b8d131af9b2335f35781ef9')
 
-    depends_on('r-lme4', type=nolink)
-    depends_on('r-matrix', type=nolink)
-    depends_on('r-mass', type=nolink)
+    depends_on('r-lme4', type=('build', 'run'))
+    depends_on('r-matrix', type=('build', 'run'))
+    depends_on('r-mass', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-pkgmaker/package.py b/var/spack/repos/builtin/packages/r-pkgmaker/package.py
index 4f193bc8e4..099cabd954 100644
--- a/var/spack/repos/builtin/packages/r-pkgmaker/package.py
+++ b/var/spack/repos/builtin/packages/r-pkgmaker/package.py
@@ -40,8 +40,8 @@ class RPkgmaker(RPackage):
 
     version('0.22', '73a0c6d3e84c6dadf3de7582ef7e88a4')
 
-    depends_on('r-registry', type=nolink)
-    depends_on('r-codetools', type=nolink)
-    depends_on('r-digest', type=nolink)
-    depends_on('r-stringr', type=nolink)
-    depends_on('r-xtable', type=nolink)
+    depends_on('r-registry', type=('build', 'run'))
+    depends_on('r-codetools', type=('build', 'run'))
+    depends_on('r-digest', type=('build', 'run'))
+    depends_on('r-stringr', type=('build', 'run'))
+    depends_on('r-xtable', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-plyr/package.py b/var/spack/repos/builtin/packages/r-plyr/package.py
index 229d5177c0..6f48f5c38e 100644
--- a/var/spack/repos/builtin/packages/r-plyr/package.py
+++ b/var/spack/repos/builtin/packages/r-plyr/package.py
@@ -40,4 +40,4 @@ class RPlyr(RPackage):
 
     version('1.8.4', 'ef455cf7fc06e34837692156b7b2587b')
 
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-pryr/package.py b/var/spack/repos/builtin/packages/r-pryr/package.py
index 703a6f788f..3a103e9855 100644
--- a/var/spack/repos/builtin/packages/r-pryr/package.py
+++ b/var/spack/repos/builtin/packages/r-pryr/package.py
@@ -36,5 +36,5 @@ class RPryr(RPackage):
 
     version('0.1.2', '66b597a762aa15a3b7037779522983b6')
 
-    depends_on('r-stringr', type=nolink)
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-stringr', type=('build', 'run'))
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-quantmod/package.py b/var/spack/repos/builtin/packages/r-quantmod/package.py
index e0276ef6d8..4cc53fcf69 100644
--- a/var/spack/repos/builtin/packages/r-quantmod/package.py
+++ b/var/spack/repos/builtin/packages/r-quantmod/package.py
@@ -35,6 +35,6 @@ class RQuantmod(RPackage):
 
     version('0.4-5', 'cab3c409e4de3df98a20f1ded60f3631')
 
-    depends_on('r-xts', type=nolink)
-    depends_on('r-zoo', type=nolink)
-    depends_on('r-ttr', type=nolink)
+    depends_on('r-xts', type=('build', 'run'))
+    depends_on('r-zoo', type=('build', 'run'))
+    depends_on('r-ttr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-quantreg/package.py b/var/spack/repos/builtin/packages/r-quantreg/package.py
index 248ab28e41..2d5091ccaf 100644
--- a/var/spack/repos/builtin/packages/r-quantreg/package.py
+++ b/var/spack/repos/builtin/packages/r-quantreg/package.py
@@ -39,6 +39,6 @@ class RQuantreg(RPackage):
 
     version('5.26', '1d89ed932fb4d67ae2d5da0eb8c2989f')
 
-    depends_on('r-sparsem', type=nolink)
-    depends_on('r-matrix', type=nolink)
-    depends_on('r-matrixmodels', type=nolink)
+    depends_on('r-sparsem', type=('build', 'run'))
+    depends_on('r-matrix', type=('build', 'run'))
+    depends_on('r-matrixmodels', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-raster/package.py b/var/spack/repos/builtin/packages/r-raster/package.py
index 02b121566e..daa42793ee 100644
--- a/var/spack/repos/builtin/packages/r-raster/package.py
+++ b/var/spack/repos/builtin/packages/r-raster/package.py
@@ -36,5 +36,5 @@ class RRaster(RPackage):
 
     version('2.5-8', '2a7db931c74d50516e82d04687c0a577')
 
-    depends_on('r-sp', type=nolink)
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-sp', type=('build', 'run'))
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-rbokeh/package.py b/var/spack/repos/builtin/packages/r-rbokeh/package.py
index 168e8bf765..00f15891b2 100644
--- a/var/spack/repos/builtin/packages/r-rbokeh/package.py
+++ b/var/spack/repos/builtin/packages/r-rbokeh/package.py
@@ -36,14 +36,14 @@ class RRbokeh(RPackage):
 
     version('0.5.0', '4e14778c3fbd9286460ca28c68f57d10')
 
-    depends_on('r-htmlwidgets', type=nolink)
-    depends_on('r-maps', type=nolink)
-    depends_on('r-jsonlite', type=nolink)
-    depends_on('r-digest', type=nolink)
-    depends_on('r-hexbin', type=nolink)
-    depends_on('r-lazyeval', type=nolink)
-    depends_on('r-pryr', type=nolink)
-    depends_on('r-magrittr', type=nolink)
-    depends_on('r-ggplot2', type=nolink)
-    depends_on('r-scales', type=nolink)
-    depends_on('r-gistr', type=nolink)
+    depends_on('r-htmlwidgets', type=('build', 'run'))
+    depends_on('r-maps', type=('build', 'run'))
+    depends_on('r-jsonlite', type=('build', 'run'))
+    depends_on('r-digest', type=('build', 'run'))
+    depends_on('r-hexbin', type=('build', 'run'))
+    depends_on('r-lazyeval', type=('build', 'run'))
+    depends_on('r-pryr', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
+    depends_on('r-ggplot2', type=('build', 'run'))
+    depends_on('r-scales', type=('build', 'run'))
+    depends_on('r-gistr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-rcppeigen/package.py b/var/spack/repos/builtin/packages/r-rcppeigen/package.py
index d407a99b48..23ec0bc27b 100644
--- a/var/spack/repos/builtin/packages/r-rcppeigen/package.py
+++ b/var/spack/repos/builtin/packages/r-rcppeigen/package.py
@@ -46,5 +46,5 @@ class RRcppeigen(RPackage):
 
     version('0.3.2.8.1', '4146e06e4fdf7f4d08db7839069d479f')
 
-    depends_on('r-matrix', type=nolink)
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-matrix', type=('build', 'run'))
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-reshape2/package.py b/var/spack/repos/builtin/packages/r-reshape2/package.py
index 129198d14f..d27231e139 100644
--- a/var/spack/repos/builtin/packages/r-reshape2/package.py
+++ b/var/spack/repos/builtin/packages/r-reshape2/package.py
@@ -35,6 +35,6 @@ class RReshape2(RPackage):
 
     version('1.4.1', '41e9dffdf5c6fa830321ac9c8ebffe00')
 
-    depends_on('r-plyr', type=nolink)
-    depends_on('r-stringr', type=nolink)
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-plyr', type=('build', 'run'))
+    depends_on('r-stringr', type=('build', 'run'))
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py
index 4dd2cd9867..87672a35e2 100644
--- a/var/spack/repos/builtin/packages/r-rgooglemaps/package.py
+++ b/var/spack/repos/builtin/packages/r-rgooglemaps/package.py
@@ -37,5 +37,5 @@ class RRgooglemaps(RPackage):
 
     version('1.2.0.7', '2e1df804f0331b4122d841105f0c7ea5')
 
-    depends_on('r-png', type=nolink)
-    depends_on('r-rjsonio', type=nolink)
+    depends_on('r-png', type=('build', 'run'))
+    depends_on('r-rjsonio', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-rinside/package.py b/var/spack/repos/builtin/packages/r-rinside/package.py
index 8e2a802eec..d8e7c28e23 100644
--- a/var/spack/repos/builtin/packages/r-rinside/package.py
+++ b/var/spack/repos/builtin/packages/r-rinside/package.py
@@ -48,4 +48,4 @@ class RRinside(RPackage):
 
     version('0.2.13', '2e3c35a7bd648e9bef98d0afcc02cf88')
 
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-rmarkdown/package.py b/var/spack/repos/builtin/packages/r-rmarkdown/package.py
index 2200ee18ec..31a7695923 100644
--- a/var/spack/repos/builtin/packages/r-rmarkdown/package.py
+++ b/var/spack/repos/builtin/packages/r-rmarkdown/package.py
@@ -35,10 +35,10 @@ class RRmarkdown(RPackage):
 
     version('1.0', '264aa6a59e9680109e38df8270e14c58')
 
-    depends_on('r-knitr', type=nolink)
-    depends_on('r-yaml', type=nolink)
-    depends_on('r-htmltools', type=nolink)
-    depends_on('r-catools', type=nolink)
-    depends_on('r-evaluate', type=nolink)
-    depends_on('r-base64enc', type=nolink)
-    depends_on('r-jsonlite', type=nolink)
+    depends_on('r-knitr', type=('build', 'run'))
+    depends_on('r-yaml', type=('build', 'run'))
+    depends_on('r-htmltools', type=('build', 'run'))
+    depends_on('r-catools', type=('build', 'run'))
+    depends_on('r-evaluate', type=('build', 'run'))
+    depends_on('r-base64enc', type=('build', 'run'))
+    depends_on('r-jsonlite', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-rmysql/package.py b/var/spack/repos/builtin/packages/r-rmysql/package.py
index fd38647220..4946b071fa 100644
--- a/var/spack/repos/builtin/packages/r-rmysql/package.py
+++ b/var/spack/repos/builtin/packages/r-rmysql/package.py
@@ -34,5 +34,5 @@ class RRmysql(RPackage):
 
     version('0.10.9', '3628200a1864ac3005cfd55cc7cde17a')
 
-    depends_on('r-dbi', type=nolink)
+    depends_on('r-dbi', type=('build', 'run'))
     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 b2b5e52861..f9edc93a2c 100644
--- a/var/spack/repos/builtin/packages/r-rngtools/package.py
+++ b/var/spack/repos/builtin/packages/r-rngtools/package.py
@@ -38,6 +38,6 @@ class RRngtools(RPackage):
 
     version('1.2.4', '715967f8b3af2848a76593a7c718c1cd')
 
-    depends_on('r-pkgmaker', type=nolink)
-    depends_on('r-stringr', type=nolink)
-    depends_on('r-digest', type=nolink)
+    depends_on('r-pkgmaker', type=('build', 'run'))
+    depends_on('r-stringr', type=('build', 'run'))
+    depends_on('r-digest', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-roxygen2/package.py b/var/spack/repos/builtin/packages/r-roxygen2/package.py
index 1d3b3fa1f6..1bbfeb2e87 100644
--- a/var/spack/repos/builtin/packages/r-roxygen2/package.py
+++ b/var/spack/repos/builtin/packages/r-roxygen2/package.py
@@ -35,8 +35,8 @@ class RRoxygen2(RPackage):
 
     version('5.0.1', 'df5bdbc12fda372e427710ef1cd92ed7')
 
-    depends_on('r-stringr', type=nolink)
-    depends_on('r-stringi', type=nolink)
-    depends_on('r-brew', type=nolink)
-    depends_on('r-digest', type=nolink)
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-stringr', type=('build', 'run'))
+    depends_on('r-stringi', type=('build', 'run'))
+    depends_on('r-brew', type=('build', 'run'))
+    depends_on('r-digest', type=('build', 'run'))
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-rpostgresql/package.py b/var/spack/repos/builtin/packages/r-rpostgresql/package.py
index 227f7e9ce5..b204c53828 100644
--- a/var/spack/repos/builtin/packages/r-rpostgresql/package.py
+++ b/var/spack/repos/builtin/packages/r-rpostgresql/package.py
@@ -42,5 +42,5 @@ class RRpostgresql(RPackage):
 
     version('0.4-1', 'e7b22e212afbb2cbb88bab937f93e55a')
 
-    depends_on('r-dbi', type=nolink)
+    depends_on('r-dbi', type=('build', 'run'))
     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 d707f5f542..1a0978363a 100644
--- a/var/spack/repos/builtin/packages/r-rsnns/package.py
+++ b/var/spack/repos/builtin/packages/r-rsnns/package.py
@@ -41,4 +41,4 @@ class RRsnns(RPackage):
 
     version('0.4-7', 'ade7736611c456effb5f72e0ce0a1e6f')
 
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-rsqlite/package.py b/var/spack/repos/builtin/packages/r-rsqlite/package.py
index f090405408..c08fcac20c 100644
--- a/var/spack/repos/builtin/packages/r-rsqlite/package.py
+++ b/var/spack/repos/builtin/packages/r-rsqlite/package.py
@@ -36,4 +36,4 @@ class RRsqlite(RPackage):
 
     version('1.0.0', 'e6cbe2709612b687c13a10d30c7bad45')
 
-    depends_on('r-dbi', type=nolink)
+    depends_on('r-dbi', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-rstan/package.py b/var/spack/repos/builtin/packages/r-rstan/package.py
index 26a040c363..e616f0a7dd 100644
--- a/var/spack/repos/builtin/packages/r-rstan/package.py
+++ b/var/spack/repos/builtin/packages/r-rstan/package.py
@@ -42,10 +42,10 @@ class RRstan(RPackage):
 
     version('2.10.1', 'f5d212f6f8551bdb91fe713d05d4052a')
 
-    depends_on('r-ggplot2', type=nolink)
-    depends_on('r-stanheaders', type=nolink)
-    depends_on('r-inline', type=nolink)
-    depends_on('r-gridextra', type=nolink)
-    depends_on('r-rcpp', type=nolink)
-    depends_on('r-rcppeigen', type=nolink)
-    depends_on('r-bh', type=nolink)
+    depends_on('r-ggplot2', type=('build', 'run'))
+    depends_on('r-stanheaders', type=('build', 'run'))
+    depends_on('r-inline', type=('build', 'run'))
+    depends_on('r-gridextra', type=('build', 'run'))
+    depends_on('r-rcpp', type=('build', 'run'))
+    depends_on('r-rcppeigen', type=('build', 'run'))
+    depends_on('r-bh', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-sandwich/package.py b/var/spack/repos/builtin/packages/r-sandwich/package.py
index 248f09c614..62bd2880e5 100644
--- a/var/spack/repos/builtin/packages/r-sandwich/package.py
+++ b/var/spack/repos/builtin/packages/r-sandwich/package.py
@@ -35,4 +35,4 @@ class RSandwich(RPackage):
 
     version('2.3-4', 'a621dbd8a57b6e1e036496642aadc2e5')
 
-    depends_on('r-zoo', type=nolink)
+    depends_on('r-zoo', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-scales/package.py b/var/spack/repos/builtin/packages/r-scales/package.py
index 174b7d7d6e..e3832f78e0 100644
--- a/var/spack/repos/builtin/packages/r-scales/package.py
+++ b/var/spack/repos/builtin/packages/r-scales/package.py
@@ -35,9 +35,9 @@ class RScales(RPackage):
 
     version('0.4.0', '7b5602d9c55595901192248bca25c099')
 
-    depends_on('r-rcolorbrewer', type=nolink)
-    depends_on('r-dichromat', type=nolink)
-    depends_on('r-plyr', type=nolink)
-    depends_on('r-munsell', type=nolink)
-    depends_on('r-labeling', type=nolink)
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-rcolorbrewer', type=('build', 'run'))
+    depends_on('r-dichromat', type=('build', 'run'))
+    depends_on('r-plyr', type=('build', 'run'))
+    depends_on('r-munsell', type=('build', 'run'))
+    depends_on('r-labeling', type=('build', 'run'))
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-shiny/package.py b/var/spack/repos/builtin/packages/r-shiny/package.py
index 4c357bdc30..b1d21c7e7c 100644
--- a/var/spack/repos/builtin/packages/r-shiny/package.py
+++ b/var/spack/repos/builtin/packages/r-shiny/package.py
@@ -37,10 +37,10 @@ class RShiny(RPackage):
 
     version('0.13.2', 'cb5bff7a28ad59ec2883cd0912ca9611')
 
-    depends_on('r-httpuv', type=nolink)
-    depends_on('r-mime', type=nolink)
-    depends_on('r-jsonlite', type=nolink)
-    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-httpuv', type=('build', 'run'))
+    depends_on('r-mime', type=('build', 'run'))
+    depends_on('r-jsonlite', type=('build', 'run'))
+    depends_on('r-xtable', type=('build', 'run'))
+    depends_on('r-digest', type=('build', 'run'))
+    depends_on('r-htmltools', type=('build', 'run'))
+    depends_on('r-r6', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-sp/package.py b/var/spack/repos/builtin/packages/r-sp/package.py
index 19ce2ee912..2917f0b6b6 100644
--- a/var/spack/repos/builtin/packages/r-sp/package.py
+++ b/var/spack/repos/builtin/packages/r-sp/package.py
@@ -37,4 +37,4 @@ class RSp(RPackage):
 
     version('1.2-3', 'f0e24d993dec128642ee66b6b47b10c1')
 
-    depends_on('r-lattice', type=nolink)
+    depends_on('r-lattice', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-stringr/package.py b/var/spack/repos/builtin/packages/r-stringr/package.py
index 5f9f05df31..de8d83b500 100644
--- a/var/spack/repos/builtin/packages/r-stringr/package.py
+++ b/var/spack/repos/builtin/packages/r-stringr/package.py
@@ -38,5 +38,5 @@ class RStringr(RPackage):
 
     version('1.0.0', '5ca977c90351f78b1b888b379114a7b4')
 
-    depends_on('r-stringi', type=nolink)
-    depends_on('r-magrittr', type=nolink)
+    depends_on('r-stringi', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-survival/package.py b/var/spack/repos/builtin/packages/r-survival/package.py
index 44d5043189..1df00f0c93 100644
--- a/var/spack/repos/builtin/packages/r-survival/package.py
+++ b/var/spack/repos/builtin/packages/r-survival/package.py
@@ -36,4 +36,4 @@ class RSurvival(RPackage):
 
     version('2.39-5', 'a3cc6b5762e8c5c0bb9e64a276710be2')
 
-    depends_on('r-matrix', type=nolink)
+    depends_on('r-matrix', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-tarifx/package.py b/var/spack/repos/builtin/packages/r-tarifx/package.py
index 0703c0f5f0..1fb2d35b1d 100644
--- a/var/spack/repos/builtin/packages/r-tarifx/package.py
+++ b/var/spack/repos/builtin/packages/r-tarifx/package.py
@@ -34,5 +34,5 @@ class RTarifx(RPackage):
 
     version('1.0.6', '7e782e04bd69d929b29f91553382e6a2')
 
-    depends_on('r-reshape2', type=nolink)
-    depends_on('r-plyr', type=nolink)
+    depends_on('r-reshape2', type=('build', 'run'))
+    depends_on('r-plyr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-testthat/package.py b/var/spack/repos/builtin/packages/r-testthat/package.py
index 7589909b3b..62409912f7 100644
--- a/var/spack/repos/builtin/packages/r-testthat/package.py
+++ b/var/spack/repos/builtin/packages/r-testthat/package.py
@@ -35,8 +35,8 @@ class RTestthat(RPackage):
 
     version('1.0.2', '6c6a90c8db860292df5784a70e07b8dc')
 
-    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-digest', type=('build', 'run'))
+    depends_on('r-crayon', type=('build', 'run'))
+    depends_on('r-praise', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
+    depends_on('r-r6', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-thdata/package.py b/var/spack/repos/builtin/packages/r-thdata/package.py
index 4639b7f5ae..cf2b01e6e8 100644
--- a/var/spack/repos/builtin/packages/r-thdata/package.py
+++ b/var/spack/repos/builtin/packages/r-thdata/package.py
@@ -34,5 +34,5 @@ class RThdata(RPackage):
 
     version('1.0-7', '3e8b6b1a4699544f175215aed7039a94')
 
-    depends_on('r-survival', type=nolink)
-    depends_on('r-mass', type=nolink)
+    depends_on('r-survival', type=('build', 'run'))
+    depends_on('r-mass', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-threejs/package.py b/var/spack/repos/builtin/packages/r-threejs/package.py
index a525425fa3..50b484dc25 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(RPackage):
 
     version('0.2.2', '35c179b10813c5e4bd3e7827fae6627b')
 
-    depends_on('r-htmlwidgets', type=nolink)
-    depends_on('r-base64enc', type=nolink)
-    depends_on('r-matrix', type=nolink)
-    depends_on('r-jsonlite', type=nolink)
+    depends_on('r-htmlwidgets', type=('build', 'run'))
+    depends_on('r-base64enc', type=('build', 'run'))
+    depends_on('r-matrix', type=('build', 'run'))
+    depends_on('r-jsonlite', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-tibble/package.py b/var/spack/repos/builtin/packages/r-tibble/package.py
index 47355cc451..39dfc3893b 100644
--- a/var/spack/repos/builtin/packages/r-tibble/package.py
+++ b/var/spack/repos/builtin/packages/r-tibble/package.py
@@ -35,6 +35,6 @@ class RTibble(RPackage):
 
     version('1.1', '2fe9f806109d0b7fadafb1ffafea4cb8')
 
-    depends_on('r-assertthat', type=nolink)
-    depends_on('r-lazyeval', type=nolink)
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-assertthat', type=('build', 'run'))
+    depends_on('r-lazyeval', type=('build', 'run'))
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-tidyr/package.py b/var/spack/repos/builtin/packages/r-tidyr/package.py
index c7ac3d3225..1285e5e9ae 100644
--- a/var/spack/repos/builtin/packages/r-tidyr/package.py
+++ b/var/spack/repos/builtin/packages/r-tidyr/package.py
@@ -36,9 +36,9 @@ class RTidyr(RPackage):
 
     version('0.5.1', '3cadc869510c054ed93d374ab44120bd')
 
-    depends_on('r-tibble', type=nolink)
-    depends_on('r-dplyr', type=nolink)
-    depends_on('r-stringi', type=nolink)
-    depends_on('r-lazyeval', type=nolink)
-    depends_on('r-magrittr', type=nolink)
-    depends_on('r-rcpp', type=nolink)
+    depends_on('r-tibble', type=('build', 'run'))
+    depends_on('r-dplyr', type=('build', 'run'))
+    depends_on('r-stringi', type=('build', 'run'))
+    depends_on('r-lazyeval', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
+    depends_on('r-rcpp', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-ttr/package.py b/var/spack/repos/builtin/packages/r-ttr/package.py
index 98f4a0e450..79429f5286 100644
--- a/var/spack/repos/builtin/packages/r-ttr/package.py
+++ b/var/spack/repos/builtin/packages/r-ttr/package.py
@@ -34,5 +34,5 @@ class RTtr(RPackage):
 
     version('0.23-1', '35f693ac0d97e8ec742ebea2da222986')
 
-    depends_on('r-xts', type=nolink)
-    depends_on('r-zoo', type=nolink)
+    depends_on('r-xts', type=('build', 'run'))
+    depends_on('r-zoo', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-vcd/package.py b/var/spack/repos/builtin/packages/r-vcd/package.py
index 0e16260d0f..56a2ebdfa7 100644
--- a/var/spack/repos/builtin/packages/r-vcd/package.py
+++ b/var/spack/repos/builtin/packages/r-vcd/package.py
@@ -39,6 +39,6 @@ class RVcd(RPackage):
 
     version('1.4-1', '7db150a77f173f85b69a1f86f73f8f02')
 
-    depends_on('r-mass', type=nolink)
-    depends_on('r-colorspace', type=nolink)
-    depends_on('r-lmtest', type=nolink)
+    depends_on('r-mass', type=('build', 'run'))
+    depends_on('r-colorspace', type=('build', 'run'))
+    depends_on('r-lmtest', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-visnetwork/package.py b/var/spack/repos/builtin/packages/r-visnetwork/package.py
index 81be9fb5c2..ea0b972bf1 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(RPackage):
 
     version('1.0.1', 'dfc9664a5165134d8dbdcd949ad73cf7')
 
-    depends_on('r-htmlwidgets', type=nolink)
-    depends_on('r-htmltools', type=nolink)
-    depends_on('r-jsonlite', type=nolink)
-    depends_on('r-magrittr', type=nolink)
+    depends_on('r-htmlwidgets', type=('build', 'run'))
+    depends_on('r-htmltools', type=('build', 'run'))
+    depends_on('r-jsonlite', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-xgboost/package.py b/var/spack/repos/builtin/packages/r-xgboost/package.py
index dfa9928ee3..766191dcc1 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(RPackage):
 
     version('0.4-4', 'c24d3076058101a71de4b8af8806697c')
 
-    depends_on('r-matrix', type=nolink)
-    depends_on('r-datatable', type=nolink)
-    depends_on('r-magrittr', type=nolink)
-    depends_on('r-stringr', type=nolink)
+    depends_on('r-matrix', type=('build', 'run'))
+    depends_on('r-datatable', type=('build', 'run'))
+    depends_on('r-magrittr', type=('build', 'run'))
+    depends_on('r-stringr', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-xlconnect/package.py b/var/spack/repos/builtin/packages/r-xlconnect/package.py
index cdb8dbce3f..1863997ad7 100644
--- a/var/spack/repos/builtin/packages/r-xlconnect/package.py
+++ b/var/spack/repos/builtin/packages/r-xlconnect/package.py
@@ -36,5 +36,5 @@ class RXlconnect(RPackage):
     version('0.2-12', '3340d05d259f0a41262eab4ed32617ad')
     version('0.2-11', '9d1769a103cda05665df399cc335017d')
 
-    depends_on('r-xlconnectjars', type=nolink)
-    depends_on('r-rjava', type=nolink)
+    depends_on('r-xlconnectjars', type=('build', 'run'))
+    depends_on('r-rjava', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py
index 4606847512..0200b00a0f 100644
--- a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py
+++ b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py
@@ -35,4 +35,4 @@ class RXlconnectjars(RPackage):
     version('0.2-12', '6984e5140cd1c887c017ef6f88cbba81')
     version('0.2-9', 'e6d6b1acfede26acaa616ee421bd30fb')
 
-    depends_on('r-rjava', type=nolink)
+    depends_on('r-rjava', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-xlsx/package.py b/var/spack/repos/builtin/packages/r-xlsx/package.py
index e7a8b28204..e16a582306 100644
--- a/var/spack/repos/builtin/packages/r-xlsx/package.py
+++ b/var/spack/repos/builtin/packages/r-xlsx/package.py
@@ -35,5 +35,5 @@ class RXlsx(RPackage):
 
     version('0.5.7', '36b1b16f29c54b6089b1dae923180dd5')
 
-    depends_on('r-rjava', type=nolink)
-    depends_on('r-xlsxjars', type=nolink)
+    depends_on('r-rjava', type=('build', 'run'))
+    depends_on('r-xlsxjars', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-xlsxjars/package.py b/var/spack/repos/builtin/packages/r-xlsxjars/package.py
index 972ac4b557..1c16c75a9d 100644
--- a/var/spack/repos/builtin/packages/r-xlsxjars/package.py
+++ b/var/spack/repos/builtin/packages/r-xlsxjars/package.py
@@ -35,4 +35,4 @@ class RXlsxjars(RPackage):
 
     version('0.6.1', '5a1721d5733cb42f3a29e3f353e39166')
 
-    depends_on('r-rjava', type=nolink)
+    depends_on('r-rjava', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-xts/package.py b/var/spack/repos/builtin/packages/r-xts/package.py
index 47b3a60720..1cedec1d42 100644
--- a/var/spack/repos/builtin/packages/r-xts/package.py
+++ b/var/spack/repos/builtin/packages/r-xts/package.py
@@ -37,4 +37,4 @@ class RXts(RPackage):
 
     version('0.9-7', 'a232e94aebfa654653a7d88a0503537b')
 
-    depends_on('r-zoo', type=nolink)
+    depends_on('r-zoo', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r-zoo/package.py b/var/spack/repos/builtin/packages/r-zoo/package.py
index ade0e762df..230c78a61a 100644
--- a/var/spack/repos/builtin/packages/r-zoo/package.py
+++ b/var/spack/repos/builtin/packages/r-zoo/package.py
@@ -38,4 +38,4 @@ class RZoo(RPackage):
 
     version('1.7-13', '99521dfa4c668e692720cefcc5a1bf30')
 
-    depends_on('r-lattice', type=nolink)
+    depends_on('r-lattice', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py
index a60fa8122c..df447eba3e 100644
--- a/var/spack/repos/builtin/packages/r/package.py
+++ b/var/spack/repos/builtin/packages/r/package.py
@@ -22,6 +22,7 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
+
 from spack import *
 from spack.util.environment import *
 import shutil
@@ -139,7 +140,8 @@ class R(Package):
         # Set R_LIBS to include the library dir for the
         # extension and any other R extensions it depends on.
         r_libs_path = []
-        for d in extension_spec.traverse(deptype=nolink, deptype_query='run'):
+        for d in extension_spec.traverse(
+                deptype=('build', 'run'), deptype_query='run'):
             if d.package.extends(self.spec):
                 r_libs_path.append(join_path(d.prefix, self.r_lib_dir))
 
diff --git a/var/spack/repos/builtin/packages/rename/package.py b/var/spack/repos/builtin/packages/rename/package.py
index 64ef5fce66..3538fd21cc 100644
--- a/var/spack/repos/builtin/packages/rename/package.py
+++ b/var/spack/repos/builtin/packages/rename/package.py
@@ -33,7 +33,7 @@ class Rename(Package):
 
     version('1.600', '91beb555c93d407420b5dad191069bb3')
 
-    depends_on('perl', type='nolink')
+    depends_on('perl', type=('build', 'run'))
 
     def install(self, spec, prefix):
         Executable('pod2man')('rename', 'rename.1')
diff --git a/var/spack/repos/builtin/packages/stat/package.py b/var/spack/repos/builtin/packages/stat/package.py
index eae4971ace..c511fcee70 100644
--- a/var/spack/repos/builtin/packages/stat/package.py
+++ b/var/spack/repos/builtin/packages/stat/package.py
@@ -50,7 +50,7 @@ class Stat(Package):
     depends_on('dyninst@8.2.1+stat_dysect', when='+dysect')
     depends_on('graphlib@2.0.0', when='@2.0.0:2.2.0')
     depends_on('graphlib@3.0.0', when='@3:')
-    depends_on('graphviz', type=alldeps)
+    depends_on('graphviz', type=('build', 'link', 'run'))
     depends_on('launchmon')
     depends_on('mrnet')
     depends_on('python')