[stack] some more version fixes, stack compiles, cabal doesn't

cabal.project

@@ -211,7 +211,35 @@ source-repository-package
     tag: d9a2df6354c1e42bb050853feadacb30c76366d3
     
 -- allow-older: *
+-- http-client-tls==0.3.6.1 still uses connection, while .3 uses crypton-connection
+allow-older: epi-api-client:http-client-tls
+allow-newer: accelerate-arithmetic:accelerate
+           , accelerate-utility:accelerate
+           
+           , corenlp-types:text
+           , crawlerHAL:servant
+           , crawlerHAL:servant-client
+           , crawlerISTEX:servant
+           , crawlerISTEX:servant-client
+           , crawlerPubMed:servant
+           , crawlerPubMed:servant-client
+           , crawlerPubMed:servant-client-core
+           , epo-api-client:aeson
+           , epo-api-client:base
+           , epo-api-client:servant
+           , epo-api-client:servant-client
+           , epo-api-client:text
+
+           -- , servant-client:servant
+           , servant-client:servant-client-core
+           -- , servant-ekg:base
+           , servant-ekg:hashable
+           -- , servant-ekg:servant
+           , servant-ekg:time
+           , servant-swagger:servant
+           , *:base
+           , *:servant
+           , *:text
  
 package gargantext
     ghc-options: -fwrite-ide-info -hiedir=".stack-work/hiedb"

gargantext.cabal

@@ -533,7 +533,7 @@ library
     , hstatistics ^>= 0.3.1
     , http-api-data ^>= 0.5
     , http-client ^>= 0.7.14
-    , http-client-tls ^>= 0.3.5.3
+    , http-client-tls == 0.3.6.1
     , http-conduit ^>= 2.3.8
     , http-media ^>= 0.8.0.0
     , http-types ^>= 0.12.3
@@ -605,7 +605,7 @@ library
     , servant-auth-swagger ^>= 0.2.10.1
     , servant-blaze ^>= 0.9.1
     , servant-cassava ^>= 0.10.1
-    , servant-client >= 0.18.3 && < 0.20
+    , servant-client ^>= 0.19
     , servant-client-core ^>= 0.20
     , servant-ekg ^>= 0.3.1
     , servant-flatten ^>= 0.2
@@ -617,7 +617,7 @@ library
     , servant-xml-conduit >= 0.1.0.4
     , simple-reflect ^>= 0.3.3
     , singletons ^>= 3.0.2
-    , singletons-th >= 3.1
+    , singletons-th ^>= 3.1.1
     , snowball ^>= 1.0.0.1
     , split ^>= 0.2.3.4
     , stm ^>= 2.5.0.1
@@ -891,7 +891,7 @@ test-suite garg-test-tasty
     , gargantext-prelude
     , http-api-data ^>= 0.5
     , http-client ^>= 0.7.14
-    , http-client-tls ^>= 0.3.5.3
+    , http-client-tls == 0.3.6.1
     , http-types
     , lens >= 5.2.2 && < 5.3
     , monad-control >= 1.0.3 && < 1.1
@@ -910,7 +910,7 @@ test-suite garg-test-tasty
     , servant-auth
     , servant-auth
     , servant-auth-client
-    , servant-client
+    , servant-client ^>= 0.19
     , servant-job
     , servant-server ^>= 0.20
     , shelly >= 1.9 && < 2
@@ -961,7 +961,7 @@ test-suite garg-test-hspec
     , http-api-data ^>= 0.5
     , http-types
     , http-client ^>= 0.7.14
-    , http-client-tls ^>= 0.3.5.3
+    , http-client-tls == 0.3.6.1
     , lens >= 5.2.2 && < 5.3
     , monad-control >= 1.0.3 && < 1.1
     , mtl ^>= 2.2.2
@@ -978,7 +978,7 @@ test-suite garg-test-hspec
     , resource-pool ^>= 0.4.0.0
     , servant-auth
     , servant-auth-client
-    , servant-client
+    , servant-client ^>= 0.19
     , servant-job
     , servant-server ^>= 0.20
     , shelly >= 1.9 && < 2

stack.yaml

@@ -33,13 +33,13 @@
 - "rake-0.0.1"
 - "random-1.2.1"
 - "recover-rtti-0.4.3"
-- "servant-0.20.1"
+  #- "servant-0.20.1"
 - "servant-auth-server-0.4.8.0"
 - "servant-auth-swagger-0.2.10.2"
-- "servant-client-core-0.20"
+  #- "servant-client-core-0.20"
 - "servant-ekg-0.3.1"
 - "servant-flatten-0.2"
-- "servant-server-0.20"
+  #- "servant-server-0.20"
 - "snap-server-1.1.2.1"
 - "snowball-1.0.0.1"
 - "taggy-0.2.1"