cli, web: simplify shakespeare bounds

This commit is contained in:
Simon Michael 2017-08-25 16:46:35 -07:00
parent 230dfea207
commit 2036260bb8
4 changed files with 9 additions and 40 deletions

View File

@ -145,7 +145,7 @@ library
, HUnit , HUnit
, conduit-extra >=1.1 , conduit-extra >=1.1
, safe >=0.2 , safe >=0.2
, shakespeare >=2.0 , shakespeare >=2.0.2.2 && < 2.1
, template-haskell , template-haskell
, text >=1.2 && <1.3 , text >=1.2 && <1.3
, transformers , transformers
@ -219,7 +219,7 @@ executable hledger-web
, HUnit , HUnit
, conduit-extra >=1.1 , conduit-extra >=1.1
, safe >=0.2 , safe >=0.2
, shakespeare >=2.0 , shakespeare >=2.0.2.2 && < 2.1
, template-haskell , template-haskell
, text >=1.2 && <1.3 , text >=1.2 && <1.3
, transformers , transformers
@ -280,7 +280,7 @@ test-suite test
, HUnit , HUnit
, conduit-extra >=1.1 , conduit-extra >=1.1
, safe >=0.2 , safe >=0.2
, shakespeare >=2.0 , shakespeare >=2.0.2.2 && < 2.1
, template-haskell , template-haskell
, text >=1.2 && <1.3 , text >=1.2 && <1.3
, transformers , transformers

View File

@ -84,7 +84,7 @@ dependencies:
- HUnit - HUnit
- conduit-extra >=1.1 - conduit-extra >=1.1
- safe >=0.2 - safe >=0.2
- shakespeare >=2.0 - shakespeare >=2.0.2.2 && < 2.1
- template-haskell - template-haskell
- text >=1.2 && <1.3 - text >=1.2 && <1.3
- transformers - transformers

View File

@ -91,6 +91,7 @@ library
, here , here
, pretty-show >=1.6.4 , pretty-show >=1.6.4
, process , process
, shakespeare >=2.0.2.2 && <2.1
, temporary , temporary
, tabular >=0.2 && <0.3 , tabular >=0.2 && <0.3
, hledger-lib >= 1.3.99 && < 1.4 , hledger-lib >= 1.3.99 && < 1.4
@ -114,13 +115,6 @@ library
, 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.*
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(oldtime) if flag(oldtime)
build-depends: build-depends:
time <1.5 time <1.5
@ -174,6 +168,7 @@ executable hledger
, here , here
, pretty-show >=1.6.4 , pretty-show >=1.6.4
, process , process
, shakespeare >=2.0.2.2 && <2.1
, temporary , temporary
, tabular >=0.2 && <0.3 , tabular >=0.2 && <0.3
, hledger-lib >= 1.3.99 && < 1.4 , hledger-lib >= 1.3.99 && < 1.4
@ -196,13 +191,6 @@ executable hledger
, 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.*
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(oldtime) if flag(oldtime)
build-depends: build-depends:
time <1.5 time <1.5
@ -234,6 +222,7 @@ test-suite test
, here , here
, pretty-show >=1.6.4 , pretty-show >=1.6.4
, process , process
, shakespeare >=2.0.2.2 && <2.1
, temporary , temporary
, tabular >=0.2 && <0.3 , tabular >=0.2 && <0.3
, hledger-lib >= 1.3.99 && < 1.4 , hledger-lib >= 1.3.99 && < 1.4
@ -258,13 +247,6 @@ test-suite test
, wizards ==1.0.* , wizards ==1.0.*
, test-framework , test-framework
, test-framework-hunit , test-framework-hunit
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(oldtime) if flag(oldtime)
build-depends: build-depends:
time <1.5 time <1.5
@ -293,6 +275,7 @@ benchmark bench
, here , here
, pretty-show >=1.6.4 , pretty-show >=1.6.4
, process , process
, shakespeare >=2.0.2.2 && <2.1
, temporary , temporary
, tabular >=0.2 && <0.3 , tabular >=0.2 && <0.3
, hledger-lib >= 1.3.99 && < 1.4 , hledger-lib >= 1.3.99 && < 1.4
@ -300,13 +283,6 @@ benchmark bench
, criterion , criterion
, html , html
, timeit , timeit
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(oldtime) if flag(oldtime)
build-depends: build-depends:
time <1.5 time <1.5

View File

@ -86,19 +86,12 @@ dependencies:
- here - here
- pretty-show >=1.6.4 - pretty-show >=1.6.4
- process - process
- shakespeare >=2.0.2.2 && <2.1
- temporary - temporary
- tabular >=0.2 && <0.3 - tabular >=0.2 && <0.3
- hledger-lib >= 1.3.99 && < 1.4 - hledger-lib >= 1.3.99 && < 1.4
when: when:
- condition: impl(ghc >=7.10)
then:
dependencies:
- shakespeare >=2.0.2.2 && <2.1
else:
dependencies:
- shakespeare >=1.0 && <2.1
- shakespeare-text >=1.0 && <1.2
- condition: flag(oldtime) - condition: flag(oldtime)
then: then:
dependencies: dependencies: