From b91f2b85d0aea7808e025cb1e6327c91f73fd4a2 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Wed, 12 Aug 2015 09:25:28 -0700
Subject: [PATCH] update hpack package.yaml files

---
 hledger-lib/package.yaml | 14 ++++++------
 hledger-web/package.yaml | 13 ++++++------
 hledger/package.yaml     | 46 +++++++++++++++++++++++-----------------
 3 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml
index 0ac23f0b2..1c0dcd843 100644
--- a/hledger-lib/package.yaml
+++ b/hledger-lib/package.yaml
@@ -1,12 +1,12 @@
 # hpack specification for generating the cabal file
 # https://github.com/sol/hpack#readme
 # http://www.haskell.org/cabal/release/cabal-latest/doc/users-guide/authors.html
-
-# currently the cabal file will have these limitations (which must be fixed by hand if needed):
-# - does not specify tested-with or extensions
-# - does not allow building with time < 1.5, and therefore GHC < 7.2.1
-# - does not allow building without pretty-show, and therefore GHC < 7.4.1
-# - does not allow building with Double
+#
+# as of hpack 0.5.4 these must be added manually:
+# - tested-with
+# - flags
+# - benchmarks
+# - conditional blocks
 
 name        : hledger-lib
 version     : '0.26'
@@ -28,7 +28,7 @@ github      : simonmichael/hledger
 homepage    : http://hledger.org
 bug-reports : http://hledger.org/bugs
 # XXX not supported
-#tested-with : GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.1
+tested-with : GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.1
             
 extra-source-files:
   - CHANGES
diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml
index ecdfdd52d..cced87f01 100644
--- a/hledger-web/package.yaml
+++ b/hledger-web/package.yaml
@@ -1,11 +1,12 @@
 # hpack specification for generating the cabal file
 # https://github.com/sol/hpack#readme
 # http://www.haskell.org/cabal/release/cabal-latest/doc/users-guide/authors.html
-
-# currently the cabal file will have these limitations (which must be fixed by hand if needed):
-# - does not specify tested-with or extensions
-# - does not allow building in non-threaded mode (for debian) or dev or library-only mode (for yesod devel)
-# - does not allow building with time < 1.5, and therefore GHC < 7.2.1
+#
+# as of hpack 0.5.4 these must be added manually:
+# - tested-with
+# - flags
+# - benchmarks
+# - conditional blocks
 
 name        : hledger-web
 version     : '0.26'
@@ -27,7 +28,7 @@ github      : simonmichael/hledger
 homepage    : http://hledger.org
 bug-reports : http://hledger.org/bugs
 # XXX not supported
-#tested-with : GHC==7.6.3, GHC==7.8.4, GHC==7.10.1
+tested-with : GHC==7.6.3, GHC==7.8.4, GHC==7.10.1
             
 extra-source-files:
   - CHANGES
diff --git a/hledger/package.yaml b/hledger/package.yaml
index 529d40801..9f9127018 100644
--- a/hledger/package.yaml
+++ b/hledger/package.yaml
@@ -1,13 +1,12 @@
 # hpack specification for generating the cabal file
 # https://github.com/sol/hpack#readme
 # http://www.haskell.org/cabal/release/cabal-latest/doc/users-guide/authors.html
-
-# currently the cabal file will have these limitations (which must be fixed by hand if needed):
-# - does not specify tested-with or extensions or benchmarks
-# - does not allow building in non-threaded mode (for debian)
-# - does not allow building with time < 1.5, and therefore GHC < 7.2.1
-# - does not allow building without pretty-show, and therefore GHC < 7.4.1
-# - does not allow building without threads or curses
+#
+# as of hpack 0.5.4 these must be added manually:
+# - tested-with
+# - flags
+# - benchmarks
+# - conditional blocks
 
 name        : hledger
 version     : '0.26'
@@ -29,25 +28,33 @@ github      : simonmichael/hledger
 homepage    : http://hledger.org
 bug-reports : http://hledger.org/bugs
 # XXX not supported
-#tested-with : GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.1
+tested-with : GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.1
             
 extra-source-files:
   - CHANGES
+  - README.md
+  - test/test.hs
 
 # XXX not supported
-# flag threaded
-#     Description:   Build with support for multithreaded execution
-#     Default:       True
+flags:
+  threaded:
+    - default: True
+    - description:
+        Build with support for multithreaded execution
 
-# flag curses
-#     Description:   On POSIX systems, enable curses support for auto-detecting terminal width.
-#     Default:       True
+flag:
+  curses:
+    - default: True
+    - description:
+        On POSIX systems, enable curses support for auto-detecting terminal width.
 
-# flag old-locale
-#   description: A compatibility flag, set automatically by cabal.
-#                If false then depend on time >= 1.5, 
-#                if true then depend on time < 1.5 together with old-locale.
-#   default: False
+flag:
+  old-locale:
+    - default: False
+    - description:
+        A compatibility flag, set automatically by cabal.
+        If false then depend on time >= 1.5, 
+        if true then depend on time < 1.5 together with old-locale.
 
 dependencies:
   - hledger-lib == 0.26
@@ -151,6 +158,7 @@ tests:
 #   bench:
 #     source-dirs: bench
 #     main: bench.hs
+#     other-modules: SimpleBench
 #     dependencies:
 #       - hledger
 #       - criterion