WIP - support GHC 9.4.7

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="69933aa295e2ea1c7e223454472f407f7d34bf9a0c76e02152b39a8d0222872b"
-expected_cabal_project_freeze_hash="bda3de8044e0cf49b077b06261a66fc7103f7bc09dd20f00b2f6b13c091d5512"
+expected_cabal_project_hash="52c9f9895eea755555fc434657e8bba3f53211c77a24a173da337ee887024854"
+expected_cabal_project_freeze_hash="92cba3fe5ddb3e30bf7c3dfbf2470f21da6eceb30f14feea9b70be8257e7cfc4"
 
 cabal --store-dir=$STORE_DIR v2-update 'hackage.haskell.org,2023-11-23T20:05:40Z'
 

cabal.project

@@ -19,8 +19,13 @@ source-repository-package
 
 source-repository-package
     type: git
-    location: https://github.com/alpmestan/accelerate.git
-    tag: 640b5af87cea94b61c7737d878e6f7f2fca5c015
+    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
@@ -34,11 +39,6 @@ source-repository-package
     subdir: accelerate-llvm-native/
             accelerate-llvm/
 
-source-repository-package
-    type: git
-    location: https://github.com/alpmestan/ekg-json.git
-    tag: fd7e5d7325939103cd87d0dc592faf644160341c
-
 source-repository-package
     type: git
     location: https://github.com/alpmestan/hmatrix.git
@@ -73,8 +73,8 @@ source-repository-package
 
 source-repository-package
     type: git
-    location: https://gitlab.iscpif.fr/cgenie/patches-class.git
-    tag: 125c7cb90ab8f0cd6ac4a526dbdf302d10c945e9
+    location: https://gitlab.iscpif.fr/gargantext/patches-class.git
+    tag: 3668d28607867a88b2dfc62158139b3cfd629ddb
 
 source-repository-package
     type: git
@@ -89,7 +89,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://gitlab.iscpif.fr/gargantext/crawlers/hal.git
-    tag: 25a1e9558075462a82660987920a698b8863dd63
+    tag: bfa9069b4ff70f341ca3244e8aff9e83eb4b8b73
 
 source-repository-package
     type: git
@@ -99,7 +99,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://gitlab.iscpif.fr/gargantext/crawlers/istex.git
-    tag: 9b1bd17f3ed38eab83e675bb68278922217a9c73
+    tag: eef5c951a6862bed31f59cd6f81a1f5fe545ac8a
 
 source-repository-package
     type: git
@@ -109,7 +109,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://gitlab.iscpif.fr/gargantext/crawlers/pubmed.git
-    tag: 234ad423fa682307ff4843ae4acd725dcc6ffc55
+    tag: 300764df4f78ea6175535f9b78b884cc2aa9da61
 
 source-repository-package
     type: git
@@ -124,7 +124,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://gitlab.iscpif.fr/gargantext/haskell-igraph.git
-    tag: 2a28524134b68421f30f6e97961063018f814a82
+    tag: 9f8a2f4a014539826a4eab3215cc70c0813f20cb
 
 source-repository-package
     type: git
@@ -148,25 +148,24 @@ source-repository-package
 
 source-repository-package
     type: git
-    location: https://github.com/haskell-servant/servant.git
-    tag: c2af6e775d1d36f2011d43aff230bb502f8fba63
-    subdir: servant-auth/servant-auth-client/
-            servant-auth/servant-auth-server/
-            servant-auth/servant-auth/
-            servant-client-core/
-            servant-client/
-            servant-server/
-            servant/
+    location: https://github.com/robstewart57/rdf4h.git
+    tag: 4fd2edf30c141600ffad6d730cc4c1c08a6dbce4
 
 source-repository-package
     type: git
-    location: https://github.com/robstewart57/rdf4h.git
-    tag: 4fd2edf30c141600ffad6d730cc4c1c08a6dbce4
+    location: https://github.com/chessai/eigen.git
+    tag: 1790fdf9138970dde0dbabf8b270698145a4a88c
+
+source-repository-package
+    type: git
+    location: https://github.com/adinapoli/llvm-hs.git
+    tag: 787dddc034c94fbe5322b3a3c766c153c9259306
+    subdir: llvm-hs-pure
 
 source-repository-package
     type: git
-    location: https://github.com/rspeer/wikiparsec.git
-    tag: 9637a82344bb70f7fa8f02e75db3c081ccd434ce
+    location: https://github.com/MercuryTechnologies/ekg-json.git
+    tag: 232db57d6ce0940fcc902adf30a9ed3f3561f21d
 
 allow-older: *
 allow-newer: *

cabal.project.freeze

@@ -1408,7 +1408,7 @@ constraints: any.AC-Angle ==1.0,
              any.ip6addr ==1.0.3,
              any.iproute ==1.7.12,
              any.ipynb ==0.2,
-             any.ipython-kernel ==0.10.3.0,
+             any.ipython-kernel ==0.11.0.0,
              any.irc ==0.6.1.0,
              any.irc-ctcp ==0.1.3.1,
              any.isbn ==1.1.0.4,
@@ -1436,7 +1436,7 @@ constraints: any.AC-Angle ==1.0,
              any.json ==0.10,
              any.json-feed ==2.0.0.9,
              any.json-rpc ==1.0.4,
-             any.json-stream ==0.4.2.4,
+             any.json-stream ==0.4.5.3,
              any.jsonifier ==0.2.1.2,
              any.jsonpath ==0.3.0.0,
              any.junit-xml ==0.1.0.3,
@@ -1699,7 +1699,7 @@ constraints: any.AC-Angle ==1.0,
              any.mono-traversable ==1.0.15.3,
              any.mono-traversable-instances ==0.1.1.0,
              any.mono-traversable-keys ==0.3.0,
-             any.monoid-extras ==0.5.1,
+             any.monoid-extras ==0.6.2,
              any.monoid-subclasses ==1.2.4.1,
              any.monoid-transformer ==0.0.4,
              any.monoidal-containers ==0.6.4.0,
@@ -2271,9 +2271,10 @@ constraints: any.AC-Angle ==1.0,
              any.servant-auth-docs ==0.2.10.0,
              any.servant-auth-wordpress ==1.0.0.2,
              any.servant-blaze ==0.9.1,
-             any.servant-cassava ==0.10.1,
+             any.servant-cassava ==0.10.2,
              any.servant-checked-exceptions ==2.2.0.1,
              any.servant-checked-exceptions-core ==2.2.0.1,
+             any.servant-client ==0.19,
              any.servant-conduit ==0.15.1,
              any.servant-docs ==0.12,
              any.servant-ekg ==0.3.1,
@@ -2901,6 +2902,7 @@ constraints: any.AC-Angle ==1.0,
              any.weigh ==0.0.16,
              any.welford-online-mean-variance ==0.2.0.0,
              any.wide-word ==0.1.5.0,
+             wikiparsec +library-only,
              windns +allow-non-windows,
              any.windns ==0.1.0.1,
              any.witch ==1.2.0.2,

gargantext.cabal

@@ -42,6 +42,10 @@ flag test-crypto
   default: False
   manual: True
 
+flag enable-ghc-clippy
+  default: False
+  manual: True
+
 library
   exposed-modules:
       Gargantext
@@ -393,6 +397,9 @@ library
   ghc-options: -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wmissing-signatures -Wunused-binds -Wunused-imports -Werror -freduction-depth=300 -fplugin=Clippy -fprint-potential-instances
   if flag(test-crypto)
     cpp-options: -DTEST_CRYPTO
+  if flag(enable-ghc-clippy)
+    build-depends:
+      ghc-clippy-plugin ^>= 0.0.0.1
   build-depends:
       HSvm ^>= 0.1.1.3.22
     , KMP ^>= 0.2.0.0
@@ -454,7 +461,6 @@ library
     , fullstop ^>= 0.1.4
     , gargantext-graph >=0.1.0.0
     , gargantext-prelude
-    , ghc-clippy-plugin ^>= 0.0.0.1
     , graphviz ^>= 2999.20.1.0
     , hashable ^>= 1.3.0.0
     , haskell-igraph ^>= 0.10.4
@@ -469,7 +475,9 @@ library
     , http-media ^>= 0.8.0.0
     , http-types ^>= 0.12.3
     , hxt ^>= 9.3.1.22
-    , ihaskell ^>= 0.10.2.2
+    , ihaskell >= 0.11.0.0
+    -- necessary for ihaskell to build
+    , ipython-kernel >= 0.11.0.0
     , ini ^>= 0.4.1
     , insert-ordered-containers ^>= 0.2.5.1
     , iso639
@@ -520,21 +528,20 @@ library
     , scientific ^>= 0.3.7.0
     , semigroups ^>= 0.19.2
     , serialise ^>= 0.2.4.0
-    , servant ^>= 0.18.3
+    , servant >= 0.18.3 && < 0.20
     , servant-auth ^>= 0.4.0.0
     , servant-auth-client ^>= 0.4.1.0
     , servant-auth-server ^>=0.4.6.0
     , servant-auth-swagger ^>= 0.2.10.1
     , servant-blaze ^>= 0.9.1
     , servant-cassava ^>= 0.10.1
-    , servant-client ^>= 0.18.3
-    , servant-client-core ^>= 0.18.3
+    , servant-client >= 0.18.3 && < 0.20
+    , servant-client-core >= 0.18.3 && < 0.20
     , servant-ekg ^>= 0.3.1
     , servant-flatten ^>= 0.2
     , servant-job >= 0.2.0.0
-    , servant-mock ^>= 0.8.7
     , servant-multipart ^>= 0.12.1
-    , servant-server ^>= 0.18.3
+    , servant-server >= 0.18.3 && < 0.20
     , servant-swagger ^>= 1.1.10
     , servant-swagger-ui ^>= 0.3.5.3.5.0
     , servant-xml-conduit >= 0.1.0.4

nix/pkgs.nix

@@ -3,18 +3,18 @@
 rec {
   inherit pkgs;
   # If we are on a Mac, in order to build successfully with cabal we need a bit more work.
-  ghc = pkgs.haskell.compiler.ghc947; #if pkgs.stdenv.isDarwin
-        #   then haskell1.compiler.ghc947.overrideAttrs (finalAttrs: previousAttrs: {
-        #        # See https://github.com/NixOS/nixpkgs/pull/149942/files
-        #        patches = previousAttrs.patches ++ [
-        #                    # Reverts the linking behavior of GHC to not resolve `-libc++` to `c++`.
-        #                    (pkgs.fetchpatch {
-        #                      url = "https://raw.githubusercontent.com/input-output-hk/haskell.nix/613ec38dbd62ab7929178c9c7ffff71df9bb86be/overlays/patches/ghc/ghc-macOS-loadArchive-fix.patch";
-        #                      sha256 = "0IUpuzjZb1G+gP3q6RnwQbW4mFzc/OZ/7QqZy+57kx0=";
-        #                    })
-        #                  ];
-        #        })
-        #   else pkgs.haskell.compiler.ghc947;
+  ghc = if pkgs.stdenv.isDarwin
+           then haskell1.compiler.ghc947.overrideAttrs (finalAttrs: previousAttrs: {
+                # See https://github.com/NixOS/nixpkgs/pull/149942/files
+                patches = previousAttrs.patches ++ [
+                            # Reverts the linking behavior of GHC to not resolve `-libc++` to `c++`.
+                            (pkgs.fetchpatch {
+                              url = "https://gist.githubusercontent.com/adinapoli/bf722db15f72763bf79dff13a3104b6f/raw/21e4fe65e71e721aece563b0c39be6ba1ace5b28/ghc947-macOS-loadArchive-fix.patch";
+                              sha256 = "sha256-0rWN6nGIVlB65QBGX3PaHPQFCitGGC8wTJg8kPJu5KQ=";
+                            })
+                          ];
+                })
+           else pkgs.haskell.compiler.ghc947;
   haskell1 = pkgs.haskell // {
       packages = pkgs.haskell.packages // {
         ghc947 = pkgs.haskell.packages.ghc947.override {

stack.yaml

@@ -2,6 +2,8 @@ resolver: lts-21.17
 flags:
     accelerate:
         debug: false
+    wikiparsec:
+        library-only: true
 extra-package-dbs: []
 skip-ghc-check: true
 packages:
@@ -33,20 +35,8 @@ extra-deps:
 - git: https://gitlab.iscpif.fr/gargantext/hlcm.git
   commit: 6f0595d2421005837d59151a8b26eee83ebb67b5
   # API libs
-- git: https://github.com/haskell-servant/servant.git
-  commit: c2af6e775d1d36f2011d43aff230bb502f8fba63
-  subdirs:
-    - servant/
-    - servant-server/
-    - servant-client-core/
-    - servant-client/
-    - servant-auth/servant-auth/
-    - servant-auth/servant-auth-client/
-    - servant-auth/servant-auth-server/
 - git: https://gitlab.iscpif.fr/gargantext/servant-xml-conduit.git
   commit: 339fd608341bd2652cf5c0e9e76a3293acffbea6
-- git: https://github.com/alpmestan/ekg-json.git
-  commit: fd7e5d7325939103cd87d0dc592faf644160341c
   # Databases libs
 - git: https://github.com/adinapoli/haskell-opaleye.git
   commit: e9a29582ac66198dd2c2fdc3f8c8a4b1e6fbe004
@@ -54,11 +44,11 @@ extra-deps:
   commit: 4fd2edf30c141600ffad6d730cc4c1c08a6dbce4
   # External Data API connectors
 - git: https://gitlab.iscpif.fr/gargantext/crawlers/pubmed.git
-  commit: 234ad423fa682307ff4843ae4acd725dcc6ffc55
+  commit: 300764df4f78ea6175535f9b78b884cc2aa9da61
 - git: https://gitlab.iscpif.fr/gargantext/crawlers/istex.git
-  commit: 9b1bd17f3ed38eab83e675bb68278922217a9c73
+  commit: eef5c951a6862bed31f59cd6f81a1f5fe545ac8a
 - git: https://gitlab.iscpif.fr/gargantext/crawlers/hal.git
-  commit: 25a1e9558075462a82660987920a698b8863dd63
+  commit: bfa9069b4ff70f341ca3244e8aff9e83eb4b8b73
 - git: https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git
   commit: 3db385e767d2100d8abe900833c6e7de3ac55e1b
 - git: https://gitlab.iscpif.fr/gargantext/crawlers/arxiv-api.git
@@ -72,17 +62,17 @@ extra-deps:
   commit: b4182487cfe479777c11ca19f3c0d47840b376f6
 - git: https://github.com/delanoe/patches-map
   commit: 76cae88f367976ff091e661ee69a5c3126b94694
-- git: https://gitlab.iscpif.fr/cgenie/patches-class.git
-  commit: 125c7cb90ab8f0cd6ac4a526dbdf302d10c945e9
+- git: https://gitlab.iscpif.fr/gargantext/patches-class.git
+  commit: 3668d28607867a88b2dfc62158139b3cfd629ddb
   # Graph libs
 - git: https://gitlab.iscpif.fr/gargantext/haskell-igraph.git
-  # 0.10.4-rc1
-  commit: 2a28524134b68421f30f6e97961063018f814a82
+  # 0.10.4-rc2
+  commit: 9f8a2f4a014539826a4eab3215cc70c0813f20cb
 - git: https://gitlab.iscpif.fr/gargantext/haskell-infomap.git
   commit: 1370fea1939e2378ce344e512d80671ac700e787
   # Accelerate Linear Algebra and specific instances
-- git: https://github.com/alpmestan/accelerate.git
-  commit: 640b5af87cea94b61c7737d878e6f7f2fca5c015
+- git: https://github.com/AccelerateHS/accelerate.git
+  commit: 334d05519436bb7f20f9926ec76418f5b8afa359
 - git: https://github.com/alpmestan/accelerate-arithmetic.git
   commit: a110807651036ca2228a76507ee35bbf7aedf87a
 - git: https://gitlab.iscpif.fr/amestanogullari/accelerate-utility.git
@@ -92,8 +82,8 @@ extra-deps:
   subdirs:
     - accelerate-llvm/
     - accelerate-llvm-native/
-- git: https://github.com/rspeer/wikiparsec.git
-  commit: 9637a82344bb70f7fa8f02e75db3c081ccd434ce
+- 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
@@ -104,6 +94,15 @@ extra-deps:
   commit: b9fca8beee0f23c17a6b2001ec834d071709e6e7
   subdirs:
     - 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
   # Temporary fork of boolexpr
 - git: https://github.com/adinapoli/boolexpr.git
   commit: 91928b5d7f9342e9865dde0d94862792d2b88779
@@ -120,21 +119,20 @@ extra-deps:
 - ghc-clippy-plugin-0.0.0.1
 - 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
+- hstatistics-0.3.1
+- ihaskell-0.11.0.0
+- ipython-kernel-0.11.0.0
 - located-base-0.1.1.1@sha256:7c6395f2b6fbf2d5f76c3514f774423838c0ea94e1c6a5530dd3c94b30c9d1c8,1904
 - logging-effect-1.3.12@sha256:72d168dd09887649ba9501627219b6027cbec2d5541931555b7885b133785ce3,1679
 - logict-0.8.0.0
 - monad-logger-aeson-0.2.0.0
-- monoid-extras-0.5.1@sha256:438dbfd7b4dce47d8f0ca577f56caf94bd1e21391afa545cad09fe7cf2e5793d,2333
 - rake-0.0.1@sha256:3380f6567fb17505d1095b7f32222c0b631fa04126ad39726c84262da99c08b3,2025
 - random-1.2.1
 - recover-rtti-0.4.3
-- servant-cassava-0.10.1@sha256:07e7b6ca67cf57dcb4a0041a399a25d058844505837c6479e01d62be59d01fdf,1665
 - servant-ekg-0.3.1@sha256:19bd9dc3943983da8e79d6f607614c68faea4054fb889d508c8a2b67b6bdd448,2203
 - servant-flatten-0.2@sha256:276896f7c5cdec5b8f8493f6205fded0cc602d050b58fdb09a6d7c85c3bb0837,1234
 - servant-mock-0.8.7@sha256:64cb3e52bbd51ab6cb25e3f412a99ea712c6c26f1efd117f01a8d1664df49c67,2306