Merge remote-tracking branch 'origin/dev-merge-nix-2' into dev-merge

gargantext.cabal

 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.34.7.
 --
 -- see: https://github.com/sol/hpack
 
@@ -96,6 +96,7 @@ library
       Gargantext.Core.Viz.Phylo.SynchronicClustering
       Gargantext.Core.Viz.Types
   other-modules:
+      ConcurrentTest
       Gargantext.API.Admin.Auth
       Gargantext.API.Admin.FrontEnd
       Gargantext.API.Admin.Orchestrator

shell.nix

 { pkgs ? import ./nix/pkgs.nix {} }:
-let 
+let
   myBuildInputs = [
     pkgs.pkgs.docker-compose
     pkgs.pkgs.haskell-language-server
     pkgs.pkgs.stack
   ];
-in  
+in
 pkgs.pkgs.mkShell {
   name = pkgs.shell.name;
   shellHook = pkgs.shell.shellHook;