Commit 5479045d authored by Valentin Reis's avatar Valentin Reis
Browse files

various application build fixes

parent e3bda823
Pipeline #5973 failed with stages
in 3 minutes and 48 seconds
......@@ -2,8 +2,8 @@
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "182582ddd924a0e06d906952e4632c25324a1120",
"sha256": "16166g7ndlhvy96wg3rr5cf9h7f8lxdpi2xyyrrsls701wiizd09",
"rev": "ac78118f79234a7c3e9fa14738a1168d6d5acb02",
"sha256": "01gjjjfnn4vm6yvlphbsi2yda3yiwx75p0vl5h7gpibyv1s1x4gg",
"url": "https://xgitlab.cels.anl.gov/argo/applications/amg.git"
},
"fn": "fetchgit"
......
......@@ -198,7 +198,7 @@ let
name = "testEnv-with-applications";
buildInputs = old.buildInputs ++ [
lammps
#qmcpack
qmcpack
openmc
stream
amg
......@@ -234,18 +234,28 @@ let
unpackPhase = "true";
buildInputs = [
pkgs.pandoc
(pkgs.rWrapper.override{ packages = with pkgs.rPackages; [
pkgs.rlwrap
pkgs.pandoc
docopt
pracma
tidyr
readr
magrittr
formatR
purrr
wrapr
knitr
cowplot
plotly
lubridate
dplyr
ggplot2
fpp2
prospectr
gridExtra
zoo
xtable
ggthemes
data_table
......@@ -253,6 +263,12 @@ let
];
};
hanalysis = analysis.overrideAttrs (old:{
buildInputs = old.buildInputs ++ [
(haskellPackages.ghcWithPackages(p:[p.inline-r]))
];
});
report = analysis.overrideAttrs (old:{
buildPhase = ''
echo "analysis/zymakefolder.R ${powerexpe}"
......
......@@ -40,4 +40,6 @@ stdenv.mkDerivation {
mkdir -p $out
cp -r * $out
'';
LIBXML2_HOME="${libxml2}/lib";
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment