Skip to content

haskell-gargantext
haskell-gargantext
Verified Commit c82f0c79 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski
Browse files
Options

[WIP] ghc 9.4.x work

parent c71dbb14
Pipeline #5326 failed with stages
          in 13 minutes and 14 seconds
          Hide whitespace changes
          Inline Side-by-side
          Showing with 62 additions and 2826 deletions
          cabal.project
          View file @ c82f0c79
          ...@@ -2,10 +2,17 @@ ...@@ -2,10 +2,17 @@
          index-state: 2023-06-24T21:28:46Z index-state: 2023-06-24T21:28:46Z
          with-compiler: ghc-8.10.7 --with-compiler: ghc-8.10.7
          with-compiler: ghc-9.4.7
          packages: packages:
          ./ ./
          /data/git-work/github/HASKELL/accelerate
          /data/git-work/github/HASKELL/accelerate-llvm/accelerate-llvm-native
          /data/git-work/github/HASKELL/accelerate-llvm/accelerate-llvm
          /data/git-work/github/HASKELL/wikiparsec
          ../haskell-gargantext-prelude
          -- ../gargantext-ihaskell
          source-repository-package source-repository-package
          type: git type: git
          ...@@ -17,22 +24,22 @@ source-repository-package ...@@ -17,22 +24,22 @@ source-repository-package
          location: https://github.com/adinapoli/haskell-opaleye.git location: https://github.com/adinapoli/haskell-opaleye.git
          tag: e9a29582ac66198dd2c2fdc3f8c8a4b1e6fbe004 tag: e9a29582ac66198dd2c2fdc3f8c8a4b1e6fbe004
          source-repository-package -- source-repository-package
          type: git -- type: git
          location: https://github.com/alpmestan/accelerate.git -- location: https://github.com/alpmestan/accelerate.git
          tag: 640b5af87cea94b61c7737d878e6f7f2fca5c015 -- tag: 640b5af87cea94b61c7737d878e6f7f2fca5c015
          source-repository-package source-repository-package
          type: git type: git
          location: https://github.com/alpmestan/accelerate-arithmetic.git location: https://github.com/alpmestan/accelerate-arithmetic.git
          tag: a110807651036ca2228a76507ee35bbf7aedf87a tag: a110807651036ca2228a76507ee35bbf7aedf87a
          source-repository-package -- source-repository-package
          type: git -- type: git
          location: https://github.com/alpmestan/accelerate-llvm.git -- location: https://github.com/alpmestan/accelerate-llvm.git
          tag: 944f5a4aea35ee6aedb81ea754bf46b131fce9e3 -- tag: 944f5a4aea35ee6aedb81ea754bf46b131fce9e3
          subdir: accelerate-llvm-native/ -- subdir: accelerate-llvm-native/
          accelerate-llvm/ -- accelerate-llvm/
          source-repository-package source-repository-package
          type: git type: git
          ...@@ -148,10 +155,10 @@ source-repository-package ...@@ -148,10 +155,10 @@ source-repository-package
          location: https://github.com/robstewart57/rdf4h.git location: https://github.com/robstewart57/rdf4h.git
          tag: 4fd2edf30c141600ffad6d730cc4c1c08a6dbce4 tag: 4fd2edf30c141600ffad6d730cc4c1c08a6dbce4
          source-repository-package -- source-repository-package
          type: git -- type: git
          location: https://github.com/rspeer/wikiparsec.git -- location: https://github.com/rspeer/wikiparsec.git
          tag: 9637a82344bb70f7fa8f02e75db3c081ccd434ce -- tag: 9637a82344bb70f7fa8f02e75db3c081ccd434ce
          allow-older: * allow-older: *
          allow-newer: * allow-newer: *
          ......
          cabal.project.freeze deleted 100644 → 0
          View file @ c71dbb14
          This source diff could not be displayed because it is too large. You can view the blob instead.
          gargantext.cabal
          View file @ c82f0c79
          ...@@ -431,7 +431,7 @@ library ...@@ -431,7 +431,7 @@ library
          , duckling ^>= 0.2.0.0 , duckling ^>= 0.2.0.0
          , ekg-core ^>= 0.1.1.7 , ekg-core ^>= 0.1.1.7
          , ekg-json ^>= 0.1.0.7 , ekg-json ^>= 0.1.0.7
          , exceptions ^>= 0.10.4 , exceptions ^>= 0.10.7
          , extra ^>= 1.7.9 , extra ^>= 1.7.9
          , fast-logger ^>= 3.0.5 , fast-logger ^>= 3.0.5
          , fclabels ^>= 2.0.5 , fclabels ^>= 2.0.5
          ...@@ -441,7 +441,7 @@ library ...@@ -441,7 +441,7 @@ library
          , formatting ^>= 7.1.3 , formatting ^>= 7.1.3
          , full-text-search ^>= 0.2.1.4 , full-text-search ^>= 0.2.1.4
          , fullstop ^>= 0.1.4 , fullstop ^>= 0.1.4
          , gargantext-graph >=0.1.0.0 , gargantext-graph
          , gargantext-prelude , gargantext-prelude
          , ghc-clippy-plugin ^>= 0.0.0.1 , ghc-clippy-plugin ^>= 0.0.0.1
          , graphviz ^>= 2999.20.1.0 , graphviz ^>= 2999.20.1.0
          ...@@ -458,7 +458,7 @@ library ...@@ -458,7 +458,7 @@ library
          , http-media ^>= 0.8.0.0 , http-media ^>= 0.8.0.0
          , http-types ^>= 0.12.3 , http-types ^>= 0.12.3
          , hxt ^>= 9.3.1.22 , hxt ^>= 9.3.1.22
          , ihaskell ^>= 0.10.2.2 , ihaskell ^>= 0.10.3.0
          , ini ^>= 0.4.1 , ini ^>= 0.4.1
          , insert-ordered-containers ^>= 0.2.5.1 , insert-ordered-containers ^>= 0.2.5.1
          , iso639 ^>= 0.1.0.3 , iso639 ^>= 0.1.0.3
          ...@@ -558,7 +558,7 @@ library ...@@ -558,7 +558,7 @@ library
          , wai-websockets ^>= 3.0.1.2 , wai-websockets ^>= 3.0.1.2
          , warp ^>= 3.3.20 , warp ^>= 3.3.20
          , websockets ^>= 0.12.7.3 , websockets ^>= 0.12.7.3
          , wikiparsec ^>= 1.2.0 , wikiparsec
          , wreq ^>= 0.5.3.3 , wreq ^>= 0.5.3.3
          , xml-conduit ^>= 1.9.1.1 , xml-conduit ^>= 1.9.1.1
          , xml-types ^>= 0.3.8 , xml-types ^>= 0.3.8
          ......
          nix/pkgs.nix
          View file @ c82f0c79
          ...@@ -114,7 +114,7 @@ rec { ...@@ -114,7 +114,7 @@ rec {
          expat expat
          icu icu
          graphviz graphviz
          llvm_9 llvm_12
          igraph_0_10_4 igraph_0_10_4
          libpqxx libpqxx
          libsodium libsodium
          ......
          stack.yaml
          View file @ c82f0c79
          resolver: lts-18.28 resolver: lts-21.19
          flags: flags:
          accelerate: accelerate:
          debug: false debug: false
          ...@@ -23,8 +23,9 @@ allow-newer: true ...@@ -23,8 +23,9 @@ allow-newer: true
          extra-deps: extra-deps:
          - git: https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude - git: https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude
          commit: 40135d166830690b1101180b79e9fd3663284b2b commit: 40135d166830690b1101180b79e9fd3663284b2b
          - git: https://gitlab.iscpif.fr/gargantext/gargantext-graph.git # - git: https://gitlab.iscpif.fr/gargantext/gargantext-graph.git
          commit: 588e104fe7593210956610cab0041fd16584a4ce # commit: 588e104fe7593210956610cab0041fd16584a4ce
          - ../gargantext-graph
          # Data Mining Libs # Data Mining Libs
          - git: https://github.com/delanoe/data-time-segment.git - git: https://github.com/delanoe/data-time-segment.git
          commit: 10a416b9f6c443866b36479c3441ebb3bcdeb7ef commit: 10a416b9f6c443866b36479c3441ebb3bcdeb7ef
          ...@@ -75,21 +76,26 @@ extra-deps: ...@@ -75,21 +76,26 @@ extra-deps:
          - git: https://gitlab.iscpif.fr/gargantext/haskell-infomap.git - git: https://gitlab.iscpif.fr/gargantext/haskell-infomap.git
          commit: 1370fea1939e2378ce344e512d80671ac700e787 commit: 1370fea1939e2378ce344e512d80671ac700e787
          # Accelerate Linear Algebra and specific instances # Accelerate Linear Algebra and specific instances
          - git: https://github.com/alpmestan/accelerate.git #- git: https://github.com/alpmestan/accelerate.git
          commit: 640b5af87cea94b61c7737d878e6f7f2fca5c015 # commit: 640b5af87cea94b61c7737d878e6f7f2fca5c015
          - /data/git-work/github/HASKELL/accelerate
          - git: https://github.com/alpmestan/accelerate-arithmetic.git - git: https://github.com/alpmestan/accelerate-arithmetic.git
          commit: a110807651036ca2228a76507ee35bbf7aedf87a commit: a110807651036ca2228a76507ee35bbf7aedf87a
          - git: https://gitlab.iscpif.fr/amestanogullari/accelerate-utility.git - git: https://gitlab.iscpif.fr/amestanogullari/accelerate-utility.git
          commit: a3875fe652d3bb5acb522674c22c6c814c1b4ad0 commit: a3875fe652d3bb5acb522674c22c6c814c1b4ad0
          - git: https://github.com/alpmestan/accelerate-llvm.git # - git: https://github.com/alpmestan/accelerate-llvm.git
          commit: 944f5a4aea35ee6aedb81ea754bf46b131fce9e3 # commit: 944f5a4aea35ee6aedb81ea754bf46b131fce9e3
          subdirs: # subdirs:
          - accelerate-llvm/ # - accelerate-llvm/
          - accelerate-llvm-native/ # - accelerate-llvm-native/
          - git: https://github.com/rspeer/wikiparsec.git - /data/git-work/github/HASKELL/accelerate-llvm/accelerate-llvm
          commit: 9637a82344bb70f7fa8f02e75db3c081ccd434ce - /data/git-work/github/HASKELL/accelerate-llvm/accelerate-llvm-native
          - /data/git-work/github/HASKELL/wikiparsec
          #- git: https://github.com/rspeer/wikiparsec.git
          # commit: 86786810afeb5e2c1ecd1031e9ebf56870cb9326
          #commit: 9637a82344bb70f7fa8f02e75db3c081ccd434ce
          # Gargantext-graph # Gargantext-graph
          - eigen-3.3.7.0@sha256:7c24a86426b238e02ba0ac2179cc44997518b443a13828ed7a791fe49a6dffa5,82060 #- eigen-3.3.7.0@sha256:7c24a86426b238e02ba0ac2179cc44997518b443a13828ed7a791fe49a6dffa5,82060
          - git: https://github.com/alpmestan/sparse-linear.git - git: https://github.com/alpmestan/sparse-linear.git
          commit: bc6ca8058077b0b5702ea4b88bd4189cfcad267a commit: bc6ca8058077b0b5702ea4b88bd4189cfcad267a
          subdirs: subdirs:
          ...@@ -110,14 +116,15 @@ extra-deps: ...@@ -110,14 +116,15 @@ extra-deps:
          - context-0.2.0.0@sha256:6b643adb4a64fe521873d08df0497f71f88e18b9ecff4b68b4eef938e446cfc9,1886 - context-0.2.0.0@sha256:6b643adb4a64fe521873d08df0497f71f88e18b9ecff4b68b4eef938e446cfc9,1886
          - dependent-sum-0.7.1.0@sha256:0e419237f5b86da3659772afff9cab355c0f8d5b3fdb15a5b30e673d8dc83941,2147 - dependent-sum-0.7.1.0@sha256:0e419237f5b86da3659772afff9cab355c0f8d5b3fdb15a5b30e673d8dc83941,2147
          - duckling-0.2.0.0@sha256:84becd4e48ee3676cdd6fe5745a77ee60e365ea730cd759610c8a7738f3eb4a6,60543 - duckling-0.2.0.0@sha256:84becd4e48ee3676cdd6fe5745a77ee60e365ea730cd759610c8a7738f3eb4a6,60543
          - fast-tagsoup-utf8-only-1.0.5@sha256:9292c8ff275c08b88b6013ccc410182552f180904214a07ad4db932ab462aaa1,1651 #- fast-tagsoup-utf8-only-1.0.5@sha256:9292c8ff275c08b88b6013ccc410182552f180904214a07ad4db932ab462aaa1,1651
          - fclabels-2.0.5@sha256:817006077632bd29e637956154aa33d3c10a59be0791c308cef955eb951b2675,4473 - fclabels-2.0.5.1@sha256:81ab243035f87928564539b87874dfee701246f5f9b124bca4f61f2e37c522f8,4475
          - full-text-search-0.2.1.4@sha256:81f6df3327e5b604f99b15e78635e5d6ca996e504c21d268a6d751d7d131aa36,6032 - full-text-search-0.2.1.4@sha256:81f6df3327e5b604f99b15e78635e5d6ca996e504c21d268a6d751d7d131aa36,6032
          - fullstop-0.1.4@sha256:80a3e382ef53551bb936e7da8b2825621df0ea169af1212debcb0a90010b30c8,2044 - fullstop-0.1.4@sha256:80a3e382ef53551bb936e7da8b2825621df0ea169af1212debcb0a90010b30c8,2044
          - ghc-clippy-plugin-0.0.0.1 - ghc-clippy-plugin-0.0.0.1
          - hgal-2.0.0.2@sha256:13d58afd0668b9cb881c612eff8488a0e289edd4bbffa893df4beee60cfeb73b,653 - hgal-2.0.0.2@sha256:13d58afd0668b9cb881c612eff8488a0e289edd4bbffa893df4beee60cfeb73b,653
          - hsparql-0.3.8 - hsparql-0.3.8
          - hstatistics-0.3.1 #- hstatistics-0.3.1
          - /data/git-work/github/HASKELL/hstatistics
          - hspec-2.11.1 - hspec-2.11.1
          - hspec-core-2.11.1 - hspec-core-2.11.1
          - hspec-discover-2.11.1 - hspec-discover-2.11.1
          ...@@ -126,7 +133,7 @@ extra-deps: ...@@ -126,7 +133,7 @@ extra-deps:
          - located-base-0.1.1.1@sha256:7c6395f2b6fbf2d5f76c3514f774423838c0ea94e1c6a5530dd3c94b30c9d1c8,1904 - located-base-0.1.1.1@sha256:7c6395f2b6fbf2d5f76c3514f774423838c0ea94e1c6a5530dd3c94b30c9d1c8,1904
          - logging-effect-1.3.12@sha256:72d168dd09887649ba9501627219b6027cbec2d5541931555b7885b133785ce3,1679 - logging-effect-1.3.12@sha256:72d168dd09887649ba9501627219b6027cbec2d5541931555b7885b133785ce3,1679
          - monad-logger-aeson-0.2.0.0 - monad-logger-aeson-0.2.0.0
          - monoid-extras-0.5.1@sha256:438dbfd7b4dce47d8f0ca577f56caf94bd1e21391afa545cad09fe7cf2e5793d,2333 #- monoid-extras-0.5.1@sha256:438dbfd7b4dce47d8f0ca577f56caf94bd1e21391afa545cad09fe7cf2e5793d,2333
          - rake-0.0.1@sha256:3380f6567fb17505d1095b7f32222c0b631fa04126ad39726c84262da99c08b3,2025 - rake-0.0.1@sha256:3380f6567fb17505d1095b7f32222c0b631fa04126ad39726c84262da99c08b3,2025
          - random-1.2.1 - random-1.2.1
          - recover-rtti-0.4.3 - recover-rtti-0.4.3
          ...@@ -144,6 +151,17 @@ extra-deps: ...@@ -144,6 +151,17 @@ extra-deps:
          - xmlbf-0.6.1@sha256:57867fcb39e0514d17b3328ff5de8d241a18482fc89bb742d9ed820a6a2a5187,1540 - xmlbf-0.6.1@sha256:57867fcb39e0514d17b3328ff5de8d241a18482fc89bb742d9ed820a6a2a5187,1540
          - xmlbf-xeno-0.2@sha256:39f70fced6052524c290cf595f114661c721452e65fc3e0953a44e7682a6a6b0,950 - xmlbf-xeno-0.2@sha256:39f70fced6052524c290cf595f114661c721452e65fc3e0953a44e7682a6a6b0,950
          # 9.4.x
          - ghc-parser-0.2.5.0@sha256:62ebb3cb459e00752f926dd126ac4169a380d02849cfe5ffe344170329c17369,1496
          - ihaskell-0.10.3.0@sha256:e25829f348452daa0452aa6a60399416cbcb613a785c0e51600fcb0398200911,6602
          #- llvm-hs-9.0.1@sha256:ee6ec2eb8cba4daf2a43586388a87dbfd6a2ec6d81d1f9965896ac187acad286,8700
          - /data/git-work/github/HASKELL/llvm-hs/llvm-hs
          #- llvm-hs-pure-9.0.0@sha256:10f655a15791a28cc53412ff9c7ce8245903da065d1dd3b981b33cfebd277693,3077
          - /data/git-work/github/HASKELL/llvm-hs/llvm-hs-pure
          - servant-auth-swagger-0.2.10.1@sha256:b56c13d9e3e1f6543c46b81dce066488d67dd6ecfa6af8ad1c78abe1182a17a6,2903
          - snap-server-1.1.2.1@sha256:d541b8cc3cd2c64d25295fb1c252d825bfa1b049529b53cd85536c8a6ab89226,15471
          # For the graph clustering # For the graph clustering
          ghc-options: ghc-options:
          hmatrix: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack hmatrix: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack
          ......
          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