]> Git — Sourcephile - gargantext.git/log
gargantext.git
15 months agoimpl: fix breaking changes with aeson >=2
Julien Moutinho [Mon, 3 Jul 2023 20:09:01 +0000 (22:09 +0200)]
impl: fix breaking changes with aeson >=2

aeson-2.0 intoduced an opaque KeyMap to replace HashMap.

15 months agoimpl: fix overlapping `MimeRender` instances
Julien Moutinho [Mon, 3 Jul 2023 20:07:44 +0000 (22:07 +0200)]
impl: fix overlapping `MimeRender` instances

This remove the need to patch servant,
as done in the previously pinned version:
https://github.com/haskell-servant/servant/commits/no-mimerender-overlap

15 months agobuild: add nix flake support
Julien Moutinho [Mon, 26 Jun 2023 19:23:12 +0000 (21:23 +0200)]
build: add nix flake support

Main motivations for using a `flake.nix`:
- To simplify managing inputs that we need to lock
  (e.g. Nixpkgs and some haskellPackages).
- To speed up the loading of the developing shell.
See last stage of:
https://www.haskellforall.com/2022/08/incrementally-package-haskell-program.html

To load a shell: `nix -L develop` or `direnv allow`,
this will get reachable all the dependencies needed through the environment,
then `cabal repl` can work.

To update a dependency: `nix flake lock --update-input nixpkgs`

To update all dependencies: `nix flake update`

WARNING: Please review the WARNING comments about the use of a non primary branch
for several dependencies, they're at the exact commit frozen in `stack.yaml`

WARNING: Please review the patches in the `patches/` directory,
some should be pushed upstream, but may require a bit more care
to support backward compatibility:
- patches/accelerate-arithmetic/0001-remove-test-using-removed-realBandedGramian.patch
- patches/arxiv-api/0001-build-fix-license.patch
- patches/crawlerPubMed/0001-fix-test-suite-build-dependencies.patch
- patches/duckling/0001-fix-missing-Eq-Dimension-a-needed-by-recent-hashable.patch
- patches/duckling/0002-support-and-require-aeson-2.0.patch
- patches/ekg-json/0001-support-and-require-aeson-2.0.patch
- patches/hal/0001-build-fix-halCrawler-crawlerHAL.patch
- patches/patches-class/0001-fix-comment-that-confused-GHC-because-of-haddock-syn.patch
- patches/servant-ekg/0001-fix-missing-instance-HasEndpoint.patch
- patches/servant-job/0001-fix-comment-breaking-haddock.patch

Some may contain questionnable changes:
eg. `patches/accelerate-llvm-native/0001-fix-removed-argInt-by-using-argInt64.patch`

Some come from upstream but are not merged yet:
- patches/opaleye/PR-563.patch

NOTE: `pre-commit-hooks` is enabled, but only on `.nix` files so far.
It generates `.pre-commit-config.yaml` and `.git/hooks/pre-commit`.

16 months ago[CABAL] cleaning
Alexandre Delanoë [Sun, 2 Jul 2023 18:44:10 +0000 (20:44 +0200)]
[CABAL] cleaning

16 months ago[BIN]
Alexandre Delanoë [Fri, 30 Jun 2023 12:36:40 +0000 (14:36 +0200)]
[BIN]

16 months ago[VERSION] +1 to 0.0.6.9.9.7.1
Alexandre Delanoë [Fri, 30 Jun 2023 12:19:10 +0000 (14:19 +0200)]
[VERSION] +1 to 0.0.6.9.9.7.1

16 months agoMerge remote-tracking branch 'origin/dev-openalex' into dev-merge
Alexandre Delanoë [Fri, 30 Jun 2023 07:49:09 +0000 (09:49 +0200)]
Merge remote-tracking branch 'origin/dev-openalex' into dev-merge

16 months ago[BIN] fix
Alexandre Delanoë [Fri, 30 Jun 2023 07:48:56 +0000 (09:48 +0200)]
[BIN] fix

16 months ago[openalex] add support for language filter in queries
Przemysław Kaminski [Fri, 30 Jun 2023 07:45:23 +0000 (09:45 +0200)]
[openalex] add support for language filter in queries

16 months agomerge
Alexandre Delanoë [Fri, 30 Jun 2023 07:01:30 +0000 (09:01 +0200)]
merge

16 months ago[openalex] allow author display_name to be null
Przemysław Kaminski [Fri, 30 Jun 2023 05:22:46 +0000 (07:22 +0200)]
[openalex] allow author display_name to be null

16 months ago[FIX]
Alexandre Delanoë [Thu, 29 Jun 2023 14:11:07 +0000 (16:11 +0200)]
[FIX]

16 months agoMerge branch 'dev' into dev-openalex
Przemysław Kaminski [Thu, 29 Jun 2023 12:39:18 +0000 (14:39 +0200)]
Merge branch 'dev' into dev-openalex

16 months ago[FIX] Database creation
Alexandre Delanoë [Thu, 29 Jun 2023 12:18:44 +0000 (14:18 +0200)]
[FIX] Database creation

16 months ago[openalex] use search instead of filter
Przemysław Kaminski [Thu, 29 Jun 2023 04:52:56 +0000 (06:52 +0200)]
[openalex] use search instead of filter

16 months ago[FIX] Install
Alexandre Delanoë [Wed, 28 Jun 2023 16:03:30 +0000 (18:03 +0200)]
[FIX] Install

16 months ago[FIX] admin
Alexandre Delanoë [Wed, 28 Jun 2023 14:33:39 +0000 (16:33 +0200)]
[FIX] admin

16 months agoUpdate CI and docker image
Alfredo Di Napoli [Wed, 28 Jun 2023 14:02:56 +0000 (16:02 +0200)]
Update CI and docker image

16 months agoDo not ignore gargantext.cabal
Alfredo Di Napoli [Wed, 28 Jun 2023 10:45:51 +0000 (12:45 +0200)]
Do not ignore gargantext.cabal

16 months agoRIP package.yaml
Alfredo Di Napoli [Wed, 28 Jun 2023 10:36:01 +0000 (12:36 +0200)]
RIP package.yaml

16 months ago[BIN] install
Alexandre Delanoë [Wed, 28 Jun 2023 10:52:26 +0000 (12:52 +0200)]
[BIN] install

16 months ago[FIX] Cabal
Alexandre Delanoë [Wed, 28 Jun 2023 10:50:56 +0000 (12:50 +0200)]
[FIX] Cabal

16 months ago[FIX] update schema
Alexandre Delanoë [Wed, 28 Jun 2023 08:19:26 +0000 (10:19 +0200)]
[FIX] update schema

16 months agoInitial version of the project that builds with cabal
Alfredo Di Napoli [Tue, 27 Jun 2023 14:27:59 +0000 (16:27 +0200)]
Initial version of the project that builds with cabal

16 months ago[FIX] Nix Config
Alexandre Delanoë [Tue, 27 Jun 2023 10:00:24 +0000 (12:00 +0200)]
[FIX] Nix Config

16 months agoinstall
Alexandre Delanoë [Wed, 28 Jun 2023 14:20:00 +0000 (16:20 +0200)]
install

16 months ago[FIX]
Alexandre Delanoë [Wed, 28 Jun 2023 13:53:32 +0000 (15:53 +0200)]
[FIX]

16 months agofix the shape and the font
qlobbe [Wed, 28 Jun 2023 13:33:55 +0000 (15:33 +0200)]
fix the shape and the font

16 months agofix the shape
qlobbe [Wed, 28 Jun 2023 13:31:14 +0000 (15:31 +0200)]
fix the shape

16 months agofix the invalid chart
qlobbe [Tue, 27 Jun 2023 14:37:46 +0000 (16:37 +0200)]
fix the invalid chart

16 months ago[FIX] admin
Alexandre Delanoë [Wed, 28 Jun 2023 14:33:39 +0000 (16:33 +0200)]
[FIX] admin

16 months ago[FIX] NIX
Alexandre Delanoë [Wed, 28 Jun 2023 13:53:32 +0000 (15:53 +0200)]
[FIX] NIX

16 months agoMerge remote-tracking branch 'origin/dev-openalex' into dev
Alexandre Delanoë [Wed, 28 Jun 2023 13:35:56 +0000 (15:35 +0200)]
Merge remote-tracking branch 'origin/dev-openalex' into dev

16 months agoMerge remote-tracking branch 'origin/dev-phylo' into dev
Alexandre Delanoë [Wed, 28 Jun 2023 13:35:12 +0000 (15:35 +0200)]
Merge remote-tracking branch 'origin/dev-phylo' into dev

16 months agofix the shape and the font
qlobbe [Wed, 28 Jun 2023 13:33:55 +0000 (15:33 +0200)]
fix the shape and the font

16 months agofix the shape
qlobbe [Wed, 28 Jun 2023 13:31:14 +0000 (15:31 +0200)]
fix the shape

16 months agoMerge branch 'dev' into dev-openalex
Przemysław Kaminski [Wed, 28 Jun 2023 13:20:46 +0000 (15:20 +0200)]
Merge branch 'dev' into dev-openalex

16 months ago[openalex] Database type fixed
Przemysław Kaminski [Wed, 28 Jun 2023 12:35:56 +0000 (14:35 +0200)]
[openalex] Database type fixed

16 months ago[BIN] install
Alexandre Delanoë [Wed, 28 Jun 2023 10:52:26 +0000 (12:52 +0200)]
[BIN] install

16 months ago[FIX] Cabal
Alexandre Delanoë [Wed, 28 Jun 2023 10:50:56 +0000 (12:50 +0200)]
[FIX] Cabal

16 months agoMerge branch 'dev' into dev-openalex
Przemysław Kaminski [Wed, 28 Jun 2023 10:47:18 +0000 (12:47 +0200)]
Merge branch 'dev' into dev-openalex

16 months ago[openalex] first attempt on integration this
Przemysław Kaminski [Wed, 28 Jun 2023 10:46:24 +0000 (12:46 +0200)]
[openalex] first attempt on integration this

16 months agoMerge branch 'adinapoli/improve-cabal' into dev
Alexandre Delanoë [Wed, 28 Jun 2023 10:44:17 +0000 (12:44 +0200)]
Merge branch 'adinapoli/improve-cabal' into dev

16 months agoUpdate cabal-install to 3.10.1.0 via overlays
Alfredo Di Napoli [Wed, 28 Jun 2023 10:24:41 +0000 (12:24 +0200)]
Update cabal-install to 3.10.1.0 via overlays

16 months ago[FIX] update schema
Alexandre Delanoë [Wed, 28 Jun 2023 08:19:26 +0000 (10:19 +0200)]
[FIX] update schema

16 months agoMerge remote-tracking branch 'origin/dev-phylo' into dev
Alexandre Delanoë [Wed, 28 Jun 2023 08:04:36 +0000 (10:04 +0200)]
Merge remote-tracking branch 'origin/dev-phylo' into dev

16 months agoAdd .clippy.dhall to package.yaml, force hpack installation in update-cabal-project...
Alfredo Di Napoli [Wed, 28 Jun 2023 07:43:07 +0000 (09:43 +0200)]
Add .clippy.dhall to package.yaml, force hpack installation in update-cabal-project script

16 months ago[FIX] Cabal
Alexandre Delanoë [Tue, 27 Jun 2023 15:40:45 +0000 (17:40 +0200)]
[FIX] Cabal

16 months ago[FIX] Cabal clippy
Alexandre Delanoë [Tue, 27 Jun 2023 15:30:08 +0000 (17:30 +0200)]
[FIX] Cabal clippy

16 months agoMerge branch 'adinapoli/try-stack2cabal' into dev
Alexandre Delanoë [Tue, 27 Jun 2023 15:29:55 +0000 (17:29 +0200)]
Merge branch 'adinapoli/try-stack2cabal' into dev

16 months agofix the invalid chart
qlobbe [Tue, 27 Jun 2023 14:37:46 +0000 (16:37 +0200)]
fix the invalid chart

16 months agoInitial version of the project that builds with cabal
Alfredo Di Napoli [Tue, 27 Jun 2023 14:27:59 +0000 (16:27 +0200)]
Initial version of the project that builds with cabal

16 months agoAlmost working version of cabal build
Alfredo Di Napoli [Tue, 27 Jun 2023 14:05:52 +0000 (16:05 +0200)]
Almost working version of cabal build

16 months agoInitial work to support building with cabal
Alfredo Di Napoli [Tue, 27 Jun 2023 09:13:07 +0000 (11:13 +0200)]
Initial work to support building with cabal

16 months ago[ERGO] Sending email at the end of phylo
Alexandre Delanoë [Tue, 27 Jun 2023 13:58:10 +0000 (15:58 +0200)]
[ERGO] Sending email at the end of phylo

16 months ago[FIX] Nix Config
Alexandre Delanoë [Tue, 27 Jun 2023 10:00:24 +0000 (12:00 +0200)]
[FIX] Nix Config

16 months ago[VERSION] +1 to 0.0.6.9.9.7
Alexandre Delanoë [Tue, 27 Jun 2023 09:06:16 +0000 (11:06 +0200)]
[VERSION] +1 to 0.0.6.9.9.7

16 months ago[FIX] Licence
Alexandre Delanoë [Tue, 27 Jun 2023 09:04:05 +0000 (11:04 +0200)]
[FIX] Licence

16 months agoMerge remote-tracking branch 'origin/dev-phylo' into dev-merge
Alexandre Delanoë [Tue, 27 Jun 2023 08:55:23 +0000 (10:55 +0200)]
Merge remote-tracking branch 'origin/dev-phylo' into dev-merge

16 months ago[FIX] Nix shell install
Alexandre Delanoë [Tue, 27 Jun 2023 08:54:37 +0000 (10:54 +0200)]
[FIX] Nix shell install

16 months agofix the synchronic clustering
qlobbe [Tue, 27 Jun 2023 07:19:52 +0000 (09:19 +0200)]
fix the synchronic clustering

16 months ago[FIX] Print phylo dev
Alexandre Delanoë [Mon, 26 Jun 2023 15:28:20 +0000 (17:28 +0200)]
[FIX] Print phylo

16 months agoresolve the conflict
qlobbe [Mon, 26 Jun 2023 14:11:42 +0000 (16:11 +0200)]
resolve the conflict

16 months ago[FIX] DefaultMode for phylo
Alexandre Delanoë [Mon, 26 Jun 2023 13:42:46 +0000 (15:42 +0200)]
[FIX] DefaultMode for phylo

16 months ago[FIX] Phylo
Alexandre Delanoë [Wed, 21 Jun 2023 13:43:40 +0000 (15:43 +0200)]
[FIX] Phylo

16 months agomaybe fix the phylo issue
qlobbe [Wed, 21 Jun 2023 12:22:17 +0000 (14:22 +0200)]
maybe fix the phylo issue

16 months ago[VERSION] +1 to 0.0.6.9.9.6.9
Alexandre Delanoë [Wed, 21 Jun 2023 08:47:43 +0000 (10:47 +0200)]
[VERSION] +1 to 0.0.6.9.9.6.9

16 months agoMerge remote-tracking branch 'origin/506-dev-tree-search-fix' into dev
Alexandre Delanoë [Wed, 21 Jun 2023 08:46:43 +0000 (10:46 +0200)]
Merge remote-tracking branch 'origin/506-dev-tree-search-fix' into dev

16 months ago[VERSION] +1 to 0.0.6.9.9.6.8
Alexandre Delanoë [Wed, 21 Jun 2023 08:44:08 +0000 (10:44 +0200)]
[VERSION] +1 to 0.0.6.9.9.6.8

16 months agoMerge branch 'dev' into 571-dev-node-corpus-api-search-fixes-take-2
Przemysław Kaminski [Wed, 21 Jun 2023 08:27:41 +0000 (10:27 +0200)]
Merge branch 'dev' into 571-dev-node-corpus-api-search-fixes-take-2

16 months ago[pubmed] implement pubmed api key in hyperdata user
Przemysław Kaminski [Wed, 21 Jun 2023 08:23:31 +0000 (10:23 +0200)]
[pubmed] implement pubmed api key in hyperdata user

16 months ago[Tree search] Search in shared folders
Karen Konou [Wed, 21 Jun 2023 08:19:43 +0000 (10:19 +0200)]
[Tree search] Search in shared folders

16 months ago[FIX] Update Node Phylo
Alexandre Delanoë [Tue, 20 Jun 2023 21:18:32 +0000 (23:18 +0200)]
[FIX] Update Node Phylo

16 months ago[node] fix pubmed JSON serialization
Przemysław Kaminski [Tue, 20 Jun 2023 15:54:18 +0000 (17:54 +0200)]
[node] fix pubmed JSON serialization

16 months agoMerge branch 'dev' into 571-dev-node-corpus-api-search-fixes-take-2
Przemysław Kaminski [Tue, 20 Jun 2023 14:54:25 +0000 (16:54 +0200)]
Merge branch 'dev' into 571-dev-node-corpus-api-search-fixes-take-2

16 months agoMerge remote-tracking branch 'origin/revert-0b51636b' into dev
Alexandre Delanoë [Tue, 20 Jun 2023 14:53:13 +0000 (16:53 +0200)]
Merge remote-tracking branch 'origin/revert-0b51636b' into dev

16 months ago[FIX] Phylo default mode
Alexandre Delanoë [Tue, 20 Jun 2023 14:52:59 +0000 (16:52 +0200)]
[FIX] Phylo default mode

16 months agoRevert "Merge remote-tracking branch 'origin/571-dev-node-corpus-api-search-fixes...
Przemyslaw Kaminski [Tue, 20 Jun 2023 14:51:02 +0000 (16:51 +0200)]
Revert "Merge remote-tracking branch 'origin/571-dev-node-corpus-api-search-fixes' into dev-merge"

This reverts merge request !166

16 months ago[errors] better handling of garg job errors
Przemysław Kaminski [Tue, 20 Jun 2023 05:43:38 +0000 (07:43 +0200)]
[errors] better handling of garg job errors

JSON should now be better so that the UI can handle it in task async
handler.

16 months ago[VERSION] +1 to 0.0.6.9.9.6.7
Alexandre Delanoë [Tue, 20 Jun 2023 13:31:06 +0000 (15:31 +0200)]
[VERSION] +1 to 0.0.6.9.9.6.7

16 months agoMerge remote-tracking branch 'origin/571-dev-node-corpus-api-search-fixes' into dev...
Alexandre Delanoë [Tue, 20 Jun 2023 13:29:16 +0000 (15:29 +0200)]
Merge remote-tracking branch 'origin/571-dev-node-corpus-api-search-fixes' into dev-merge

16 months agoMerge remote-tracking branch 'origin/adinapoli/fix-phylo-types' into dev-merge
Alexandre Delanoë [Tue, 20 Jun 2023 13:28:52 +0000 (15:28 +0200)]
Merge remote-tracking branch 'origin/adinapoli/fix-phylo-types' into dev-merge

16 months ago[MERGE] Phylo
Alexandre Delanoë [Tue, 20 Jun 2023 13:28:45 +0000 (15:28 +0200)]
[MERGE] Phylo

16 months agoAdd Phylo golden tests
Alfredo Di Napoli [Tue, 20 Jun 2023 07:31:03 +0000 (09:31 +0200)]
Add Phylo golden tests

16 months agoInitial work on the GraphData for Phylio GraphData
Alfredo Di Napoli [Mon, 19 Jun 2023 14:54:13 +0000 (16:54 +0200)]
Initial work on the GraphData for Phylio GraphData

16 months ago[errors] better handling of garg job errors
Przemysław Kaminski [Tue, 20 Jun 2023 05:43:38 +0000 (07:43 +0200)]
[errors] better handling of garg job errors

JSON should now be better so that the UI can handle it in task async
handler.

16 months ago[json] bring back previous JSON serialization of Datafield
Przemysław Kaminski [Mon, 19 Jun 2023 17:27:14 +0000 (19:27 +0200)]
[json] bring back previous JSON serialization of Datafield

16 months agoRevert b3fb1a1697d18777af6b401c132c39a5c905e129
Przemysław Kaminski [Mon, 19 Jun 2023 17:03:32 +0000 (19:03 +0200)]
Revert b3fb1a1697d18777af6b401c132c39a5c905e129

This reverts commit b3fb1a1697d18777af6b401c132c39a5c905e129

It introduced changes which cause issues described in
https://gitlab.iscpif.fr/gargantext/purescript-gargantext/issues/571

16 months agoMerge remote-tracking branch 'origin/adinapoli/fix-phylo-types' into dev-merge
Alexandre Delanoë [Mon, 19 Jun 2023 13:51:16 +0000 (15:51 +0200)]
Merge remote-tracking branch 'origin/adinapoli/fix-phylo-types' into dev-merge

16 months agoPartial support for bidirectional PhyloData parsing
Alfredo Di Napoli [Mon, 19 Jun 2023 13:17:53 +0000 (15:17 +0200)]
Partial support for bidirectional PhyloData parsing

This commits changes the `PhyloData` data structure to
include a proper `GraphData` in the `pd_data` field. The
`GraphData` is almost complete, but the `objects` field needs
to be further refined from a generic JSON `Value` to proper
Haskell types.

16 months agoMerge remote-tracking branch 'origin/adinapoli/fix-datafield-instance' into dev-merge
Alexandre Delanoë [Mon, 19 Jun 2023 11:41:50 +0000 (13:41 +0200)]
Merge remote-tracking branch 'origin/adinapoli/fix-datafield-instance' into dev-merge

16 months agoAdd JSON roundtrip tests for Datafield and WithQuery
Alfredo Di Napoli [Mon, 19 Jun 2023 09:29:05 +0000 (11:29 +0200)]
Add JSON roundtrip tests for Datafield and WithQuery

16 months ago[VERSION] +1 to 0.0.6.9.9.6.6
Alexandre Delanoë [Mon, 19 Jun 2023 08:16:28 +0000 (10:16 +0200)]
[VERSION] +1 to 0.0.6.9.9.6.6

16 months ago[FIX] Phylo is back
Alexandre Delanoë [Mon, 19 Jun 2023 08:14:56 +0000 (10:14 +0200)]
[FIX] Phylo is back

16 months agoRevert "Revert "Merge remote-tracking branch 'origin/201-dev-user-pubmed-api-key...
Alexandre Delanoë [Mon, 19 Jun 2023 07:42:53 +0000 (09:42 +0200)]
Revert "Revert "Merge remote-tracking branch 'origin/201-dev-user-pubmed-api-key' into dev""

This reverts commit a444cb3000bbc36c1328d7d7788257a557d0abc8.

16 months agoRevert "Try the hotfix"
Alexandre Delanoë [Mon, 19 Jun 2023 07:42:45 +0000 (09:42 +0200)]
Revert "Try the hotfix"

This reverts commit 22b14f561106ded3520b5b4672d169491f1d4beb.

16 months ago[MERGE] Phylo
Alexandre Delanoë [Sun, 18 Jun 2023 20:00:48 +0000 (22:00 +0200)]
[MERGE] Phylo

16 months agoTry the hotfix
Alfredo Di Napoli [Fri, 16 Jun 2023 14:41:57 +0000 (16:41 +0200)]
Try the hotfix

16 months agoRevert "Merge remote-tracking branch 'origin/201-dev-user-pubmed-api-key' into dev"
Alfredo Di Napoli [Fri, 16 Jun 2023 13:57:13 +0000 (15:57 +0200)]
Revert "Merge remote-tracking branch 'origin/201-dev-user-pubmed-api-key' into dev"

This reverts commit d04cf03b00ed6c8ba8bd685044b897e4df701eee, reversing
changes made to e213a4bfe8a4be983f4a9be2f6a62308e6b27d6f.

16 months agoadaptative time fixed
qlobbe [Thu, 15 Jun 2023 14:39:38 +0000 (16:39 +0200)]
adaptative time fixed