simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-11-08 07:09:28 +03:00
Code Issues Projects Releases Wiki Activity

fix cabal file regression breaking GHC<7.10 (#280)

Browse Source
This commit is contained in:
Simon Michael 2015-08-21 12:16:46 -07:00
parent 780549b448
commit 6fd1e965ed
3 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hledger-lib/hledger-lib.cabal
View File

@ -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

19
hledger-web/hledger-web.cabal
View File

@ -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

30
hledger/hledger.cabal
View File

@ -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