regenerate cabal files, fix tabular compilation error

2018-04-22 10:12:17 -07:00 · 2018-04-22 10:12:17 -07:00 · 41665d07b0
commit 41665d07b0
parent 0c140d7238
5 changed files with 183 additions and 182 deletions
--- a/hledger-api/hledger-api.cabal
+++ b/hledger-api/hledger-api.cabal
@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
-- hash: 9b937b4285d0c855e81cf6a06d89b5becec7273b00def35f77b6821a83b8c54f
+-- hash: 6e88fc6dc1563f77fa7cb770026fb5039e3293499797c2af985830545fce17f2

 name:           hledger-api
 version:        1.9.99
@ -42,6 +42,8 @@ source-repository head

 executable hledger-api
  main-is: hledger-api.hs
+  other-modules:
+      Paths_hledger_api
  ghc-options: -threaded
  cpp-options: -DVERSION="1.9.99"
  build-depends:
@ -66,6 +68,4 @@ executable hledger-api
    , wai
    , wai-extra
    , warp
-  other-modules:
-      Paths_hledger_api
  default-language: Haskell2010
--- a/hledger-lib/hledger-lib.cabal
+++ b/hledger-lib/hledger-lib.cabal
@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
-- hash: 592152e395a797cb3d802bb72f5633a401f780a273f78bc636443ec2ed7232f6
+-- hash: 35b99fca4f907c785bc51a5b5b6b0d5b7a0861f996100de9ff4f3b82c068ea95

 name:           hledger-lib
 version:        1.9.99
@ -47,44 +47,6 @@ source-repository head
  location: https://github.com/simonmichael/hledger

 library
-  hs-source-dirs:
-      ./.
-  ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
-  build-depends:
-      Decimal
-    , HUnit
-    , ansi-terminal >=0.6.2.3
-    , array
-    , base >=4.8 && <4.12
-    , base-compat >=0.8.1
-    , blaze-markup >=0.5.1
-    , bytestring
-    , cmdargs >=0.10
-    , containers
-    , csv
-    , data-default >=0.5
-    , deepseq
-    , directory
-    , extra
-    , filepath
-    , hashtables >=1.2
-    , megaparsec >=5.0
-    , mtl
-    , mtl-compat
-    , old-time
-    , parsec >=3
-    , pretty-show >=1.6.4
-    , regex-tdfa
-    , safe >=0.2
-    , split >=0.1
-    , text >=1.2
-    , time >=1.5
-    , transformers >=0.2
-    , uglymemo
-    , utf8-string >=0.3.5
-  if (!impl(ghc >= 8.0))
-    build-depends:
-        semigroups ==0.18.*
  exposed-modules:
      Hledger
      Hledger.Data
@ -135,11 +97,99 @@ library
      Text.Tabular.AsciiWide
  other-modules:
      Paths_hledger_lib
+  hs-source-dirs:
+      ./.
+  ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
+  build-depends:
+      Decimal
+    , HUnit
+    , ansi-terminal >=0.6.2.3
+    , array
+    , base >=4.8 && <4.12
+    , base-compat >=0.8.1
+    , blaze-markup >=0.5.1
+    , bytestring
+    , cmdargs >=0.10
+    , containers
+    , csv
+    , data-default >=0.5
+    , deepseq
+    , directory
+    , extra
+    , filepath
+    , hashtables >=1.2
+    , megaparsec >=5.0
+    , mtl
+    , mtl-compat
+    , old-time
+    , parsec >=3
+    , pretty-show >=1.6.4
+    , regex-tdfa
+    , safe >=0.2
+    , split >=0.1
+    , tabular >=0.2
+    , text >=1.2
+    , time >=1.5
+    , transformers >=0.2
+    , uglymemo
+    , utf8-string >=0.3.5
+  if (!impl(ghc >= 8.0))
+    build-depends:
+        semigroups ==0.18.*
  default-language: Haskell2010

 test-suite doctests
  type: exitcode-stdio-1.0
  main-is: doctests.hs
+  other-modules:
+      Hledger
+      Hledger.Data
+      Hledger.Data.Account
+      Hledger.Data.AccountName
+      Hledger.Data.Amount
+      Hledger.Data.AutoTransaction
+      Hledger.Data.Commodity
+      Hledger.Data.Dates
+      Hledger.Data.Journal
+      Hledger.Data.Ledger
+      Hledger.Data.MarketPrice
+      Hledger.Data.Period
+      Hledger.Data.Posting
+      Hledger.Data.RawOptions
+      Hledger.Data.StringFormat
+      Hledger.Data.Timeclock
+      Hledger.Data.Transaction
+      Hledger.Data.Types
+      Hledger.Query
+      Hledger.Read
+      Hledger.Read.Common
+      Hledger.Read.CsvReader
+      Hledger.Read.JournalReader
+      Hledger.Read.TimeclockReader
+      Hledger.Read.TimedotReader
+      Hledger.Reports
+      Hledger.Reports.BalanceHistoryReport
+      Hledger.Reports.BalanceReport
+      Hledger.Reports.BudgetReport
+      Hledger.Reports.EntriesReport
+      Hledger.Reports.MultiBalanceReports
+      Hledger.Reports.PostingsReport
+      Hledger.Reports.ReportOptions
+      Hledger.Reports.ReportTypes
+      Hledger.Reports.TransactionsReports
+      Hledger.Utils
+      Hledger.Utils.Color
+      Hledger.Utils.Debug
+      Hledger.Utils.Parse
+      Hledger.Utils.Regex
+      Hledger.Utils.String
+      Hledger.Utils.Test
+      Hledger.Utils.Text
+      Hledger.Utils.Tree
+      Hledger.Utils.UTF8IOCompat
+      Text.Megaparsec.Compat
+      Text.Tabular.AsciiWide
+      Paths_hledger_lib
  hs-source-dirs:
      ./.
      tests
@ -184,6 +234,11 @@ test-suite doctests
        semigroups ==0.18.*
  if impl(ghc >= 8.4) && os(darwin)
    buildable: False
+  default-language: Haskell2010
+
+test-suite easytests
+  type: exitcode-stdio-1.0
+  main-is: easytests.hs
  other-modules:
      Hledger
      Hledger.Data
@ -233,11 +288,6 @@ test-suite doctests
      Text.Megaparsec.Compat
      Text.Tabular.AsciiWide
      Paths_hledger_lib
-  default-language: Haskell2010
-
-test-suite easytests
-  type: exitcode-stdio-1.0
-  main-is: easytests.hs
  hs-source-dirs:
      ./.
      tests
@ -280,6 +330,11 @@ test-suite easytests
  if (!impl(ghc >= 8.0))
    build-depends:
        semigroups ==0.18.*
+  default-language: Haskell2010
+
+test-suite hunittests
+  type: exitcode-stdio-1.0
+  main-is: hunittests.hs
  other-modules:
      Hledger
      Hledger.Data
@ -329,11 +384,6 @@ test-suite easytests
      Text.Megaparsec.Compat
      Text.Tabular.AsciiWide
      Paths_hledger_lib
-  default-language: Haskell2010
-
-test-suite hunittests
-  type: exitcode-stdio-1.0
-  main-is: hunittests.hs
  hs-source-dirs:
      ./.
      tests
@ -366,9 +416,9 @@ test-suite hunittests
    , regex-tdfa
    , safe >=0.2
    , split >=0.1
+    , tabular >=0.2
    , test-framework
    , test-framework-hunit
-    , tabular >=0.2
    , text >=1.2
    , time >=1.5
    , transformers >=0.2
@ -377,53 +427,4 @@ test-suite hunittests
  if (!impl(ghc >= 8.0))
    build-depends:
        semigroups ==0.18.*
-  other-modules:
-      Hledger
-      Hledger.Data
-      Hledger.Data.Account
-      Hledger.Data.AccountName
-      Hledger.Data.Amount
-      Hledger.Data.AutoTransaction
-      Hledger.Data.Commodity
-      Hledger.Data.Dates
-      Hledger.Data.Journal
-      Hledger.Data.Ledger
-      Hledger.Data.MarketPrice
-      Hledger.Data.Period
-      Hledger.Data.Posting
-      Hledger.Data.RawOptions
-      Hledger.Data.StringFormat
-      Hledger.Data.Timeclock
-      Hledger.Data.Transaction
-      Hledger.Data.Types
-      Hledger.Query
-      Hledger.Read
-      Hledger.Read.Common
-      Hledger.Read.CsvReader
-      Hledger.Read.JournalReader
-      Hledger.Read.TimeclockReader
-      Hledger.Read.TimedotReader
-      Hledger.Reports
-      Hledger.Reports.BalanceHistoryReport
-      Hledger.Reports.BalanceReport
-      Hledger.Reports.BudgetReport
-      Hledger.Reports.EntriesReport
-      Hledger.Reports.MultiBalanceReports
-      Hledger.Reports.PostingsReport
-      Hledger.Reports.ReportOptions
-      Hledger.Reports.ReportTypes
-      Hledger.Reports.TransactionsReports
-      Hledger.Utils
-      Hledger.Utils.Color
-      Hledger.Utils.Debug
-      Hledger.Utils.Parse
-      Hledger.Utils.Regex
-      Hledger.Utils.String
-      Hledger.Utils.Test
-      Hledger.Utils.Text
-      Hledger.Utils.Tree
-      Hledger.Utils.UTF8IOCompat
-      Text.Megaparsec.Compat
-      Text.Tabular.AsciiWide
-      Paths_hledger_lib
  default-language: Haskell2010
--- a/hledger-ui/hledger-ui.cabal
+++ b/hledger-ui/hledger-ui.cabal
@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
-- hash: 14279ffbc5973fef7bdbb7dce639eb4acff51f9a60ca6b7a18b30640cbc6333e
+-- hash: b550ebb38d8cb6318ceaade71bf1f9eeb9c85a5a84b4da7d9b63f6f8ccd91124

 name:           hledger-ui
 version:        1.9.99
@ -46,6 +46,20 @@ flag threaded

 executable hledger-ui
  main-is: hledger-ui.hs
+  other-modules:
+      Hledger.UI
+      Hledger.UI.AccountsScreen
+      Hledger.UI.Editor
+      Hledger.UI.ErrorScreen
+      Hledger.UI.Main
+      Hledger.UI.RegisterScreen
+      Hledger.UI.Theme
+      Hledger.UI.TransactionScreen
+      Hledger.UI.UIOptions
+      Hledger.UI.UIState
+      Hledger.UI.UITypes
+      Hledger.UI.UIUtils
+      Paths_hledger_ui
  hs-source-dirs:
      ./.
  ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
@ -84,18 +98,4 @@ executable hledger-ui
      , vty >=5.5
  if flag(threaded)
    ghc-options: -threaded
-  other-modules:
-      Hledger.UI
-      Hledger.UI.AccountsScreen
-      Hledger.UI.Editor
-      Hledger.UI.ErrorScreen
-      Hledger.UI.Main
-      Hledger.UI.RegisterScreen
-      Hledger.UI.Theme
-      Hledger.UI.TransactionScreen
-      Hledger.UI.UIOptions
-      Hledger.UI.UIState
-      Hledger.UI.UITypes
-      Hledger.UI.UIUtils
-      Paths_hledger_ui
  default-language: Haskell2010
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
-- hash: a51ae10d4bfa2f17493ee1442d3f957b817dfffef0960f2c6ad9be22a59dbcdb
+-- hash: 0f07bd3900d1a00fa95eb4cc28f4e539eddce9d0b6a6123a37a809c6f71f6b6d

 name:           hledger-web
 version:        1.9.99
@ -120,6 +120,25 @@ flag threaded
  default: True

 library
+  exposed-modules:
+      Application
+      Foundation
+      Handler.AddForm
+      Handler.Common
+      Handler.JournalR
+      Handler.RegisterR
+      Handler.RootR
+      Handler.SidebarR
+      Handler.Utils
+      Hledger.Web
+      Hledger.Web.Main
+      Hledger.Web.WebOptions
+      Import
+      Settings
+      Settings.Development
+      Settings.StaticFiles
+  other-modules:
+      Paths_hledger_web
  ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
  cpp-options: -DVERSION="1.9.99"
  build-depends:
@ -163,29 +182,12 @@ library
    cpp-options: -DDEVELOPMENT
  if flag(dev)
    ghc-options: -O0
-  exposed-modules:
-      Application
-      Foundation
-      Handler.AddForm
-      Handler.Common
-      Handler.JournalR
-      Handler.RegisterR
-      Handler.RootR
-      Handler.SidebarR
-      Handler.Utils
-      Hledger.Web
-      Hledger.Web.Main
-      Hledger.Web.WebOptions
-      Import
-      Settings
-      Settings.Development
-      Settings.StaticFiles
-  other-modules:
-      Paths_hledger_web
  default-language: Haskell2010

 executable hledger-web
  main-is: main.hs
+  other-modules:
+      Paths_hledger_web
  hs-source-dirs:
      app
  ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
@ -236,13 +238,15 @@ executable hledger-web
    buildable: False
  if flag(threaded)
    ghc-options: -threaded
-  other-modules:
-      Paths_hledger_web
  default-language: Haskell2010

 test-suite test
  type: exitcode-stdio-1.0
  main-is: main.hs
+  other-modules:
+      HomeTest
+      TestImport
+      Paths_hledger_web
  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
@ -291,8 +295,4 @@ test-suite test
    cpp-options: -DDEVELOPMENT
  if flag(dev)
    ghc-options: -O0
-  other-modules:
-      HomeTest
-      TestImport
-      Paths_hledger_web
  default-language: Haskell2010
--- a/hledger/hledger.cabal
+++ b/hledger/hledger.cabal
@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
-- hash: eecd827b902295d8c507d0ec981d848af27c219f1fbda2a8c13d9e0f1a5c773f
+-- hash: 76caff99c32b8b2a218a88b5935bdd4f5aacf03ce196484689e33855c1e9da84

 name:           hledger
 version:        1.9.99
@ -76,6 +76,38 @@ flag threaded
  default: True

 library
+  exposed-modules:
+      Hledger.Cli
+      Hledger.Cli.Main
+      Hledger.Cli.CliOptions
+      Hledger.Cli.DocFiles
+      Hledger.Cli.Utils
+      Hledger.Cli.Version
+      Hledger.Cli.Commands
+      Hledger.Cli.Commands.Accounts
+      Hledger.Cli.Commands.Activity
+      Hledger.Cli.Commands.Add
+      Hledger.Cli.Commands.Balance
+      Hledger.Cli.Commands.Balancesheet
+      Hledger.Cli.Commands.Balancesheetequity
+      Hledger.Cli.Commands.Cashflow
+      Hledger.Cli.Commands.Checkdates
+      Hledger.Cli.Commands.Checkdupes
+      Hledger.Cli.Commands.Close
+      Hledger.Cli.Commands.Help
+      Hledger.Cli.Commands.Import
+      Hledger.Cli.Commands.Incomestatement
+      Hledger.Cli.Commands.Prices
+      Hledger.Cli.Commands.Print
+      Hledger.Cli.Commands.Printunique
+      Hledger.Cli.Commands.Register
+      Hledger.Cli.Commands.Registermatch
+      Hledger.Cli.Commands.Rewrite
+      Hledger.Cli.Commands.Stats
+      Hledger.Cli.Commands.Tags
+      Hledger.Cli.CompoundBalanceCommand
+  other-modules:
+      Paths_hledger
  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
  cpp-options: -DVERSION="1.9.99"
  build-depends:
@ -120,42 +152,12 @@ library
  if (!(os(windows))) && (flag(terminfo))
    build-depends:
        terminfo
-  exposed-modules:
-      Hledger.Cli
-      Hledger.Cli.Main
-      Hledger.Cli.CliOptions
-      Hledger.Cli.DocFiles
-      Hledger.Cli.Utils
-      Hledger.Cli.Version
-      Hledger.Cli.Commands
-      Hledger.Cli.Commands.Accounts
-      Hledger.Cli.Commands.Activity
-      Hledger.Cli.Commands.Add
-      Hledger.Cli.Commands.Balance
-      Hledger.Cli.Commands.Balancesheet
-      Hledger.Cli.Commands.Balancesheetequity
-      Hledger.Cli.Commands.Cashflow
-      Hledger.Cli.Commands.Checkdates
-      Hledger.Cli.Commands.Checkdupes
-      Hledger.Cli.Commands.Close
-      Hledger.Cli.Commands.Help
-      Hledger.Cli.Commands.Import
-      Hledger.Cli.Commands.Incomestatement
-      Hledger.Cli.Commands.Prices
-      Hledger.Cli.Commands.Print
-      Hledger.Cli.Commands.Printunique
-      Hledger.Cli.Commands.Register
-      Hledger.Cli.Commands.Registermatch
-      Hledger.Cli.Commands.Rewrite
-      Hledger.Cli.Commands.Stats
-      Hledger.Cli.Commands.Tags
-      Hledger.Cli.CompoundBalanceCommand
-  other-modules:
-      Paths_hledger
  default-language: Haskell2010

 executable hledger
  main-is: hledger-cli.hs
+  other-modules:
+      Paths_hledger
  hs-source-dirs:
      app
  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
@ -201,13 +203,13 @@ executable hledger
        terminfo
  if flag(threaded)
    ghc-options: -threaded
-  other-modules:
-      Paths_hledger
  default-language: Haskell2010

 test-suite test
  type: exitcode-stdio-1.0
  main-is: test.hs
+  other-modules:
+      Paths_hledger
  hs-source-dirs:
      test
  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
@ -253,13 +255,13 @@ test-suite test
  if (!(os(windows))) && (flag(terminfo))
    build-depends:
        terminfo
-  other-modules:
-      Paths_hledger
  default-language: Haskell2010

 benchmark bench
  type: exitcode-stdio-1.0
  main-is: bench.hs
+  other-modules:
+      Paths_hledger
  hs-source-dirs:
      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
@ -286,6 +288,4 @@ benchmark bench
  if (!(os(windows))) && (flag(terminfo))
    build-depends:
        terminfo
-  other-modules:
-      Paths_hledger
  default-language: Haskell2010