cli: package.yaml: simplify dep lists, whitespace
This commit is contained in:
Simon Michael
parent
d9e72d389e
commit
6e402e1ed6
@ -179,7 +179,7 @@ executable hledger
|
|||||||
, process
|
, process
|
||||||
, temporary
|
, temporary
|
||||||
, tabular >=0.2 && <0.3
|
, tabular >=0.2 && <0.3
|
||||||
, hledger-lib >= 1.3.99
|
, hledger-lib >= 1.3.99 && < 1.4
|
||||||
, hledger
|
, hledger
|
||||||
, bytestring
|
, bytestring
|
||||||
, containers
|
, containers
|
||||||
@ -199,8 +199,6 @@ executable hledger
|
|||||||
, 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 flag(threaded)
|
|
||||||
ghc-options: -threaded
|
|
||||||
if impl(ghc <7.6)
|
if impl(ghc <7.6)
|
||||||
build-depends:
|
build-depends:
|
||||||
ghc-prim
|
ghc-prim
|
||||||
@ -221,6 +219,8 @@ executable hledger
|
|||||||
if (!(os(windows))) && (flag(terminfo))
|
if (!(os(windows))) && (flag(terminfo))
|
||||||
build-depends:
|
build-depends:
|
||||||
terminfo
|
terminfo
|
||||||
|
if flag(threaded)
|
||||||
|
ghc-options: -threaded
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
|
||||||
test-suite test
|
test-suite test
|
||||||
@ -242,7 +242,7 @@ test-suite test
|
|||||||
, process
|
, process
|
||||||
, temporary
|
, temporary
|
||||||
, tabular >=0.2 && <0.3
|
, tabular >=0.2 && <0.3
|
||||||
, hledger-lib >= 1.3.99
|
, hledger-lib >= 1.3.99 && < 1.4
|
||||||
, hledger
|
, hledger
|
||||||
, bytestring
|
, bytestring
|
||||||
, containers
|
, containers
|
||||||
@ -304,11 +304,21 @@ benchmark bench
|
|||||||
, process
|
, process
|
||||||
, temporary
|
, temporary
|
||||||
, tabular >=0.2 && <0.3
|
, tabular >=0.2 && <0.3
|
||||||
, hledger-lib >= 1.3.99
|
, hledger-lib >= 1.3.99 && < 1.4
|
||||||
, hledger
|
, hledger
|
||||||
, criterion
|
, criterion
|
||||||
, html
|
, html
|
||||||
, timeit
|
, timeit
|
||||||
|
if impl(ghc <7.6)
|
||||||
|
build-depends:
|
||||||
|
ghc-prim
|
||||||
|
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)
|
if flag(oldtime)
|
||||||
build-depends:
|
build-depends:
|
||||||
time <1.5
|
time <1.5
|
||||||
@ -316,4 +326,7 @@ benchmark bench
|
|||||||
else
|
else
|
||||||
build-depends:
|
build-depends:
|
||||||
time >=1.5
|
time >=1.5
|
||||||
|
if (!(os(windows))) && (flag(terminfo))
|
||||||
|
build-depends:
|
||||||
|
terminfo
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
|||||||
@ -19,11 +19,15 @@ maintainer: Simon Michael <simon@joyful.com>
|
|||||||
github: simonmichael/hledger
|
github: simonmichael/hledger
|
||||||
homepage: http://hledger.org
|
homepage: http://hledger.org
|
||||||
bug-reports: http://bugs.hledger.org
|
bug-reports: http://bugs.hledger.org
|
||||||
|
stability: stable
|
||||||
|
tested-with: GHC==7.10.3, GHC==8.0
|
||||||
|
|
||||||
extra-source-files:
|
extra-source-files:
|
||||||
- CHANGES
|
- CHANGES
|
||||||
- README.md
|
- README.md
|
||||||
- test/test.hs
|
- test/test.hs
|
||||||
- bench/10000x1000x10.journal
|
- bench/10000x1000x10.journal
|
||||||
|
|
||||||
data-files:
|
data-files:
|
||||||
- doc/hledger.1
|
- doc/hledger.1
|
||||||
- doc/hledger.1.txt
|
- doc/hledger.1.txt
|
||||||
@ -49,6 +53,7 @@ data-files:
|
|||||||
- doc/other/hledger_timedot.5
|
- doc/other/hledger_timedot.5
|
||||||
- doc/other/hledger_timedot.5.txt
|
- doc/other/hledger_timedot.5.txt
|
||||||
- doc/other/hledger_timedot.5.info
|
- doc/other/hledger_timedot.5.info
|
||||||
|
|
||||||
flags:
|
flags:
|
||||||
terminfo:
|
terminfo:
|
||||||
description: On POSIX systems, build with the terminfo lib for detecting terminal width.
|
description: On POSIX systems, build with the terminfo lib for detecting terminal width.
|
||||||
@ -62,6 +67,15 @@ flags:
|
|||||||
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
|
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
|
||||||
manual: false
|
manual: false
|
||||||
default: false
|
default: false
|
||||||
|
|
||||||
|
ghc-options:
|
||||||
|
- -Wall
|
||||||
|
- -fno-warn-unused-do-bind
|
||||||
|
- -fno-warn-name-shadowing
|
||||||
|
- -fno-warn-missing-signatures
|
||||||
|
- -fno-warn-type-defaults
|
||||||
|
- -fno-warn-orphans
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- base >=4.8 && <5
|
- base >=4.8 && <5
|
||||||
- base-compat >=0.8.1
|
- base-compat >=0.8.1
|
||||||
@ -74,13 +88,32 @@ dependencies:
|
|||||||
- process
|
- process
|
||||||
- temporary
|
- temporary
|
||||||
- tabular >=0.2 && <0.3
|
- tabular >=0.2 && <0.3
|
||||||
ghc-options:
|
- hledger-lib >= 1.3.99 && < 1.4
|
||||||
- -Wall
|
|
||||||
- -fno-warn-unused-do-bind
|
when:
|
||||||
- -fno-warn-name-shadowing
|
- condition: impl(ghc <7.6)
|
||||||
- -fno-warn-missing-signatures
|
dependencies:
|
||||||
- -fno-warn-type-defaults
|
- ghc-prim
|
||||||
- -fno-warn-orphans
|
- 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:
|
||||||
|
- time <1.5
|
||||||
|
- old-locale
|
||||||
|
else:
|
||||||
|
dependencies:
|
||||||
|
- time >=1.5
|
||||||
|
- condition: (!(os(windows))) && (flag(terminfo))
|
||||||
|
dependencies:
|
||||||
|
- terminfo
|
||||||
|
|
||||||
library:
|
library:
|
||||||
cpp-options: -DVERSION="1.3.99"
|
cpp-options: -DVERSION="1.3.99"
|
||||||
exposed-modules:
|
exposed-modules:
|
||||||
@ -107,7 +140,6 @@ library:
|
|||||||
- Hledger.Cli.Stats
|
- Hledger.Cli.Stats
|
||||||
- Text.Tabular.AsciiWide
|
- Text.Tabular.AsciiWide
|
||||||
dependencies:
|
dependencies:
|
||||||
- hledger-lib >= 1.3.99 && < 1.4
|
|
||||||
- bytestring
|
- bytestring
|
||||||
- containers
|
- containers
|
||||||
- unordered-containers
|
- unordered-containers
|
||||||
@ -128,36 +160,16 @@ 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.*
|
||||||
when:
|
|
||||||
- condition: impl(ghc <7.6)
|
|
||||||
dependencies:
|
|
||||||
- ghc-prim
|
|
||||||
- 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:
|
|
||||||
- time <1.5
|
|
||||||
- old-locale
|
|
||||||
else:
|
|
||||||
dependencies:
|
|
||||||
- time >=1.5
|
|
||||||
- condition: (!(os(windows))) && (flag(terminfo))
|
|
||||||
dependencies:
|
|
||||||
- terminfo
|
|
||||||
executables:
|
executables:
|
||||||
hledger:
|
hledger:
|
||||||
main: hledger-cli.hs
|
main: hledger-cli.hs
|
||||||
source-dirs: app
|
source-dirs: app
|
||||||
cpp-options: -DVERSION="1.3.99"
|
cpp-options: -DVERSION="1.3.99"
|
||||||
|
when:
|
||||||
|
- condition: flag(threaded)
|
||||||
|
ghc-options: -threaded
|
||||||
dependencies:
|
dependencies:
|
||||||
- hledger-lib >= 1.3.99
|
|
||||||
- hledger
|
- hledger
|
||||||
- bytestring
|
- bytestring
|
||||||
- containers
|
- containers
|
||||||
@ -177,38 +189,13 @@ executables:
|
|||||||
- 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.*
|
||||||
when:
|
|
||||||
- condition: flag(threaded)
|
|
||||||
ghc-options: -threaded
|
|
||||||
- condition: impl(ghc <7.6)
|
|
||||||
dependencies:
|
|
||||||
- ghc-prim
|
|
||||||
- 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:
|
|
||||||
- time <1.5
|
|
||||||
- old-locale
|
|
||||||
else:
|
|
||||||
dependencies:
|
|
||||||
- time >=1.5
|
|
||||||
- condition: (!(os(windows))) && (flag(terminfo))
|
|
||||||
dependencies:
|
|
||||||
- terminfo
|
|
||||||
tests:
|
tests:
|
||||||
test:
|
test:
|
||||||
main: test.hs
|
main: test.hs
|
||||||
source-dirs: test
|
source-dirs: test
|
||||||
cpp-options: -DVERSION="1.3.99"
|
cpp-options: -DVERSION="1.3.99"
|
||||||
dependencies:
|
dependencies:
|
||||||
- hledger-lib >= 1.3.99
|
|
||||||
- hledger
|
- hledger
|
||||||
- bytestring
|
- bytestring
|
||||||
- containers
|
- containers
|
||||||
@ -230,47 +217,13 @@ tests:
|
|||||||
- wizards ==1.0.*
|
- wizards ==1.0.*
|
||||||
- test-framework
|
- test-framework
|
||||||
- test-framework-hunit
|
- test-framework-hunit
|
||||||
when:
|
|
||||||
- condition: impl(ghc <7.6)
|
|
||||||
dependencies:
|
|
||||||
- ghc-prim
|
|
||||||
- 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:
|
|
||||||
- time <1.5
|
|
||||||
- old-locale
|
|
||||||
else:
|
|
||||||
dependencies:
|
|
||||||
- time >=1.5
|
|
||||||
- condition: (!(os(windows))) && (flag(terminfo))
|
|
||||||
dependencies:
|
|
||||||
- terminfo
|
|
||||||
benchmarks:
|
benchmarks:
|
||||||
bench:
|
bench:
|
||||||
main: bench.hs
|
main: bench.hs
|
||||||
source-dirs: bench
|
source-dirs: bench
|
||||||
dependencies:
|
dependencies:
|
||||||
- hledger-lib >= 1.3.99
|
|
||||||
- hledger
|
- hledger
|
||||||
- criterion
|
- criterion
|
||||||
- html
|
- html
|
||||||
- timeit
|
- timeit
|
||||||
when:
|
|
||||||
- condition: flag(oldtime)
|
|
||||||
then:
|
|
||||||
dependencies:
|
|
||||||
- time <1.5
|
|
||||||
- old-locale
|
|
||||||
else:
|
|
||||||
dependencies:
|
|
||||||
- time >=1.5
|
|
||||||
stability: stable
|
|
||||||
tested-with: GHC==7.10.3, GHC==8.0
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user