From 000cd2780cbe2607a8114ddfc79a3d3ee6cdf213 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Mon, 30 Apr 2018 18:37:43 -0700
Subject: [PATCH] cli: fix benchmark compilation, clean up cabal

---
 hledger/hledger.cabal | 30 ++++++++++++++-
 hledger/package.yaml  | 85 ++++++++++++-------------------------------
 2 files changed, 52 insertions(+), 63 deletions(-)

diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal
index b90a43dc5..01e4b8e7c 100644
--- a/hledger/hledger.cabal
+++ b/hledger/hledger.cabal
@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 76caff99c32b8b2a218a88b5935bdd4f5aacf03ce196484689e33855c1e9da84
+-- hash: d2e059ba76c4adc8bd3486849c68143d38dc3fb25e92eb6a19327a6de3e852db
 
 name:           hledger
 version:        1.9.99
@@ -134,6 +134,7 @@ library
     , mtl
     , mtl-compat
     , old-time
+    , parsec >=3
     , pretty-show >=1.6.4
     , process
     , regex-tdfa
@@ -180,6 +181,7 @@ executable hledger
     , here
     , hledger
     , hledger-lib >=1.9.99 && <2.0
+    , megaparsec >=5.0
     , mtl
     , mtl-compat
     , old-time
@@ -194,6 +196,7 @@ executable hledger
     , temporary
     , text >=0.11
     , time >=1.5
+    , transformers
     , unordered-containers
     , utf8-string >=0.3.5
     , utility-ht >=0.0.13
@@ -232,6 +235,7 @@ test-suite test
     , here
     , hledger
     , hledger-lib >=1.9.99 && <2.0
+    , megaparsec >=5.0
     , mtl
     , mtl-compat
     , old-time
@@ -248,6 +252,7 @@ test-suite test
     , test-framework-hunit
     , text >=0.11
     , time >=1.5
+    , transformers
     , unordered-containers
     , utf8-string >=0.3.5
     , utility-ht >=0.0.13
@@ -266,25 +271,46 @@ benchmark 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
   build-depends:
-      ansi-terminal >=0.6.2.3
+      Decimal
+    , HUnit
+    , ansi-terminal >=0.6.2.3
     , base >=4.8 && <4.12
     , base-compat >=0.8.1
+    , bytestring
+    , cmdargs >=0.10
+    , containers
     , criterion
+    , csv
+    , data-default >=0.5
     , directory
     , file-embed >=0.0.10
     , filepath
+    , haskeline >=0.6
     , here
     , hledger
     , hledger-lib >=1.9.99 && <2.0
     , html
+    , megaparsec >=5.0
+    , mtl
+    , mtl-compat
+    , old-time
+    , parsec >=3
     , pretty-show >=1.6.4
     , process
+    , regex-tdfa
+    , safe >=0.2
     , shakespeare >=2.0.2.2
+    , split >=0.1
     , tabular >=0.2
     , temporary
+    , text >=0.11
     , time >=1.5
     , timeit
+    , transformers
+    , unordered-containers
+    , utf8-string >=0.3.5
     , utility-ht >=0.0.13
+    , wizards >=1.0
   if (!(os(windows))) && (flag(terminfo))
     build-depends:
         terminfo
diff --git a/hledger/package.yaml b/hledger/package.yaml
index e1ae437bd..a93f19420 100644
--- a/hledger/package.yaml
+++ b/hledger/package.yaml
@@ -78,21 +78,42 @@ ghc-options:
 - -optP-Wno-nonportable-include-path
 
 dependencies:
+- hledger-lib >=1.9.99 && <2.0
+- ansi-terminal >=0.6.2.3
 - base >=4.8 && <4.12
 - base-compat >=0.8.1
-- ansi-terminal >=0.6.2.3
+- bytestring
+- cmdargs >=0.10
+- containers
+- csv
+- data-default >=0.5
+- Decimal
 - directory
 - file-embed >=0.0.10
 - filepath
+- haskeline >=0.6
 - here
+- HUnit
+- megaparsec >=5.0
+- mtl
+- mtl-compat
+- old-time
+- parsec >=3
 - pretty-show >=1.6.4
 - process
+- regex-tdfa
+- safe >=0.2
 - shakespeare >=2.0.2.2
-- temporary
+- split >=0.1
 - tabular >=0.2
+- temporary
+- text >=0.11
 - time >=1.5
+- transformers
+- unordered-containers
+- utf8-string >=0.3.5
 - utility-ht >=0.0.13
-- hledger-lib >=1.9.99 && <2.0
+- wizards >=1.0
 
 when:
 - condition: (!(os(windows))) && (flag(terminfo))
@@ -132,29 +153,9 @@ library:
   - Hledger.Cli.Commands.Tags
   - Hledger.Cli.CompoundBalanceCommand
   dependencies:
-  - bytestring
-  - containers
-  - unordered-containers
-  - cmdargs >=0.10
-  - csv
-  - data-default >=0.5
   - Diff
   - hashable >=1.2.4
-  - haskeline >=0.6
-  - HUnit
   - 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:
   hledger:
@@ -166,25 +167,6 @@ executables:
       ghc-options: -threaded
     dependencies:
     - 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:
   test:
@@ -193,25 +175,6 @@ tests:
     cpp-options: -DVERSION="1.9.99"
     dependencies:
     - 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-hunit