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

avoid unncessary dep on old-locale when building with new version of time

Browse source
This commit is contained in:
Joey Hess 2015-05-10 16:50:22 -04:00
parent 64a4553e0b
commit 663eb15aa3
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
git-annex.cabal
View file

@ -101,11 +101,15 @@ Flag network-uri
Description: Get Network.URI from the network-uri package Description: Get Network.URI from the network-uri package
Default: True Default: True
Flag new-time
Description: Build with new version of time and without old-locale
Default: True
Executable git-annex Executable git-annex
Main-Is: git-annex.hs Main-Is: git-annex.hs
Build-Depends: MissingH, hslogger, directory, filepath, Build-Depends: MissingH, hslogger, directory, filepath,
containers (>= 0.5.0.0), utf8-string, mtl (>= 2), containers (>= 0.5.0.0), utf8-string, mtl (>= 2),
bytestring, old-locale, time, sandi, process, json, bytestring, sandi, process, json,
base (>= 4.5 && < 4.9), monad-control, exceptions (>= 0.6), transformers, base (>= 4.5 && < 4.9), monad-control, exceptions (>= 0.6), transformers,
IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance,
SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3), SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3),
@ -124,6 +128,11 @@ Executable git-annex
else else
Build-Depends: network (< 2.6), network (>= 2.0) 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) if flag(Production)
GHC-Options: -O2 GHC-Options: -O2