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

remove new-time build flag

Browse source 
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.
This commit is contained in:
Joey Hess 2015-07-21 19:25:12 -04:00
parent 33e5f2e532
commit d4c7cde087
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
git-annex.cabal
View file

@ -105,10 +105,6 @@ 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: Build-Depends:
@ -127,7 +123,8 @@ Executable git-annex
monad-control, transformers, monad-control, transformers,
bloomfilter, edit-distance, bloomfilter, edit-distance,
resourcet, http-conduit, http-types, resourcet, http-conduit, http-types,
esqueleto, persistent-sqlite, persistent, persistent-template esqueleto, persistent-sqlite, persistent, persistent-template,
time, old-locale
CC-Options: -Wall CC-Options: -Wall
GHC-Options: -Wall -fno-warn-tabs GHC-Options: -Wall -fno-warn-tabs
Extensions: PackageImports Extensions: PackageImports
@ -144,11 +141,6 @@ 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