pyrox.dev
lol
rPackages.BayesXsrc: fix build
+1
-5
pkgs/development/r-modules/default.nix
+1
-5
pkgs/development/r-modules/default.nix
···
278
278
audio = [ pkgs.portaudio ];
279
279
BayesSAE = [ pkgs.gsl ];
280
280
BayesVarSel = [ pkgs.gsl ];
281
-
BayesXsrc = with pkgs; [ readline.dev ncurses ];
281
+
BayesXsrc = with pkgs; [ readline.dev ncurses gsl ];
282
282
bigGP = [ pkgs.mpi ];
283
283
bio3d = [ pkgs.zlib ];
284
284
BiocCheck = [ pkgs.which ];
···
873
873
874
874
rpf = old.rpf.overrideDerivation (attrs: {
875
875
patchPhase = "patchShebangs configure";
876
-
});
877
-
878
-
BayesXsrc = old.BayesXsrc.overrideDerivation (attrs: {
879
-
patches = [ ./patches/BayesXsrc.patch ];
880
876
});
881
877
882
878
Rhdf5lib = old.Rhdf5lib.overrideDerivation (attrs: {
-55
pkgs/development/r-modules/patches/BayesXsrc.patch
-55
pkgs/development/r-modules/patches/BayesXsrc.patch
···
1
-
diff -ru -x '*~' BayesXsrc_org/MD5 BayesXsrc/MD5
2
-
--- BayesXsrc_org/MD5 2013-11-22 21:59:01.000000000 +0900
3
-
+++ BayesXsrc/MD5 2014-10-14 22:50:46.040754675 +0900
4
-
@@ -4,7 +4,7 @@
5
-
cba21fc7e2d39608d0241d8cedc4fd43 *R/run.bayesx.R
6
-
112cb3aff0f8f0cd60bb146b14df1fcf *inst/CITATION
7
-
cf04425475f03ee67c06efcebbd8d476 *man/run.bayesx.Rd
8
-
-1f73de4dba1228cdaa8d5435d1c1656b *src/Makefile
9
-
+658152ec0b336198a2654385bb27666d *src/Makefile
10
-
2971212d003d1d647110264fb471e63b *src/Makefile.win
11
-
e0fd1515e0d2f8553d4034c3f7544fc5 *src/bayesxsrc/adaptiv/fullcond_adaptiv.cpp
12
-
08cd954d541c3c0d635bbbd61cd05d15 *src/bayesxsrc/adaptiv/fullcond_adaptiv.h
13
-
@@ -320,7 +320,7 @@
14
-
465ac930657299f89a0a164232dc15d2 *src/dev-Makefile
15
-
d9aafe726622cd8c46bab760fef0d813 *src/dev-Makefile.win
16
-
50413e579bc999d49037293a612190c0 *src/install.libs.R
17
-
-1f73de4dba1228cdaa8d5435d1c1656b *src/rel-Makefile
18
-
+658152ec0b336198a2654385bb27666d *src/rel-Makefile
19
-
2971212d003d1d647110264fb471e63b *src/rel-Makefile.win
20
-
4d675785837670b6a9b2b3405812a910 *tests/data.raw
21
-
1d3777462fcefa39559aa645305a65f2 *tests/mcmc.R
22
-
diff -ru -x '*~' BayesXsrc_org/src/Makefile BayesXsrc/src/Makefile
23
-
--- BayesXsrc_org/src/Makefile 2013-11-22 21:49:16.000000000 +0900
24
-
+++ BayesXsrc/src/Makefile 2014-10-14 22:47:15.458766001 +0900
25
-
@@ -137,11 +137,11 @@
26
-
${PSPLINES_OBJS}\
27
-
${STRUCTADD_OBJS}\
28
-
bayesxsrc/main.o\
29
-
- bayesxsrc/samson/multgaussian.o\
30
-
+ bayesxsrc/samson/multgaussian.o\
31
-
bayesxsrc/adaptiv/fullcond_adaptiv.o\
32
-
bayesxsrc/alex/mixture.o
33
-
34
-
-LDFLAGS += -L${R_HOME}/lib -lreadline -lcurses
35
-
+LDFLAGS += -L${R_HOME}/lib -lreadline -lncurses
36
-
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"
37
-
CPPFLAGS += -D__BUILDING_GNU -D__BUILDING_LINUX -DTEMPL_INCL_DEF -D_MSC_VER2 -DNO_TEMPLATE_FRIENDS -DINCLUDE_REML -DINCLUDE_MCMC
38
-
# CXXFLAGS += -O3 -ansi
39
-
diff -ru -x '*~' BayesXsrc_org/src/rel-Makefile BayesXsrc/src/rel-Makefile
40
-
--- BayesXsrc_org/src/rel-Makefile 2013-10-08 21:28:09.000000000 +0900
41
-
+++ BayesXsrc/src/rel-Makefile 2014-10-14 22:47:04.601766431 +0900
42
-
@@ -137,11 +137,11 @@
43
-
${PSPLINES_OBJS}\
44
-
${STRUCTADD_OBJS}\
45
-
bayesxsrc/main.o\
46
-
- bayesxsrc/samson/multgaussian.o\
47
-
+ bayesxsrc/samson/multgaussian.o\
48
-
bayesxsrc/adaptiv/fullcond_adaptiv.o\
49
-
bayesxsrc/alex/mixture.o
50
-
51
-
-LDFLAGS += -L${R_HOME}/lib -lreadline -lcurses
52
-
+LDFLAGS += -L${R_HOME}/lib -lreadline -lncurses
53
-
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"
54
-
CPPFLAGS += -D__BUILDING_GNU -D__BUILDING_LINUX -DTEMPL_INCL_DEF -D_MSC_VER2 -DNO_TEMPLATE_FRIENDS -DINCLUDE_REML -DINCLUDE_MCMC
55
-
# CXXFLAGS += -O3 -ansi