slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: drop shakespeare-text dependency in more places

Browse Source 
Drop deprecated shakespeare-text dependency for ghc 7.10+ consistently,
not just in one place. Hopefully this will clear the warning
at packdeps.haskellers.com.
This commit is contained in:
Simon Michael 2015-07-12 14:58:06 -07:00
parent 73e4ccee80
commit 2b3bdca6b1
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hledger/hledger.cabal
View File

@ -98,7 +98,7 @@ library
-- ghc 7.10 requires shakespeare 2.0.2.2+ -- ghc 7.10 requires shakespeare 2.0.2.2+
build-depends: shakespeare >= 2.0.2.2 && < 2.1 build-depends: shakespeare >= 2.0.2.2 && < 2.1
else else
-- for older ghcs, allow shakespeare 2.x or 1.x (which also requires shakespeare-text) -- for older ghcs, allow shakespeare 1.x (which also requires shakespeare-text)
-- http://www.yesodweb.com/blog/2014/04/consolidation-progress -- http://www.yesodweb.com/blog/2014/04/consolidation-progress
build-depends: build-depends:
shakespeare >= 1.0 && < 2.1 shakespeare >= 1.0 && < 2.1
@ -144,13 +144,18 @@ executable hledger
,process ,process
,regex-tdfa ,regex-tdfa
,safe >= 0.2 ,safe >= 0.2
,shakespeare-text >= 1.0 && < 1.2
,shakespeare >= 1.0 && < 2.1
,split >= 0.1 && < 0.3 ,split >= 0.1 && < 0.3
,tabular >= 0.2 && < 0.3 ,tabular >= 0.2 && < 0.3
,text >= 0.11 ,text >= 0.11
,utf8-string >= 0.3.5 && < 1.1 ,utf8-string >= 0.3.5 && < 1.1
,wizards == 1.0.* ,wizards == 1.0.*
-- as above
if impl(ghc >= 7.10)
build-depends: shakespeare >= 2.0.2.2 && < 2.1
else
build-depends:
shakespeare >= 1.0 && < 2.1
,shakespeare-text >= 1.0 && < 1.2
if flag(old-locale) if flag(old-locale)
build-depends: time < 1.5, old-locale build-depends: time < 1.5, old-locale
else else
@ -186,8 +191,6 @@ test-suite test
, process , process
, regex-tdfa , regex-tdfa
, safe , safe
, shakespeare-text >= 1.0 && < 1.2
, shakespeare >= 1.0 && < 2.1
, split , split
,tabular >= 0.2 && < 0.3 ,tabular >= 0.2 && < 0.3
, test-framework , test-framework
@ -195,6 +198,13 @@ test-suite test
, text , text
, transformers , transformers
, wizards == 1.0.* , wizards == 1.0.*
-- as above
if impl(ghc >= 7.10)
build-depends: shakespeare >= 2.0.2.2 && < 2.1
else
build-depends:
shakespeare >= 1.0 && < 2.1
,shakespeare-text >= 1.0 && < 1.2
if impl(ghc >= 7.4) if impl(ghc >= 7.4)
build-depends: pretty-show >= 1.6.4 build-depends: pretty-show >= 1.6.4
if flag(old-locale) if flag(old-locale)