one dep per line and add comments about workaround deps

1 files changed, 41 insertions, 11 deletions

diff --git a/git-annex.cabal b/git-annex.cabal
index c5f76165b..047ea82b9 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -329,15 +329,42 @@ Executable git-annex
    stm (>= 2.3),
    mtl (>= 2),
    uuid (>= 1.2.6),
-   process, data-default, case-insensitive, random, dlist,
-   unix-compat, SafeSemaphore, async, directory, filepath, IfElse,
-   MissingH, hslogger, monad-logger,
-   utf8-string, bytestring, text, sandi,
-   monad-control, transformers,
-   bloomfilter, edit-distance,
-   resourcet, http-conduit (<2.2.0), http-client, http-types,
-   time, old-locale,
-   esqueleto, persistent-sqlite, persistent (==2.2.4.1), persistent-template,
+   process,
+   data-default,
+   case-insensitive,
+   random,
+   dlist,
+   unix-compat,
+   SafeSemaphore,
+   async,
+   directory,
+   filepath,
+   IfElse,
+   MissingH,
+   hslogger,
+   monad-logger,
+   utf8-string,
+   bytestring,
+   text,
+   sandi,
+   monad-control,
+   transformers,
+   bloomfilter,
+   edit-distance,
+   resourcet,
+   http-client,
+   http-types,
+   -- Old version needed due to https://github.com/aristidb/aws/issues/206
+   http-conduit (<2.2.0),
+   time,
+   old-locale,
+   esqueleto,
+   persistent-sqlite, 
+   -- Old version needed due to
+   -- https://github.com/prowdsponsor/esqueleto/issues/137
+   -- and also temporarily to make ghc 8 builds work
+   persistent (== 2.2.4.1),
+   persistent-template,
    aeson,
    unordered-containers,
    feed,
@@ -438,8 +465,11 @@ Executable git-annex
      path-pieces (>= 0.1.4),
      warp (>= 3.0.0.5),
      warp-tls (>= 1.4),
-     wai, wai-extra,
-     blaze-builder, crypto-api, clientsession,
+     wai,
+     wai-extra,
+     blaze-builder,
+     crypto-api,
+     clientsession,
      template-haskell,
      shakespeare (>= 2.0.0),
      securemem,