diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index d9cf1e0a8..642d130f0 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -70,14 +70,15 @@ library , transformers >= 0.2 && < 0.5 , utf8-string >= 0.3.5 && < 1.1 , HUnit - , pretty-show >= 1.6.4 - , time >= 1.5 + if impl(ghc >= 7.4) build-depends: pretty-show >= 1.6.4 + if flag(old-locale) build-depends: time < 1.5, old-locale else build-depends: time >= 1.5 + exposed-modules: Hledger Hledger.Data @@ -146,15 +147,16 @@ test-suite tests , transformers >= 0.2 && < 0.5 , utf8-string >= 0.3.5 && < 1.1 , HUnit - , pretty-show >= 1.6.4 - , time >= 1.5 , hledger-lib , test-framework , test-framework-hunit + if impl(ghc >= 7.4) build-depends: pretty-show >= 1.6.4 + if flag(old-locale) build-depends: time < 1.5, old-locale else build-depends: time >= 1.5 + default-language: Haskell2010 diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 7c8c7e227..e41412be8 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -158,11 +158,12 @@ library , yesod-form , yesod-static , json - , time >= 1.5 + if flag(old-locale) build-depends: time < 1.5, old-locale else build-depends: time >= 1.5 + exposed-modules: Application Foundation @@ -230,17 +231,21 @@ executable hledger-web , yesod-form , yesod-static , json - , time >= 1.5 , hledger-web == 0.26.98 + if flag(old-locale) build-depends: time < 1.5, old-locale else build-depends: time >= 1.5 + default-language: Haskell2010 test-suite test type: exitcode-stdio-1.0 main-is: main.hs + other-modules: + HomeTest + TestImport hs-source-dirs: tests ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans @@ -279,11 +284,13 @@ test-suite test , yesod-form , yesod-static , json - , time >= 1.5 , hledger-web , hspec , yesod-test - other-modules: - HomeTest - TestImport + + if flag(old-locale) + build-depends: time < 1.5, old-locale + else + build-depends: time >= 1.5 + default-language: Haskell2010 diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index e7c3b3a50..6a42bab96 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -75,10 +75,6 @@ library , tabular >= 0.2 && < 0.3 , utf8-string >= 0.3.5 && < 1.1 , wizards == 1.0.* - , shakespeare >= 2.0.2.2 && < 2.1 - , terminfo - , pretty-show >= 1.6.4 - , time >= 1.5 if impl(ghc >= 7.10) -- ghc 7.10 requires shakespeare 2.0.2.2+ @@ -89,12 +85,15 @@ library 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 build-depends: time >= 1.5 + if impl(ghc >= 7.4) build-depends: pretty-show >= 1.6.4 + if !os(windows) && flag(curses) build-depends: terminfo @@ -149,23 +148,26 @@ executable hledger , tabular >= 0.2 && < 0.3 , utf8-string >= 0.3.5 && < 1.1 , wizards == 1.0.* - , shakespeare >= 2.0.2.2 && < 2.1 - , terminfo - , pretty-show >= 1.6.4 - , time >= 1.5 , hledger == 0.26.98 + 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 build-depends: time >= 1.5 + if impl(ghc >= 7.4) build-depends: pretty-show >= 1.6.4 + + if !os(windows) && flag(curses) + build-depends: terminfo + default-language: Haskell2010 test-suite test @@ -199,25 +201,28 @@ test-suite test , tabular >= 0.2 && < 0.3 , utf8-string >= 0.3.5 && < 1.1 , wizards == 1.0.* - , shakespeare >= 2.0.2.2 && < 2.1 - , terminfo - , pretty-show >= 1.6.4 - , time >= 1.5 , hledger , 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 impl(ghc >= 7.4) build-depends: pretty-show >= 1.6.4 + if flag(old-locale) build-depends: time < 1.5, old-locale else build-depends: time >= 1.5 + + if !os(windows) && flag(curses) + build-depends: terminfo + default-language: Haskell2010 benchmark bench @@ -239,6 +244,7 @@ benchmark bench process, filepath, directory + if flag(old-locale) build-depends: time < 1.5, old-locale else