diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-01-20 14:32:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-01-20 14:32:06 -0400 |
| commit | 5534e89870b7d0885f6fe113068c0514a03a74bd (patch) | |
| tree | b93322142671b636def24e61b5f4d89add9bd24c | |
| parent | 387ae5aeb31bdf54ac43696377fc7ff5e4acf8be (diff) | |
promote stm dependency, since Remote.External needs it
| -rw-r--r-- | doc/bugs/__96__minimal_build__39____fails_due_to_missing_stm_dependency.mdwn | 2 | ||||
| -rw-r--r-- | doc/install/fromscratch.mdwn | 2 | ||||
| -rw-r--r-- | git-annex.cabal | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/bugs/__96__minimal_build__39____fails_due_to_missing_stm_dependency.mdwn b/doc/bugs/__96__minimal_build__39____fails_due_to_missing_stm_dependency.mdwn index 7f1dc9c0d..12a5e0c14 100644 --- a/doc/bugs/__96__minimal_build__39____fails_due_to_missing_stm_dependency.mdwn +++ b/doc/bugs/__96__minimal_build__39____fails_due_to_missing_stm_dependency.mdwn @@ -91,3 +91,5 @@ ExitFailure 1 # End of transcript or log. """]] + +> [[fixed|done]] --[[Joey]] diff --git a/doc/install/fromscratch.mdwn b/doc/install/fromscratch.mdwn index 7f78da537..2c8bf4b71 100644 --- a/doc/install/fromscratch.mdwn +++ b/doc/install/fromscratch.mdwn @@ -25,9 +25,9 @@ quite a lot. * [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) +* Optional haskell stuff, used by the [[assistant]] and its webapp * [hinotify](http://hackage.haskell.org/package/hinotify) (Linux only) * [dbus](http://hackage.haskell.org/package/dbus) diff --git a/git-annex.cabal b/git-annex.cabal index 9b4edf8b2..a7322e400 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -93,7 +93,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, async + SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3) CC-Options: -Wall GHC-Options: -Wall Extensions: PackageImports @@ -134,7 +134,6 @@ Executable git-annex CPP-Options: -DWITH_WEBDAV if flag(Assistant) && ! os(solaris) - Build-Depends: stm (>= 2.3) CPP-Options: -DWITH_ASSISTANT if flag(Assistant) |