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

promote stm dependency, since Remote.External needs it

Browse source
This commit is contained in:
Joey Hess 2014-01-20 14:32:06 -04:00
parent 514a4efb7a
commit ecd4c35d7e
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/__96__minimal_build__39____fails_due_to_missing_stm_dependency.mdwn
View file

@ -91,3 +91,5 @@ ExitFailure 1
# End of transcript or log. # End of transcript or log.
"""]] """]]
> [[fixed|done]] --[[Joey]]

2
doc/install/fromscratch.mdwn
View file

@ -25,9 +25,9 @@ quite a lot.
* [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) * [async](http://hackage.haskell.org/package/async)
* 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)
* Optional haskell stuff, used by the [[assistant]] and its webapp
* [hinotify](http://hackage.haskell.org/package/hinotify) * [hinotify](http://hackage.haskell.org/package/hinotify)
(Linux only) (Linux only)
* [dbus](http://hackage.haskell.org/package/dbus) * [dbus](http://hackage.haskell.org/package/dbus)

3
git-annex.cabal
View file

@ -93,7 +93,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, async SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3)
CC-Options: -Wall CC-Options: -Wall
GHC-Options: -Wall GHC-Options: -Wall
Extensions: PackageImports Extensions: PackageImports
@ -134,7 +134,6 @@ Executable git-annex
CPP-Options: -DWITH_WEBDAV CPP-Options: -DWITH_WEBDAV
if flag(Assistant) && ! os(solaris) if flag(Assistant) && ! os(solaris)
Build-Depends: stm (>= 2.3)
CPP-Options: -DWITH_ASSISTANT CPP-Options: -DWITH_ASSISTANT
if flag(Assistant) if flag(Assistant)