diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-21 19:25:12 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-21 19:25:12 -0400 |
| commit | 6cae3c62a71cb7a963d876da12fc5b6f8e3edabf (patch) | |
| tree | 8d99848fc728b4121a5482c01f26e51ff6fd3ebf | |
| parent | b641f3cf9b535250562e9bfcb11f1e294db84627 (diff) | |
remove new-time build flag
This caused problems building with stackage and ghc 7.6, since cabal
assumes the flag means it wants a newer time. Since time is bundled with
ghc, stackage doesn't pin it.
Since this flag was only there to avoid a dep on old-locale, which is
currently bundled with ghc, let's remove the flag.
| -rw-r--r-- | git-annex.cabal | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index edcaa7121..5dde20bfe 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -105,10 +105,6 @@ Flag network-uri Description: Get Network.URI from the network-uri package Default: True -Flag new-time - Description: Build with new version of time and without old-locale - Default: True - Executable git-annex Main-Is: git-annex.hs Build-Depends: @@ -127,7 +123,8 @@ Executable git-annex monad-control, transformers, bloomfilter, edit-distance, resourcet, http-conduit, http-types, - esqueleto, persistent-sqlite, persistent, persistent-template + esqueleto, persistent-sqlite, persistent, persistent-template, + time, old-locale CC-Options: -Wall GHC-Options: -Wall -fno-warn-tabs Extensions: PackageImports @@ -144,11 +141,6 @@ Executable git-annex else Build-Depends: network (< 2.6), network (>= 2.0) - if flag(new-time) - Build-Depends: time (>= 1.5) - else - Build-Depends: time, old-locale - if flag(Production) GHC-Options: -O2 |