Commit 3621480b authored by Valentin Reis's avatar Valentin Reis
Browse files

experimental additions.

parent 121e9c82
Pipeline #5461 failed with stages
in 3 minutes and 34 seconds
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
, # versioned nixpkgs , # versioned nixpkgs
pkgs ? import (hostPkgs.nix-update-source.fetch ./pkgs.json).src {} pkgs ? import (hostPkgs.nix-update-source.fetch ./pkgs.json).src {}
, # versioned nixpkgs-older version for zmcat
pkgs-old ? import (hostPkgs.nix-update-source.fetch ./pkgs-old.json).src {}
, # fetcher alias for the remaining arguments , # fetcher alias for the remaining arguments
fetched ? s: (pkgs.nix-update-source.fetch s).src fetched ? s: (pkgs.nix-update-source.fetch s).src
...@@ -105,7 +108,8 @@ let ...@@ -105,7 +108,8 @@ let
pyzmq = pkgs.pythonPackages.pyzmq.override { zeromq3 = pkgs.zeromq; }; pyzmq = pkgs.pythonPackages.pyzmq.override { zeromq3 = pkgs.zeromq; };
# archived for sake of the simplicity of this file # archived for sake of the simplicity of this file
#zmcat = pkgs-stable.haskellPackages.callPackage ./tools/zmcat {}; zmcat = pkgs-old.haskellPackages.callPackage ./zmcat {};
zmqat = pkgs-old.haskellPackages.zmqat;
# ci/experimental environments # ci/experimental environments
testBuildInputs = [ testBuildInputs = [
...@@ -151,17 +155,19 @@ let ...@@ -151,17 +155,19 @@ let
buildInputs = testBuildInputs ++ [ buildInputs = testBuildInputs ++ [
#debug tools #debug tools
pkgs.which pkgs.which
zmcat
#experiment tools #experiment tools
zymake zymake
#applications #applications
(stream.override {iterationCount = "20000";}) (stream.override {iterationCount = "20000";})
amg
lammps lammps
qmcpack qmcpack
openmc openmc
openmc-data openmc-data
## amg is not ready, its progress report loop isn't tight enough.
#amg
]; ];
OPENMC_CROSS_SECTIONS = "${openmc-data}/cross_sections.xml"; OPENMC_CROSS_SECTIONS = "${openmc-data}/cross_sections.xml";
OPENMC_PWD = "${argotk}/share/openmc"; OPENMC_PWD = "${argotk}/share/openmc";
...@@ -169,6 +175,8 @@ let ...@@ -169,6 +175,8 @@ let
analysis = analysis =
pkgs.rWrapper.override{ packages = with pkgs.rPackages; [ pkgs.rWrapper.override{ packages = with pkgs.rPackages; [
pkgs.rlwrap
pkgs.pandoc
docopt docopt
formatR formatR
purrr purrr
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "290141c58162cf06946df24be7e966e64d54a831", "rev": "b54075405aa76933e3c10df6987ddfc56c6c720e",
"sha256": "1p47ajy672wfyspwy7h9zrx7axlb2jjd3yiq1j5awcaf9m261mxy", "sha256": "0ayfddb433abkj8m6ig3yfyn9ansrh48gin4m7s1rp9abpqfi4pn",
"url": "https://xgitlab.cels.anl.gov/argo/libnrm.git" "url": "https://xgitlab.cels.anl.gov/argo/libnrm.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
}, },
"rev": "refs/heads/master", "rev": "refs/heads/halfsecond",
"type": "fetchgit", "type": "fetchgit",
"url": "https://xgitlab.cels.anl.gov/argo/libnrm.git" "url": "https://xgitlab.cels.anl.gov/argo/libnrm.git"
} }
\ No newline at end of file
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "f107d6917c0433d313816c8557a578a544ee2cf9", "rev": "a3390c6b120399c3894cd1d5e3eca6b54b6cf8c9",
"sha256": "17lkn7nh9rx0jn6glmj22jydn7wm817a1c096phsw9km01dldi3n", "sha256": "1ns6ybrwwyigg20265m1mjf04g99sgg5iw907gdfncdirzskjwb7",
"url": "https://xgitlab.cels.anl.gov/argo/applications/openmc.git" "url": "https://xgitlab.cels.anl.gov/argo/applications/openmc.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
......
{
"fetch": {
"args": {
"fetchSubmodules": false,
"rev": "cb0e20d6db96fe09a501076c7a2c265359982814",
"sha256": "0d9pkbax0phh392j6pzkn365wbsgd0h1cmm58rwq8zf9lb0pgkg2",
"url": "https://github.com/nixos/nixpkgs-channels.git"
},
"fn": "fetchgit"
},
"rev": "refs/heads/nixos-18.03",
"type": "fetchgit",
"url": "https://github.com/nixos/nixpkgs-channels.git"
}
\ No newline at end of file
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