Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
argo
argopkgs
Commits
5479045d
Commit
5479045d
authored
Mar 12, 2019
by
Valentin Reis
Browse files
various application build fixes
parent
e3bda823
Pipeline
#5973
failed with stages
in 3 minutes and 48 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
pkgs/amg/pin.json
View file @
5479045d
...
...
@@ -2,8 +2,8 @@
"fetch"
:
{
"args"
:
{
"fetchSubmodules"
:
false
,
"rev"
:
"
182582ddd
924a
0e06d906952e4632c25324a1120
"
,
"sha256"
:
"
16166g7ndlhvy96wg3rr5cf9h7f8lxdpi2xyyrrsls701wiizd09
"
,
"rev"
:
"
ac78118f7
92
3
4a
7c3e9fa14738a1168d6d5acb02
"
,
"sha256"
:
"
01gjjjfnn4vm6yvlphbsi2yda3yiwx75p0vl5h7gpibyv1s1x4gg
"
,
"url"
:
"https://xgitlab.cels.anl.gov/argo/applications/amg.git"
},
"fn"
:
"fetchgit"
...
...
pkgs/default.nix
View file @
5479045d
...
...
@@ -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
}
"
...
...
pkgs/qmcpack/default.nix
View file @
5479045d
...
...
@@ -40,4 +40,6 @@ stdenv.mkDerivation {
mkdir -p $out
cp -r * $out
''
;
LIBXML2_HOME
=
"
${
libxml2
}
/lib"
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment