mirror of
https://github.com/simonmichael/hledger.git
synced 2024-09-19 10:17:35 +03:00
cli: drop shakespeare-text dependency in more places
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:
parent
73e4ccee80
commit
2b3bdca6b1
@ -98,7 +98,7 @@ library
|
||||
-- ghc 7.10 requires shakespeare 2.0.2.2+
|
||||
build-depends: shakespeare >= 2.0.2.2 && < 2.1
|
||||
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
|
||||
build-depends:
|
||||
shakespeare >= 1.0 && < 2.1
|
||||
@ -144,13 +144,18 @@ executable hledger
|
||||
,process
|
||||
,regex-tdfa
|
||||
,safe >= 0.2
|
||||
,shakespeare-text >= 1.0 && < 1.2
|
||||
,shakespeare >= 1.0 && < 2.1
|
||||
,split >= 0.1 && < 0.3
|
||||
,tabular >= 0.2 && < 0.3
|
||||
,text >= 0.11
|
||||
,utf8-string >= 0.3.5 && < 1.1
|
||||
,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)
|
||||
build-depends: time < 1.5, old-locale
|
||||
else
|
||||
@ -186,8 +191,6 @@ test-suite test
|
||||
, process
|
||||
, regex-tdfa
|
||||
, safe
|
||||
, shakespeare-text >= 1.0 && < 1.2
|
||||
, shakespeare >= 1.0 && < 2.1
|
||||
, split
|
||||
,tabular >= 0.2 && < 0.3
|
||||
, test-framework
|
||||
@ -195,6 +198,13 @@ test-suite test
|
||||
, text
|
||||
, transformers
|
||||
, 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)
|
||||
build-depends: pretty-show >= 1.6.4
|
||||
if flag(old-locale)
|
||||
|
Loading…
Reference in New Issue
Block a user