r-modules: fix evaluation and minor cleanups

1 files changed, 2 insertions, 24 deletions

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index f3634afb0455..28671fd847f0 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -221,7 +221,6 @@ let
     libamtrack = [ pkgs.gsl ];
     mixcat = [ pkgs.gsl ];
     outbreaker = [ pkgs.gsl ];
-    #pcaPA = [ pkgs.gsl ];
     ridge = [ pkgs.gsl ];
     simplexreg = [ pkgs.gsl ];
     stsm = [ pkgs.gsl ];
@@ -283,10 +282,6 @@ let
     PopGenome = [ pkgs.zlib ];
     RJaCGH = [ pkgs.zlib ];
     RcppCNPy = [ pkgs.zlib ];
-    #Rniftilib = [ pkgs.zlib ];
-    #WhopGenome = [ pkgs.zlib ];
-    #devEMF = [ pkgs.zlib ];
-    #gdsfmt = [ pkgs.zlib ];
     rbamtools = [ pkgs.zlib ];
     rmatio = [ pkgs.zlib ];
     RVowpalWabbit = [ pkgs.zlib pkgs.boost ];
@@ -311,7 +306,6 @@ let
     gmatrix = [ pkgs.cudatoolkit ];
     WideLM = [ pkgs.cudatoolkit ];
     RCurl = [ pkgs.curl ];
-    #Rgnuplot = [ pkgs.gnuplot ];
     R2SWF = [ pkgs.pkgconfig ];
     RGtk2 = [ pkgs.pkgconfig ];
     RProtoBuf = [ pkgs.pkgconfig ];
@@ -393,7 +387,6 @@ let
     "LS2Wstat"
     "MAR1"
     "MTurkR"
-    #"MVPARTwrap"
     "MareyMap"
     "MergeGUI"
     "Meth27QC"
@@ -405,8 +398,6 @@ let
     "PBSadmb"
     "PBSmodelling"
     "PCPS"
-    #"PKmodelFinder"
-    #"PoMoS"
     "PopGenReport"
     "PredictABEL"
     "PrevMap"
@@ -432,7 +423,6 @@ let
     "RcmdrPlugin_KMggplot2"
     "RcmdrPlugin_MA"
     "RcmdrPlugin_MPAStats"
-    #"RcmdrPlugin_NMBU"
     "RcmdrPlugin_ROC"
     "RcmdrPlugin_SCDA"
     "RcmdrPlugin_SLC"
@@ -474,7 +464,6 @@ let
     "TestScorer"
     "VIMGUI"
     "VecStatGraphs3D"
-    #"VisuClust"
     "WMCapacity"
     "accrual"
     "ade4TkGUI"
@@ -622,6 +611,8 @@ let
 
   # Packages which cannot be installed due to lack of dependencies or other reasons.
   brokenPackages = [            # sort -t '#' -k 2
+    "metabolomics" # depends on broken crmn
+    "retistruct" # depends on broken RImageJROI
     "CARrampsOcl" # depends on OpenCL
     "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED!
     "alm" # jsonlite.so: undefined symbol: XXX
@@ -644,7 +635,6 @@ let
     "rmongodb" # jsonlite.so: undefined symbol: XXX
     "rnoaa" # jsonlite.so: undefined symbol: XXX
     "RSiteCatalyst" # jsonlite.so: undefined symbol: XXX
-    #"RSocrata" # jsonlite.so: undefined symbol: XXX
     "rsunlight" # jsonlite.so: undefined symbol: XXX
     "rWBclimate" # jsonlite.so: undefined symbol: XXX
     "SGP" # jsonlite.so: undefined symbol: XXX
@@ -722,7 +712,6 @@ let
     "gRapHD" # requires graph
     "msSurv" # requires graph
     "PairViz" # requires graph
-    #"ddepn" # requires graph, and genefilter
     "iRefR" # requires graph, and RBGL
     "pcalg" # requires graph, and RBGL
     "protiq" # requires graph, and RBGL
@@ -765,7 +754,6 @@ let
     "metaMA" # requires limma
     "plmDE" # requires limma
     "SQDA" # requires limma
-    #"RPPanalyzer" # requires limma, and Biobase
     "PerfMeas" # requires limma, graph, and RBGL
     "rLindo" # requires LINDO API
     "magma" # requires MAGMA
@@ -802,7 +790,6 @@ let
     "crmn" # requires pcaMethods, and Biobase
     "imputeLCMD" # requires pcaMethods, and impute
     "MEET" # requires pcaMethods, and seqLogo
-    #"SigTree" # requires phyloseq
     "saps" # requires piano, and survcomp
     "smart" # requires PMA
     "surveillance" # requires polyCub
@@ -823,7 +810,6 @@ let
     "PKgraph" # requires rggobi
     "SeqGrapheR" # requires rggobi
     "branchLars" # requires Rgraphviz
-    #"gcExplorer" # requires Rgraphviz
     "hasseDiagram" # requires Rgraphviz
     "hpoPlot" # requires Rgraphviz
     "strum" # requires Rgraphviz
@@ -891,7 +877,6 @@ let
     "rsig" # requires survcomp
     "leapp" # requires sva
     "ttScreening" # requires sva, and limma
-    #"ENA" # requires WGCNA
     "GOGANPA" # requires WGCNA
     "nettools" # requires WGCNA
     "rneos" # requires XMLRPC
@@ -1067,13 +1052,6 @@ let
     qtpaint = old.qtpaint.override { hydraPlatforms = stdenv.lib.platforms.none; };
     bamboo = old.bamboo.override { hydraPlatforms = stdenv.lib.platforms.none; };
 
-    # Obsolete package that I keep around temporarily because some
-    # existing code depends on it.
-    Defaults = derive {
-      name="Defaults";
-      version="1.1-1";
-      sha256="0ikgd5mswlky327pzp09cz93bn3mq7qnybq1r64y19c2brbax00d";
-    };
   };
 in
   self