regenerate cabal files with hpack

A few packages which included the Paths_* module no longer do,
and this seems ok with stack and cabal as far as I can tell.
That should be the only change, aside from a bunch of reorderings.

hledger-api/hledger-api.cabal

@@ -22,9 +22,9 @@ author:         Simon Michael <simon@joyful.com>
 maintainer:     Simon Michael <simon@joyful.com>
 license:        GPL
 license-file:   LICENSE
+tested-with:    GHC==7.10.3, GHC==8.0
 build-type:     Simple
 cabal-version:  >= 1.10
-tested-with:    GHC==7.10.3, GHC==8.0
 
 extra-source-files:
     CHANGES

hledger-lib/hledger-lib.cabal

@@ -4,8 +4,6 @@
 
 name:           hledger-lib
 version:        1.1.98
-stability:      stable
-category:       Finance
 synopsis:       Core data types, parsers and functionality for the hledger accounting tools
 description:    This is a reusable library containing hledger's core functionality.
                 .
@@ -15,15 +13,17 @@ description:    This is a reusable library containing hledger's core functionali
                 with ledger(1).  hledger provides command-line, curses and web
                 interfaces, and aims to be a reliable, practical tool for daily
                 use.
-license:        GPL
+category:       Finance
-license-file:   LICENSE
+stability:      stable
-author:         Simon Michael <simon@joyful.com>
-maintainer:     Simon Michael <simon@joyful.com>
 homepage:       http://hledger.org
 bug-reports:    http://bugs.hledger.org
-cabal-version:  >= 1.10
+author:         Simon Michael <simon@joyful.com>
-build-type:     Simple
+maintainer:     Simon Michael <simon@joyful.com>
+license:        GPL
+license-file:   LICENSE
 tested-with:    GHC==7.10.3, GHC==8.0
+build-type:     Simple
+cabal-version:  >= 1.10
 
 extra-source-files:
     CHANGES
@@ -144,17 +144,16 @@ library
       Hledger.Utils.UTF8IOCompat
   other-modules:
       Ledger.Parser.Text
-      Paths_hledger_lib
   default-language: Haskell2010
 
 test-suite doctests
   type: exitcode-stdio-1.0
+  main-is: doctests.hs
   hs-source-dirs:
       other/ledger-parse
     , .
     , tests
   ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
-  main-is: doctests.hs
   build-depends:
       base >=4.8 && <5
     , base-compat >=0.8.1

hledger-ui/hledger-ui.cabal

@@ -4,8 +4,6 @@
 
 name:           hledger-ui
 version:        1.1.98
-stability:      stable
-category:       Finance, Console
 synopsis:       Curses-style user interface for the hledger accounting tool
 description:    This is hledger's curses-style interface.
                 It is simpler and more convenient for browsing data than the command-line interface,
@@ -17,15 +15,17 @@ description:    This is hledger's curses-style interface.
                 with ledger(1).  hledger provides command-line, curses and web
                 interfaces, and aims to be a reliable, practical tool for daily
                 use.
-license:        GPL
+category:       Finance, Console
-license-file:   LICENSE
+stability:      stable
-author:         Simon Michael <simon@joyful.com>
-maintainer:     Simon Michael <simon@joyful.com>
 homepage:       http://hledger.org
 bug-reports:    http://bugs.hledger.org
-cabal-version:  >= 1.10
+author:         Simon Michael <simon@joyful.com>
-build-type:     Simple
+maintainer:     Simon Michael <simon@joyful.com>
+license:        GPL
+license-file:   LICENSE
 tested-with:    GHC==7.10.3, GHC==8.0
+build-type:     Simple
+cabal-version:  >= 1.10
 
 extra-source-files:
     CHANGES
@@ -46,9 +46,9 @@ flag oldtime
   default: False
 
 flag threaded
-  default: True
   description: Build with support for multithreaded execution
   manual: False
+  default: True
 
 executable hledger-ui
   main-is: hledger-ui.hs

hledger-web/hledger-web.cabal

@@ -4,8 +4,6 @@
 
 name:           hledger-web
 version:        1.1.98
-stability:      stable
-category:       Finance
 synopsis:       Web interface for the hledger accounting tool
 description:    This is hledger's web interface.
                 It provides a more user-friendly and collaborative UI than the
@@ -17,15 +15,17 @@ description:    This is hledger's web interface.
                 with ledger(1).  hledger provides command-line, curses and web
                 interfaces, and aims to be a reliable, practical tool for daily
                 use.
-license:        GPL
+category:       Finance
-license-file:   LICENSE
+stability:      stable
-author:         Simon Michael <simon@joyful.com>
-maintainer:     Simon Michael <simon@joyful.com>
 homepage:       http://hledger.org
 bug-reports:    http://bugs.hledger.org
-cabal-version:  >= 1.10
+author:         Simon Michael <simon@joyful.com>
-build-type:     Simple
+maintainer:     Simon Michael <simon@joyful.com>
+license:        GPL
+license-file:   LICENSE
 tested-with:    GHC==7.10.3, GHC==8.0
+build-type:     Simple
+cabal-version:  >= 1.10
 
 extra-source-files:
     CHANGES
@@ -104,14 +104,14 @@ source-repository head
   location: https://github.com/simonmichael/hledger
 
 flag dev
-    default: False
   description: Turn on development settings, like auto-reload templates.
   manual: False
+  default: False
 
 flag library-only
-    default: False
   description: Build for use with "yesod devel"
   manual: False
+  default: False
 
 flag oldtime
   description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
@@ -119,9 +119,9 @@ flag oldtime
   default: False
 
 flag threaded
-    default: True
   description: Build with support for multithreaded execution.
   manual: False
+  default: True
 
 library
   ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
@@ -258,9 +258,6 @@ executable hledger-web
 test-suite test
   type: exitcode-stdio-1.0
   main-is: main.hs
-    other-modules:
-          HomeTest
-          TestImport
   hs-source-dirs:
       tests
   ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
@@ -311,4 +308,7 @@ test-suite test
   if impl(ghc <7.6)
     build-depends:
         ghc-prim
+  other-modules:
+      HomeTest
+      TestImport
   default-language: Haskell2010

hledger/hledger.cabal

@@ -4,8 +4,6 @@
 
 name:           hledger
 version:        1.1.98
-stability:      stable
-category:       Finance, Console
 synopsis:       Command-line interface for the hledger accounting tool
 description:    This is hledger's command-line interface.
                 Its basic function is to read a plain text file describing
@@ -17,15 +15,17 @@ description:    This is hledger's command-line interface.
                 with ledger(1).  hledger provides command-line, curses and web
                 interfaces, and aims to be a reliable, practical tool for daily
                 use.
-license:        GPL
+category:       Finance, Console
-license-file:   LICENSE
+stability:      stable
-author:         Simon Michael <simon@joyful.com>
-maintainer:     Simon Michael <simon@joyful.com>
 homepage:       http://hledger.org
 bug-reports:    http://bugs.hledger.org
-cabal-version:  >= 1.10
+author:         Simon Michael <simon@joyful.com>
-build-type:     Simple
+maintainer:     Simon Michael <simon@joyful.com>
+license:        GPL
+license-file:   LICENSE
 tested-with:    GHC==7.10.3, GHC==8.0
+build-type:     Simple
+cabal-version:  >= 1.10
 
 extra-source-files:
     bench/10000x1000x10.journal
@@ -74,9 +74,9 @@ flag terminfo
   default: True
 
 flag threaded
-  default: True
   description: Build with support for multithreaded execution
   manual: False
+  default: True
 
 library
   ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
@@ -281,11 +281,10 @@ test-suite test
 
 benchmark bench
   type: exitcode-stdio-1.0
+  main-is: bench.hs
   hs-source-dirs:
       bench
-  main-is: bench.hs
   ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
-  default-language: Haskell2010
   build-depends:
       base >=4.8 && <5
     , base-compat >=0.8.1
@@ -308,3 +307,4 @@ benchmark bench
   else
     build-depends:
         time >=1.5
+  default-language: Haskell2010