Commit 9b8f7762 authored by Valentin Reis's avatar Valentin Reis

nrm-gen changes.

parent 2210f54f
Pipeline #7277 failed with stages
in 5 minutes and 45 seconds
...@@ -61,7 +61,7 @@ let ...@@ -61,7 +61,7 @@ let
excit = callPackage ./excit {src=excit-src;}; excit = callPackage ./excit {src=excit-src;};
nrm = (callPackage ./nrm {src=nrm-src;}).overrideAttrs (o:{ nrm = (callPackage ./nrm {src=nrm-src;}).overrideAttrs (o:{
installPhase=o.installPhase+'' installPhase=o.installPhase+''
cp nrm/*.json $out/lib/python2.7/site-packages/nrm/ cp -r nrm/schemas $out/lib/python2.7/site-packages/nrm/
''; '';
}); });
containers = callPackage ./containers {src=containers-src;}; containers = callPackage ./containers {src=containers-src;};
...@@ -72,6 +72,13 @@ let ...@@ -72,6 +72,13 @@ let
buildInputs = oldAttrs.buildInputs ++ [ pkgs.mpich2 ]; buildInputs = oldAttrs.buildInputs ++ [ pkgs.mpich2 ];
}); });
#jsonschema3 = pkgs.pythonPackages.jsonschema.overrideAttrs(o:{
#src=pkgs.fetchurl{
#url="https://files.pythonhosted.org/packages/1f/7f/a020327823b9c405ee6f85ab3053ff171e10801b19cfe55c78bb0b3810e7/jsonschema-3.0.1.tar.gz";
#sha256 = "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc";
#};
#});
nrm-pytest = nrm.overrideAttrs (old:{checkPhase="py.test --deselect=test/test_messaging.py";}); nrm-pytest = nrm.overrideAttrs (old:{checkPhase="py.test --deselect=test/test_messaging.py";});
aml-dist = aml.overrideAttrs (old:{ aml-dist = aml.overrideAttrs (old:{
...@@ -146,6 +153,7 @@ let ...@@ -146,6 +153,7 @@ let
monad-mock = doJailbreak super.monad-mock; monad-mock = doJailbreak super.monad-mock;
generic-pretty = doJailbreak super.generic-pretty; generic-pretty = doJailbreak super.generic-pretty;
jsonschema-gen = doJailbreak super.jsonschema-gen; jsonschema-gen = doJailbreak super.jsonschema-gen;
aeson-t = doJailbreak super.aeson-t;
#minor cabal and version fix #minor cabal and version fix
panhandle = (self.callCabal2nix "panhandle" (builtins.fetchGit { panhandle = (self.callCabal2nix "panhandle" (builtins.fetchGit {
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "9b52e9fb9209a0a19ba21a830e6a2c0cbddf3052", "rev": "ce7e31d039527292784baad3333dca462c05a2a8",
"sha256": "1canjww3igzd8d1wxpjfvzjalc0iacqljxl0nbpc5j0s6clj0q45", "sha256": "0ynblg9bi9glsgr578s08aiz9gqdylc49g95clknlhha4x8l1aj7",
"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/nrm-gen",
"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,13 +2,13 @@ ...@@ -2,13 +2,13 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "753c0048f999255ca42dce10e18e71c109af7ed7", "rev": "eabcbb164167cd3e4d69be980e1f3339eec4c84e",
"sha256": "01wngv506nx43h6jjrbzg7axwpnfn7920nn9dajm7das0mbfv9bx", "sha256": "19s0469bp7mmp0q2jghibavd1ic2sl0g7n0lykr95g6ada0ca2ga",
"url": "https://xgitlab.cels.anl.gov/argo/nrm.git" "url": "https://xgitlab.cels.anl.gov/argo/nrm.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
}, },
"rev": "refs/heads/master", "rev": "refs/heads/nrm-gen",
"type": "fetchgit", "type": "fetchgit",
"url": "https://xgitlab.cels.anl.gov/argo/nrm.git" "url": "https://xgitlab.cels.anl.gov/argo/nrm.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