Revert "WIP - try to upgrade to LLVM-15 the Haskell stack"

This reverts commit 45fbb34a0994a22500829fae125517a6a0055ca7.

cabal.project

@@ -7,18 +7,6 @@ with-compiler: ghc-9.4.7
 packages:
     ./
 
-source-repository-package
-    type: git
-    location: https://github.com/AccelerateHS/accelerate.git
-    tag: 334d05519436bb7f20f9926ec76418f5b8afa359
-
-source-repository-package
-    type: git
-    location: https://github.com/AccelerateHS/accelerate-llvm.git
-    tag: 2b5d69448557e89002c0179ea1aaf59bb757a6e3
-    subdir: accelerate-llvm-native/
-            accelerate-llvm/
-
 source-repository-package
     type: git
     location: https://github.com/adinapoli/boolexpr.git
@@ -34,11 +22,23 @@ source-repository-package
     location: https://github.com/adinapoli/wikiparsec.git
     tag: b3519a0351ae9515497680571f76200c24dedb53
 
+source-repository-package
+    type: git
+    location: https://github.com/AccelerateHS/accelerate.git
+    tag: 334d05519436bb7f20f9926ec76418f5b8afa359
+
 source-repository-package
     type: git
     location: https://github.com/alpmestan/accelerate-arithmetic.git
     tag: a110807651036ca2228a76507ee35bbf7aedf87a
 
+source-repository-package
+    type: git
+    location: https://github.com/alpmestan/accelerate-llvm.git
+    tag: 944f5a4aea35ee6aedb81ea754bf46b131fce9e3
+    subdir: accelerate-llvm-native/
+            accelerate-llvm/
+
 source-repository-package
     type: git
     location: https://github.com/alpmestan/hmatrix.git
@@ -56,11 +56,6 @@ source-repository-package
     tag: bc6ca8058077b0b5702ea4b88bd4189cfcad267a
     subdir: sparse-linear
 
-source-repository-package
-    type: git
-    location: https://github.com/chessai/eigen.git
-    tag: 1790fdf9138970dde0dbabf8b270698145a4a88c
-
 source-repository-package
     type: git
     location: https://github.com/delanoe/data-time-segment.git
@@ -76,6 +71,11 @@ 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/patches-class.git
+    tag: 3668d28607867a88b2dfc62158139b3cfd629ddb
+
 source-repository-package
     type: git
     location: https://gitlab.iscpif.fr/gargantext/crawlers/arxiv-api.git
@@ -143,30 +143,29 @@ source-repository-package
 
 source-repository-package
     type: git
-    location: https://gitlab.iscpif.fr/gargantext/patches-class.git
-    tag: 3668d28607867a88b2dfc62158139b3cfd629ddb
+    location: https://gitlab.iscpif.fr/gargantext/servant-xml-conduit.git
+    tag: 339fd608341bd2652cf5c0e9e76a3293acffbea6
 
 source-repository-package
     type: git
-    location: https://gitlab.iscpif.fr/gargantext/servant-xml-conduit.git
-    tag: 339fd608341bd2652cf5c0e9e76a3293acffbea6
+    location: https://github.com/robstewart57/rdf4h.git
+    tag: 4fd2edf30c141600ffad6d730cc4c1c08a6dbce4
 
 source-repository-package
     type: git
-    location: https://github.com/llvm-hs/llvm-hs.git
-    tag: e4b3cfa47e72f094ab109884f18acfc666b0fb7d
-    subdir: llvm-hs
-            llvm-hs-pure
+    location: https://github.com/chessai/eigen.git
+    tag: 1790fdf9138970dde0dbabf8b270698145a4a88c
 
 source-repository-package
     type: git
-    location: https://github.com/MercuryTechnologies/ekg-json.git
-    tag: 232db57d6ce0940fcc902adf30a9ed3f3561f21d
+    location: https://github.com/adinapoli/llvm-hs.git
+    tag: 787dddc034c94fbe5322b3a3c766c153c9259306
+    subdir: llvm-hs-pure
 
 source-repository-package
     type: git
-    location: https://github.com/robstewart57/rdf4h.git
-    tag: 4fd2edf30c141600ffad6d730cc4c1c08a6dbce4
+    location: https://github.com/MercuryTechnologies/ekg-json.git
+    tag: 232db57d6ce0940fcc902adf30a9ed3f3561f21d
 
 allow-older: *
 allow-newer: *

cabal.project.freeze

@@ -771,6 +771,7 @@ constraints: any.AC-Angle ==1.0,
              any.effectful-core ==2.2.2.2,
              any.effectful-plugin ==1.1.0.2,
              any.effectful-th ==1.0.0.1,
+             any.eigen ==3.3.7.0,
              any.either ==5.0.2,
              any.either-both ==0.1.1.1,
              any.either-unwrap ==1.1,
@@ -1355,7 +1356,6 @@ constraints: any.AC-Angle ==1.0,
              any.ieee754 ==0.8.0,
              any.if ==0.1.0.0,
              any.iff ==0.0.6.1,
-             any.ihaskell ==0.11.0.0,
              any.ihs ==0.1.0.3,
              any.imagesize-conduit ==1.1,
              any.immortal ==0.3,
@@ -2268,9 +2268,6 @@ constraints: any.AC-Angle ==1.0,
              any.sequence-formats ==1.7.1,
              any.sequenceTools ==1.5.3.1,
              any.serialise ==0.2.6.0,
-             any.servant ==0.19.1,
-             any.servant-auth ==0.4.1.0,
-             any.servant-auth-client ==0.4.1.1,
              any.servant-auth-docs ==0.2.10.0,
              any.servant-auth-wordpress ==1.0.0.2,
              any.servant-blaze ==0.9.1,
@@ -2278,7 +2275,6 @@ constraints: any.AC-Angle ==1.0,
              any.servant-checked-exceptions ==2.2.0.1,
              any.servant-checked-exceptions-core ==2.2.0.1,
              any.servant-client ==0.19,
-             any.servant-client-core ==0.19,
              any.servant-conduit ==0.15.1,
              any.servant-docs ==0.12,
              any.servant-ekg ==0.3.1,
@@ -2298,7 +2294,6 @@ constraints: any.AC-Angle ==1.0,
              any.servant-pipes ==0.15.3,
              any.servant-rate-limit ==0.2.0.0,
              any.servant-rawm ==1.0.0.0,
-             any.servant-server ==0.19.2,
              any.servant-static-th ==1.0.0.0,
              any.servant-subscriber ==0.7.0.0,
              any.servant-swagger ==1.1.11,

nix/pkgs.nix

@@ -125,8 +125,8 @@ rec {
     expat
     icu
     graphviz
-    llvm_15
-    clang_15
+    llvm_11
+    clang_11
     gcc7
     igraph_0_10_4
     libpqxx

stack.yaml

@@ -72,27 +72,20 @@ extra-deps:
   commit: 1370fea1939e2378ce344e512d80671ac700e787
   # Accelerate Linear Algebra and specific instances
 - git: https://github.com/AccelerateHS/accelerate.git
-  # latest version from github (2023-12-13)
   commit: 334d05519436bb7f20f9926ec76418f5b8afa359
 - git: https://github.com/alpmestan/accelerate-arithmetic.git
   commit: a110807651036ca2228a76507ee35bbf7aedf87a
 - git: https://gitlab.iscpif.fr/amestanogullari/accelerate-utility.git
   commit: a3875fe652d3bb5acb522674c22c6c814c1b4ad0
-- git: https://github.com/AccelerateHS/accelerate-llvm.git
-  # latest version from github (2023-12-13)
-  commit: 2b5d69448557e89002c0179ea1aaf59bb757a6e3
+- git: https://github.com/alpmestan/accelerate-llvm.git
+  commit: 944f5a4aea35ee6aedb81ea754bf46b131fce9e3
   subdirs:
     - accelerate-llvm/
     - accelerate-llvm-native/
-- github: llvm-hs/llvm-hs
-  commit: e4b3cfa47e72f094ab109884f18acfc666b0fb7d  # llvm-15
-  # commit: 423220bffac4990d019fc088c46c5f25310d5a33  # llvm-12
-  subdirs:
-    - llvm-hs
-    - llvm-hs-pure
 - git: https://github.com/adinapoli/wikiparsec.git
   commit: b3519a0351ae9515497680571f76200c24dedb53
   # Gargantext-graph
+- eigen-3.3.7.0@sha256:7c24a86426b238e02ba0ac2179cc44997518b443a13828ed7a791fe49a6dffa5,82060
 - git: https://github.com/alpmestan/sparse-linear.git
   commit: bc6ca8058077b0b5702ea4b88bd4189cfcad267a
   subdirs:
@@ -103,6 +96,10 @@ extra-deps:
     - packages/base
 - git: https://github.com/chessai/eigen.git
   commit: 1790fdf9138970dde0dbabf8b270698145a4a88c
+- git: https://github.com/adinapoli/llvm-hs.git
+  commit: 787dddc034c94fbe5322b3a3c766c153c9259306
+  subdirs:
+    - llvm-hs-pure
   # Mercury is a reputable Haskell company.
 - git: https://github.com/MercuryTechnologies/ekg-json.git
   commit: 232db57d6ce0940fcc902adf30a9ed3f3561f21d