From 54915ecf0dc54af6a21cd3fde9fef3152fd8871b Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Tue, 27 Sep 2016 17:46:06 +0200 Subject: r-modules: Fix h5 and rhdf5 and some packages that depend on them. --- pkgs/development/r-modules/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 99120a13cd05..4f5d27002fd0 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -266,6 +266,8 @@ let gmp = [ pkgs.gmp ]; graphscan = [ pkgs.gsl_1 ]; gsl = [ pkgs.gsl_1 ]; + h5 = [ pkgs.hdf5-cpp pkgs.which ]; + h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl_1 ]; iBMQ = [ pkgs.gsl_1 ]; igraph = [ pkgs.gmp ]; @@ -308,6 +310,7 @@ let rgl = [ pkgs.mesa pkgs.xlibsWrapper ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2 ]; + rhdf5 = [ pkgs.zlib ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; Rhtslib = [ pkgs.zlib ]; RJaCGH = [ pkgs.zlib ]; @@ -367,12 +370,12 @@ let bamsignals = [ pkgs.zlib ]; BitSeq = [ pkgs.zlib ]; DiffBind = [ pkgs.zlib ]; - ShortRead = [ pkgs.zlib ]; + ShortRead = [ pkgs.zlib.dev ]; oligo = [ pkgs.zlib ]; gmapR = [ pkgs.zlib ]; Rsubread = [ pkgs.zlib ]; - XVector = [ pkgs.zlib ]; - Rsamtools = [ pkgs.zlib ]; + XVector = [ pkgs.zlib.dev ]; + Rsamtools = [ pkgs.zlib.dev ]; rtracklayer = [ pkgs.zlib ]; affyio = [ pkgs.zlib ]; VariantAnnotation = [ pkgs.zlib ]; @@ -390,7 +393,7 @@ let qtpaint = [ pkgs.cmake ]; qtbase = [ pkgs.cmake pkgs.perl ]; gmatrix = [ pkgs.cudatoolkit ]; - RCurl = [ pkgs.curl ]; + RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkgconfig ]; rggobi = [ pkgs.pkgconfig ]; RGtk2 = [ pkgs.pkgconfig ]; @@ -1142,7 +1145,6 @@ let "proteoQC" # depends on broken package rTANDEM "PGA" # depends on broken package rTANDEM "MBESS" # depends on broken package OpenMx - "IONiseR" # depends on broken package rhdf5 "DOQTL" # depends on broken package rhdf5 "DmelSGI" # depends on broken package rhdf5 "flowDiv" # depends on broken package ncdfFlow @@ -1356,7 +1358,6 @@ let "gcmr" # depends on broken package nlopt "GDAtools" # depends on broken package nlopt "gdtools" # broken build - "GENE_E" # depends on broken package rhdf5 "GENESIS" # broken build "genridge" # depends on broken package nlopt "geojsonio" # depends on broken package V8 @@ -1379,8 +1380,6 @@ let "GUIDE" # depends on broken package rpanel "GWAF" # depends on broken package nlopt "GWASTools" # broken build - "h5" # build is broken - "h5vc" # depends on broken package rhdf5 "hbsae" # depends on broken package nlopt "heplots" # depends on broken package nlopt "HiDimMaxStable" # broken build @@ -1407,7 +1406,6 @@ let "inSilicoMerging" # build is broken "INSPEcT" # depends on broken GenomicFeatures "interplot" # depends on broken arm - "IONiseR" # depends on broken rhdf5 "IsingFit" # depends on broken package nlopt "ITEMAN" # depends on broken package car "iteRates" # broken build @@ -1645,7 +1643,6 @@ let "REST" # depends on broken package nlopt "rgbif" # depends on broken package V8 "Rgnuplot" # broken build - "rhdf5" # build is broken "rjade" # depends on broken package V8 "rJPSGCS" # build is broken "rLindo" # build is broken -- cgit 1.4.1 From cf3a2e99ada02dff808a083da0467eff07d49136 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Tue, 27 Sep 2016 17:47:16 +0200 Subject: r-modules: edgeR is broken due to broken url --- pkgs/development/r-modules/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 4f5d27002fd0..5c05973095fd 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1294,7 +1294,7 @@ let "DEGraph" # depends on broken package RCytoscape "destiny" # depends on broken package VIM "DiagTest3Grp" # depends on broken package nlopt - "diffHic" # depends on broken package rhdf5 + "diffHic" # depends on broken package edgeR "difR" # depends on broken package nlopt "DirichletMultinomial" # Build Is Broken "DistatisR" # depends on broken package nlopt @@ -1309,6 +1309,7 @@ let "easyanova" # depends on broken package nlopt "ecd" # depends on broken package polynom "edge" # depends on broken package nlopt + "edgeR" # broken url "eeptools" # depends on broken package nlopt "EffectLiteR" # depends on broken package nlopt "effects" # depends on broken package nlopt -- cgit 1.4.1