lib, cli, web: try to fix building with GHC 7.4

This commit is contained in:
Simon Michael 2016-08-09 12:22:38 -07:00
parent c3b76221d4
commit 15ebae5c5f
6 changed files with 55 additions and 0 deletions

View File

@ -83,6 +83,9 @@ library
, HUnit , HUnit
, parsec , parsec
, semigroups , semigroups
if impl(ghc <7.6)
build-depends:
ghc-prim
if flag(oldtime) if flag(oldtime)
build-depends: build-depends:
time <1.5 time <1.5
@ -170,6 +173,9 @@ test-suite doctests
, HUnit , HUnit
, doctest >=0.8 , doctest >=0.8
, Glob >=0.7 , Glob >=0.7
if impl(ghc <7.6)
build-depends:
ghc-prim
default-language: Haskell2010 default-language: Haskell2010
test-suite hunittests test-suite hunittests
@ -208,6 +214,9 @@ test-suite hunittests
, hledger-lib , hledger-lib
, test-framework , test-framework
, test-framework-hunit , test-framework-hunit
if impl(ghc <7.6)
build-depends:
ghc-prim
if flag(oldtime) if flag(oldtime)
build-depends: build-depends:
time <1.5 time <1.5

View File

@ -118,6 +118,9 @@ library:
- parsec - parsec
- semigroups - semigroups
when: when:
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
- condition: flag(oldtime) - condition: flag(oldtime)
then: then:
dependencies: dependencies:
@ -133,6 +136,10 @@ tests:
dependencies: dependencies:
- doctest >=0.8 - doctest >=0.8
- Glob >=0.7 - Glob >=0.7
when:
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
hunittests: hunittests:
main: hunittests.hs main: hunittests.hs
source-dirs: tests source-dirs: tests
@ -141,6 +148,9 @@ tests:
- test-framework - test-framework
- test-framework-hunit - test-framework-hunit
when: when:
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
- condition: flag(oldtime) - condition: flag(oldtime)
then: then:
dependencies: dependencies:

View File

@ -170,6 +170,9 @@ library
else else
build-depends: build-depends:
time >=1.5 time >=1.5
if impl(ghc <7.6)
build-depends:
ghc-prim
exposed-modules: exposed-modules:
Application Application
Foundation Foundation
@ -247,6 +250,9 @@ executable hledger-web
else else
build-depends: build-depends:
time >=1.5 time >=1.5
if impl(ghc <7.6)
build-depends:
ghc-prim
default-language: Haskell2010 default-language: Haskell2010
test-suite test test-suite test
@ -302,4 +308,7 @@ test-suite test
else else
build-depends: build-depends:
time >=1.5 time >=1.5
if impl(ghc <7.6)
build-depends:
ghc-prim
default-language: Haskell2010 default-language: Haskell2010

View File

@ -132,6 +132,9 @@ library:
else: else:
dependencies: dependencies:
- time >=1.5 - time >=1.5
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
executables: executables:
hledger-web: hledger-web:
main: main.hs main: main.hs
@ -157,6 +160,9 @@ executables:
else: else:
dependencies: dependencies:
- time >=1.5 - time >=1.5
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
tests: tests:
test: test:
main: main.hs main: main.hs
@ -175,5 +181,8 @@ tests:
else: else:
dependencies: dependencies:
- time >=1.5 - time >=1.5
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
stability: stable stability: stable
tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0 tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0

View File

@ -111,6 +111,9 @@ 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.6)
build-depends:
ghc-prim
if impl(ghc >=7.10) if impl(ghc >=7.10)
build-depends: build-depends:
shakespeare >=2.0.2.2 && <2.1 shakespeare >=2.0.2.2 && <2.1
@ -192,6 +195,9 @@ executable hledger
, wizards ==1.0.* , wizards ==1.0.*
if flag(threaded) if flag(threaded)
ghc-options: -threaded ghc-options: -threaded
if impl(ghc <7.6)
build-depends:
ghc-prim
if impl(ghc >=7.10) if impl(ghc >=7.10)
build-depends: build-depends:
shakespeare >=2.0.2.2 && <2.1 shakespeare >=2.0.2.2 && <2.1
@ -250,6 +256,9 @@ test-suite test
, wizards ==1.0.* , wizards ==1.0.*
, test-framework , test-framework
, test-framework-hunit , test-framework-hunit
if impl(ghc <7.6)
build-depends:
ghc-prim
if impl(ghc >=7.10) if impl(ghc >=7.10)
build-depends: build-depends:
shakespeare >=2.0.2.2 && <2.1 shakespeare >=2.0.2.2 && <2.1

View File

@ -125,6 +125,9 @@ library:
- utf8-string >=0.3.5 && <1.1 - utf8-string >=0.3.5 && <1.1
- wizards ==1.0.* - wizards ==1.0.*
when: when:
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
- condition: impl(ghc >=7.10) - condition: impl(ghc >=7.10)
then: then:
dependencies: dependencies:
@ -173,6 +176,9 @@ executables:
when: when:
- condition: flag(threaded) - condition: flag(threaded)
ghc-options: -threaded ghc-options: -threaded
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
- condition: impl(ghc >=7.10) - condition: impl(ghc >=7.10)
then: then:
dependencies: dependencies:
@ -221,6 +227,9 @@ tests:
- test-framework - test-framework
- test-framework-hunit - test-framework-hunit
when: when:
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
- condition: impl(ghc >=7.10) - condition: impl(ghc >=7.10)
then: then:
dependencies: dependencies: