From 1f0317cd5b64510aec2fa2e9e49d3333efdd5227 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 26 Oct 2021 09:31:32 +1100 Subject: [PATCH] rPackages.BayesXsrc: fix build --- pkgs/development/r-modules/default.nix | 6 +- .../r-modules/patches/BayesXsrc.patch | 55 ------------------- 2 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 pkgs/development/r-modules/patches/BayesXsrc.patch diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 84522fc59f81..1760d1294991 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -278,7 +278,7 @@ let audio = [ pkgs.portaudio ]; BayesSAE = [ pkgs.gsl ]; BayesVarSel = [ pkgs.gsl ]; - BayesXsrc = with pkgs; [ readline.dev ncurses ]; + BayesXsrc = with pkgs; [ readline.dev ncurses gsl ]; bigGP = [ pkgs.mpi ]; bio3d = [ pkgs.zlib ]; BiocCheck = [ pkgs.which ]; @@ -875,10 +875,6 @@ let patchPhase = "patchShebangs configure"; }); - BayesXsrc = old.BayesXsrc.overrideDerivation (attrs: { - patches = [ ./patches/BayesXsrc.patch ]; - }); - Rhdf5lib = old.Rhdf5lib.overrideDerivation (attrs: { patches = [ ./patches/Rhdf5lib.patch ]; }); diff --git a/pkgs/development/r-modules/patches/BayesXsrc.patch b/pkgs/development/r-modules/patches/BayesXsrc.patch deleted file mode 100644 index b357d7f83fcc..000000000000 --- a/pkgs/development/r-modules/patches/BayesXsrc.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -ru -x '*~' BayesXsrc_org/MD5 BayesXsrc/MD5 ---- BayesXsrc_org/MD5 2013-11-22 21:59:01.000000000 +0900 -+++ BayesXsrc/MD5 2014-10-14 22:50:46.040754675 +0900 -@@ -4,7 +4,7 @@ - cba21fc7e2d39608d0241d8cedc4fd43 *R/run.bayesx.R - 112cb3aff0f8f0cd60bb146b14df1fcf *inst/CITATION - cf04425475f03ee67c06efcebbd8d476 *man/run.bayesx.Rd --1f73de4dba1228cdaa8d5435d1c1656b *src/Makefile -+658152ec0b336198a2654385bb27666d *src/Makefile - 2971212d003d1d647110264fb471e63b *src/Makefile.win - e0fd1515e0d2f8553d4034c3f7544fc5 *src/bayesxsrc/adaptiv/fullcond_adaptiv.cpp - 08cd954d541c3c0d635bbbd61cd05d15 *src/bayesxsrc/adaptiv/fullcond_adaptiv.h -@@ -320,7 +320,7 @@ - 465ac930657299f89a0a164232dc15d2 *src/dev-Makefile - d9aafe726622cd8c46bab760fef0d813 *src/dev-Makefile.win - 50413e579bc999d49037293a612190c0 *src/install.libs.R --1f73de4dba1228cdaa8d5435d1c1656b *src/rel-Makefile -+658152ec0b336198a2654385bb27666d *src/rel-Makefile - 2971212d003d1d647110264fb471e63b *src/rel-Makefile.win - 4d675785837670b6a9b2b3405812a910 *tests/data.raw - 1d3777462fcefa39559aa645305a65f2 *tests/mcmc.R -diff -ru -x '*~' BayesXsrc_org/src/Makefile BayesXsrc/src/Makefile ---- BayesXsrc_org/src/Makefile 2013-11-22 21:49:16.000000000 +0900 -+++ BayesXsrc/src/Makefile 2014-10-14 22:47:15.458766001 +0900 -@@ -137,11 +137,11 @@ - ${PSPLINES_OBJS}\ - ${STRUCTADD_OBJS}\ - bayesxsrc/main.o\ -- bayesxsrc/samson/multgaussian.o\ -+ bayesxsrc/samson/multgaussian.o\ - bayesxsrc/adaptiv/fullcond_adaptiv.o\ - bayesxsrc/alex/mixture.o - --LDFLAGS += -L${R_HOME}/lib -lreadline -lcurses -+LDFLAGS += -L${R_HOME}/lib -lreadline -lncurses - CPPFLAGS += -Ibayesxsrc/. -I"bayesxsrc/bib" -I"bayesxsrc/alex" -I"bayesxsrc/adaptiv" -I"bayesxsrc/andrea" -I"bayesxsrc/dag" -I"bayesxsrc/graph" -I"bayesxsrc/mcmc" -I"bayesxsrc/psplines" -I"bayesxsrc/samson" -I"bayesxsrc/leyre" -I"bayesxsrc/structadd" - CPPFLAGS += -D__BUILDING_GNU -D__BUILDING_LINUX -DTEMPL_INCL_DEF -D_MSC_VER2 -DNO_TEMPLATE_FRIENDS -DINCLUDE_REML -DINCLUDE_MCMC - # CXXFLAGS += -O3 -ansi -diff -ru -x '*~' BayesXsrc_org/src/rel-Makefile BayesXsrc/src/rel-Makefile ---- BayesXsrc_org/src/rel-Makefile 2013-10-08 21:28:09.000000000 +0900 -+++ BayesXsrc/src/rel-Makefile 2014-10-14 22:47:04.601766431 +0900 -@@ -137,11 +137,11 @@ - ${PSPLINES_OBJS}\ - ${STRUCTADD_OBJS}\ - bayesxsrc/main.o\ -- bayesxsrc/samson/multgaussian.o\ -+ bayesxsrc/samson/multgaussian.o\ - bayesxsrc/adaptiv/fullcond_adaptiv.o\ - bayesxsrc/alex/mixture.o - --LDFLAGS += -L${R_HOME}/lib -lreadline -lcurses -+LDFLAGS += -L${R_HOME}/lib -lreadline -lncurses - CPPFLAGS += -Ibayesxsrc/. -I"bayesxsrc/bib" -I"bayesxsrc/alex" -I"bayesxsrc/adaptiv" -I"bayesxsrc/andrea" -I"bayesxsrc/dag" -I"bayesxsrc/graph" -I"bayesxsrc/mcmc" -I"bayesxsrc/psplines" -I"bayesxsrc/samson" -I"bayesxsrc/leyre" -I"bayesxsrc/structadd" - CPPFLAGS += -D__BUILDING_GNU -D__BUILDING_LINUX -DTEMPL_INCL_DEF -D_MSC_VER2 -DNO_TEMPLATE_FRIENDS -DINCLUDE_REML -DINCLUDE_MCMC - # CXXFLAGS += -O3 -ansi