From 2036260bb8d92fb08e31279d0fc2360910a3d2ea Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 25 Aug 2017 16:46:35 -0700 Subject: [PATCH] cli, web: simplify shakespeare bounds --- hledger-web/hledger-web.cabal | 6 +++--- hledger-web/package.yaml | 2 +- hledger/hledger.cabal | 32 ++++---------------------------- hledger/package.yaml | 9 +-------- 4 files changed, 9 insertions(+), 40 deletions(-) diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 473778d45..1e281037d 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -145,7 +145,7 @@ library , HUnit , conduit-extra >=1.1 , safe >=0.2 - , shakespeare >=2.0 + , shakespeare >=2.0.2.2 && < 2.1 , template-haskell , text >=1.2 && <1.3 , transformers @@ -219,7 +219,7 @@ executable hledger-web , HUnit , conduit-extra >=1.1 , safe >=0.2 - , shakespeare >=2.0 + , shakespeare >=2.0.2.2 && < 2.1 , template-haskell , text >=1.2 && <1.3 , transformers @@ -280,7 +280,7 @@ test-suite test , HUnit , conduit-extra >=1.1 , safe >=0.2 - , shakespeare >=2.0 + , shakespeare >=2.0.2.2 && < 2.1 , template-haskell , text >=1.2 && <1.3 , transformers diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 815cb7d38..ee554c879 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -84,7 +84,7 @@ dependencies: - HUnit - conduit-extra >=1.1 - safe >=0.2 -- shakespeare >=2.0 +- shakespeare >=2.0.2.2 && < 2.1 - template-haskell - text >=1.2 && <1.3 - transformers diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index 2bccee741..d8ac59209 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -91,6 +91,7 @@ library , here , pretty-show >=1.6.4 , process + , shakespeare >=2.0.2.2 && <2.1 , temporary , tabular >=0.2 && <0.3 , hledger-lib >= 1.3.99 && < 1.4 @@ -114,13 +115,6 @@ library , text >=0.11 , utf8-string >=0.3.5 && <1.1 , 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) build-depends: time <1.5 @@ -174,6 +168,7 @@ executable hledger , here , pretty-show >=1.6.4 , process + , shakespeare >=2.0.2.2 && <2.1 , temporary , tabular >=0.2 && <0.3 , hledger-lib >= 1.3.99 && < 1.4 @@ -196,13 +191,6 @@ executable hledger , text >=0.11 , utf8-string >=0.3.5 && <1.1 , 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) build-depends: time <1.5 @@ -234,6 +222,7 @@ test-suite test , here , pretty-show >=1.6.4 , process + , shakespeare >=2.0.2.2 && <2.1 , temporary , tabular >=0.2 && <0.3 , hledger-lib >= 1.3.99 && < 1.4 @@ -258,13 +247,6 @@ test-suite test , wizards ==1.0.* , test-framework , 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) build-depends: time <1.5 @@ -293,6 +275,7 @@ benchmark bench , here , pretty-show >=1.6.4 , process + , shakespeare >=2.0.2.2 && <2.1 , temporary , tabular >=0.2 && <0.3 , hledger-lib >= 1.3.99 && < 1.4 @@ -300,13 +283,6 @@ benchmark bench , criterion , html , 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) build-depends: time <1.5 diff --git a/hledger/package.yaml b/hledger/package.yaml index eb2a7194e..d7a1ed304 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -86,19 +86,12 @@ dependencies: - here - pretty-show >=1.6.4 - process +- shakespeare >=2.0.2.2 && <2.1 - temporary - tabular >=0.2 && <0.3 - hledger-lib >= 1.3.99 && < 1.4 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) then: dependencies: