From 5345e2641a9cd5316a58f463bda413fc5c3f7beb Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 16 Jan 2017 14:23:47 -0800 Subject: [PATCH] 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 | 2 +- hledger-lib/hledger-lib.cabal | 19 +- hledger-ui/hledger-ui.cabal | 18 +- hledger-web/hledger-web.cabal | 542 +++++++++++++++++----------------- hledger/hledger.cabal | 22 +- 5 files changed, 301 insertions(+), 302 deletions(-) diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index e8a7e7f63..f50071a86 100644 --- a/hledger-api/hledger-api.cabal +++ b/hledger-api/hledger-api.cabal @@ -22,9 +22,9 @@ author: Simon Michael maintainer: Simon Michael 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 diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 4657e4f1c..c8be33e84 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/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 -license-file: LICENSE -author: Simon Michael -maintainer: Simon Michael +category: Finance +stability: stable homepage: http://hledger.org bug-reports: http://bugs.hledger.org -cabal-version: >= 1.10 -build-type: Simple +author: Simon Michael +maintainer: Simon Michael +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 diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal index 2f8e93eb0..d624becba 100644 --- a/hledger-ui/hledger-ui.cabal +++ b/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 -license-file: LICENSE -author: Simon Michael -maintainer: Simon Michael +category: Finance, Console +stability: stable homepage: http://hledger.org bug-reports: http://bugs.hledger.org -cabal-version: >= 1.10 -build-type: Simple +author: Simon Michael +maintainer: Simon Michael +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 diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 8d3f9da68..43d3ba75e 100644 --- a/hledger-web/hledger-web.cabal +++ b/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,298 +15,300 @@ 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 -license-file: LICENSE -author: Simon Michael -maintainer: Simon Michael +category: Finance +stability: stable homepage: http://hledger.org bug-reports: http://bugs.hledger.org -cabal-version: >= 1.10 -build-type: Simple +author: Simon Michael +maintainer: Simon Michael +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 - config/favicon.ico - config/keter.yaml - config/robots.txt - config/routes - config/settings.yml - messages/en.msg - README - static/css/bootstrap-theme.css - static/css/bootstrap-theme.css.map - static/css/bootstrap-theme.min.css - static/css/bootstrap.css - static/css/bootstrap.css.map - static/css/bootstrap.min.css - static/fonts/glyphicons-halflings-regular.eot - static/fonts/glyphicons-halflings-regular.svg - static/fonts/glyphicons-halflings-regular.ttf - static/fonts/glyphicons-halflings-regular.woff - static/hledger.css - static/hledger.js - static/js/bootstrap.js - static/js/bootstrap.min.js - static/js/excanvas.js - static/js/excanvas.min.js - static/js/jquery.cookie.js - static/js/jquery.flot.canvas.js - static/js/jquery.flot.canvas.min.js - static/js/jquery.flot.categories.js - static/js/jquery.flot.categories.min.js - static/js/jquery.flot.crosshair.js - static/js/jquery.flot.crosshair.min.js - static/js/jquery.flot.errorbars.js - static/js/jquery.flot.errorbars.min.js - static/js/jquery.flot.fillbetween.js - static/js/jquery.flot.fillbetween.min.js - static/js/jquery.flot.image.js - static/js/jquery.flot.image.min.js - static/js/jquery.flot.js - static/js/jquery.flot.min.js - static/js/jquery.flot.navigate.js - static/js/jquery.flot.navigate.min.js - static/js/jquery.flot.pie.js - static/js/jquery.flot.pie.min.js - static/js/jquery.flot.resize.js - static/js/jquery.flot.resize.min.js - static/js/jquery.flot.selection.js - static/js/jquery.flot.selection.min.js - static/js/jquery.flot.stack.js - static/js/jquery.flot.stack.min.js - static/js/jquery.flot.symbol.js - static/js/jquery.flot.symbol.min.js - static/js/jquery.flot.threshold.js - static/js/jquery.flot.threshold.min.js - static/js/jquery.flot.time.js - static/js/jquery.flot.time.min.js - static/js/jquery.flot.tooltip.js - static/js/jquery.flot.tooltip.min.js - static/js/jquery.hotkeys.js - static/js/jquery.js - static/js/jquery.min.js - static/js/jquery.url.js - static/js/typeahead.bundle.js - static/js/typeahead.bundle.min.js - templates/default-layout-wrapper.hamlet - templates/default-layout.hamlet + CHANGES + config/favicon.ico + config/keter.yaml + config/robots.txt + config/routes + config/settings.yml + messages/en.msg + README + static/css/bootstrap-theme.css + static/css/bootstrap-theme.css.map + static/css/bootstrap-theme.min.css + static/css/bootstrap.css + static/css/bootstrap.css.map + static/css/bootstrap.min.css + static/fonts/glyphicons-halflings-regular.eot + static/fonts/glyphicons-halflings-regular.svg + static/fonts/glyphicons-halflings-regular.ttf + static/fonts/glyphicons-halflings-regular.woff + static/hledger.css + static/hledger.js + static/js/bootstrap.js + static/js/bootstrap.min.js + static/js/excanvas.js + static/js/excanvas.min.js + static/js/jquery.cookie.js + static/js/jquery.flot.canvas.js + static/js/jquery.flot.canvas.min.js + static/js/jquery.flot.categories.js + static/js/jquery.flot.categories.min.js + static/js/jquery.flot.crosshair.js + static/js/jquery.flot.crosshair.min.js + static/js/jquery.flot.errorbars.js + static/js/jquery.flot.errorbars.min.js + static/js/jquery.flot.fillbetween.js + static/js/jquery.flot.fillbetween.min.js + static/js/jquery.flot.image.js + static/js/jquery.flot.image.min.js + static/js/jquery.flot.js + static/js/jquery.flot.min.js + static/js/jquery.flot.navigate.js + static/js/jquery.flot.navigate.min.js + static/js/jquery.flot.pie.js + static/js/jquery.flot.pie.min.js + static/js/jquery.flot.resize.js + static/js/jquery.flot.resize.min.js + static/js/jquery.flot.selection.js + static/js/jquery.flot.selection.min.js + static/js/jquery.flot.stack.js + static/js/jquery.flot.stack.min.js + static/js/jquery.flot.symbol.js + static/js/jquery.flot.symbol.min.js + static/js/jquery.flot.threshold.js + static/js/jquery.flot.threshold.min.js + static/js/jquery.flot.time.js + static/js/jquery.flot.time.min.js + static/js/jquery.flot.tooltip.js + static/js/jquery.flot.tooltip.min.js + static/js/jquery.hotkeys.js + static/js/jquery.js + static/js/jquery.min.js + static/js/jquery.url.js + static/js/typeahead.bundle.js + static/js/typeahead.bundle.min.js + templates/default-layout-wrapper.hamlet + templates/default-layout.hamlet data-files: - doc/hledger-web.1 - doc/hledger-web.1.info - doc/hledger-web.1.txt + doc/hledger-web.1 + doc/hledger-web.1.info + doc/hledger-web.1.txt source-repository head - type: git - location: https://github.com/simonmichael/hledger + type: git + location: https://github.com/simonmichael/hledger flag dev - default: False - description: Turn on development settings, like auto-reload templates. - manual: 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 + 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. - manual: False - default: False + description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal. + manual: False + default: False flag threaded - default: True - description: Build with support for multithreaded execution. - manual: False + 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 - cpp-options: -DVERSION="1.1.98" + 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.1.98" + build-depends: + hledger-lib >= 1.1.98 && < 1.2 + , hledger >= 1.1.98 && < 1.2 + , base >=4.8 && <5 + , base-compat >=0.8.1 + , blaze-html + , blaze-markup + , bytestring + , clientsession + , cmdargs >=0.10 && <0.11 + , data-default + , directory + , filepath + , hjsmin + , http-conduit + , http-client + , HUnit + , conduit-extra >=1.1 + , safe >=0.2 + , shakespeare >=2.0 + , template-haskell + , text >=1.2 && <1.3 + , transformers + , wai + , wai-extra + , wai-handler-launch >=1.3 + , warp + , yaml + , yesod >=1.4 && <1.5 + , yesod-core + , yesod-form + , yesod-static + , json + , megaparsec >=5.0 && < 5.2 + , mtl + if (flag(dev)) || (flag(library-only)) + cpp-options: -DDEVELOPMENT + if flag(oldtime) build-depends: - hledger-lib >= 1.1.98 && < 1.2 - , hledger >= 1.1.98 && < 1.2 - , base >=4.8 && <5 - , base-compat >=0.8.1 - , blaze-html - , blaze-markup - , bytestring - , clientsession - , cmdargs >=0.10 && <0.11 - , data-default - , directory - , filepath - , hjsmin - , http-conduit - , http-client - , HUnit - , conduit-extra >=1.1 - , safe >=0.2 - , shakespeare >=2.0 - , template-haskell - , text >=1.2 && <1.3 - , transformers - , wai - , wai-extra - , wai-handler-launch >=1.3 - , warp - , yaml - , yesod >=1.4 && <1.5 - , yesod-core - , yesod-form - , yesod-static - , json - , megaparsec >=5.0 && < 5.2 - , mtl - if (flag(dev)) || (flag(library-only)) - cpp-options: -DDEVELOPMENT - if flag(oldtime) - build-depends: - time <1.5 - , old-locale - else - build-depends: - time >=1.5 - if impl(ghc <7.6) - build-depends: - ghc-prim - 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 + time <1.5 + , old-locale + else + build-depends: + time >=1.5 + if impl(ghc <7.6) + build-depends: + ghc-prim + 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 - 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 - cpp-options: -DVERSION="1.1.98" + main-is: main.hs + 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 + cpp-options: -DVERSION="1.1.98" + build-depends: + hledger-lib >= 1.1.98 && < 1.2 + , hledger >= 1.1.98 && < 1.2 + , base >=4.8 && <5 + , base-compat >=0.8.1 + , blaze-html + , blaze-markup + , bytestring + , clientsession + , cmdargs >=0.10 && <0.11 + , data-default + , directory + , filepath + , hjsmin + , http-conduit + , http-client + , HUnit + , conduit-extra >=1.1 + , safe >=0.2 + , shakespeare >=2.0 + , template-haskell + , text >=1.2 && <1.3 + , transformers + , wai + , wai-extra + , wai-handler-launch >=1.3 + , warp + , yaml + , yesod >=1.4 && <1.5 + , yesod-core + , yesod-form + , yesod-static + , json + , parsec >=3 + , hledger-web == 1.1.98 + if flag(library-only) + buildable: False + if flag(threaded) + ghc-options: -threaded + if flag(dev) + ghc-options: -O0 + if flag(dev) + cpp-options: -DDEVELOPMENT + if flag(oldtime) build-depends: - hledger-lib >= 1.1.98 && < 1.2 - , hledger >= 1.1.98 && < 1.2 - , base >=4.8 && <5 - , base-compat >=0.8.1 - , blaze-html - , blaze-markup - , bytestring - , clientsession - , cmdargs >=0.10 && <0.11 - , data-default - , directory - , filepath - , hjsmin - , http-conduit - , http-client - , HUnit - , conduit-extra >=1.1 - , safe >=0.2 - , shakespeare >=2.0 - , template-haskell - , text >=1.2 && <1.3 - , transformers - , wai - , wai-extra - , wai-handler-launch >=1.3 - , warp - , yaml - , yesod >=1.4 && <1.5 - , yesod-core - , yesod-form - , yesod-static - , json - , parsec >=3 - , hledger-web == 1.1.98 - if flag(library-only) - buildable: False - if flag(threaded) - ghc-options: -threaded - if flag(dev) - ghc-options: -O0 - if flag(dev) - cpp-options: -DDEVELOPMENT - if flag(oldtime) - build-depends: - time <1.5 - , old-locale - else - build-depends: - time >=1.5 - if impl(ghc <7.6) - build-depends: - ghc-prim - default-language: Haskell2010 + time <1.5 + , old-locale + else + build-depends: + time >=1.5 + if impl(ghc <7.6) + build-depends: + ghc-prim + default-language: Haskell2010 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 - cpp-options: -DVERSION="1.1.98" + type: exitcode-stdio-1.0 + main-is: main.hs + 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 + cpp-options: -DVERSION="1.1.98" + build-depends: + hledger-lib >= 1.1.98 && < 1.2 + , hledger >= 1.1.98 && < 1.2 + , base >=4.8 && <5 + , base-compat >=0.8.1 + , blaze-html + , blaze-markup + , bytestring + , clientsession + , cmdargs >=0.10 && <0.11 + , data-default + , directory + , filepath + , hjsmin + , http-conduit + , http-client + , HUnit + , conduit-extra >=1.1 + , safe >=0.2 + , shakespeare >=2.0 + , template-haskell + , text >=1.2 && <1.3 + , transformers + , wai + , wai-extra + , wai-handler-launch >=1.3 + , warp + , yaml + , yesod >=1.4 && <1.5 + , yesod-core + , yesod-form + , yesod-static + , json + , hledger-web == 1.1.98 + , hspec + , yesod-test + if flag(oldtime) build-depends: - hledger-lib >= 1.1.98 && < 1.2 - , hledger >= 1.1.98 && < 1.2 - , base >=4.8 && <5 - , base-compat >=0.8.1 - , blaze-html - , blaze-markup - , bytestring - , clientsession - , cmdargs >=0.10 && <0.11 - , data-default - , directory - , filepath - , hjsmin - , http-conduit - , http-client - , HUnit - , conduit-extra >=1.1 - , safe >=0.2 - , shakespeare >=2.0 - , template-haskell - , text >=1.2 && <1.3 - , transformers - , wai - , wai-extra - , wai-handler-launch >=1.3 - , warp - , yaml - , yesod >=1.4 && <1.5 - , yesod-core - , yesod-form - , yesod-static - , json - , hledger-web == 1.1.98 - , hspec - , yesod-test - if flag(oldtime) - build-depends: - time <1.5 - , old-locale - else - build-depends: - time >=1.5 - if impl(ghc <7.6) - build-depends: - ghc-prim - default-language: Haskell2010 + time <1.5 + , old-locale + else + build-depends: + time >=1.5 + if impl(ghc <7.6) + build-depends: + ghc-prim + other-modules: + HomeTest + TestImport + default-language: Haskell2010 diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index a4bdb4df4..9ffde5df2 100644 --- a/hledger/hledger.cabal +++ b/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 -license-file: LICENSE -author: Simon Michael -maintainer: Simon Michael +category: Finance, Console +stability: stable homepage: http://hledger.org bug-reports: http://bugs.hledger.org -cabal-version: >= 1.10 -build-type: Simple +author: Simon Michael +maintainer: Simon Michael +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