cli: fix benchmark compilation, clean up cabal

This commit is contained in:
Simon Michael 2018-04-30 18:37:43 -07:00
parent f67455c2b7
commit 000cd2780c
2 changed files with 52 additions and 63 deletions

View File

@ -2,7 +2,7 @@
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: 76caff99c32b8b2a218a88b5935bdd4f5aacf03ce196484689e33855c1e9da84 -- hash: d2e059ba76c4adc8bd3486849c68143d38dc3fb25e92eb6a19327a6de3e852db
name: hledger name: hledger
version: 1.9.99 version: 1.9.99
@ -134,6 +134,7 @@ library
, mtl , mtl
, mtl-compat , mtl-compat
, old-time , old-time
, parsec >=3
, pretty-show >=1.6.4 , pretty-show >=1.6.4
, process , process
, regex-tdfa , regex-tdfa
@ -180,6 +181,7 @@ executable hledger
, here , here
, hledger , hledger
, hledger-lib >=1.9.99 && <2.0 , hledger-lib >=1.9.99 && <2.0
, megaparsec >=5.0
, mtl , mtl
, mtl-compat , mtl-compat
, old-time , old-time
@ -194,6 +196,7 @@ executable hledger
, temporary , temporary
, text >=0.11 , text >=0.11
, time >=1.5 , time >=1.5
, transformers
, unordered-containers , unordered-containers
, utf8-string >=0.3.5 , utf8-string >=0.3.5
, utility-ht >=0.0.13 , utility-ht >=0.0.13
@ -232,6 +235,7 @@ test-suite test
, here , here
, hledger , hledger
, hledger-lib >=1.9.99 && <2.0 , hledger-lib >=1.9.99 && <2.0
, megaparsec >=5.0
, mtl , mtl
, mtl-compat , mtl-compat
, old-time , old-time
@ -248,6 +252,7 @@ test-suite test
, test-framework-hunit , test-framework-hunit
, text >=0.11 , text >=0.11
, time >=1.5 , time >=1.5
, transformers
, unordered-containers , unordered-containers
, utf8-string >=0.3.5 , utf8-string >=0.3.5
, utility-ht >=0.0.13 , utility-ht >=0.0.13
@ -266,25 +271,46 @@ benchmark bench
bench bench
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans -optP-Wno-nonportable-include-path
build-depends: build-depends:
ansi-terminal >=0.6.2.3 Decimal
, HUnit
, ansi-terminal >=0.6.2.3
, base >=4.8 && <4.12 , base >=4.8 && <4.12
, base-compat >=0.8.1 , base-compat >=0.8.1
, bytestring
, cmdargs >=0.10
, containers
, criterion , criterion
, csv
, data-default >=0.5
, directory , directory
, file-embed >=0.0.10 , file-embed >=0.0.10
, filepath , filepath
, haskeline >=0.6
, here , here
, hledger , hledger
, hledger-lib >=1.9.99 && <2.0 , hledger-lib >=1.9.99 && <2.0
, html , html
, megaparsec >=5.0
, mtl
, mtl-compat
, old-time
, parsec >=3
, pretty-show >=1.6.4 , pretty-show >=1.6.4
, process , process
, regex-tdfa
, safe >=0.2
, shakespeare >=2.0.2.2 , shakespeare >=2.0.2.2
, split >=0.1
, tabular >=0.2 , tabular >=0.2
, temporary , temporary
, text >=0.11
, time >=1.5 , time >=1.5
, timeit , timeit
, transformers
, unordered-containers
, utf8-string >=0.3.5
, utility-ht >=0.0.13 , utility-ht >=0.0.13
, wizards >=1.0
if (!(os(windows))) && (flag(terminfo)) if (!(os(windows))) && (flag(terminfo))
build-depends: build-depends:
terminfo terminfo

View File

@ -78,21 +78,42 @@ ghc-options:
- -optP-Wno-nonportable-include-path - -optP-Wno-nonportable-include-path
dependencies: dependencies:
- hledger-lib >=1.9.99 && <2.0
- ansi-terminal >=0.6.2.3
- base >=4.8 && <4.12 - base >=4.8 && <4.12
- base-compat >=0.8.1 - base-compat >=0.8.1
- ansi-terminal >=0.6.2.3 - bytestring
- cmdargs >=0.10
- containers
- csv
- data-default >=0.5
- Decimal
- directory - directory
- file-embed >=0.0.10 - file-embed >=0.0.10
- filepath - filepath
- haskeline >=0.6
- here - here
- HUnit
- megaparsec >=5.0
- mtl
- mtl-compat
- old-time
- parsec >=3
- pretty-show >=1.6.4 - pretty-show >=1.6.4
- process - process
- regex-tdfa
- safe >=0.2
- shakespeare >=2.0.2.2 - shakespeare >=2.0.2.2
- temporary - split >=0.1
- tabular >=0.2 - tabular >=0.2
- temporary
- text >=0.11
- time >=1.5 - time >=1.5
- transformers
- unordered-containers
- utf8-string >=0.3.5
- utility-ht >=0.0.13 - utility-ht >=0.0.13
- hledger-lib >=1.9.99 && <2.0 - wizards >=1.0
when: when:
- condition: (!(os(windows))) && (flag(terminfo)) - condition: (!(os(windows))) && (flag(terminfo))
@ -132,29 +153,9 @@ library:
- Hledger.Cli.Commands.Tags - Hledger.Cli.Commands.Tags
- Hledger.Cli.CompoundBalanceCommand - Hledger.Cli.CompoundBalanceCommand
dependencies: dependencies:
- bytestring
- containers
- unordered-containers
- cmdargs >=0.10
- csv
- data-default >=0.5
- Diff - Diff
- hashable >=1.2.4 - hashable >=1.2.4
- haskeline >=0.6
- HUnit
- lucid - lucid
- mtl
- mtl-compat
- old-time
- megaparsec >=5.0
- regex-tdfa
- safe >=0.2
- split >=0.1
- transformers
- text >=0.11
- utf8-string >=0.3.5
- wizards >=1.0
- Decimal
executables: executables:
hledger: hledger:
@ -166,25 +167,6 @@ executables:
ghc-options: -threaded ghc-options: -threaded
dependencies: dependencies:
- hledger - hledger
- bytestring
- containers
- unordered-containers
- cmdargs >=0.10
- csv
- data-default >=0.5
- haskeline >=0.6
- HUnit
- mtl
- mtl-compat
- old-time
- parsec >=3
- regex-tdfa
- safe >=0.2
- split >=0.1
- text >=0.11
- utf8-string >=0.3.5
- wizards >=1.0
- Decimal
tests: tests:
test: test:
@ -193,25 +175,6 @@ tests:
cpp-options: -DVERSION="1.9.99" cpp-options: -DVERSION="1.9.99"
dependencies: dependencies:
- hledger - hledger
- bytestring
- containers
- unordered-containers
- cmdargs >=0.10
- csv
- data-default >=0.5
- haskeline >=0.6
- HUnit
- mtl
- mtl-compat
- old-time
- parsec >=3
- regex-tdfa
- safe >=0.2
- split >=0.1
- text >=0.11
- utf8-string >=0.3.5
- wizards >=1.0
- Decimal
- test-framework - test-framework
- test-framework-hunit - test-framework-hunit