fix cabal file regression breaking GHC<7.10 (#280)
This commit is contained in:
parent
780549b448
commit
6fd1e965ed
@ -70,14 +70,15 @@ library
|
|||||||
, transformers >= 0.2 && < 0.5
|
, transformers >= 0.2 && < 0.5
|
||||||
, utf8-string >= 0.3.5 && < 1.1
|
, utf8-string >= 0.3.5 && < 1.1
|
||||||
, HUnit
|
, HUnit
|
||||||
, pretty-show >= 1.6.4
|
|
||||||
, time >= 1.5
|
|
||||||
if impl(ghc >= 7.4)
|
if impl(ghc >= 7.4)
|
||||||
build-depends: pretty-show >= 1.6.4
|
build-depends: pretty-show >= 1.6.4
|
||||||
|
|
||||||
if flag(old-locale)
|
if flag(old-locale)
|
||||||
build-depends: time < 1.5, old-locale
|
build-depends: time < 1.5, old-locale
|
||||||
else
|
else
|
||||||
build-depends: time >= 1.5
|
build-depends: time >= 1.5
|
||||||
|
|
||||||
exposed-modules:
|
exposed-modules:
|
||||||
Hledger
|
Hledger
|
||||||
Hledger.Data
|
Hledger.Data
|
||||||
@ -146,15 +147,16 @@ test-suite tests
|
|||||||
, transformers >= 0.2 && < 0.5
|
, transformers >= 0.2 && < 0.5
|
||||||
, utf8-string >= 0.3.5 && < 1.1
|
, utf8-string >= 0.3.5 && < 1.1
|
||||||
, HUnit
|
, HUnit
|
||||||
, pretty-show >= 1.6.4
|
|
||||||
, time >= 1.5
|
|
||||||
, hledger-lib
|
, hledger-lib
|
||||||
, test-framework
|
, test-framework
|
||||||
, test-framework-hunit
|
, test-framework-hunit
|
||||||
|
|
||||||
if impl(ghc >= 7.4)
|
if impl(ghc >= 7.4)
|
||||||
build-depends: pretty-show >= 1.6.4
|
build-depends: pretty-show >= 1.6.4
|
||||||
|
|
||||||
if flag(old-locale)
|
if flag(old-locale)
|
||||||
build-depends: time < 1.5, old-locale
|
build-depends: time < 1.5, old-locale
|
||||||
else
|
else
|
||||||
build-depends: time >= 1.5
|
build-depends: time >= 1.5
|
||||||
|
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
|||||||
@ -158,11 +158,12 @@ library
|
|||||||
, yesod-form
|
, yesod-form
|
||||||
, yesod-static
|
, yesod-static
|
||||||
, json
|
, json
|
||||||
, time >= 1.5
|
|
||||||
if flag(old-locale)
|
if flag(old-locale)
|
||||||
build-depends: time < 1.5, old-locale
|
build-depends: time < 1.5, old-locale
|
||||||
else
|
else
|
||||||
build-depends: time >= 1.5
|
build-depends: time >= 1.5
|
||||||
|
|
||||||
exposed-modules:
|
exposed-modules:
|
||||||
Application
|
Application
|
||||||
Foundation
|
Foundation
|
||||||
@ -230,17 +231,21 @@ executable hledger-web
|
|||||||
, yesod-form
|
, yesod-form
|
||||||
, yesod-static
|
, yesod-static
|
||||||
, json
|
, json
|
||||||
, time >= 1.5
|
|
||||||
, hledger-web == 0.26.98
|
, hledger-web == 0.26.98
|
||||||
|
|
||||||
if flag(old-locale)
|
if flag(old-locale)
|
||||||
build-depends: time < 1.5, old-locale
|
build-depends: time < 1.5, old-locale
|
||||||
else
|
else
|
||||||
build-depends: time >= 1.5
|
build-depends: time >= 1.5
|
||||||
|
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
|
||||||
test-suite test
|
test-suite test
|
||||||
type: exitcode-stdio-1.0
|
type: exitcode-stdio-1.0
|
||||||
main-is: main.hs
|
main-is: main.hs
|
||||||
|
other-modules:
|
||||||
|
HomeTest
|
||||||
|
TestImport
|
||||||
hs-source-dirs:
|
hs-source-dirs:
|
||||||
tests
|
tests
|
||||||
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
|
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-form
|
||||||
, yesod-static
|
, yesod-static
|
||||||
, json
|
, json
|
||||||
, time >= 1.5
|
|
||||||
, hledger-web
|
, hledger-web
|
||||||
, hspec
|
, hspec
|
||||||
, yesod-test
|
, yesod-test
|
||||||
other-modules:
|
|
||||||
HomeTest
|
if flag(old-locale)
|
||||||
TestImport
|
build-depends: time < 1.5, old-locale
|
||||||
|
else
|
||||||
|
build-depends: time >= 1.5
|
||||||
|
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
|||||||
@ -75,10 +75,6 @@ library
|
|||||||
, tabular >= 0.2 && < 0.3
|
, tabular >= 0.2 && < 0.3
|
||||||
, utf8-string >= 0.3.5 && < 1.1
|
, utf8-string >= 0.3.5 && < 1.1
|
||||||
, wizards == 1.0.*
|
, wizards == 1.0.*
|
||||||
, shakespeare >= 2.0.2.2 && < 2.1
|
|
||||||
, terminfo
|
|
||||||
, pretty-show >= 1.6.4
|
|
||||||
, time >= 1.5
|
|
||||||
|
|
||||||
if impl(ghc >= 7.10)
|
if impl(ghc >= 7.10)
|
||||||
-- ghc 7.10 requires shakespeare 2.0.2.2+
|
-- ghc 7.10 requires shakespeare 2.0.2.2+
|
||||||
@ -89,12 +85,15 @@ library
|
|||||||
build-depends:
|
build-depends:
|
||||||
shakespeare >= 1.0 && < 2.1
|
shakespeare >= 1.0 && < 2.1
|
||||||
,shakespeare-text >= 1.0 && < 1.2
|
,shakespeare-text >= 1.0 && < 1.2
|
||||||
|
|
||||||
if flag(old-locale)
|
if flag(old-locale)
|
||||||
build-depends: time < 1.5, old-locale
|
build-depends: time < 1.5, old-locale
|
||||||
else
|
else
|
||||||
build-depends: time >= 1.5
|
build-depends: time >= 1.5
|
||||||
|
|
||||||
if impl(ghc >= 7.4)
|
if impl(ghc >= 7.4)
|
||||||
build-depends: pretty-show >= 1.6.4
|
build-depends: pretty-show >= 1.6.4
|
||||||
|
|
||||||
if !os(windows) && flag(curses)
|
if !os(windows) && flag(curses)
|
||||||
build-depends: terminfo
|
build-depends: terminfo
|
||||||
|
|
||||||
@ -149,23 +148,26 @@ executable hledger
|
|||||||
, tabular >= 0.2 && < 0.3
|
, tabular >= 0.2 && < 0.3
|
||||||
, utf8-string >= 0.3.5 && < 1.1
|
, utf8-string >= 0.3.5 && < 1.1
|
||||||
, wizards == 1.0.*
|
, wizards == 1.0.*
|
||||||
, shakespeare >= 2.0.2.2 && < 2.1
|
|
||||||
, terminfo
|
|
||||||
, pretty-show >= 1.6.4
|
|
||||||
, time >= 1.5
|
|
||||||
, hledger == 0.26.98
|
, hledger == 0.26.98
|
||||||
|
|
||||||
if impl(ghc >= 7.10)
|
if impl(ghc >= 7.10)
|
||||||
build-depends: shakespeare >= 2.0.2.2 && < 2.1
|
build-depends: shakespeare >= 2.0.2.2 && < 2.1
|
||||||
else
|
else
|
||||||
build-depends:
|
build-depends:
|
||||||
shakespeare >= 1.0 && < 2.1
|
shakespeare >= 1.0 && < 2.1
|
||||||
,shakespeare-text >= 1.0 && < 1.2
|
,shakespeare-text >= 1.0 && < 1.2
|
||||||
|
|
||||||
if flag(old-locale)
|
if flag(old-locale)
|
||||||
build-depends: time < 1.5, old-locale
|
build-depends: time < 1.5, old-locale
|
||||||
else
|
else
|
||||||
build-depends: time >= 1.5
|
build-depends: time >= 1.5
|
||||||
|
|
||||||
if impl(ghc >= 7.4)
|
if impl(ghc >= 7.4)
|
||||||
build-depends: pretty-show >= 1.6.4
|
build-depends: pretty-show >= 1.6.4
|
||||||
|
|
||||||
|
if !os(windows) && flag(curses)
|
||||||
|
build-depends: terminfo
|
||||||
|
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
|
||||||
test-suite test
|
test-suite test
|
||||||
@ -199,25 +201,28 @@ test-suite test
|
|||||||
, tabular >= 0.2 && < 0.3
|
, tabular >= 0.2 && < 0.3
|
||||||
, utf8-string >= 0.3.5 && < 1.1
|
, utf8-string >= 0.3.5 && < 1.1
|
||||||
, wizards == 1.0.*
|
, wizards == 1.0.*
|
||||||
, shakespeare >= 2.0.2.2 && < 2.1
|
|
||||||
, terminfo
|
|
||||||
, pretty-show >= 1.6.4
|
|
||||||
, time >= 1.5
|
|
||||||
, hledger
|
, hledger
|
||||||
, test-framework
|
, test-framework
|
||||||
, test-framework-hunit
|
, test-framework-hunit
|
||||||
|
|
||||||
if impl(ghc >= 7.10)
|
if impl(ghc >= 7.10)
|
||||||
build-depends: shakespeare >= 2.0.2.2 && < 2.1
|
build-depends: shakespeare >= 2.0.2.2 && < 2.1
|
||||||
else
|
else
|
||||||
build-depends:
|
build-depends:
|
||||||
shakespeare >= 1.0 && < 2.1
|
shakespeare >= 1.0 && < 2.1
|
||||||
,shakespeare-text >= 1.0 && < 1.2
|
,shakespeare-text >= 1.0 && < 1.2
|
||||||
|
|
||||||
if impl(ghc >= 7.4)
|
if impl(ghc >= 7.4)
|
||||||
build-depends: pretty-show >= 1.6.4
|
build-depends: pretty-show >= 1.6.4
|
||||||
|
|
||||||
if flag(old-locale)
|
if flag(old-locale)
|
||||||
build-depends: time < 1.5, old-locale
|
build-depends: time < 1.5, old-locale
|
||||||
else
|
else
|
||||||
build-depends: time >= 1.5
|
build-depends: time >= 1.5
|
||||||
|
|
||||||
|
if !os(windows) && flag(curses)
|
||||||
|
build-depends: terminfo
|
||||||
|
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
|
||||||
benchmark bench
|
benchmark bench
|
||||||
@ -239,6 +244,7 @@ benchmark bench
|
|||||||
process,
|
process,
|
||||||
filepath,
|
filepath,
|
||||||
directory
|
directory
|
||||||
|
|
||||||
if flag(old-locale)
|
if flag(old-locale)
|
||||||
build-depends: time < 1.5, old-locale
|
build-depends: time < 1.5, old-locale
|
||||||
else
|
else
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user