Update hspec in stack.yaml

.gitlab-ci.yml

@@ -76,11 +76,13 @@ test:
       nix-shell --run "./bin/update-cabal-project $CABAL_STORE_DIR"
       mkdir -p /root/.cache/cabal/logs
       chown -R test:test /root/.cache/cabal/logs/
+      chown -R test:test /root/.cache/cabal/packages/hackage.haskell.org/
       nix-shell --run "chown -R test:test /root/.config/ && su -m test -c \"export PATH=$PATH:$TEST_NIX_PATH && cd /builds/gargantext/haskell-gargantext && $CABAL --store-dir=$CABAL_STORE_DIR v2-test --test-show-details=streaming --flags test-crypto --ghc-options='-O0 -fclear-plugins'\""
       chown -R root:root dist-newstyle/
       chown -R root:root /root/
       chown -R root:root $CABAL_STORE_DIR
       chown -R root:root /root/.cache/cabal/logs/
+      chown -R root:root /root/.cache/cabal/packages/hackage.haskell.org/
 
 #docs:
 #  stage: docs

bin/update-cabal-project

@@ -7,11 +7,12 @@ STORE_DIR="${1:-$DEFAULT_STORE}"
 
 # README!
 # Every time you modify the `stack.yaml` and as result the relevant `cabal.project`
-# changes, you have to make sure to update the `expected_cabal_projet_hash` with the
-# `sha256sum` result calculated on the `cabal.project`. This ensures the `cabal.project`
-# stays deterministic so that CI cache can kick in.
-#expected_cabal_project_hash="2754bf61cc7a2aa7b29345ffe34dc1e90a06426f00fc39da9f793cd828be4e15"
-expected_cabal_project_hash="5e989e199765ba2dd476208a66e96495ade69eb7cb14c0a448dfebd5748c9b39"
+# changes, you have to make sure to update the `expected_cabal_project_hash` and
+# `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="eb12c232115b3fffa1f81add7c83d921e5899c7712eddee6100ff8df7305088e"
+expected_cabal_project_freeze_hash="b7acfd12c970323ffe2c6684a13130db09d8ec9fa5676a976afed329f1ef3436"
 
 cabal --store-dir=$STORE_DIR v2-update 'hackage.haskell.org,2023-06-24T21:28:46Z'
 
@@ -24,9 +25,16 @@ fi
 stack2cabal --no-run-hpack -p '2023-06-24 21:28: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}')
 if [[ $actual_cabal_project_hash != $expected_cabal_project_hash ]]; then
   echo "ERROR! hash mismatch between expected cabal.project and the one computed by stack2cabal."
   exit 1
 else
   echo "cabal.project updated successfully."
 fi
+if [[ $actual_cabal_project_freeze_hash != $expected_cabal_project_freeze_hash ]]; then
+  echo "ERROR! hash mismatch between expected cabal.project.freeze and the one computed by stack2cabal."
+  exit 1
+else
+  echo "cabal.project.freeze updated successfully."
+fi

cabal.project

@@ -66,11 +66,6 @@ source-repository-package
     location: https://gitlab.iscpif.fr/amestanogullari/accelerate-utility.git
     tag: a3875fe652d3bb5acb522674c22c6c814c1b4ad0
 
-source-repository-package
-    type: git
-    location: https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude.git
-    tag: 8f97fef4dfd941d773914ad058d8e02ce2bb1a3e
-
 source-repository-package
     type: git
     location: https://gitlab.iscpif.fr/cgenie/patches-class.git
@@ -111,6 +106,11 @@ source-repository-package
     location: https://gitlab.iscpif.fr/gargantext/gargantext-graph.git
     tag: 588e104fe7593210956610cab0041fd16584a4ce
 
+source-repository-package
+    type: git
+    location: https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude
+    tag: 8f97fef4dfd941d773914ad058d8e02ce2bb1a3e
+
 source-repository-package
     type: git
     location: https://gitlab.iscpif.fr/gargantext/haskell-igraph.git

stack.yaml

@@ -21,7 +21,7 @@ nix:
 allow-newer: true
 
 extra-deps:
-- git: https://gitlab.iscpif.fr/cgenie/haskell-gargantext-prelude
+- git: https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude
   commit: 8f97fef4dfd941d773914ad058d8e02ce2bb1a3e
 - git: https://gitlab.iscpif.fr/gargantext/gargantext-graph.git
   commit: 588e104fe7593210956610cab0041fd16584a4ce
@@ -58,7 +58,7 @@ extra-deps:
 - git: https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git
   commit: 3db385e767d2100d8abe900833c6e7de3ac55e1b
 - git: https://gitlab.iscpif.fr/gargantext/crawlers/arxiv-api.git
-  commit: 2d7e5753cbbce248b860b571a0e9885415c846f7
+  commit: eb130c71fa17adaceed6ff66beefbccb13df51ba
 - git: https://gitlab.iscpif.fr/gargantext/crawlers/openalex.git
   commit: 1cf872fb3bd0e3e44af31247833c4b6bb7d0dca5
   # NP libs
@@ -116,6 +116,9 @@ extra-deps:
 - hgal-2.0.0.2@sha256:13d58afd0668b9cb881c612eff8488a0e289edd4bbffa893df4beee60cfeb73b,653
 - hsparql-0.3.8
 - hstatistics-0.3.1
+- hspec-2.11.1
+- hspec-core-2.11.1
+- hspec-discover-2.11.1
 - hspec-expectations-0.8.3
 - json-stream-0.4.2.4@sha256:8b7f17d54a6e1e6311756270f8bcf51e91bab4300945400de66118470dcf51b9,4716
 - located-base-0.1.1.1@sha256:7c6395f2b6fbf2d5f76c3514f774423838c0ea94e1c6a5530dd3c94b30c9d1c8,1904
@@ -133,6 +136,7 @@ extra-deps:
 - stemmer-0.5.2@sha256:823aec56249ec2619f60a2c0d1384b732894dbbbe642856d337ebfe9629a0efd,4082
 - taggy-0.2.1@sha256:7bc55ddba178971dc6052163597f0445a0a2b5b0ca0e84ce651d53d722e3c265,4662
 - taggy-lens-0.1.2@sha256:091ca81d02bd3d7fb493dce0148e1a38f25eb178a1ebd751043a23239e5e3265,3009
+- tasty-hspec-1.2.0.3
 - tmp-postgres-1.34.1.0
 - vector-0.12.3.0@sha256:0ae2c1ba86f0077910be242ec6802cc3d7725fe7b2bea6987201aa3737b239b5,7953
 - xmlbf-0.6.1@sha256:57867fcb39e0514d17b3328ff5de8d241a18482fc89bb742d9ed820a6a2a5187,1540