diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 1669162c5295..d1309024613e 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -513,6 +513,9 @@ let Rbowtie = with pkgs; [ zlib.dev ]; gaston = with pkgs; [ zlib.dev ]; csaw = with pkgs; [ zlib.dev curl ]; + DirichletMultinomial = with pkgs; [ gsl ]; + DiffBind = with pkgs; [ zlib.dev ]; + CNEr = with pkgs; [ zlib ]; }; packagesRequiringX = [ @@ -882,10 +885,6 @@ let PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack"; }); - EMCluster = old.EMCluster.overrideDerivation (attrs: { - patches = [ ./patches/EMCluster.patch ]; - }); - spMC = old.spMC.overrideDerivation (attrs: { patches = [ ./patches/spMC.patch ]; }); diff --git a/pkgs/development/r-modules/patches/EMCluster.patch b/pkgs/development/r-modules/patches/EMCluster.patch deleted file mode 100644 index afc9de3a95a9..000000000000 --- a/pkgs/development/r-modules/patches/EMCluster.patch +++ /dev/null @@ -1,6 +0,0 @@ -diff -ru -x '*~' EMCluster_orig/src/Makevars EMCluster/src/Makevars ---- EMCluster_orig/src/Makevars 2013-07-05 02:43:25.000000000 +0900 -+++ EMCluster/src/Makevars 2014-10-25 18:10:19.190992120 +0900 -@@ -1 +1 @@ --PKG_LIBS = $(FLIBS) $(BLAS_LIBS) $(LAPACK_LIBS) -+PKG_LIBS = $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)