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
029c0382
Commit
029c0382
authored
Mar 15, 2019
by
Valentin Reis
Browse files
bump powerplots
parent
2c1dc51b
Pipeline
#6036
passed with stages
in 7 minutes and 9 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/utils.nix
View file @
029c0382
...
...
@@ -10,6 +10,7 @@ let
,
protolude
,
shake
,
brittany
,
panpipe
,
ghcid
}:
mkDerivation
{
...
...
@@ -27,6 +28,7 @@ let
protolude
shake
brittany
panpipe
ghcid
];
description
=
""
;
...
...
@@ -45,18 +47,28 @@ rec {
(
baseNameOf
path
!=
".README"
)
&&
(
baseNameOf
path
!=
"dist"
))
path
;
devInputs
=
p
:
with
p
;
[
git
htop
devInputs
=
p
:
[
p
.
git
p
.
hwloc
p
.
htop
];
getPostEnv
=
pkgs
:
super
:
package
:
super
.
shellFor
{
packages
=
p
:
[
package
(
pkgs
.
haskellPackages
.
callPackage
f
{})
];
withHoogle
=
true
;
buildInputs
=
devInputs
pkgs
++
[
package
];
};
getHackEnv
=
pkgs
:
super
:
package
:
super
.
shellFor
{
packages
=
p
:
[
package
(
pkgs
.
haskellPackages
.
callPackage
f
{})
];
withHoogle
=
true
;
buildInputs
=
devInputs
pkgs
;
buildInputs
=
devInputs
pkgs
++
package
.
buildInputs
;
};
cabalDevLoader
=
self
:
path
:
set
:
...
...
pkgs/default.nix
View file @
029c0382
...
...
@@ -28,6 +28,7 @@
,
#source overrides: tooling
argotk-src
?
builtins
.
fetchGit
{
inherit
(
fetched
argotk/pin.json
)
url
rev
;}
,
repoquality-src
?
builtins
.
fetchGit
{
inherit
(
fetched
repoquality/pin.json
)
url
rev
;}
,
powerplots-src
?
builtins
.
fetchGit
{
inherit
(
fetched
powerplots/pin.json
)
url
rev
;}
,
argonix-src
?
builtins
.
fetchGit
{
inherit
(
fetched
argonix/pin.json
)
url
rev
;}
,
experiments-src
?
fetched
experiments/pin.json
...
...
@@ -107,11 +108,13 @@ let
#minor cabal and version fix
panhandle
=
(
self
.
callCabal2nix
"panhandle"
(
builtins
.
fetchGit
{
inherit
(
panhandle-src
)
url
rev
;
}))
{};
inline-r
=
dontCheck
super
.
inline-r
;
#argo tools
argotk
=
(
self
.
callCabal2nix
"argotk"
argotk-src
)
{};
argonix
=
(
self
.
callCabal2nix
"argonix"
argonix-src
)
{};
repoquality
=
(
self
.
callCabal2nix
"repoquality"
repoquality-src
)
{};
argotk
=
(
self
.
callCabal2nix
"argotk"
argotk-src
)
{};
argonix
=
(
self
.
callCabal2nix
"argonix"
argonix-src
)
{};
repoquality
=
(
self
.
callCabal2nix
"repoquality"
repoquality-src
)
{};
powerplots
=
(
self
.
callCabal2nix
"powerplots"
powerplots-src
)
{};
};
};
...
...
@@ -140,6 +143,27 @@ let
''
;
});
powerplots
=
let
pkl
=
with
pkgs
.
rPackages
;
[
docopt
pracma
tidyr
readr
magrittr
formatR
purrr
wrapr
knitr
cowplot
plotly
lubridate
dplyr
ggplot2
fpp2
prospectr
gridExtra
zoo
xtable
ggthemes
data_table
];
myR
=
(
pkgs
.
rWrapper
.
override
{
packages
=
[
pkl
];});
in
haskellPackages
.
powerplots
.
overrideDerivation
(
drv
:
rec
{
buildInputs
=
(
drv
.
buildInputs
or
[])
++
[
pkgs
.
makeWrapper
myR
];
installPhase
=
drv
.
installPhase
+
''
wrapProgram "$out/bin/powerplots" \
--set R_LIBS_SITE `Rscript -e "Sys.getenv(\"R_LIBS_SITE\")"`
''
;
});
# fix for nrm
pyzmq
=
pkgs
.
pythonPackages
.
pyzmq
.
override
{
zeromq3
=
pkgs
.
zeromq
;
};
...
...
@@ -265,10 +289,61 @@ let
hanalysis
=
analysis
.
overrideAttrs
(
old
:{
buildInputs
=
old
.
buildInputs
++
[
(
haskellPackages
.
ghcWithPackages
(
p
:[
p
.
inline-r
]))
(
haskellPackages
.
ghcWithPackages
(
p
:[
p
.
protolude
p
.
optparse-applicative
(
p
.
inline-r
.
overrideAttrs
(
old
:{
doCheck
=
false
;}))
]))
];
});
f
=
{
mkDerivation
,
base
,
protolude
,
data-default
,
optparse-applicative
,
typed-process
,
inline-r
,
R
,
stdenv
}:
mkDerivation
{
pname
=
"hsr"
;
version
=
"1.0.0"
;
src
=
""
;
isLibrary
=
true
;
isExecutable
=
false
;
libraryHaskellDepends
=
[
base
protolude
inline-r
typed-process
optparse-applicative
data-default
];
librarySystemDepends
=
[
pkgs
.
pandoc
R
pkgs
.
rPackages
.
docopt
pkgs
.
rPackages
.
pracma
pkgs
.
rPackages
.
tidyr
pkgs
.
rPackages
.
readr
pkgs
.
rPackages
.
magrittr
pkgs
.
rPackages
.
formatR
pkgs
.
rPackages
.
purrr
pkgs
.
rPackages
.
wrapr
pkgs
.
rPackages
.
knitr
pkgs
.
rPackages
.
cowplot
pkgs
.
rPackages
.
plotly
pkgs
.
rPackages
.
lubridate
pkgs
.
rPackages
.
dplyr
pkgs
.
rPackages
.
ggplot2
pkgs
.
rPackages
.
fpp2
pkgs
.
rPackages
.
prospectr
pkgs
.
rPackages
.
gridExtra
pkgs
.
rPackages
.
zoo
pkgs
.
rPackages
.
xtable
pkgs
.
rPackages
.
ggthemes
pkgs
.
rPackages
.
data_table
];
license
=
stdenv
.
lib
.
licenses
.
bsd3
;
};
hanal
=
argolib
.
getHackEnv
(
pkgs
//
argopkgs
)
haskellPackages
(
haskellPackages
.
callPackage
f
{});
report
=
analysis
.
overrideAttrs
(
old
:{
buildPhase
=
''
echo "analysis/zymakefolder.R
${
powerexpe
}
"
...
...
@@ -291,11 +366,16 @@ let
testListen
=
doArgotk
test
"TestListen"
;
testPerfwrapper
=
doArgotk
test
"TestPerfwrapper"
;
testPower
=
doArgotk
test
"TestPower"
;
testSTREAM
=
doArgotk
(
test
.
overrideAttrs
(
old
:{
buildInputs
=
old
.
buildInputs
++
[
stream
];}))
"TestSTREAM"
;
testAMG
=
doArgotk
(
test
.
overrideAttrs
(
old
:{
buildInputs
=
old
.
buildInputs
++
[
amg
];}))
"TestAMG"
;
testOpenMC
=
doArgotk
(
test
.
overrideAttrs
(
old
:{
buildInputs
=
old
.
buildInputs
++
[
openmc
];}))
"TestOpenMC"
;
testLAMMPS
=
doArgotk
(
test
.
overrideAttrs
(
old
:{
buildInputs
=
old
.
buildInputs
++
[
lammps
];}))
"TestLAMMPS"
;
testQMCPack
=
doArgotk
(
test
.
overrideAttrs
(
old
:{
buildInputs
=
old
.
buildInputs
++
[
qmcpack
];}))
"TestQMCPack"
;
testSTREAM
=
doArgotk
(
test
.
overrideAttrs
(
old
:{
buildInputs
=
old
.
buildInputs
++
[
stream
];}))
"TestSTREAM"
;
testAMG
=
doArgotk
(
test
.
overrideAttrs
(
old
:{
buildInputs
=
old
.
buildInputs
++
[
amg
];}))
"TestAMG"
;
testOpenMC
=
doArgotk
(
test
.
overrideAttrs
(
old
:{
buildInputs
=
old
.
buildInputs
++
[
openmc
];}))
"TestOpenMC"
;
testLAMMPS
=
doArgotk
(
test
.
overrideAttrs
(
old
:{
buildInputs
=
old
.
buildInputs
++
[
lammps
];}))
"TestLAMMPS"
;
testQMCPack
=
doArgotk
(
test
.
overrideAttrs
(
old
:{
buildInputs
=
old
.
buildInputs
++
[
qmcpack
];}))
"TestQMCPack"
;
testAll
=
doArgotk
test
"tests"
;
};
...
...
pkgs/powerplots/pin.json
0 → 100644
View file @
029c0382
{
"fetch"
:
{
"args"
:
{
"fetchSubmodules"
:
false
,
"rev"
:
"ad2ee5a0eeb4cc9c43c9c1c380ab30ea73000960"
,
"sha256"
:
"1042blh42dign3mq60x35a6ljxs4vfzh0v6wxlplfhc26nh85yjn"
,
"url"
:
"https://xgitlab.cels.anl.gov/vreis/powerplots.git"
},
"fn"
:
"fetchgit"
},
"rev"
:
"refs/heads/master"
,
"type"
:
"fetchgit"
,
"url"
:
"https://xgitlab.cels.anl.gov/vreis/powerplots.git"
}
\ No newline at end of file
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