[flake] some more fixes to try to get nix -L develop to work

parent 228dbfee
Pipeline #7537 failed with stages
in 16 minutes and 18 seconds
......@@ -1119,28 +1119,11 @@
"patches-class": "patches-class",
"patches-map": "patches-map",
"rdf4h": "rdf4h",
"servant-job": "servant-job",
"servant-routes": "servant-routes",
"servant-xml-conduit": "servant-xml-conduit",
"sparse-linear": "sparse-linear"
}
},
"servant-job": {
"flake": false,
"locked": {
"lastModified": 1600676045,
"narHash": "sha256-nWfZBqu1h/8yFRIpcNLKfVmhcofY6JHbZPtWGME21hE=",
"owner": "adinapoli",
"repo": "servant-job",
"rev": "4ad71332ed549f0d15639cf58c49cd86af0bbf79",
"type": "github"
},
"original": {
"owner": "adinapoli",
"repo": "servant-job",
"type": "github"
}
},
"servant-routes": {
"flake": false,
"locked": {
......
......@@ -89,7 +89,6 @@
patches-map = { url = "github:delanoe/patches-map"; flake = false; };
rdf4h = { url = "github:robstewart57/rdf4h"; flake = false; };
# WARNING: using the more-exports branch
servant-job = { url = "github:adinapoli/servant-job"; flake = false; };
servant-routes = { url = "github:fpringle/servant-routes"; flake = false; };
servant-xml-conduit = { url = "git+https://gitlab.iscpif.fr/gargantext/servant-xml-conduit"; flake = false; };
# WARNING: using the alp/static branch
......@@ -229,7 +228,6 @@
# nix/haskell.nix/patches/accelerate-arithmetic/0001-remove-test-using-removed-realBandedGramian.patch
#];
"https://github.com/alpmestan/hmatrix.git" = inputs.hmatrix;
"https://github.com/adinapoli/servant-job.git" = removePackageYaml inputs.servant-job;
"https://github.com/alpmestan/sparse-linear.git" = inputs.sparse-linear;
"https://github.com/chessai/eigen.git" = inputs.eigen;
"https://github.com/delanoe/data-time-segment.git" = inputs.data-time-segment;
......@@ -295,6 +293,8 @@
}) )
];
};
packages.llvm-hs.components.library.build-tools = lib.mkOverride 49 [ pkgs.llvmPackages_12.llvm ];
})
];
......
......@@ -6,7 +6,7 @@
# Use `nix run` instead of `inputs.coreNLP` directly
# to avoid downloading it if not running garg-test-hspec
packages.gargantext.components.tests.garg-test-hspec.preCheck = ''
export GARGANTEXT_CORENLP_SERVER="${pkgs.nixFlakes}/bin/nix run .#coreNLP"
export GARGANTEXT_CORENLP_SERVER="${pkgs.nixVersions.stable}/bin/nix run .#coreNLP"
'';
packages.gargantext.components.tests.garg-test-hspec.testFlags = [
......
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