diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-26 11:46:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-26 11:46:45 -0400 |
| commit | 670ee13716e606e93b05e060838b8c6de58bdd6d (patch) | |
| tree | 86deddd32adf0e11aad545fe2a5d1f17b646d931 | |
| parent | c662dda2e4bb04230c36d7310f84d69858b826b1 (diff) | |
always depend on async
| -rw-r--r-- | doc/bugs/Build_error_on_Linux.mdwn | 3 | ||||
| -rw-r--r-- | doc/install/fromscratch.mdwn | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/doc/bugs/Build_error_on_Linux.mdwn b/doc/bugs/Build_error_on_Linux.mdwn index cc46d18dd..af560788a 100644 --- a/doc/bugs/Build_error_on_Linux.mdwn +++ b/doc/bugs/Build_error_on_Linux.mdwn @@ -24,3 +24,6 @@ This is the patch I applied to `git-annex.cabal`: if os(linux) && flag(Dbus) Build-Depends: dbus (>= 0.10.3) CPP-Options: -DWITH_DBUS + +> Feel async is core enough it should depend on it unconditionally. +> [[done]] --[[Joey]] diff --git a/doc/install/fromscratch.mdwn b/doc/install/fromscratch.mdwn index c85de7ef0..ae9065cd0 100644 --- a/doc/install/fromscratch.mdwn +++ b/doc/install/fromscratch.mdwn @@ -24,6 +24,7 @@ quite a lot. * [regex-tdfa](http://hackage.haskell.org/package/regex-tdfa) * [extensible-exceptions](http://hackage.haskell.org/package/extensible-exceptions) * [feed](http://hackage.haskell.org/package/feed) + * [async](http://hackage.haskell.org/package/async) * Optional haskell stuff, used by the [[assistant]] and its webapp * [stm](http://hackage.haskell.org/package/stm) (version 2.3 or newer) @@ -48,7 +49,6 @@ quite a lot. * [network-protocol-xmpp](http://hackage.haskell.org/package/network-protocol-xmpp) * [dns](http://hackage.haskell.org/package/dns) * [xml-types](http://hackage.haskell.org/package/xml-types) - * [async](http://hackage.haskell.org/package/async) * [HTTP](http://hackage.haskell.org/package/HTTP) * [unix-compat](http://hackage.haskell.org/package/unix-compat) * [MonadCatchIO-transformers](http://hackage.haskell.org/package/MonadCatchIO-transformers) diff --git a/git-annex.cabal b/git-annex.cabal index d8ca54651..e82e210c4 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -82,7 +82,7 @@ Executable git-annex extensible-exceptions, dataenc, SHA, process, json, base (>= 4.5 && < 4.9), monad-control, MonadCatchIO-transformers, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process, - SafeSemaphore, uuid, random, dlist, unix-compat + SafeSemaphore, uuid, random, dlist, unix-compat, async -- Need to list these because they're generated from .hsc files. Other-Modules: Utility.Touch Utility.Mounts Include-Dirs: Utility @@ -121,7 +121,7 @@ Executable git-annex CPP-Options: -DWITH_WEBDAV if flag(Assistant) && ! os(windows) && ! os(solaris) - Build-Depends: async, stm (>= 2.3) + Build-Depends: stm (>= 2.3) CPP-Options: -DWITH_ASSISTANT if flag(Android) |