Merge pull request #7820 from michelk/r-modules/update

r-modules: regenerate cran packages (2015-05-11T14:48:00+0100)
This commit is contained in:
Peter Simons 2015-05-12 11:59:38 +02:00
commit 8310a8169f
2 changed files with 475 additions and 374 deletions

File diff suppressed because it is too large Load Diff

View File

@ -224,7 +224,7 @@ let
fftwtools = [ pkgs.fftw ]; fftwtools = [ pkgs.fftw ];
Formula = [ pkgs.gmp ]; Formula = [ pkgs.gmp ];
geoCount = [ pkgs.gsl ]; geoCount = [ pkgs.gsl ];
git2r = [ pkgs.zlib ]; git2r = [ pkgs.zlib pkgs.openssl ];
glpkAPI = [ pkgs.gmp pkgs.glpk ]; glpkAPI = [ pkgs.gmp pkgs.glpk ];
gmp = [ pkgs.gmp ]; gmp = [ pkgs.gmp ];
graphscan = [ pkgs.gsl ]; graphscan = [ pkgs.gsl ];
@ -888,7 +888,6 @@ let
"RVideoPoker" # requires Rpanel "RVideoPoker" # requires Rpanel
"rysgran" # requires soiltexture "rysgran" # requires soiltexture
"samr" # requires impute "samr" # requires impute
"saps" # requires piano, and survcomp
"SDD" # requires rpanel "SDD" # requires rpanel
"seeg" # requires spatstat "seeg" # requires spatstat
"selectspm" # depends on broken ecespa "selectspm" # depends on broken ecespa