mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

always depend on async

Browse source
This commit is contained in:
Joey Hess 2013-10-26 11:46:45 -04:00
parent c3bb7f4ef9
commit 76dd6f814d
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/bugs/Build_error_on_Linux.mdwn
View file

@ -24,3 +24,6 @@ This is the patch I applied to `git-annex.cabal`:
if os(linux) && flag(Dbus) if os(linux) && flag(Dbus)
Build-Depends: dbus (>= 0.10.3) Build-Depends: dbus (>= 0.10.3)
CPP-Options: -DWITH_DBUS CPP-Options: -DWITH_DBUS
> Feel async is core enough it should depend on it unconditionally.
> [[done]] --[[Joey]]

2
doc/install/fromscratch.mdwn
View file

@ -24,6 +24,7 @@ quite a lot.
* [regex-tdfa](http://hackage.haskell.org/package/regex-tdfa) * [regex-tdfa](http://hackage.haskell.org/package/regex-tdfa)
* [extensible-exceptions](http://hackage.haskell.org/package/extensible-exceptions) * [extensible-exceptions](http://hackage.haskell.org/package/extensible-exceptions)
* [feed](http://hackage.haskell.org/package/feed) * [feed](http://hackage.haskell.org/package/feed)
* [async](http://hackage.haskell.org/package/async)
* Optional haskell stuff, used by the [[assistant]] and its webapp * Optional haskell stuff, used by the [[assistant]] and its webapp
* [stm](http://hackage.haskell.org/package/stm) * [stm](http://hackage.haskell.org/package/stm)
(version 2.3 or newer) (version 2.3 or newer)
@ -48,7 +49,6 @@ quite a lot.
* [network-protocol-xmpp](http://hackage.haskell.org/package/network-protocol-xmpp) * [network-protocol-xmpp](http://hackage.haskell.org/package/network-protocol-xmpp)
* [dns](http://hackage.haskell.org/package/dns) * [dns](http://hackage.haskell.org/package/dns)
* [xml-types](http://hackage.haskell.org/package/xml-types) * [xml-types](http://hackage.haskell.org/package/xml-types)
* [async](http://hackage.haskell.org/package/async)
* [HTTP](http://hackage.haskell.org/package/HTTP) * [HTTP](http://hackage.haskell.org/package/HTTP)
* [unix-compat](http://hackage.haskell.org/package/unix-compat) * [unix-compat](http://hackage.haskell.org/package/unix-compat)
* [MonadCatchIO-transformers](http://hackage.haskell.org/package/MonadCatchIO-transformers) * [MonadCatchIO-transformers](http://hackage.haskell.org/package/MonadCatchIO-transformers)

4
git-annex.cabal
View file

@ -82,7 +82,7 @@ Executable git-annex
extensible-exceptions, dataenc, SHA, process, json, extensible-exceptions, dataenc, SHA, process, json,
base (>= 4.5 && < 4.9), monad-control, MonadCatchIO-transformers, base (>= 4.5 && < 4.9), monad-control, MonadCatchIO-transformers,
IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process, 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. -- Need to list these because they're generated from .hsc files.
Other-Modules: Utility.Touch Utility.Mounts Other-Modules: Utility.Touch Utility.Mounts
Include-Dirs: Utility Include-Dirs: Utility
@ -121,7 +121,7 @@ Executable git-annex
CPP-Options: -DWITH_WEBDAV CPP-Options: -DWITH_WEBDAV
if flag(Assistant) && ! os(windows) && ! os(solaris) if flag(Assistant) && ! os(windows) && ! os(solaris)
Build-Depends: async, stm (>= 2.3) Build-Depends: stm (>= 2.3)
CPP-Options: -DWITH_ASSISTANT CPP-Options: -DWITH_ASSISTANT
if flag(Android) if flag(Android)