diff options
Diffstat (limited to 'pkgs/development/r-modules/default.nix')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index ad214d63f7b4..746e6eefe53e 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -44,6 +44,7 @@ let deriveBioc = mkDerive { mkHomepage = {name, biocVersion, ...}: "https://bioconductor.org/packages/${biocVersion}/bioc/html/${name}.html"; mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/bioc/src/contrib/${name}_${version}.tar.gz" + "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}/${name}_${version}.tar.gz" "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}_${version}.tar.gz" ]; }; deriveBiocAnn = mkDerive { @@ -283,7 +284,6 @@ let odbc = [ pkgs.unixODBC ]; pander = [ pkgs.pandoc pkgs.which ]; pbdMPI = [ pkgs.openmpi ]; - pbdNCDF4 = [ pkgs.netcdf ]; pbdPROF = [ pkgs.openmpi ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ]; pdftools = [ pkgs.poppler.dev ]; @@ -330,7 +330,8 @@ let rtiff = [ pkgs.libtiff.dev ]; runjags = [ pkgs.jags ]; RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; - rzmq = [ pkgs.zeromq ]; + rzmq = [ pkgs.zeromq pkgs.pkgconfig ]; + clustermq = [ pkgs.zeromq ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; sdcTable = [ pkgs.gmp pkgs.glpk ]; seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; @@ -380,10 +381,12 @@ let rmutil = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; robustbase = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; SparseM = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; + hexbin = lib.optionals stdenv.isDarwin [ pkgs.libiconv ]; svKomodo = [ pkgs.which ]; nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; + clustermq = [ pkgs.pkgconfig ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; RcppEigen = [ pkgs.libiconv ]; @@ -483,7 +486,6 @@ let "Demerelate" "detrendeR" "dgmb" - "DivMelt" "dpa" "DSpat" "dynamicGraph" @@ -503,14 +505,12 @@ let "forensim" "FreeSortR" "fscaret" - "fSRM" "gcmr" "geomorph" "geoR" "georob" "GGEBiplotGUI" "gnm" - "GPCSIV" "GrapheR" "GroupSeq" "gsubfn" @@ -585,7 +585,6 @@ let "RcmdrPlugin_orloca" "RcmdrPlugin_plotByGroup" "RcmdrPlugin_pointG" - "RcmdrPlugin_qual" "RcmdrPlugin_ROC" "RcmdrPlugin_sampling" "RcmdrPlugin_SCDA" @@ -611,7 +610,6 @@ let "soundecology" "spatsurv" "sqldf" - "SRRS" "SSDforR" "statcheck" "StatDA" @@ -628,8 +626,6 @@ let "tcltk2" "TestScorer" "TIMP" - "titan" - "tkrgl" "tkrplot" "tmap" "tspmeta" @@ -675,6 +671,14 @@ let ''; }); + rzmq = old.rzmq.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + + clustermq = old.clustermq.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + Cairo = old.Cairo.overrideDerivation (attrs: { NIX_LDFLAGS = "-lfontconfig"; }); @@ -703,7 +707,6 @@ let data_table = old.data_table.overrideDerivation (attrs: { NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + " -fopenmp"; patchPhase = "patchShebangs configure"; - postInstall = "mv $out/library/data.table/libs/{data.table,datatable}.so"; }); ModelMetrics = old.ModelMetrics.overrideDerivation (attrs: { |