summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/r-rjava/package.py2
-rw-r--r--var/spack/repos/builtin/packages/r-rmysql/package.py2
-rw-r--r--var/spack/repos/builtin/packages/r-rodbc/package.py2
-rw-r--r--var/spack/repos/builtin/packages/r-rpostgresql/package.py2
-rw-r--r--var/spack/repos/builtin/packages/r-rsqlite/package.py2
-rw-r--r--var/spack/repos/builtin/packages/r-xlconnect/package.py7
-rw-r--r--var/spack/repos/builtin/packages/r-xlconnectjars/package.py5
-rw-r--r--var/spack/repos/builtin/packages/r-xlsx/package.py2
-rw-r--r--var/spack/repos/builtin/packages/r-xlsxjars/package.py2
9 files changed, 15 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/r-rjava/package.py b/var/spack/repos/builtin/packages/r-rjava/package.py
index 0ce0942602..47804bd7fc 100644
--- a/var/spack/repos/builtin/packages/r-rjava/package.py
+++ b/var/spack/repos/builtin/packages/r-rjava/package.py
@@ -37,6 +37,8 @@ class RRjava(Package):
extends('R')
+ depends_on('jdk')
+
def install(self, spec, prefix):
R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir),
self.stage.source_path)
diff --git a/var/spack/repos/builtin/packages/r-rmysql/package.py b/var/spack/repos/builtin/packages/r-rmysql/package.py
index 774c166f8b..086374df07 100644
--- a/var/spack/repos/builtin/packages/r-rmysql/package.py
+++ b/var/spack/repos/builtin/packages/r-rmysql/package.py
@@ -36,7 +36,7 @@ class RRmysql(Package):
extends('R')
- depends_on('r-DBI')
+ depends_on('r-dbi')
depends_on('mariadb')
def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/r-rodbc/package.py b/var/spack/repos/builtin/packages/r-rodbc/package.py
index 9cc9aebd9a..11fe0ace56 100644
--- a/var/spack/repos/builtin/packages/r-rodbc/package.py
+++ b/var/spack/repos/builtin/packages/r-rodbc/package.py
@@ -36,7 +36,7 @@ class RRodbc(Package):
extends('R')
- depends_on('unixODBC')
+ depends_on('unixodbc')
def install(self, spec, prefix):
R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir),
diff --git a/var/spack/repos/builtin/packages/r-rpostgresql/package.py b/var/spack/repos/builtin/packages/r-rpostgresql/package.py
index 83c9b85525..53e1978ffe 100644
--- a/var/spack/repos/builtin/packages/r-rpostgresql/package.py
+++ b/var/spack/repos/builtin/packages/r-rpostgresql/package.py
@@ -44,7 +44,7 @@ class RRpostgresql(Package):
extends('R')
- depends_on('r-DBI')
+ depends_on('r-dbi')
depends_on('postgresql')
def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/r-rsqlite/package.py b/var/spack/repos/builtin/packages/r-rsqlite/package.py
index 9602f6d927..7c03ab8950 100644
--- a/var/spack/repos/builtin/packages/r-rsqlite/package.py
+++ b/var/spack/repos/builtin/packages/r-rsqlite/package.py
@@ -38,7 +38,7 @@ class RRsqlite(Package):
extends('R')
- depends_on('r-DBI')
+ depends_on('r-dbi')
def install(self, spec, prefix):
R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir),
diff --git a/var/spack/repos/builtin/packages/r-xlconnect/package.py b/var/spack/repos/builtin/packages/r-xlconnect/package.py
index 919291a023..4ee7163be1 100644
--- a/var/spack/repos/builtin/packages/r-xlconnect/package.py
+++ b/var/spack/repos/builtin/packages/r-xlconnect/package.py
@@ -33,12 +33,13 @@ class RXlconnect(Package):
url = "https://cran.r-project.org/src/contrib/XLConnect_0.2-11.tar.gz"
list_url = "https://cran.r-project.org/src/contrib/Archive/XLConnect"
- version('0.2-11', '9d1769a103cda05665df399cc335017d')
+ version('0.2-11', '9d1769a103cda05665df399cc335017d',
+ url='https://cran.r-project.org/src/contrib/Archive/XLConnect/XLConnect_0.2-11.tar.gz')
extends('R')
- depends_on('r-XLConnectJars')
- depends_on('r-rJava')
+ depends_on('r-xlconnectjars')
+ depends_on('r-rjava')
def install(self, spec, prefix):
R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir),
diff --git a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py
index 15d08cc5af..c1fb365883 100644
--- a/var/spack/repos/builtin/packages/r-xlconnectjars/package.py
+++ b/var/spack/repos/builtin/packages/r-xlconnectjars/package.py
@@ -32,11 +32,12 @@ class RXlconnectjars(Package):
url = "https://cran.r-project.org/src/contrib/XLConnectJars_0.2-9.tar.gz"
list_url = "https://cran.r-project.org/src/contrib/Archive/XLConnectJars"
- version('0.2-9', 'e6d6b1acfede26acaa616ee421bd30fb')
+ version('0.2-9', 'e6d6b1acfede26acaa616ee421bd30fb',
+ url='https://cran.r-project.org/src/contrib/Archive/XLConnectJars/XLConnectJars_0.2-9.tar.gz')
extends('R')
- depends_on('r-rJava')
+ depends_on('r-rjava')
def install(self, spec, prefix):
R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir),
diff --git a/var/spack/repos/builtin/packages/r-xlsx/package.py b/var/spack/repos/builtin/packages/r-xlsx/package.py
index 0aac6cdd1f..99d41dbb94 100644
--- a/var/spack/repos/builtin/packages/r-xlsx/package.py
+++ b/var/spack/repos/builtin/packages/r-xlsx/package.py
@@ -37,7 +37,7 @@ class RXlsx(Package):
extends('R')
- depends_on('r-rJava')
+ depends_on('r-rjava')
depends_on('r-xlsxjars')
def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/r-xlsxjars/package.py b/var/spack/repos/builtin/packages/r-xlsxjars/package.py
index cff6e7427e..80e86d0c73 100644
--- a/var/spack/repos/builtin/packages/r-xlsxjars/package.py
+++ b/var/spack/repos/builtin/packages/r-xlsxjars/package.py
@@ -37,7 +37,7 @@ class RXlsxjars(Package):
extends('R')
- depends_on('r-rJava')
+ depends_on('r-rjava')
def install(self, spec, prefix):
R('CMD', 'INSTALL', '--library={0}'.format(self.module.r_lib_dir),