Skip to content

haskell-gargantext
haskell-gargantext
Commit 62c0a399 authored by Alfredo Di Napoli's avatar Alfredo Di Napoli
Browse files
Options

feat(ghc): Upgrade GGTX to build with GHC 9.6.6

parent a86bf07b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 178 deletions
cabal.project
View file @ 62c0a399
-- Generated by stack2cabal -- Generated by stack2cabal
-- index-state: 2023-12-10T10:34:46Z -- index-state: 2023-12-10T10:34:46Z
index-state: 2024-09-12T03:02:26Z index-state: 2025-02-17T10:13:39Z
with-compiler: ghc-9.4.8 with-compiler: ghc-9.6.6
optimization: 2 optimization: 2
benchmarks: False benchmarks: False
tests: True
packages: packages:
./ ./
...@@ -103,10 +104,11 @@ source-repository-package ...@@ -103,10 +104,11 @@ source-repository-package
location: https://gitlab.iscpif.fr/gargantext/gargantext-graph.git location: https://gitlab.iscpif.fr/gargantext/gargantext-graph.git
tag: 588e104fe7593210956610cab0041fd16584a4ce tag: 588e104fe7593210956610cab0041fd16584a4ce
-- Support for GHC 9.6.x
source-repository-package source-repository-package
type: git type: git
location: https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude location: https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude
tag: bb15d828d5ef36eeaa84cccb00598b585048c88e tag: 214b31a2db46de5a2cac24231a3c07a1c4c3fab9
source-repository-package source-repository-package
type: git type: git
...@@ -128,10 +130,11 @@ source-repository-package ...@@ -128,10 +130,11 @@ source-repository-package
location: https://gitlab.iscpif.fr/gargantext/iso639.git location: https://gitlab.iscpif.fr/gargantext/iso639.git
tag: eab929d106833ded8011a0d6705135e3fc506a9c tag: eab929d106833ded8011a0d6705135e3fc506a9c
-- GHC 9.6.6 support
source-repository-package source-repository-package
type: git type: git
location: https://gitlab.iscpif.fr/gargantext/patches-class.git location: https://gitlab.iscpif.fr/gargantext/patches-class.git
tag: 3668d28607867a88b2dfc62158139b3cfd629ddb tag: a591716220cfcabffa24eb29cbaa2517023642af
source-repository-package source-repository-package
type: git type: git
...@@ -177,23 +180,26 @@ source-repository-package ...@@ -177,23 +180,26 @@ source-repository-package
location: https://gitlab.iscpif.fr/gargantext/haskell-throttle location: https://gitlab.iscpif.fr/gargantext/haskell-throttle
tag: 02f5ed9ee2d6cce45161addf945b88bc6adf9059 tag: 02f5ed9ee2d6cce45161addf945b88bc6adf9059
allow-newer: MissingH:base allow-newer: MissingH:base
, accelerate-arithmetic:accelerate , accelerate-arithmetic:accelerate
, accelerate-utility:accelerate , accelerate-utility:accelerate
, base:* , *:base
, crawlerHAL:servant , crawlerHAL:*
, eigen:constraints
, eigen:transformers
, eigen:primitive
, epo-api-client:http-client-tls
, openalex:http-client-tls
, iso639:aeson , iso639:aeson
, iso639:text , iso639:text
, servant-ekg:base
, servant-ekg:hashable , servant-ekg:hashable
, servant-ekg:servant , servant-ekg:servant
, servant-ekg:text , servant-ekg:text
, servant-ekg:time , servant-ekg:time
, servant-xml-conduit:base
, servant-xml-conduit:bytestring , servant-xml-conduit:bytestring
, servant-xml-conduit:servant , servant-xml-conduit:servant
, stemmer:base , servant-auth-server:data-default-class
, wuss:template-haskell
allow-older: aeson:hashable allow-older: aeson:hashable
, crawlerHAL:servant-client , crawlerHAL:servant-client
, haskell-bee:stm , haskell-bee:stm
...@@ -203,7 +209,7 @@ allow-older: aeson:hashable ...@@ -203,7 +209,7 @@ allow-older: aeson:hashable
package gargantext package gargantext
ghc-options: -fwrite-ide-info ghc-options: -fwrite-ide-info
package hmatrix package hmatrix
ghc-options: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack ghc-options: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal -fno-state-hack
......
cabal.project.freeze
View file @ 62c0a399
This diff is collapsed.
gargantext.cabal
View file @ 62c0a399
...@@ -549,7 +549,7 @@ library ...@@ -549,7 +549,7 @@ library
, hstatistics ^>= 0.3.1 , hstatistics ^>= 0.3.1
, http-api-data >= 0.5 && < 0.6 , http-api-data >= 0.5 && < 0.6
, http-client ^>= 0.7.14 , http-client ^>= 0.7.14
, http-client-tls == 0.3.6.1 , http-client-tls >= 0.3.6.1 && < 0.4
, http-conduit >= 2.3.8 && < 2.3.9 , http-conduit >= 2.3.8 && < 2.3.9
, http-media ^>= 0.8.0.0 , http-media ^>= 0.8.0.0
, http-types ^>= 0.12.3 , http-types ^>= 0.12.3
...@@ -570,7 +570,7 @@ library ...@@ -570,7 +570,7 @@ library
, morpheus-graphql-app >= 0.24.3 && < 0.28.1 , morpheus-graphql-app >= 0.24.3 && < 0.28.1
, morpheus-graphql-server >= 0.24.3 && < 0.28.1 , morpheus-graphql-server >= 0.24.3 && < 0.28.1
, morpheus-graphql-subscriptions >= 0.24.3 && < 0.28.1 , morpheus-graphql-subscriptions >= 0.24.3 && < 0.28.1
, mtl ^>= 2.2.2 , mtl >= 2.2.2 && < 2.4
, nanomsg-haskell >= 0.2.4 && < 0.3 , nanomsg-haskell >= 0.2.4 && < 0.3
, network >= 3.1.4.0 , network >= 3.1.4.0
, network-uri ^>= 2.6.4.1 , network-uri ^>= 2.6.4.1
...@@ -597,9 +597,9 @@ library ...@@ -597,9 +597,9 @@ library
, scientific < 0.4 , scientific < 0.4
, serialise ^>= 0.2.4.0 , serialise ^>= 0.2.4.0
, servant >= 0.20.1 && < 0.21 , servant >= 0.20.1 && < 0.21
, servant-auth ^>= 0.4.0.0 , servant-auth >= 0.4.0.0 && < 0.5
, servant-auth-client , servant-auth-client
, servant-auth-server ^>=0.4.6.0 , servant-auth-server >=0.4.6.0 && < 0.5
, servant-auth-swagger ^>= 0.2.10.1 , servant-auth-swagger ^>= 0.2.10.1
, servant-blaze ^>= 0.9.1 , servant-blaze ^>= 0.9.1
, servant-client >= 0.20 && < 0.21 , servant-client >= 0.20 && < 0.21
...@@ -616,7 +616,7 @@ library ...@@ -616,7 +616,7 @@ library
, servant-xml-conduit ^>= 0.1.0.4 , servant-xml-conduit ^>= 0.1.0.4
, shelly >= 1.9 && < 2 , shelly >= 1.9 && < 2
, singletons ^>= 3.0.2 , singletons ^>= 3.0.2
, singletons-th >= 3.1 && < 3.2 , singletons-th >= 3.1 && < 3.3
, smtp-mail >= 0.3.0.0 , smtp-mail >= 0.3.0.0
, split >= 0.2.3.4 , split >= 0.2.3.4
, stemmer == 0.5.2 , stemmer == 0.5.2
...@@ -625,11 +625,12 @@ library ...@@ -625,11 +625,12 @@ library
, stringsearch >= 0.3.6.6 , stringsearch >= 0.3.6.6
, swagger2 ^>= 2.8.7 , swagger2 ^>= 2.8.7
, tagsoup ^>= 0.14.8 , tagsoup ^>= 0.14.8
, template-haskell ^>= 2.19.0.0 , template-haskell >= 2.19.0.0 && < 2.21
, temporary ^>= 1.3 , temporary ^>= 1.3
, text ^>= 2.0.2 , text ^>= 2.0.2
, text-metrics ^>= 0.3.2 , text-metrics ^>= 0.3.2
, time ^>= 1.12.2 , time ^>= 1.12.2
, transformers
, transformers-base ^>= 0.4.6 , transformers-base ^>= 0.4.6
, tree-diff , tree-diff
, toml-parser >= 2.0.1.0 && < 3 , toml-parser >= 2.0.1.0 && < 3
...@@ -648,7 +649,7 @@ library ...@@ -648,7 +649,7 @@ library
, wai-extra ^>= 3.1.8 , wai-extra ^>= 3.1.8
, wai-util >= 0.8 , wai-util >= 0.8
, warp ^>= 3.3.20 , warp ^>= 3.3.20
, websockets ^>= 0.12.7.3 , websockets >= 0.12.7.3 && < 0.14
, wreq ^>= 0.5.3.3 , wreq ^>= 0.5.3.3
, xml-conduit ^>= 1.9.1.3 , xml-conduit ^>= 1.9.1.3
, xml-types ^>= 0.3.8 , xml-types ^>= 0.3.8
...@@ -738,12 +739,11 @@ common commonTestDependencies ...@@ -738,12 +739,11 @@ common commonTestDependencies
, hspec-wai , hspec-wai
, hspec-wai-json , hspec-wai-json
, http-client ^>= 0.7.14 , http-client ^>= 0.7.14
-- important: 0.3.6.1 uses cryptonite, while > uses crypton , http-client-tls >= 0.3.6.1 && < 0.4
, http-client-tls == 0.3.6.1
, http-types , http-types
, lens >= 5.2.2 && < 5.3 , lens >= 5.2.2 && < 5.3
, monad-control >= 1.0.3 && < 1.1 , monad-control >= 1.0.3 && < 1.1
, mtl ^>= 2.2.2 , mtl >= 2.2.2 && < 2.4
, network-uri , network-uri
, parsec ^>= 3.1.16.1 , parsec ^>= 3.1.16.1
, patches-class ^>= 0.1.0.1 , patches-class ^>= 0.1.0.1
......
src/Gargantext/API/GraphQL/PolicyCheck.hs
View file @ 62c0a399
...@@ -14,7 +14,8 @@ module Gargantext.API.GraphQL.PolicyCheck where ...@@ -14,7 +14,8 @@ module Gargantext.API.GraphQL.PolicyCheck where
import Prelude import Prelude
import Control.Monad.Except (MonadError(..), MonadTrans(..)) import Control.Monad.Except (MonadError(..))
import Control.Monad.Trans.Class (lift)
import Gargantext.API.Admin.Auth.Types ( AuthenticatedUser ) import Gargantext.API.Admin.Auth.Types ( AuthenticatedUser )
import Gargantext.API.Auth.PolicyCheck ( BoolExpr, AccessCheck, AccessPolicyManager(..), AccessResult(..)) import Gargantext.API.Auth.PolicyCheck ( BoolExpr, AccessCheck, AccessPolicyManager(..), AccessResult(..))
import Gargantext.API.Errors.Types ( BackendInternalError(..) ) import Gargantext.API.Errors.Types ( BackendInternalError(..) )
......
src/Gargantext/Database/Types.hs
View file @ 62c0a399
...@@ -32,6 +32,9 @@ data Indexed i a = ...@@ -32,6 +32,9 @@ data Indexed i a =
makeLenses ''Indexed makeLenses ''Indexed
instance Functor (Indexed i) where
fmap f (Indexed i a) = Indexed i (f a)
instance Bifunctor Indexed where instance Bifunctor Indexed where
first f (Indexed i a) = Indexed (f i) a first f (Indexed i a) = Indexed (f i) a
second g (Indexed i a) = Indexed i (g a) second g (Indexed i a) = Indexed i (g a)
......
test/Test/Database/Operations.hs
View file @ 62c0a399
...@@ -10,7 +10,6 @@ module Test.Database.Operations ( ...@@ -10,7 +10,6 @@ module Test.Database.Operations (
, nodeStoryTests , nodeStoryTests
) where ) where
import Control.Monad.Except
import Control.Monad.Reader import Control.Monad.Reader
import Data.Text qualified as T import Data.Text qualified as T
import Data.Text.Encoding qualified as TE import Data.Text.Encoding qualified as TE
......
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