[ghc] more deps fixes, also test small fix

parent 95f311fb
......@@ -166,6 +166,10 @@ If you want to see the detailed build info for a given dependency:
cabal v2-build -v servant-server
```
Also, you might use the `-Wunused-packages` GHC option, to get a
warning about unused packages (make sure though you build all targets
with `cabal v2-build all`).
Also, here is a relevant discussion:
https://discourse.haskell.org/t/whats-your-workflow-to-update-cabal-dependencies/9475
......
......@@ -18,8 +18,8 @@ fi
# 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="641c87fb990ef95f861805e11c76663f075516af845c5dab458bf82b3ba5fd7d"
expected_cabal_project_freeze_hash="6ca9d2c298827a05d873e30aaac5db3cf6648c7ca9118f13f1b109c13479f38b"
expected_cabal_project_hash="967fee2ed28f46b12a629ad9821301854d3159975b7297653e50d7fc1f3b8919"
expected_cabal_project_freeze_hash="af825192f1ec47b07e6001dd2556b59991c9e6c50094dc732ee933a41f0dc9bd"
cabal --store-dir=$STORE_DIR v2-build --dry-run
......
......@@ -90,7 +90,7 @@ source-repository-package
source-repository-package
type: git
location: https://gitlab.iscpif.fr/gargantext/crawlers/epo-proxy-api.git
tag: 9225d046083853200b9045c8d71161e6a234fc5c
tag: cf4e5004f3b002bdef3fcab95e3559d65cdcd858
source-repository-package
type: git
......@@ -110,7 +110,7 @@ source-repository-package
source-repository-package
type: git
location: https://gitlab.iscpif.fr/gargantext/crawlers/openalex.git
tag: d2df0130575cfd32d6863d77e2ce34c48a1c32fa
tag: 4eec15855207dc74afc75b94c3764eede4de7b55
source-repository-package
type: git
......@@ -199,8 +199,6 @@ source-repository-package
tag: 02f5ed9ee2d6cce45161addf945b88bc6adf9059
allow-newer:
accelerate-arithmetic:accelerate
, MissingH:base
......@@ -210,10 +208,6 @@ allow-newer:
, crawlerISTEX:servant
, crawlerPubMed:servant
, crawlerPubMed:servant-client-core
, epo-api-client:base
, epo-api-client:aeson
, epo-api-client:servant
, epo-api-client:text
, iso639:aeson
, iso639:text
, morpheus-graphql-app:text
......@@ -224,9 +218,6 @@ allow-newer:
, morpheus-graphql-server:text
, morpheus-graphql-subscriptions:text
, morpheus-graphql:text
, openalex:servant
, openalex:servant-client-core
, openalex:time
, servant-client:servant
, servant-client:servant-client-core
, servant-ekg:base
......@@ -240,11 +231,8 @@ allow-newer:
, stemmer:base
allow-older: aeson:hashable
, crawlerHAL:servant-client
, epo-api-client:http-client-tls
, haskell-throttle:time
, hsparql:rdf4h
, openalex:http-client-tls
, openalex:vector
package gargantext
ghc-options: -fwrite-ide-info -hiedir=".stack-work/hiedb"
......
active-repositories: hackage.haskell.org:merge
constraints: any.Cabal ==3.8.1.0,
any.Cabal-syntax ==3.8.1.0,
any.Glob ==0.10.2,
any.HTTP ==4000.4.1,
HTTP -conduit10 +network-uri -warn-as-error -warp-tests,
any.HUnit ==1.6.2.0,
any.JuicyPixels ==3.3.9,
JuicyPixels -mmap,
any.KMP ==0.2.0.0,
any.MissingH ==1.4.3.1,
MissingH +network--ge-3_0_0,
any.MonadRandom ==0.6,
any.OneTuple ==0.4.2,
any.Only ==0.1,
any.QuickCheck ==2.14.3,
QuickCheck -old-random +templatehaskell,
any.RSA ==2.4.1,
any.SHA ==1.6.4.4,
SHA -exe,
any.StateVar ==1.2.2,
any.abstract-deque ==0.3,
abstract-deque -usecas,
any.accelerate ==1.3.0.0,
accelerate +bounds-checks -debug -internal-checks -nofib -unsafe-checks,
any.accelerate-arithmetic ==1.0.0.1,
any.accelerate-llvm ==1.3.0.0,
any.accelerate-llvm-native ==1.3.0.0,
any.accelerate-utility ==1.0.0.1,
any.adjunctions ==4.4.2,
any.aeson ==2.1.2.1,
aeson -cffi +ordered-keymap,
any.aeson-pretty ==0.8.10,
aeson-pretty -lib-only,
any.aeson-qq ==0.8.4,
any.alex ==3.5.1.0,
any.ansi-terminal ==1.0.2,
ansi-terminal -example,
any.ansi-terminal-types ==0.11.5,
any.ansi-wl-pprint ==0.6.9,
ansi-wl-pprint -example,
any.appar ==0.1.8,
any.array ==0.5.4.0,
any.asn1-encoding ==0.9.6,
any.asn1-parse ==0.9.5,
any.asn1-types ==0.3.4,
any.assoc ==1.1.1,
assoc -tagged,
any.async ==2.2.5,
async -bench,
any.atomic-primops ==0.8.8,
atomic-primops -debug,
any.attoparsec ==0.14.4,
attoparsec -developer,
any.attoparsec-aeson ==2.1.0.0,
any.attoparsec-iso8601 ==1.1.0.0,
any.authenticate-oauth ==1.7,
any.auto-update ==0.1.6,
any.barbies ==2.1.1.0,
any.base ==4.17.2.0,
any.base-compat ==0.13.1,
any.base-compat-batteries ==0.13.1,
any.base-orphans ==0.9.2,
any.base-unicode-symbols ==0.2.4.2,
base-unicode-symbols +base-4-8 -old-base,
any.base16-bytestring ==1.0.2.0,
any.base64 ==1.0,
any.base64-bytestring ==1.2.1.0,
any.basement ==0.0.16,
any.bifunctors ==5.6.2,
bifunctors +tagged,
any.bimap ==0.5.0,
any.binary ==0.8.9.1,
any.binary-orphans ==1.0.5,
any.bindings-DSL ==1.0.25,
any.bitvec ==1.1.5.0,
bitvec +simd,
any.blaze-builder ==0.4.2.3,
any.blaze-html ==0.9.2.0,
any.blaze-markup ==0.8.3.0,
any.boolexpr ==0.3,
any.boring ==0.2.2,
boring +tagged,
any.bsb-http-chunked ==0.0.0.4,
any.byteable ==0.1.1,
any.byteorder ==1.0.4,
any.bytestring ==0.11.5.2,
any.bytestring-builder ==0.10.8.2.0,
bytestring-builder +bytestring_has_builder,
any.bzlib-conduit ==0.3.0.3,
any.c2hs ==0.28.8,
c2hs +base3 -regression,
any.cabal-doctest ==1.0.10,
any.cache ==0.1.3.0,
any.call-stack ==0.4.0,
any.case-insensitive ==1.2.1.0,
any.cassava ==0.5.3.2,
any.cassava-conduit ==0.6.6,
cassava-conduit +small_base,
any.cborg ==0.2.10.0,
cborg +optimize-gmp,
any.cereal ==0.5.8.3,
cereal -bytestring-builder,
any.charset ==0.3.10,
any.cipher-aes ==0.2.11,
cipher-aes +support_aesni,
any.clock ==0.8.4,
clock -llvm,
any.cmdargs ==0.10.22,
cmdargs +quotation -testprog,
any.code-page ==0.2.1,
any.colour ==2.3.6,
any.comonad ==5.0.8,
comonad +containers +distributive +indexed-traversable,
any.concise ==0.1.0.1,
any.concurrent-output ==1.10.21,
any.conduit ==1.3.6,
any.conduit-extra ==1.3.6,
any.conduit-zstd ==0.0.2.0,
any.connection ==0.3.1,
any.constraints ==0.13.4,
any.containers ==0.6.7,
any.contravariant ==1.5.5,
contravariant +semigroups +statevar +tagged,
any.cookie ==0.4.6,
any.cprng-aes ==0.6.1,
any.crawlerArxiv ==0.1.0.0,
any.crawlerHAL ==0.1.0.0,
any.crawlerISTEX ==0.1.0.0,
any.crawlerIsidore ==0.1.0.0,
any.crawlerPubMed ==0.1.0.0,
any.criterion ==1.6.1.0,
criterion -embed-data-files -fast,
any.criterion-measurement ==0.2.2.0,
criterion-measurement -fast,
any.cron ==0.7.1,
cron -lib-werror,
any.crypto-api ==0.13.3,
crypto-api -all_cpolys,
any.crypto-cipher-types ==0.0.9,
any.crypto-pubkey-types ==0.4.3,
any.crypto-random ==0.0.9,
any.cryptohash ==0.11.9,
any.cryptohash-md5 ==0.11.101.0,
any.cryptohash-sha1 ==0.11.101.0,
any.crypton ==1.0.0,
crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
any.crypton-x509 ==1.7.7,
any.cryptonite ==0.30,
cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
any.data-default ==0.7.1.1,
any.data-default-class ==0.1.2.0,
any.data-default-instances-containers ==0.0.1,
any.data-default-instances-dlist ==0.0.1,
any.data-default-instances-old-locale ==0.0.1,
any.data-fix ==0.3.4,
any.data-ordlist ==0.4.7.0,
any.data-time-segment ==0.1.0.0,
any.dec ==0.0.6,
any.deepseq ==1.4.8.0,
any.deferred-folds ==0.9.18.6,
any.dense-linear-algebra ==0.1.0.0,
any.digest ==0.0.2.1,
digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config,
any.directory ==1.3.7.1,
any.discrimination ==0.5,
any.distributive ==0.6.2.1,
distributive +semigroups +tagged,
any.dlist ==1.0,
dlist -werror,
any.double-conversion ==2.0.5.0,
double-conversion -developer +embedded_double_conversion,
any.easy-file ==0.2.5,
any.eigen ==3.3.7.0,
any.either ==5.0.2,
any.ekg-core ==0.1.1.7,
any.ekg-json ==0.1.0.8,
any.enclosed-exceptions ==1.0.3,
any.entropy ==0.4.1.10,
entropy -donotgetentropy,
any.epo-api-client ==0.1.0.0,
any.erf ==2.0.0.0,
any.exceptions ==0.10.5,
any.extra ==1.7.16,
any.fail ==4.9.0.0,
any.fast-logger ==3.2.3,
any.fgl ==5.8.2.0,
fgl +containers042,
any.file-embed ==0.0.16.0,
any.file-embed-lzma ==0.1,
any.filepath ==1.4.2.2,
any.fmt ==0.6.3.0,
any.focus ==1.0.3.2,
any.foldable1-classes-compat ==0.1,
foldable1-classes-compat +tagged,
any.foldl ==1.4.17,
any.formatting ==7.2.0,
formatting -no-double-conversion,
any.free ==5.2,
any.fullstop ==0.1.4,
any.gargantext-graph ==0.1.0.0,
any.gargantext-prelude ==0.1.0.0,
any.generic-monoid ==0.1.0.1,
any.generically ==0.1.1,
any.generics-sop ==0.5.1.3,
any.ghc ==9.4.7,
any.ghc-bignum ==1.3,
any.ghc-boot ==9.4.7,
any.ghc-boot-th ==9.4.7,
any.ghc-heap ==9.4.7,
any.ghc-prim ==0.9.1,
any.ghci ==9.4.7,
any.githash ==0.1.7.0,
any.graphviz ==2999.20.2.0,
graphviz -test-parsing,
any.groups ==0.5.3,
any.half ==0.3.1,
any.happy ==1.20.1.1,
any.hashable ==1.4.4.0,
hashable +integer-gmp -random-initial-seed,
any.hashtables ==1.3.1,
hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks,
any.haskell-igraph ==0.10.4,
any.haskell-lexer ==1.1.1,
any.haskell-src-exts ==1.23.1,
any.haskell-src-meta ==0.8.14,
any.haskell-throttle ==0.1.0.0,
any.hedgehog ==1.5,
any.hgal ==2.0.0.3,
any.hlcm ==0.2.2,
any.hmatrix ==0.20.2,
hmatrix -disable-default-paths -no-random_r -openblas,
any.hmatrix-gsl-stats ==0.4.1.8,
hmatrix-gsl-stats -onlygsl,
any.hourglass ==0.2.12,
any.hpc ==0.6.1.0,
any.hsc2hs ==0.68.10,
hsc2hs -in-ghc-tree,
any.hsinfomap ==0.1,
any.hslogger ==1.3.1.1,
hslogger +network--gt-3_0_0,
any.hsparql ==0.3.8,
any.hspec ==2.11.9,
any.hspec-api ==2.11.9,
any.hspec-core ==2.11.9,
any.hspec-discover ==2.11.9,
any.hspec-expectations ==0.8.4,
any.hspec-wai ==0.11.1,
any.hspec-wai-json ==0.11.0,
any.hstatistics ==0.3.1,
any.http-accept ==0.2,
any.http-api-data ==0.5.1,
http-api-data -use-text-show,
any.http-client ==0.7.14,
http-client +network-uri,
any.http-client-tls ==0.3.6.1,
any.http-conduit ==2.3.8.3,
http-conduit +aeson,
any.http-date ==0.0.11,
any.http-media ==0.8.1.1,
any.http-reverse-proxy ==0.6.1.0,
any.http-types ==0.12.4,
any.http2 ==5.0.1,
http2 -devel -h2spec,
any.hxt ==9.3.1.22,
hxt -network-uri -profile,
any.hxt-charproperties ==9.5.0.0,
hxt-charproperties -profile,
any.hxt-regex-xmlschema ==9.2.0.7,
hxt-regex-xmlschema -profile,
any.hxt-unicode ==9.0.2.4,
any.indexed-profunctors ==0.1.1.1,
any.indexed-traversable ==0.1.4,
any.indexed-traversable-instances ==0.1.1.2,
any.ini ==0.4.2,
any.insert-ordered-containers ==0.2.5.3,
any.integer-gmp ==1.1,
any.integer-logarithms ==1.0.3.1,
integer-logarithms -check-bounds +integer-gmp,
any.invariant ==0.6.3,
any.iproute ==1.7.14,
any.iso639 ==0.1.0.3,
any.jose ==0.10.0.1,
jose -demos,
any.js-chart ==2.9.4.1,
any.json-stream ==0.4.6.0,
json-stream -conduit,
any.kan-extensions ==5.2.6,
any.language-c ==0.9.3,
language-c -allwarnings +iecfpextension +usebytestrings,
any.lens ==5.2.3,
lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy,
any.lens-aeson ==1.2.3,
any.libffi ==0.2.1,
libffi +ghc-bundled-libffi,
any.libyaml ==0.1.4,
libyaml -no-unicode -system-libyaml,
any.libyaml-clib ==0.2.5,
any.lifted-async ==0.10.2.5,
any.lifted-base ==0.2.3.12,
any.list-t ==1.0.5.7,
any.llvm-hs ==12.0.0,
llvm-hs -debug -llvm-with-rtti +shared-llvm,
any.llvm-hs-pure ==12.0.0,
any.lockfree-queue ==0.2.4,
any.logict ==0.8.1.0,
any.loop ==0.3.0,
any.lzma ==0.0.1.1,
lzma +pkgconfig,
any.math-functions ==0.3.4.4,
math-functions +system-erf +system-expm1,
any.matrix ==0.3.6.3,
any.megaparsec ==9.6.1,
megaparsec -dev,
any.memory ==0.18.0,
memory +support_bytestring +support_deepseq,
any.microlens ==0.4.13.1,
any.microlens-th ==0.4.3.15,
any.microstache ==1.0.2.3,
any.mime-mail ==0.5.1,
any.mime-types ==0.1.2.0,
any.mmorph ==1.2.0,
any.modern-uri ==0.3.6.1,
modern-uri -dev,
any.monad-control ==1.0.3.1,
any.monad-logger ==0.3.40,
monad-logger +template_haskell,
any.monad-loops ==0.4.3,
monad-loops +base4,
any.monad-time ==0.4.0.0,
any.mono-traversable ==1.0.17.0,
any.monoid-extras ==0.6.3,
any.morpheus-graphql ==0.24.3,
any.morpheus-graphql-app ==0.24.3,
any.morpheus-graphql-client ==0.24.3,
any.morpheus-graphql-code-gen ==0.24.3,
any.morpheus-graphql-code-gen-utils ==0.24.3,
any.morpheus-graphql-core ==0.24.3,
any.morpheus-graphql-server ==0.24.3,
any.morpheus-graphql-subscriptions ==0.24.3,
any.mtl ==2.2.2,
any.mtl-compat ==0.2.2,
mtl-compat -two-point-one -two-point-two,
any.mwc-random ==0.15.1.0,
mwc-random -benchpapi,
any.nanomsg-haskell ==0.2.4,
any.network ==3.1.4.0,
network -devel,
any.network-bsd ==2.8.1.0,
any.network-byte-order ==0.1.7,
any.network-control ==0.0.2,
any.network-info ==0.2.1,
any.network-uri ==2.6.4.2,
any.old-locale ==1.0.0.7,
any.old-time ==1.1.0.4,
any.opaleye ==0.9.7.0,
any.opaleye-textsearch ==0.2.0.0,
any.openalex ==0.1.0.0,
any.optics-core ==0.4.1.1,
optics-core -explicit-generic-labels,
any.optics-extra ==0.4.2.1,
any.optics-th ==0.4.1,
any.optparse-applicative ==0.17.1.0,
optparse-applicative +process,
any.optparse-generic ==1.4.9,
any.optparse-simple ==0.1.1.4,
optparse-simple -build-example,
any.ordered-containers ==0.2.4,
any.os-string ==2.0.6,
any.parallel ==3.2.2.0,
any.parsec ==3.1.16.1,
any.parser-combinators ==1.3.0,
parser-combinators -dev,
any.parsers ==0.12.11,
parsers +attoparsec +binary +parsec,
any.password ==3.0.4.0,
password +argon2 +bcrypt -crypton -cryptonite +pbkdf2 +scrypt,
any.password-types ==1.0.0.0,
any.patches-class ==0.1.0.1,
any.patches-map ==0.1.0.1,
any.pem ==0.2.4,
any.polyparse ==1.13,
any.port-utils ==0.2.1.0,
any.postgres-options ==0.2.2.0,
any.postgresql-libpq ==0.9.5.0,
postgresql-libpq -use-pkg-config,
any.postgresql-simple ==0.6.5.1,
any.pretty ==1.1.3.6,
any.pretty-show ==1.10,
any.pretty-simple ==4.1.2.0,
pretty-simple -buildexample +buildexe,
any.prettyprinter ==1.7.1,
prettyprinter -buildreadme +text,
any.prettyprinter-ansi-terminal ==1.1.3,
any.primitive ==0.7.4.0,
any.primitive-extras ==0.10.2,
any.primitive-unlifted ==2.1.0.0,
any.process ==1.6.17.0,
any.product-profunctors ==0.11.1.1,
any.profunctors ==5.6.2,
any.promises ==0.3,
any.protolude ==0.3.4,
any.psqueues ==0.2.8.0,
any.qrcode-core ==0.9.9,
any.qrcode-juicypixels ==0.8.5,
any.quickcheck-instances ==0.3.30,
quickcheck-instances -bytestring-builder,
any.quickcheck-io ==0.2.0,
any.rake ==0.0.1,
any.random ==1.2.1.2,
any.random-shuffle ==0.0.4,
any.raw-strings-qq ==1.1,
any.rdf4h ==3.1.1,
any.recover-rtti ==0.4.3,
any.recv ==0.1.0,
any.reflection ==2.1.8,
reflection -slow +template-haskell,
any.regex ==1.1.0.2,
any.regex-base ==0.94.0.2,
any.regex-compat ==0.95.2.1,
any.regex-pcre-builtin ==0.95.2.3.8.44,
any.regex-posix ==0.96.0.1,
regex-posix -_regex-posix-clib,
any.regex-tdfa ==1.3.2.2,
regex-tdfa +doctest -force-o2,
any.relude ==1.2.1.0,
any.replace-attoparsec ==1.5.0.0,
any.req ==3.13.0,
req -dev,
any.resource-pool ==0.4.0.0,
any.resourcet ==1.3.0,
any.retry ==0.9.3.1,
retry -lib-werror,
any.rts ==1.0.2,
any.safe ==0.3.21,
any.safe-exceptions ==0.1.7.4,
any.scientific ==0.3.7.0,
scientific -bytestring-builder -integer-simple,
any.securemem ==0.1.10,
any.semialign ==1.3,
semialign +semigroupoids,
any.semigroupoids ==5.3.7,
semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
any.semigroups ==0.20,
semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers,
any.serialise ==0.2.6.1,
serialise +newtime15,
any.servant ==0.20.2,
any.servant-auth ==0.4.2.0,
any.servant-auth-client ==0.4.2.0,
any.servant-auth-server ==0.4.9.0,
any.servant-auth-swagger ==0.2.11.0,
any.servant-blaze ==0.9.1,
any.servant-client ==0.19,
any.servant-client-core ==0.20.2,
any.servant-ekg ==0.3.1,
any.servant-flatten ==0.2,
any.servant-job ==0.2.0.0,
any.servant-routes ==0.1.0.0,
any.servant-server ==0.20.2,
any.servant-swagger ==1.2.1,
any.servant-swagger-ui ==0.3.5.5.0.1,
any.servant-swagger-ui-core ==0.3.5,
any.servant-websockets ==2.0.0,
any.servant-xml-conduit ==0.1.0.4,
any.shelly ==1.12.1,
shelly -build-examples -lifted,
any.simple-sendfile ==0.2.32,
simple-sendfile +allow-bsd -fallback,
any.singleton-bool ==0.1.8,
any.singletons ==3.0.3,
any.singletons-base ==3.1.1,
any.singletons-th ==3.1.1,
any.smallcheck ==1.2.1.1,
any.smtp-mail ==0.3.0.0,
any.socks ==0.6.1,
any.some ==1.0.6,
some +newtype-unsafe,
any.sop-core ==0.5.0.2,
any.sparse-linear ==0.1.0.0,
any.split ==0.2.5,
any.splitmix ==0.1.0.5,
splitmix -optimised-mixer,
any.statistics ==0.16.2.1,
any.stemmer ==0.5.2,
any.stm ==2.5.1.0,
any.stm-chans ==3.0.0.9,
any.stm-containers ==1.2.1,
any.stm-hamt ==1.2.1,
any.storable-complex ==0.2.3.0,
any.streaming-commons ==0.2.2.6,
streaming-commons -use-bytestring-builder,
any.strict ==0.5,
any.string-conversions ==0.4.0.1,
any.stringsearch ==0.3.6.6,
stringsearch -base3 +base4,
any.swagger2 ==2.8.9,
any.syb ==0.7.2.4,
any.system-cxx-std-lib ==1.0,
any.system-filepath ==0.4.14,
any.tagged ==0.8.8,
tagged +deepseq +transformers,
any.taggy ==0.2.1,
any.taggy-lens ==0.1.2,
any.tagsoup ==0.14.8,
any.tasty ==1.5,
tasty +unix,
any.tasty-bench ==0.4,
tasty-bench +tasty,
any.tasty-golden ==2.3.5,
tasty-golden -build-example,
any.tasty-hspec ==1.2.0.4,
any.tasty-hunit ==0.10.2,
any.tasty-quickcheck ==0.11,
any.tasty-smallcheck ==0.8.2,
any.template-haskell ==2.19.0.0,
any.temporary ==1.3,
any.terminal-size ==0.3.4,
any.terminfo ==0.4.1.5,
any.text ==2.0.2,
any.text-format ==0.3.2.1,
text-format -developer,
any.text-metrics ==0.3.2,
text-metrics -dev,
any.text-short ==0.1.6,
text-short -asserts,
any.tf-random ==0.5,
any.th-abstraction ==0.4.5.0,
any.th-compat ==0.1.5,
any.th-desugar ==1.14,
any.th-expand-syns ==0.4.11.0,
any.th-lift ==0.8.4,
any.th-lift-instances ==0.1.20,
any.th-orphans ==0.13.14,
any.th-reify-many ==0.1.10,
any.these ==1.2.1,
any.time ==1.12.2,
any.time-compat ==1.9.7,
any.time-locale-compat ==0.1.1.5,
time-locale-compat -old-locale,
any.time-manager ==0.0.1,
any.tls ==1.6.0,
tls +compat -hans +network,
any.tmp-postgres ==1.34.1.0,
any.toml-parser ==2.0.1.0,
any.transformers ==0.5.6.2,
any.transformers-base ==0.4.6,
transformers-base +orphaninstances,
any.transformers-compat ==0.7.2,
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
any.tree-diff ==0.3.0.1,
any.tuple ==0.3.0.2,
any.type-equality ==1.0.1,
any.typed-process ==0.2.12.0,
any.unicode-collation ==0.1.3.6,
unicode-collation -doctests -executable,
any.unique ==0.0.1,
any.unix ==2.7.3,
any.unix-compat ==0.7.2,
any.unix-time ==0.4.15,
any.unliftio ==0.2.25.0,
any.unliftio-core ==0.2.1.0,
any.unordered-containers ==0.2.20,
unordered-containers -debug,
any.uri-bytestring ==0.3.3.1,
uri-bytestring -lib-werror,
any.uri-encode ==1.5.0.7,
uri-encode +network-uri -tools,
any.utf8-string ==1.0.2,
any.utility-ht ==0.0.17.2,
any.uuid ==1.3.16,
any.uuid-types ==1.0.6,
any.validity ==0.12.1.0,
any.vault ==0.3.1.5,
vault +useghc,
any.vector ==0.12.3.1,
vector +boundschecks -internalchecks -unsafechecks -wall,
any.vector-algorithms ==0.9.0.2,
vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
any.vector-binary-instances ==0.2.5.2,
any.vector-th-unbox ==0.2.2,
any.void ==0.7.3,
void -safe,
any.wai ==3.2.4,
any.wai-app-static ==3.1.9,
wai-app-static +crypton -print,
any.wai-cors ==0.2.7,
any.wai-extra ==3.1.15,
wai-extra -build-example,
any.wai-logger ==2.4.1,
any.wai-util ==0.8,
any.wai-websockets ==3.0.1.2,
wai-websockets +example,
any.warp ==3.3.31,
warp +allow-sendfilefd -network-bytestring -warp-debug +x509,
any.websockets ==0.12.7.3,
websockets -example,
any.witherable ==0.4.2,
any.wl-pprint-annotated ==0.1.0.1,
any.wl-pprint-text ==1.2.0.2,
any.word8 ==0.1.3,
any.wreq ==0.5.4.3,
wreq -aws -developer +doctest -httpbin,
any.wuss ==2.0.1.3,
wuss -pedantic,
any.x509 ==1.7.7,
any.x509-store ==1.6.9,
any.x509-system ==1.6.7,
any.x509-validation ==1.6.12,
any.xml ==1.3.14,
any.xml-conduit ==1.9.1.3,
any.xml-types ==0.3.8,
any.yaml ==0.11.11.2,
yaml +no-examples +no-exe,
any.zip ==2.0.1,
zip -dev -disable-bzip2 -disable-zstd,
any.zip-archive ==0.4.3.2,
zip-archive -executable,
any.zlib ==0.7.1.0,
zlib -bundled-c-zlib +non-blocking-ffi +pkg-config,
any.zstd ==0.1.3.0,
zstd +standalone
index-state: hackage.haskell.org 2024-09-12T03:02:26Z
......@@ -472,8 +472,7 @@ library
if flag(no-phylo-debug-logs)
cpp-options: -DNO_PHYLO_DEBUG_LOGS
build-depends:
HSvm ^>= 0.1.1.3.22
, KMP ^>= 0.2.0.0
KMP ^>= 0.2.0.0
, MissingH ^>= 1.4.3.0
, MonadRandom ^>= 0.6
, QuickCheck ^>= 2.14.2
......@@ -502,7 +501,6 @@ library
, crawlerPubMed
, cron ^>= 0.7.0
, data-time-segment ^>= 0.1.0.0
, deepseq ^>= 1.4.4.0
, deferred-folds >= 0.9.18 && < 0.10
, directory ^>= 1.3.6.0
, discrimination >= 0.5
......@@ -516,7 +514,6 @@ library
, filepath ^>= 1.4.2.1
, fmt
, formatting ^>= 7.2.0
, full-text-search ^>= 0.2.1.4
, fullstop ^>= 0.1.4
, gargantext-graph >=0.1.0.0
, gargantext-prelude
......@@ -530,11 +527,10 @@ library
, http-api-data >= 0.5 && < 0.6
, http-client ^>= 0.7.14
, http-client-tls == 0.3.6.1
, http-conduit ^>= 2.3.8
, http-conduit >= 2.3.8 && < 2.3.9
, http-media ^>= 0.8.0.0
, http-types ^>= 0.12.3
, http-reverse-proxy >= 0.6.1.0
, hxt ^>= 9.3.1.22
, ini ^>= 0.4.1
, insert-ordered-containers ^>= 0.2.5.1
, iso639 ^>= 0.1.0.3
......@@ -542,8 +538,6 @@ library
, json-stream ^>= 0.4.2.4
, lens >= 5.2.2 && < 5.3
, lens-aeson < 1.3
, lifted-base ^>= 0.2.3.12
, listsafe ^>= 0.1.0.1
, matrix ^>= 0.3.6.1
, mime-mail >= 0.5.1
, monad-control ^>= 1.0.3.1
......@@ -553,13 +547,11 @@ library
, morpheus-graphql-subscriptions >= 0.24.3 && < 0.25
, mtl ^>= 2.2.2
, nanomsg-haskell >= 0.2.4 && < 0.3
, natural-transformation ^>= 0.4
, network >= 3.1.4.0
, network-uri ^>= 2.6.4.1
, opaleye ^>= 0.9.6.1
, opaleye-textsearch >= 0.2.0.0
, openalex
, pandoc ^>= 3.0.1
, parallel ^>= 3.2.2.0
, parsec ^>= 3.1.14.0
, patches-class ^>= 0.1.0.1
......@@ -586,7 +578,6 @@ library
, servant-client-core >= 0.20 && < 0.21
, servant-ekg ^>= 0.3.1
, servant-job >= 0.2.0.0
, servant-multipart ^>= 0.12.1
, servant-routes < 0.2
, servant-server >= 0.18.3 && < 0.21
, servant-swagger ^>= 1.2
......@@ -602,7 +593,6 @@ library
, stm-containers >= 1.2.0.3 && < 1.3
, stringsearch >= 0.3.6.6
, swagger2 ^>= 2.8.7
, taggy-lens ^>= 0.1.2
, tagsoup ^>= 0.14.8
, template-haskell ^>= 2.19.0.0
, temporary ^>= 1.3
......@@ -624,7 +614,6 @@ library
, wai-cors ^>= 0.2.7
, wai-extra ^>= 3.1.8
, wai-util >= 0.8
, wai-websockets ^>= 3.0.1.2
, warp ^>= 3.3.20
, websockets ^>= 0.12.7.3
, wreq ^>= 0.5.3.3
......@@ -667,7 +656,6 @@ executable gargantext-cli
, cryptohash ^>= 0.11.9
, directory ^>= 1.3.6.0
, extra ^>= 1.7.9
, full-text-search ^>= 0.2.1.4
, gargantext
, gargantext-prelude
, ini ^>= 0.4.1
......@@ -704,7 +692,6 @@ executable gargantext-server
cassava ^>= 0.5.2.0
, containers ^>= 0.6.5.1
, extra ^>= 1.7.9
, full-text-search ^>= 0.2.1.4
, gargantext
, gargantext-prelude
, ini ^>= 0.4.1
......@@ -892,7 +879,6 @@ benchmark garg-bench
Paths_gargantext
build-depends: base
, bytestring ^>= 0.11.5.2
, deepseq
, gargantext
, gargantext-prelude
, tasty-bench
......
......@@ -51,7 +51,7 @@ import Network.Wai
import Network.Wai.Util (redirect')
import Servant hiding (Header)
import Servant.Auth.Server
import Servant.Auth.Server.Internal.AddSetCookie
import Servant.Auth.Server.Internal.AddSetCookie ()
import Servant.Auth.Swagger ()
import Servant.Client.Core.BaseUrl
import Servant.Server.Generic
......@@ -59,13 +59,13 @@ import Text.RE.Replace hiding (Capture)
import Text.RE.TDFA.ByteString
-- See https://github.com/haskell-servant/servant/issues/1601#issue-1338013029
instance {-# OVERLAPPING #-}
( AddSetCookies ('S n) a a
, AddSetCookies ('S n) b b'
)
=> AddSetCookies ('S n) (a :<|> b) (a :<|> b') where
addSetCookies cookies ( a :<|> b) = addSetCookies cookies a :<|> addSetCookies cookies b
-- -- See https://github.com/haskell-servant/servant/issues/1601#issue-1338013029
-- instance {-# OVERLAPPING #-}
-- ( AddSetCookies ('S n) a a
-- , AddSetCookies ('S n) b b'
-- )
-- => AddSetCookies ('S n) (a :<|> b) (a :<|> b') where
-- addSetCookies cookies ( a :<|> b) = addSetCookies cookies a :<|> addSetCookies cookies b
--
-- Types
......
#"allow-newer": true
"allow-newer": false
"extra-deps":
- "HSvm-0.1.1.3.22"
- "JuicyPixels-3.3.9"
- "KMP-0.2.0.0"
- "MissingH-1.4.3.0"
- "MissingH-1.4.3.1"
- "OneTuple-0.4.2"
- "aeson-pretty-0.8.10"
- "alex-3.5.1.0"
- "ansi-terminal-1.0.2"
- "assoc-1.1.1"
- "async-2.2.5"
- "atomic-primops-0.8.8"
- "barbies-2.1.1.0"
- "base-compat-0.13.1"
- "base-compat-batteries-0.13.1"
- "base-orphans-0.9.2"
- "base64-1.0"
- "bifunctors-5.6.2"
- "binary-orphans-1.0.5"
- "blaze-html-0.9.2.0"
- "boring-0.2.2"
- "bzlib-conduit-0.3.0.3"
- "cabal-doctest-1.0.10"
- "cassava-0.5.3.2"
- "cassava-conduit-0.6.6"
- "cborg-0.2.10.0"
- "concurrent-output-1.10.21"
- "conduit-1.3.6"
- "criterion-measurement-0.2.2.0"
- "cron-0.7.1"
- "crypton-1.0.0"
- "crypton-x509-1.7.7"
- "data-fix-0.3.4"
- "dec-0.0.6"
- "deferred-folds-0.9.18.6"
- "full-text-search-0.2.1.4"
- "digest-0.0.2.1"
- "double-conversion-2.0.5.0"
- "extra-1.7.16"
- "fast-logger-3.2.3"
- "fgl-5.8.2.0"
- "file-embed-0.0.16.0"
- "file-embed-lzma-0.1"
- "foldl-1.4.17"
- "free-5.2"
- "fullstop-0.1.4"
- "hgal-2.0.0.2"
- "graphviz-2999.20.2.0"
- "hashable-1.4.4.0"
- "haskell-src-meta-0.8.14"
- "hedgehog-1.5"
- "hslogger-1.3.1.1"
- "hsparql-0.3.8"
- "hspec-2.11.1"
- "hspec-core-2.11.1"
- "hspec-discover-2.11.1"
- "hspec-expectations-0.8.3"
- "hspec-2.11.9"
- "hspec-api-2.11.9"
- "hspec-core-2.11.9"
- "hspec-discover-2.11.9"
- "hspec-expectations-0.8.4"
- "http-accept-0.2"
- "http-api-data-0.5.1"
- "http-conduit-2.3.8.3"
- "http-types-0.12.4"
- "http2-5.0.1"
- "indexed-traversable-0.1.4"
- "invariant-0.6.3"
- "iproute-1.7.14"
- "jose-0.10.0.1"
- "json-stream-0.4.6.0"
- "kan-extensions-5.2.6"
- "language-c-0.9.3"
- "libyaml-0.1.4"
- "libyaml-clib-0.2.5"
- "lifted-async-0.10.2.5"
- "logict-0.8.1.0"
- "lzma-0.0.1.1"
- "math-functions-0.3.4.4"
- "matrix-0.3.6.3"
- "megaparsec-9.6.1"
- "microlens-th-0.4.3.15"
- "mono-traversable-1.0.17.0"
- "monoid-extras-0.6.3"
- "morpheus-graphql-0.24.3"
- "morpheus-graphql-app-0.24.3"
- "morpheus-graphql-client-0.24.3"
......@@ -21,25 +85,78 @@
- "morpheus-graphql-core-0.24.3"
- "morpheus-graphql-server-0.24.3"
- "morpheus-graphql-subscriptions-0.24.3"
- "opaleye-0.9.6.1"
- "mwc-random-0.15.1.0"
- "network-control-0.0.2"
- "old-time-1.1.0.4"
- "ordered-containers-0.2.4"
- "os-string-2.0.6"
- "password-3.0.4.0"
- "postgres-options-0.2.2.0"
- "primitive-0.7.4.0"
- "primitive-extras-0.10.2"
- "primitive-unlifted-2.1.0.0"
- "protolude-0.3.4"
- "psqueues-0.2.8.0"
- "rake-0.0.1"
- "random-1.2.1"
- "random-1.2.1.2"
- "recover-rtti-0.4.3"
- "servant-0.20.1"
- "servant-auth-server-0.4.8.0"
- "servant-auth-swagger-0.2.10.2"
- "servant-client-core-0.20"
- "reflection-2.1.8"
- "resourcet-1.3.0"
- "safe-0.3.21"
- "serialise-0.2.6.1"
- "servant-0.20.2"
- "servant-auth-0.4.2.0"
- "servant-auth-client-0.4.2.0"
- "servant-auth-server-0.4.9.0"
- "servant-auth-swagger-0.2.11.0"
- "servant-client-core-0.20.2"
- "servant-ekg-0.3.1"
- "servant-flatten-0.2"
- "servant-server-0.20"
- "servant-swagger-1.2"
- "servant-server-0.20.2"
- "servant-swagger-1.2.1"
- "servant-swagger-ui-0.3.5.5.0.1"
- "singleton-bool-0.1.8"
- "singletons-3.0.3"
- "some-1.0.6"
- "split-0.2.5"
- "stemmer-0.5.2"
- "stm-containers-1.2.1"
- "stm-hamt-1.2.1"
- "swagger2-2.8.9"
- "tagged-0.8.8"
- "taggy-0.2.1"
- "taggy-lens-0.1.2"
- "vector-0.12.3.0"
- "tasty-1.5"
- "tasty-bench-0.4"
- "tasty-hspec-1.2.0.4"
- "tasty-hunit-0.10.2"
- "tasty-quickcheck-0.11"
- "text-short-0.1.6"
- "th-compat-0.1.5"
- "these-1.2.1"
- "time-compat-1.9.7"
- "type-equality-1.0.1"
- "typed-process-0.2.12.0"
- "unicode-collation-0.1.3.6"
- "unix-compat-0.7.2"
- "unix-time-0.4.15"
- "unordered-containers-0.2.20"
- "utility-ht-0.0.17.2"
- "uuid-1.3.16"
- "uuid-types-1.0.6"
- "validity-0.12.1.0"
- "vector-0.12.3.1"
- "vector-algorithms-0.9.0.2"
- "wai-3.2.4"
- "wai-app-static-3.1.9"
- "wai-extra-3.1.15"
- "wai-logger-2.4.1"
- "wai-util-0.8"
- "warp-3.3.31"
- "wreq-0.5.4.3"
- "zip-2.0.1"
- "zip-archive-0.4.3.2"
- "zlib-0.7.1.0"
- commit: 2b5d69448557e89002c0179ea1aaf59bb757a6e3
git: "https://github.com/AccelerateHS/accelerate-llvm.git"
subdirs:
......@@ -88,7 +205,7 @@
git: "https://github.com/boolexpr/boolexpr.git"
subdirs:
- .
- commit: 8fff32a43df743c8c83428a86dd566a0936a4fba
- commit: 1790fdf9138970dde0dbabf8b270698145a4a88c
git: "https://github.com/chessai/eigen.git"
subdirs:
- .
......@@ -124,7 +241,7 @@
git: "https://gitlab.iscpif.fr/gargantext/crawlers/arxiv-api.git"
subdirs:
- .
- commit: 9225d046083853200b9045c8d71161e6a234fc5c
- commit: cf4e5004f3b002bdef3fcab95e3559d65cdcd858
git: "https://gitlab.iscpif.fr/gargantext/crawlers/epo-proxy-api.git"
subdirs:
- .
......@@ -140,7 +257,7 @@
git: "https://gitlab.iscpif.fr/gargantext/crawlers/istex.git"
subdirs:
- .
- commit: d2df0130575cfd32d6863d77e2ce34c48a1c32fa
- commit: 4eec15855207dc74afc75b94c3764eede4de7b55
git: "https://gitlab.iscpif.fr/gargantext/crawlers/openalex.git"
subdirs:
- .
......@@ -218,11 +335,10 @@ flags:
"lib-only": false
"ansi-terminal":
example: false
"win32-2-13-1": false
"ansi-wl-pprint":
example: false
assoc:
tagged: true
tagged: false
async:
bench: false
"atomic-primops":
......@@ -233,7 +349,6 @@ flags:
"base-4-8": true
"old-base": false
bifunctors:
semigroups: true
tagged: true
bitvec:
simd: true
......@@ -244,8 +359,6 @@ flags:
c2hs:
base3: true
regression: false
cassava:
"bytestring--lt-0_10_4": false
"cassava-conduit":
small_base: true
cborg:
......@@ -254,9 +367,6 @@ flags:
"bytestring-builder": false
"cipher-aes":
support_aesni: true
citeproc:
executable: false
icu: false
clock:
llvm: false
cmdargs:
......@@ -300,6 +410,12 @@ flags:
support_sse: false
use_target_attributes: true
digest:
have_arm64_crc32c: false
have_builtin_prefetch: false
have_mm_prefetch: false
have_sse42: false
have_strong_getauxval: false
have_weak_getauxval: false
"pkg-config": true
distributive:
semigroups: true
......@@ -316,9 +432,7 @@ flags:
"foldable1-classes-compat":
tagged: true
formatting:
"no-double-conversion": true
"full-text-search":
"build-search-demo": false
"no-double-conversion": false
gargantext:
"no-phylo-debug-logs": false
"test-crypto": false
......@@ -354,7 +468,7 @@ flags:
devel: false
h2spec: false
hxt:
"network-uri": true
"network-uri": false
profile: false
"hxt-charproperties":
profile: false
......@@ -408,6 +522,8 @@ flags:
"mtl-compat":
"two-point-one": false
"two-point-two": false
"mwc-random":
benchpapi: false
network:
devel: false
"optics-core":
......@@ -416,8 +532,6 @@ flags:
process: true
"optparse-simple":
"build-example": false
pandoc:
embed_data_files: false
"parser-combinators":
dev: false
parsers:
......@@ -427,6 +541,8 @@ flags:
password:
argon2: true
bcrypt: true
crypton: false
cryptonite: false
pbkdf2: true
scrypt: true
"postgresql-libpq":
......@@ -483,10 +599,6 @@ flags:
"simple-sendfile":
"allow-bsd": true
fallback: false
skylighting:
executable: false
"skylighting-core":
executable: false
some:
"newtype-unsafe": true
splitmix:
......@@ -502,21 +614,15 @@ flags:
tasty:
unix: true
"tasty-bench":
debug: false
tasty: true
"tasty-golden":
"build-example": false
texmath:
executable: false
server: false
"text-format":
developer: false
"text-metrics":
dev: false
"text-short":
asserts: false
"time-compat":
"old-locale": false
"time-locale-compat":
"old-locale": false
tls:
......@@ -536,16 +642,6 @@ flags:
"unicode-collation":
doctests: false
executable: false
"unicode-data":
ucd2haskell: false
"unicode-transforms":
"bench-show": false
dev: false
"has-icu": false
"has-llvm": false
"use-gauge": false
"unix-compat":
"old-time": false
"unordered-containers":
debug: false
"uri-bytestring":
......@@ -601,8 +697,8 @@ flags:
executable: false
zlib:
"bundled-c-zlib": false
"non-blocking-ffi": false
"pkg-config": false
"non-blocking-ffi": true
"pkg-config": true
zstd:
standalone: true
packages:
......
......@@ -362,19 +362,24 @@ testFetchJobStatusNoContention = do
testMarkProgress :: IO ()
testMarkProgress = do
myEnv <- newTestEnv
evts <- newTBQueueIO 7
-- evts <- newTBQueueIO 7
evts <- newTVarIO []
let getStatus hdl = do
liftIO $ threadDelay 100_000
st <- getLatestJobStatus hdl
liftIO $ atomically $ writeTBQueue evts st
-- liftIO $ atomically $ writeTBQueue evts st
liftIO $ atomically $ modifyTVar evts (\xs -> st:xs)
readAllEvents = do
-- We will get thread blocking if there is ANY error in the job
-- Hence we assert the `readAllEvents` test doesn't take too long
mRet <- timeout 2_000_000 $ atomically $ do
allEventsArrived <- isFullTBQueue evts
mRet <- timeout 1_000_000 $ atomically $ do
-- allEventsArrived <- isFullTBQueue evts
evts' <- readTVar evts
-- STM retry if things failed
check allEventsArrived
flushTBQueue evts
-- check allEventsArrived
check (length evts' == 7)
-- flushTBQueue evts
return evts'
return $ fromMaybe [] mRet
withJob_ myEnv $ \hdl _input -> do
......@@ -401,7 +406,8 @@ testMarkProgress = do
getStatus hdl
[jl0, jl1, jl2, jl3, jl4, jl5, jl6] <- readAllEvents
evts' <- readAllEvents
let [jl0, jl1, jl2, jl3, jl4, jl5, jl6] = evts'
-- Check the events are what we expect
jl0 `shouldBe` JobLog { _scst_succeeded = Just 0
......
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