diff --git a/bin/update-cabal-project b/bin/update-cabal-project index aa579b7f77c9bfb3dd3356e1c0de0360379b33f8..10ac9c8d940f7fd1089160aa005dfeee66daf677 100755 --- a/bin/update-cabal-project +++ b/bin/update-cabal-project @@ -11,8 +11,8 @@ STORE_DIR="${1:-$DEFAULT_STORE}" # `expected_cabal_project_freeze_hash` 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="69e03370a602f40243373515ff884a2cd50dc02eb6f52cd23ba9016a61fe8069" -expected_cabal_project_freeze_hash="796f0109611f3381278b1885ae1fa257c4177b99885eb04701938f1107c06ee5" +expected_cabal_project_hash="6c0c00081f0987c5670bf7c9e9ed38758c0909f32be45c1a52124f012f691348" +expected_cabal_project_freeze_hash="2db6b8696cbfcc1fa1b17ad359003c2e35e98005db16c2441a32373cb4d6c879" cabal --store-dir=$STORE_DIR v2-update 'hackage.haskell.org,2023-12-10T10:34:46Z' @@ -22,7 +22,7 @@ then echo "stack2cabal could not be found" cabal --store-dir=$STORE_DIR v2-install --index-state="2023-12-10T10:34:46Z" stack2cabal-1.0.14 --overwrite-policy=always fi -stack2cabal --no-run-hpack -p '2023-11-23 20:05:40' +stack2cabal --no-run-hpack -p '2023-12-10 10:34:46' actual_cabal_project_hash=$(sha256sum cabal.project | awk '{printf "%s",$1}') actual_cabal_project_freeze_hash=$(sha256sum cabal.project.freeze | awk '{printf "%s",$1}') diff --git a/cabal.project b/cabal.project index 246fed1d7e8397b17672024bcd1e760202ee36b4..71bd0f9a19cb6889363024caaef65c4551e3324b 100644 --- a/cabal.project +++ b/cabal.project @@ -99,7 +99,7 @@ source-repository-package source-repository-package type: git location: https://gitlab.iscpif.fr/gargantext/crawlers/istex.git - tag: c1aba6034ceddcd1cdd0378c3841068c96accca7 + tag: 9b1bd17f3ed38eab83e675bb68278922217a9c73 source-repository-package type: git @@ -141,6 +141,11 @@ source-repository-package location: https://gitlab.iscpif.fr/gargantext/iso639.git tag: eab929d106833ded8011a0d6705135e3fc506a9c +source-repository-package + type: git + location: https://gitlab.iscpif.fr/gargantext/servant-xml-conduit.git + tag: 339fd608341bd2652cf5c0e9e76a3293acffbea6 + source-repository-package type: git location: https://github.com/haskell-servant/servant.git