summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--git-annex.cabal12
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