Commit 56f06cf2 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[FIX] merge

parent 5f1195fd
......@@ -18,7 +18,7 @@ fi
# with the `sha256sum` result calculated on the `cabal.project` and
# `cabal.project.freeze`. This ensures the files stay deterministic so that CI
# cache can kick in.
expected_cabal_project_hash="7142cc1299cafe14f07273c3437409a862f7d931cff778a634312a450543c07b"
expected_cabal_project_hash="4e2bc98c9e153d35a18644f22c9b764f4190d2b6bb2a55f863be1112c2e6bebc"
expected_cabal_project_freeze_hash="a88c2d091ee6223b64fb5dd38e71ab8379710a2aa716d2467f318789e4d75589"
cabal --store-dir=$STORE_DIR v2-build --dry-run
......
......@@ -19,10 +19,11 @@ source-repository-package
subdir: accelerate-llvm-native/
accelerate-llvm/
-- Patch for "Allow NOT to backtrack"
source-repository-package
type: git
location: https://github.com/adinapoli/boolexpr.git
tag: 91928b5d7f9342e9865dde0d94862792d2b88779
location: https://github.com/boolexpr/boolexpr.git
tag: bcd7cb20a1b1bc3b58c4ba1b6ae1bccfe62f67ae
source-repository-package
type: git
......
......@@ -62,10 +62,6 @@
git: "https://github.com/MercuryTechnologies/ekg-json.git"
subdirs:
- .
- commit: 91928b5d7f9342e9865dde0d94862792d2b88779
git: "https://github.com/adinapoli/boolexpr.git"
subdirs:
- .
- commit: 23603a832117e5352d5b0fb9bb1110228324b35a
git: "https://github.com/adinapoli/duckling.git"
subdirs:
......@@ -98,6 +94,10 @@
git: "https://github.com/alpmestan/sparse-linear.git"
subdirs:
- "sparse-linear"
- commit: bcd7cb20a1b1bc3b58c4ba1b6ae1bccfe62f67ae
git: "https://github.com/boolexpr/boolexpr.git"
subdirs:
- .
- commit: 8fff32a43df743c8c83428a86dd566a0936a4fba
git: "https://github.com/chessai/eigen.git"
subdirs:
......@@ -319,7 +319,7 @@ flags:
"build-search-demo": false
gargantext:
"disable-db-obfuscation-executable": false
"no-phylo-debug-logs": false
"no-phylo-debug-logs": true
"test-crypto": false
"generic-deriving":
"base-4-9": true
......
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