From d1656001552c38b57af37b73227a19da8c4deea7 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 9 Aug 2016 07:24:41 -0700 Subject: [PATCH] lib, cli, web, api: use hpack (package.yaml) for all packages at last #371 Generated package.yaml files from the old cabal files with hpack-convert, removed some problematic blank lines manually, regenerated the cabal files from the package.yaml files with hpack. Tests pass, looks like all the info is still there. This means that from now on, we don't edit cabal files directly. We edit the less verbose package.yaml files. stack will update the cabal files automatically (or non-stack users can use hpack). The changes to both are committed, as we still want to provide the cabal files to downloaders. --- hledger-api/future-package.yaml | 178 ------------------ hledger-api/hledger-api.cabal | 30 ++- hledger-api/package.yaml | 54 ++++++ hledger-lib/future-package.yaml | 161 ---------------- hledger-lib/hledger-lib.cabal | 171 +++++++++-------- hledger-lib/package.yaml | 163 ++++++++++++++++ hledger-web/future-package.yaml | 200 -------------------- hledger-web/hledger-web.cabal | 243 ++++++++++++++---------- hledger-web/package.yaml | 180 ++++++++++++++++++ hledger/future-package.yaml | 183 ------------------ hledger/hledger.cabal | 322 ++++++++++++++++---------------- hledger/package.yaml | 272 +++++++++++++++++++++++++++ 12 files changed, 1077 insertions(+), 1080 deletions(-) delete mode 100644 hledger-api/future-package.yaml create mode 100644 hledger-api/package.yaml delete mode 100644 hledger-lib/future-package.yaml create mode 100644 hledger-lib/package.yaml delete mode 100644 hledger-web/future-package.yaml create mode 100644 hledger-web/package.yaml delete mode 100644 hledger/future-package.yaml create mode 100644 hledger/package.yaml diff --git a/hledger-api/future-package.yaml b/hledger-api/future-package.yaml deleted file mode 100644 index 9a2ef3653..000000000 --- a/hledger-api/future-package.yaml +++ /dev/null @@ -1,178 +0,0 @@ -# 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 -# -# as of hpack 0.5.4 these must be added manually: -# - tested-with -# - flags -# - benchmarks -# - conditional blocks - -name : hledger-api -version : '0.28' -stability : alpha -category : Finance -synopsis : Web API server for the hledger accounting tool -description : | - This is a simple web API server for hledger data. - It comes with a series of simple client-side web app examples. - - hledger is a cross-platform program for tracking money, time, or - any other commodity, using double-entry accounting and a simple, - editable file format. It is inspired by and largely compatible - with ledger(1). hledger provides command-line, curses and web - interfaces, and aims to be a reliable, practical tool for daily - use. - -license : GPL -author : Simon Michael -maintainer : Simon Michael -github : simonmichael/hledger -homepage : http://hledger.org -bug-reports : http://bugs.hledger.org -tested-with : GHC==7.10.3 - -extra-source-files: - - CHANGES - - README - - examples/*.html - -data-files: - - doc/hledger-api.1 - - doc/hledger-api.1.txt - - doc/hledger-api.1.info - -# XXX not supported -# flag threaded -# Description: Build with support for multithreaded execution -# Default: True - -# flag dev -# Description: Turn on development settings, like auto-reload templates. -# Default: False - -# flag library-only -# Description: Build for use with "yesod devel" -# Default: False - -# 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 - -# dependencies: -# - hledger-lib == 0.28 -# - hledger == 0.28 -# - base >= 4 && < 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 - # - parsec >= 3 - # - safe >= 0.2 - # - shakespeare >= 2.0 - # - template-haskell - # - text - # - transformers - # - wai - # - wai-extra - # - wai-handler-launch >= 1.3 - # - warp - # - yaml - # - json - -# # if flag(old-locale) -# # build-depends: time < 1.5, old-locale -# # else -# # build-depends: time >= 1.5 -# - time >= 1.5 - -# ghc-options: -# -Wall -# -fno-warn-unused-do-bind -# -fno-warn-name-shadowing -# -fno-warn-missing-signatures -# -fno-warn-type-defaults -# -fno-warn-orphans - -# XXX not supported -# extensions: -# CPP -# MultiParamTypeClasses -# NoImplicitPrelude -# OverloadedStrings -# QuasiQuotes -# RecordWildCards -# TemplateHaskell -# TypeFamilies -# # -- seem to not be needed at present: -# # -- GADTs -# # -- GeneralizedNewtypeDeriving -# # -- FlexibleContexts -# # -- EmptyDataDecls -# # -- NoMonomorphismRestriction - -cpp-options: -DVERSION="0.28" -# XXX -# if flag(dev) || flag(library-only) -# cpp-options: -DDEVELOPMENT - -# library: -# # source-dirs: . # XXX includes Setup and uncommitted stuff -# exposed-modules: -# - Lib - -# tests: -# test: -# source-dirs: tests -# main: test.hs -# dependencies: -# - hledger-api -# - hspec -# - yesod-test - -executables: - hledger-api: - # XXX - # if flag(library-only) - # buildable: False - # if flag(threaded) - # ghc-options: -threaded - ghc-options: - -threaded - # if flag(dev) - # ghc-options: -O0 - # source-dirs: app - main: hledger-api.hs - dependencies: - - hledger-lib == 0.28 - - hledger == 0.28 - - base >= 4 && < 5 - - aeson - - bytestring - - containers - - Decimal - - docopt - - either - - microlens >= 0.4 && < 0.5 - - microlens-platform >= 0.2.3.1 && < 0.4 - - safe - - servant-server - - servant-swagger - - swagger2 - - text - - transformers - - wai - - warp - diff --git a/hledger-api/hledger-api.cabal b/hledger-api/hledger-api.cabal index 9898605dd..e3fa88d9b 100644 --- a/hledger-api/hledger-api.cabal +++ b/hledger-api/hledger-api.cabal @@ -1,19 +1,12 @@ --- This file has been generated from package.yaml by hpack version 0.5.4. +-- This file has been generated from package.yaml by hpack version 0.14.0. -- -- see: https://github.com/sol/hpack name: hledger-api version: 0.28 synopsis: Web API server for the hledger accounting tool -description: This is a simple web API server for hledger data. - It comes with a series of simple client-side web app examples. - . - hledger is a cross-platform program for tracking money, time, or - any other commodity, using double-entry accounting and a simple, - editable file format. It is inspired by and largely compatible - with ledger(1). hledger provides command-line, curses and web - interfaces, and aims to be a reliable, practical tool for daily - use. +description: This is a simple web API server for hledger data. It comes with a series of simple client-side web app examples. + hledger is a cross-platform program for tracking money, time, or any other commodity, using double-entry accounting and a simple, editable file format. It is inspired by and largely compatible with ledger(1). hledger provides command-line, curses and web interfaces, and aims to be a reliable, practical tool for daily use. category: Finance stability: alpha homepage: http://hledger.org @@ -24,17 +17,18 @@ license: GPL license-file: LICENSE build-type: Simple cabal-version: >= 1.10 -tested-with: GHC==7.10.3 +tested-with: ghc ==7.10.3 extra-source-files: CHANGES + examples/01.html + examples/02.html README - examples/*.html data-files: doc/hledger-api.1 - doc/hledger-api.1.txt doc/hledger-api.1.info + doc/hledger-api.1.txt source-repository head type: git @@ -45,17 +39,17 @@ executable hledger-api ghc-options: -threaded cpp-options: -DVERSION="0.28" build-depends: - hledger-lib == 0.28 - , hledger == 0.28 - , base >= 4 && < 5 + hledger-lib ==0.28 + , hledger ==0.28 + , base >=4 && <5 , aeson , bytestring , containers , Decimal , docopt , either - , microlens >= 0.4 && < 0.5 - , microlens-platform >= 0.2.3.1 && < 0.4 + , microlens >=0.4 && <0.5 + , microlens-platform >=0.2.3.1 && <0.4 , safe , servant-server , servant-swagger diff --git a/hledger-api/package.yaml b/hledger-api/package.yaml new file mode 100644 index 000000000..f2150903e --- /dev/null +++ b/hledger-api/package.yaml @@ -0,0 +1,54 @@ +name: hledger-api +version: '0.28' +synopsis: Web API server for the hledger accounting tool +description: ! 'This is a simple web API server for hledger data. + It comes with a series of simple client-side web app examples. + + hledger is a cross-platform program for tracking money, time, or + any other commodity, using double-entry accounting and a simple, + editable file format. It is inspired by and largely compatible + with ledger(1). hledger provides command-line, curses and web + interfaces, and aims to be a reliable, practical tool for daily + use.' +category: Finance +author: Simon Michael +maintainer: Simon Michael +license: GPL +github: simonmichael/hledger +homepage: http://hledger.org +bug-reports: http://bugs.hledger.org +extra-source-files: +- CHANGES +- README +- examples/*.html +dependencies: +- hledger-lib ==0.28 +- hledger ==0.28 +- base >=4 && <5 +- aeson +- bytestring +- containers +- Decimal +- docopt +- either +- microlens >=0.4 && <0.5 +- microlens-platform >=0.2.3.1 && <0.4 +- safe +- servant-server +- servant-swagger +- swagger2 +- text +- transformers +- wai +- warp +executables: + hledger-api: + main: hledger-api.hs + ghc-options: -threaded + cpp-options: -DVERSION="0.28" +data-files: +- doc/hledger-api.1 +- doc/hledger-api.1.txt +- doc/hledger-api.1.info +stability: alpha +tested-with: ghc ==7.10.3 diff --git a/hledger-lib/future-package.yaml b/hledger-lib/future-package.yaml deleted file mode 100644 index 0fe9580f8..000000000 --- a/hledger-lib/future-package.yaml +++ /dev/null @@ -1,161 +0,0 @@ -# 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 -# -# as of hpack 0.5.4 these must be added manually: -# - tested-with -# - flags -# - benchmarks -# - conditional blocks - -name : hledger-lib -version : '0.28' -stability : stable -category : Finance, Console -synopsis : Core data types, parsers and functionality for the hledger accounting tools -description : | - This is a reusable library containing hledger's core functionality. - hledger is a cross-platform program for tracking money, time, or - any other commodity, using double-entry accounting and a simple, - editable file format. It is inspired by and largely compatible - with ledger(1). hledger provides command-line, curses and web - interfaces, and aims to be a reliable, practical tool for daily - use. - -license : GPL -author : Simon Michael -maintainer : Simon Michael -github : simonmichael/hledger -homepage : http://hledger.org -bug-reports : http://bugs.hledger.org -# XXX not supported -tested-with : GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0 - -extra-source-files: - - CHANGES - - README - -data-files: - - doc/hledger_csv.5 - - doc/hledger_csv.5.txt - - doc/hledger_csv.5.info - - doc/hledger_journal.5 - - doc/hledger_journal.5.txt - - doc/hledger_journal.5.info - - doc/hledger_timedot.5 - - doc/hledger_timedot.5.txt - - doc/hledger_timedot.5.info - - doc/hledger_timeclock.5 - - doc/hledger_timeclock.5.txt - - doc/hledger_timeclock.5.info - -# XXX not supported -# flag double -# description: Use old Double number representation (instead of Decimal), for testing/benchmarking. -# default: False -# manual: True -# -# 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 - -dependencies: - - base >= 4.3 && < 5 - - base-compat >= 0.8.1 - - array - - blaze-markup >= 0.5.1 - - bytestring - - cmdargs >= 0.10 && < 0.11 - - containers - - csv - - data-default >= 0.5 - - Decimal - - deepseq - - directory - - filepath - - mtl - - mtl-compat - - old-time - - megaparsec >= 5 - - regex-tdfa - - safe >= 0.2 - - split >= 0.1 && < 0.3 - - text >= 1.2 && < 1.3 - - transformers >= 0.2 && < 0.6 - - uglymemo - - utf8-string >= 0.3.5 && < 1.1 - - HUnit -# XXX not supported -# if impl(ghc >= 7.4) -# dependencies: pretty-show >= 1.6.4 -# if flag(old-locale) -# build-depends: time < 1.5, old-locale -# else -# build-depends: time >= 1.5 - - pretty-show >= 1.6.4 - - time >= 1.5 - -ghc-options: - -Wall - -fno-warn-unused-do-bind - -fno-warn-name-shadowing - -fno-warn-missing-signatures - -fno-warn-type-defaults - -fno-warn-orphans - -library: - # XXX not supported - # if flag(double) - # cpp-options: -DDOUBLE - # source-dirs: . # XXX includes Setup and uncommitted stuff - exposed-modules: - - Hledger - - Hledger.Data - - Hledger.Data.Account - - Hledger.Data.AccountName - - Hledger.Data.Amount - - Hledger.Data.Commodity - - Hledger.Data.Dates - - Hledger.Data.Journal - - Hledger.Data.Ledger - - 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.CsvReader - - Hledger.Read.JournalReader - - Hledger.Read.TimedotReader - - Hledger.Read.TimeclockReader - - Hledger.Read.Util - - Hledger.Reports - - Hledger.Reports.ReportOptions - - Hledger.Reports.BalanceHistoryReport - - Hledger.Reports.BalanceReport - - Hledger.Reports.EntriesReport - - Hledger.Reports.MultiBalanceReports - - Hledger.Reports.PostingsReport - - Hledger.Reports.TransactionsReports - - Hledger.Utils - - Hledger.Utils.Debug - - Hledger.Utils.Parse - - Hledger.Utils.Regex - - Hledger.Utils.String - - Hledger.Utils.Test - - Hledger.Utils.Tree - - Hledger.Utils.UTF8IOCompat - -tests: - tests: - main: suite.hs - source-dirs: tests - dependencies: - - hledger-lib - - test-framework - - test-framework-hunit diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index 23da579d1..e581c898f 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -1,4 +1,4 @@ --- This file has been generated from package.yaml by hpack version 0.5.4. +-- This file has been generated from package.yaml by hpack version 0.14.0. -- -- see: https://github.com/sol/hpack @@ -7,14 +7,7 @@ version: 0.28 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. - hledger is a cross-platform program for tracking money, time, or - any other commodity, using double-entry accounting and a simple, - editable file format. It is inspired by and largely compatible - with ledger(1). hledger provides command-line, curses and web - interfaces, and aims to be a reliable, practical tool for daily - use. +description: This is a reusable library containing hledger's core functionality. hledger is a cross-platform program for tracking money, time, or any other commodity, using double-entry accounting and a simple, editable file format. It is inspired by and largely compatible 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 @@ -23,25 +16,25 @@ homepage: http://hledger.org bug-reports: http://bugs.hledger.org cabal-version: >= 1.10 build-type: Simple -tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0 +tested-with: ghc ==7.6.3 ghc ==7.8.4 ghc ==7.10.3 ghc ==8.0 extra-source-files: - CHANGES + CHANGES README data-files: doc/hledger_csv.5 - doc/hledger_csv.5.txt doc/hledger_csv.5.info + doc/hledger_csv.5.txt doc/hledger_journal.5 - doc/hledger_journal.5.txt doc/hledger_journal.5.info - doc/hledger_timedot.5 - doc/hledger_timedot.5.txt - doc/hledger_timedot.5.info + doc/hledger_journal.5.txt doc/hledger_timeclock.5 - doc/hledger_timeclock.5.txt doc/hledger_timeclock.5.info + doc/hledger_timeclock.5.txt + doc/hledger_timedot.5 + doc/hledger_timedot.5.info + doc/hledger_timedot.5.txt source-repository head type: git @@ -50,28 +43,25 @@ source-repository head flag double manual: True default: False - description: - Use old Double number representation (instead of Decimal), for testing/benchmarking. + description: Use old Double number representation (instead of Decimal), for testing/benchmarking. 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. + 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. + manual: False library 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: - base >= 4.3 && < 5 - , base-compat >= 0.8.1 + base >=4.3 && <5 + , base-compat >=0.8.1 , array - , blaze-markup >= 0.5.1 + , blaze-markup >=0.5.1 , bytestring - , cmdargs >= 0.10 && < 0.11 + , cmdargs >=0.10 && <0.11 , containers , csv - , data-default >= 0.5 + , data-default >=0.5 , Decimal , deepseq , directory @@ -79,26 +69,27 @@ library , mtl , mtl-compat , old-time - , megaparsec >= 5 - , parsec + , megaparsec >=5 , regex-tdfa - , safe >= 0.2 - , semigroups - , split >= 0.1 && < 0.3 - , text >= 1.2 && < 1.3 - , transformers >= 0.2 && < 0.6 + , safe >=0.2 + , split >=0.1 && <0.3 + , text >=1.2 && <1.3 + , transformers >=0.2 && <0.6 , uglymemo - , utf8-string >= 0.3.5 && < 1.1 + , utf8-string >=0.3.5 && <1.1 , HUnit - - if impl(ghc >= 7.4) - build-depends: pretty-show >= 1.6.4 - + , parsec + , semigroups + if impl(ghc >=7.4) + build-depends: + pretty-show >=1.6.4 if flag(old-locale) - build-depends: time < 1.5, old-locale + build-depends: + time <1.5 + , old-locale else - build-depends: time >= 1.5 - + build-depends: + time >=1.5 exposed-modules: Hledger Hledger.Data @@ -140,23 +131,26 @@ library Hledger.Utils.Text Hledger.Utils.Tree Hledger.Utils.UTF8IOCompat + other-modules: + Paths_hledger_lib default-language: Haskell2010 -test-suite hunittests +test-suite doctests type: exitcode-stdio-1.0 - main-is: hunittests.hs - hs-source-dirs: tests + 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 + main-is: doctests.hs build-depends: - base >= 4.3 && < 5 - , base-compat >= 0.8.1 + base >=4.3 && <5 + , base-compat >=0.8.1 , array - , blaze-markup >= 0.5.1 + , blaze-markup >=0.5.1 , bytestring - , cmdargs >= 0.10 && < 0.11 + , cmdargs >=0.10 && <0.11 , containers , csv - , data-default >= 0.5 + , data-default >=0.5 , Decimal , deepseq , directory @@ -164,36 +158,63 @@ test-suite hunittests , mtl , mtl-compat , old-time - , megaparsec >= 5 + , megaparsec >=5 , regex-tdfa - , safe >= 0.2 - , split >= 0.1 && < 0.3 - , text >= 1.2 && < 1.3 - , transformers >= 0.2 && < 0.6 + , safe >=0.2 + , split >=0.1 && <0.3 + , text >=1.2 && <1.3 + , transformers >=0.2 && <0.6 , uglymemo - , utf8-string >= 0.3.5 && < 1.1 + , utf8-string >=0.3.5 && <1.1 + , HUnit + , base + , Glob >=0.7 + , doctest >=0.8 + default-language: Haskell2010 + +test-suite hunittests + type: exitcode-stdio-1.0 + main-is: hunittests.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 + build-depends: + base >=4.3 && <5 + , base-compat >=0.8.1 + , array + , blaze-markup >=0.5.1 + , bytestring + , cmdargs >=0.10 && <0.11 + , containers + , csv + , data-default >=0.5 + , Decimal + , deepseq + , directory + , filepath + , mtl + , mtl-compat + , old-time + , megaparsec >=5 + , regex-tdfa + , safe >=0.2 + , split >=0.1 && <0.3 + , text >=1.2 && <1.3 + , transformers >=0.2 && <0.6 + , uglymemo + , utf8-string >=0.3.5 && <1.1 , HUnit , hledger-lib , test-framework , test-framework-hunit - - if impl(ghc >= 7.4) - build-depends: pretty-show >= 1.6.4 - + if impl(ghc >=7.4) + build-depends: + pretty-show >=1.6.4 if flag(old-locale) - build-depends: time < 1.5, old-locale + build-depends: + time <1.5 + , old-locale else - build-depends: time >= 1.5 - - default-language: Haskell2010 - -test-suite doctests - type: exitcode-stdio-1.0 - hs-source-dirs: tests - main-is: doctests.hs - build-depends: - base - , Glob >= 0.7 - , doctest >= 0.8 - --, hledger-lib ? + build-depends: + time >=1.5 default-language: Haskell2010 diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml new file mode 100644 index 000000000..8885b9cdd --- /dev/null +++ b/hledger-lib/package.yaml @@ -0,0 +1,163 @@ +name: hledger-lib +version: '0.28' +synopsis: Core data types, parsers and functionality for the hledger accounting tools +description: ! 'This is a reusable library containing hledger''s core functionality. + hledger is a cross-platform program for tracking money, time, or + any other commodity, using double-entry accounting and a simple, + editable file format. It is inspired by and largely compatible + with ledger(1). hledger provides command-line, curses and web + interfaces, and aims to be a reliable, practical tool for daily + use.' +category: Finance +author: Simon Michael +maintainer: Simon Michael +license: GPL +github: simonmichael/hledger +homepage: http://hledger.org +bug-reports: http://bugs.hledger.org +extra-source-files: +- CHANGES +- README +dependencies: +- base >=4.3 && <5 +- base-compat >=0.8.1 +- array +- blaze-markup >=0.5.1 +- bytestring +- cmdargs >=0.10 && <0.11 +- containers +- csv +- data-default >=0.5 +- Decimal +- deepseq +- directory +- filepath +- mtl +- mtl-compat +- old-time +- megaparsec >=5 +- regex-tdfa +- safe >=0.2 +- split >=0.1 && <0.3 +- text >=1.2 && <1.3 +- transformers >=0.2 && <0.6 +- uglymemo +- utf8-string >=0.3.5 && <1.1 +- HUnit +ghc-options: +- -Wall +- -fno-warn-unused-do-bind +- -fno-warn-name-shadowing +- -fno-warn-missing-signatures +- -fno-warn-type-defaults +- -fno-warn-orphans +library: + exposed-modules: + - Hledger + - Hledger.Data + - Hledger.Data.Account + - Hledger.Data.AccountName + - Hledger.Data.Amount + - Hledger.Data.Commodity + - Hledger.Data.Dates + - Hledger.Data.Journal + - Hledger.Data.Ledger + - Hledger.Data.Period + - Hledger.Data.StringFormat + - Hledger.Data.Posting + - Hledger.Data.RawOptions + - Hledger.Data.Timeclock + - Hledger.Data.Transaction + - Hledger.Data.Types + - Hledger.Query + - Hledger.Read + - Hledger.Read.Common + - Hledger.Read.CsvReader + - Hledger.Read.JournalReader + - Hledger.Read.TimedotReader + - Hledger.Read.TimeclockReader + - Hledger.Reports + - Hledger.Reports.ReportOptions + - Hledger.Reports.BalanceHistoryReport + - Hledger.Reports.BalanceReport + - Hledger.Reports.EntriesReport + - Hledger.Reports.MultiBalanceReports + - Hledger.Reports.PostingsReport + - Hledger.Reports.TransactionsReports + - Hledger.Utils + - Hledger.Utils.Debug + - Hledger.Utils.Parse + - Hledger.Utils.Regex + - Hledger.Utils.String + - Hledger.Utils.Test + - Hledger.Utils.Text + - Hledger.Utils.Tree + - Hledger.Utils.UTF8IOCompat + dependencies: + - parsec + - semigroups + when: + - condition: impl(ghc >=7.4) + dependencies: + - pretty-show >=1.6.4 + - condition: flag(old-locale) + then: + dependencies: + - time <1.5 + - old-locale + else: + dependencies: + - time >=1.5 +tests: + doctests: + main: doctests.hs + source-dirs: tests + dependencies: + - base + - Glob >=0.7 + - doctest >=0.8 + hunittests: + main: hunittests.hs + source-dirs: tests + dependencies: + - hledger-lib + - test-framework + - test-framework-hunit + when: + - condition: impl(ghc >=7.4) + dependencies: + - pretty-show >=1.6.4 + - condition: flag(old-locale) + then: + dependencies: + - time <1.5 + - old-locale + else: + dependencies: + - time >=1.5 +flags: + double: + description: Use old Double number representation (instead of Decimal), for testing/benchmarking. + manual: true + default: false + 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.' + manual: false + default: false +data-files: +- doc/hledger_csv.5 +- doc/hledger_csv.5.txt +- doc/hledger_csv.5.info +- doc/hledger_journal.5 +- doc/hledger_journal.5.txt +- doc/hledger_journal.5.info +- doc/hledger_timedot.5 +- doc/hledger_timedot.5.txt +- doc/hledger_timedot.5.info +- doc/hledger_timeclock.5 +- doc/hledger_timeclock.5.txt +- doc/hledger_timeclock.5.info +stability: stable +tested-with: ghc ==7.6.3 ghc ==7.8.4 ghc ==7.10.3 ghc ==8.0 diff --git a/hledger-web/future-package.yaml b/hledger-web/future-package.yaml deleted file mode 100644 index 5f0938e2c..000000000 --- a/hledger-web/future-package.yaml +++ /dev/null @@ -1,200 +0,0 @@ -# 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 -# -# as of hpack 0.5.4 these must be added manually: -# - tested-with -# - flags -# - benchmarks -# - conditional blocks - -name : hledger-web -version : '0.28' -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 - command-line or curses-style interfaces. - hledger is a cross-platform program for tracking money, time, or - any other commodity, using double-entry accounting and a simple, - editable file format. It is inspired by and largely compatible - with ledger(1). hledger provides command-line, curses and web - interfaces, and aims to be a reliable, practical tool for daily - use. - -license : GPL -author : Simon Michael -maintainer : Simon Michael -github : simonmichael/hledger -homepage : http://hledger.org -bug-reports : http://bugs.hledger.org -# XXX not supported -tested-with : GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0 - -extra-source-files: - - CHANGES - - README - - config/favicon.ico - - config/keter.yaml - - config/robots.txt - - config/routes - - config/settings.yml - - messages/*.msg - - static/css/*.css - - static/css/*.map - - static/fonts/*.eot - - static/fonts/*.svg - - static/fonts/*.ttf - - static/fonts/*.woff - - static/hledger.css - - static/hledger.js - - static/js/*.js - - templates/*.hamlet - -data-files: - - doc/hledger-web.1 - - doc/hledger-web.1.txt - - doc/hledger-web.1.info - -# XXX not supported -# flag threaded -# Description: Build with support for multithreaded execution -# Default: True - -# flag dev -# Description: Turn on development settings, like auto-reload templates. -# Default: False - -# flag library-only -# Description: Build for use with "yesod devel" -# Default: False - -# 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 - -dependencies: - - hledger-lib >= 0.28 && < 0.29 - - hledger >= 0.28 && < 0.29 - - base >= 4 && < 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 - - parsec >= 3 - - safe >= 0.2 - - shakespeare >= 2.0 - - template-haskell - - text - - 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 - # required by extra ghci utilities: - # - fsnotify - # - hsdev - # - mtl - -# if flag(old-locale) -# build-depends: time < 1.5, old-locale -# else -# build-depends: time >= 1.5 - - time >= 1.5 - -ghc-options: - -Wall - -fno-warn-unused-do-bind - -fno-warn-name-shadowing - -fno-warn-missing-signatures - -fno-warn-type-defaults - -fno-warn-orphans - -# XXX not supported -# extensions: -# CPP -# MultiParamTypeClasses -# NoImplicitPrelude -# OverloadedStrings -# QuasiQuotes -# RecordWildCards -# TemplateHaskell -# TypeFamilies -# # -- seem to not be needed at present: -# # -- GADTs -# # -- GeneralizedNewtypeDeriving -# # -- FlexibleContexts -# # -- EmptyDataDecls -# # -- NoMonomorphismRestriction - -cpp-options: -DVERSION="0.28" -# XXX -# if flag(dev) || flag(library-only) -# cpp-options: -DDEVELOPMENT - -library: - # source-dirs: . # XXX includes Setup and uncommitted stuff - 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 - #- Setup # stops yesod devel complaining but requires depending on Cabal - -executables: - hledger-web: - # XXX - # if flag(library-only) - # buildable: False - # if flag(threaded) - # ghc-options: -threaded - ghc-options: - -threaded - # if flag(dev) - # ghc-options: -O0 - source-dirs: app - main: main.hs - dependencies: - - hledger-web == 0.28 - -tests: - test: - source-dirs: tests - main: main.hs - dependencies: - - hledger-web - - hspec - - yesod-test diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index bc05f169f..49a376a36 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -1,4 +1,4 @@ --- This file has been generated from package.yaml by hpack version 0.5.4. +-- This file has been generated from package.yaml by hpack version 0.14.0. -- -- see: https://github.com/sol/hpack @@ -7,16 +7,7 @@ version: 0.28 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 - command-line or curses-style interfaces. - hledger is a cross-platform program for tracking money, time, or - any other commodity, using double-entry accounting and a simple, - editable file format. It is inspired by and largely compatible - with ledger(1). hledger provides command-line, curses and web - interfaces, and aims to be a reliable, practical tool for daily - use. +description: This is hledger's web interface. It provides a more user-friendly and collaborative UI than the command-line or curses-style interfaces. hledger is a cross-platform program for tracking money, time, or any other commodity, using double-entry accounting and a simple, editable file format. It is inspired by and largely compatible 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 @@ -25,74 +16,117 @@ homepage: http://hledger.org bug-reports: http://bugs.hledger.org cabal-version: >= 1.10 build-type: Simple -tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0 +tested-with: ghc ==7.6.3 ghc ==7.8.4 ghc ==7.10.3 ghc ==8.0 extra-source-files: CHANGES - README config/favicon.ico config/keter.yaml config/robots.txt config/routes config/settings.yml - messages/*.msg - static/css/*.css - static/css/*.map - static/fonts/*.eot - static/fonts/*.svg - static/fonts/*.ttf - static/fonts/*.woff + 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/*.js - templates/*.hamlet + 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.txt - doc/hledger-web.1.info + 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 -flag threaded - default: True - description: - Build with support for multithreaded execution. - flag dev - default: False - description: - Turn on development settings, like auto-reload templates. + default: False + description: Turn on development settings, like auto-reload templates. + manual: False flag library-only - default: False - description: - Build for use with "yesod devel" + default: False + description: Build for use with "yesod devel" + manual: 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. + 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. + manual: False + +flag threaded + default: True + description: Build with support for multithreaded execution. + manual: False 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="0.28" - if flag(dev) || flag(library-only) - cpp-options: -DDEVELOPMENT build-depends: - hledger-lib >= 0.28 && < 0.29 - , hledger >= 0.28 && < 0.29 - , base >= 4 && < 5 - , base-compat >= 0.8.1 + hledger-lib >=0.28 && <0.29 + , hledger >=0.28 && <0.29 + , base >=4 && <5 + , base-compat >=0.8.1 , blaze-html , blaze-markup , bytestring , clientsession - , cmdargs >= 0.10 && < 0.11 + , cmdargs >=0.10 && <0.11 , data-default , directory , filepath @@ -100,30 +134,33 @@ library , http-conduit , http-client , HUnit - , conduit-extra >= 1.1 - , megaparsec >= 5 - , mtl - , safe >= 0.2 - , shakespeare >= 2.0 + , conduit-extra >=1.1 + , safe >=0.2 + , shakespeare >=2.0 , template-haskell - , text >= 1.2 && < 1.3 + , text >=1.2 && <1.3 , transformers , wai , wai-extra - , wai-handler-launch >= 1.3 + , wai-handler-launch >=1.3 , warp , yaml - , yesod >= 1.4 && < 1.5 + , yesod >=1.4 && <1.5 , yesod-core , yesod-form , yesod-static , json - + , megaparsec >=5 + , mtl + if (flag(dev)) || (flag(library-only)) + cpp-options: -DDEVELOPMENT if flag(old-locale) - build-depends: time < 1.5, old-locale + build-depends: + time <1.5 + , old-locale else - build-depends: time >= 1.5 - + build-depends: + time >=1.5 exposed-modules: Application Foundation @@ -141,32 +178,26 @@ library Settings Settings.Development Settings.StaticFiles + other-modules: + Paths_hledger_web default-language: Haskell2010 executable hledger-web - if flag(library-only) - buildable: False 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 - if flag(threaded) - ghc-options: -threaded - if flag(dev) - ghc-options: -O0 cpp-options: -DVERSION="0.28" - if flag(dev) - cpp-options: -DDEVELOPMENT build-depends: - hledger-lib >= 0.28 && < 0.29 - , hledger >= 0.28 && < 0.29 - , base >= 4 && < 5 - , base-compat >= 0.8.1 + hledger-lib >=0.28 && <0.29 + , hledger >=0.28 && <0.29 + , base >=4 && <5 + , base-compat >=0.8.1 , blaze-html , blaze-markup , bytestring , clientsession - , cmdargs >= 0.10 && < 0.11 + , cmdargs >=0.10 && <0.11 , data-default , directory , filepath @@ -174,30 +205,39 @@ executable hledger-web , http-conduit , http-client , HUnit - , conduit-extra >= 1.1 - , parsec >= 3 - , safe >= 0.2 - , shakespeare >= 2.0 + , conduit-extra >=1.1 + , safe >=0.2 + , shakespeare >=2.0 , template-haskell - , text >= 1.2 && < 1.3 + , text >=1.2 && <1.3 , transformers , wai , wai-extra - , wai-handler-launch >= 1.3 + , wai-handler-launch >=1.3 , warp , yaml - , yesod >= 1.4 && < 1.5 + , yesod >=1.4 && <1.5 , yesod-core , yesod-form , yesod-static , json - , hledger-web == 0.28 - + , parsec >=3 + , hledger-web ==0.28 + 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(old-locale) - build-depends: time < 1.5, old-locale + build-depends: + time <1.5 + , old-locale else - build-depends: time >= 1.5 - + build-depends: + time >=1.5 default-language: Haskell2010 test-suite test @@ -211,15 +251,15 @@ test-suite test 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="0.28" build-depends: - hledger-lib >= 0.28 && < 0.29 - , hledger >= 0.28 && < 0.29 - , base >= 4 && < 5 - , base-compat >= 0.8.1 + hledger-lib >=0.28 && <0.29 + , hledger >=0.28 && <0.29 + , base >=4 && <5 + , base-compat >=0.8.1 , blaze-html , blaze-markup , bytestring , clientsession - , cmdargs >= 0.10 && < 0.11 + , cmdargs >=0.10 && <0.11 , data-default , directory , filepath @@ -227,30 +267,31 @@ test-suite test , http-conduit , http-client , HUnit - , conduit-extra >= 1.1 - , parsec >= 3 - , safe >= 0.2 - , shakespeare >= 2.0 + , conduit-extra >=1.1 + , safe >=0.2 + , shakespeare >=2.0 , template-haskell - , text >= 1.2 && < 1.3 + , text >=1.2 && <1.3 , transformers , wai , wai-extra - , wai-handler-launch >= 1.3 + , wai-handler-launch >=1.3 , warp , yaml - , yesod >= 1.4 && < 1.5 + , yesod >=1.4 && <1.5 , yesod-core , yesod-form , yesod-static , json + , parsec >=3 , hledger-web , hspec , yesod-test - if flag(old-locale) - build-depends: time < 1.5, old-locale + build-depends: + time <1.5 + , old-locale else - build-depends: time >= 1.5 - + build-depends: + time >=1.5 default-language: Haskell2010 diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml new file mode 100644 index 000000000..097107ccd --- /dev/null +++ b/hledger-web/package.yaml @@ -0,0 +1,180 @@ +name: hledger-web +version: '0.28' +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 + command-line or curses-style interfaces. + hledger is a cross-platform program for tracking money, time, or + any other commodity, using double-entry accounting and a simple, + editable file format. It is inspired by and largely compatible + with ledger(1). hledger provides command-line, curses and web + interfaces, and aims to be a reliable, practical tool for daily + use.' +category: Finance +author: Simon Michael +maintainer: Simon Michael +license: GPL +github: simonmichael/hledger +homepage: http://hledger.org +bug-reports: http://bugs.hledger.org +extra-source-files: +- CHANGES +- README +- config/favicon.ico +- config/keter.yaml +- config/robots.txt +- config/routes +- config/settings.yml +- messages/*.msg +- static/css/*.css +- static/css/*.map +- static/fonts/*.eot +- static/fonts/*.svg +- static/fonts/*.ttf +- static/fonts/*.woff +- static/hledger.css +- static/hledger.js +- static/js/*.js +- templates/*.hamlet +ghc-options: +- -Wall +- -fno-warn-unused-do-bind +- -fno-warn-name-shadowing +- -fno-warn-missing-signatures +- -fno-warn-type-defaults +- -fno-warn-orphans +dependencies: +- hledger-lib >=0.28 && <0.29 +- hledger >=0.28 && <0.29 +- base >=4 && <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 +library: + cpp-options: -DVERSION="0.28" + 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 + dependencies: + - megaparsec >=5 + - mtl + when: + - condition: (flag(dev)) || (flag(library-only)) + cpp-options: -DDEVELOPMENT + - condition: flag(old-locale) + then: + dependencies: + - time <1.5 + - old-locale + else: + dependencies: + - time >=1.5 +executables: + hledger-web: + main: main.hs + source-dirs: app + cpp-options: -DVERSION="0.28" + dependencies: + - parsec >=3 + - hledger-web ==0.28 + when: + - condition: flag(library-only) + buildable: false + - condition: flag(threaded) + ghc-options: -threaded + - condition: flag(dev) + ghc-options: -O0 + - condition: flag(dev) + cpp-options: -DDEVELOPMENT + - condition: flag(old-locale) + then: + dependencies: + - time <1.5 + - old-locale + else: + dependencies: + - time >=1.5 +tests: + test: + main: main.hs + source-dirs: tests + cpp-options: -DVERSION="0.28" + dependencies: + - parsec >=3 + - hledger-web + - hspec + - yesod-test + when: + - condition: flag(old-locale) + then: + dependencies: + - time <1.5 + - old-locale + else: + dependencies: + - time >=1.5 +flags: + library-only: + description: Build for use with "yesod devel" + manual: false + default: false + dev: + description: Turn on development settings, like auto-reload templates. + manual: false + default: false + threaded: + description: Build with support for multithreaded execution. + manual: false + default: true + 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.' + manual: false + default: false +data-files: +- doc/hledger-web.1 +- doc/hledger-web.1.txt +- doc/hledger-web.1.info +stability: stable +tested-with: ghc ==7.6.3 ghc ==7.8.4 ghc ==7.10.3 ghc ==8.0 diff --git a/hledger/future-package.yaml b/hledger/future-package.yaml deleted file mode 100644 index 0495b83c1..000000000 --- a/hledger/future-package.yaml +++ /dev/null @@ -1,183 +0,0 @@ -# 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 -# -# as of hpack 0.5.4 these must be added manually: -# - tested-with -# - flags -# - benchmarks -# - conditional blocks - -name : hledger -version : '0.28' -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 - financial transactions and produce useful reports. - hledger is a cross-platform program for tracking money, time, or - any other commodity, using double-entry accounting and a simple, - editable file format. It is inspired by and largely compatible - with ledger(1). hledger provides command-line, curses and web - interfaces, and aims to be a reliable, practical tool for daily - use. - -license : GPL -author : Simon Michael -maintainer : Simon Michael -github : simonmichael/hledger -homepage : http://hledger.org -bug-reports : http://bugs.hledger.org -# XXX not supported -tested-with : GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0 - -extra-source-files: - - CHANGES - - README.md - - test/test.hs - -data-files: - - doc/hledger.1 - - doc/hledger.1.txt - - doc/hledger.1.info - -# XXX not supported -flags: - threaded: - - default: True - - description: - Build with support for multithreaded execution - -flag: - curses: - - default: True - - description: - On POSIX systems, enable curses support for auto-detecting terminal width. - -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.28 - - base >= 4.3 && < 5 - - base-compat >= 0.8.1 - - bytestring - - containers - - unordered-containers - - cmdargs >= 0.10 && < 0.11 - - csv - - data-default >= 0.5 - - directory - - file-embed >= 0.0.10 && < 0.1 - - filepath - - haskeline >= 0.6 && <= 0.8 - - HUnit - - mtl - - mtl-compat - - old-time - - parsec >= 3 - - process - - regex-tdfa - - safe >= 0.2 - - split >= 0.1 && < 0.3 - - temporary - - text >= 0.11 - - tabular >= 0.2 && < 0.3 - - utf8-string >= 0.3.5 && < 1.1 - - wizards == 1.0.* -# XXX not supported -# if impl(ghc >= 7.10) -# -- ghc 7.10 requires shakespeare 2.0.2.2+ -# build-depends: shakespeare >= 2.0.2.2 && < 2.1 -# else -# -- for older ghcs, allow shakespeare 1.x (which also requires shakespeare-text) -# -- http://www.yesodweb.com/blog/2014/04/consolidation-progress -# build-depends: -# shakespeare >= 1.0 && < 2.1 -# ,shakespeare-text >= 1.0 && < 1.2 - - shakespeare >= 2.0.2.2 && < 2.1 -# if !os(windows) && flag(curses) -# build-depends: terminfo - - terminfo -# if impl(ghc >= 7.4) -# dependencies: pretty-show >= 1.6.4 - - pretty-show >= 1.6.4 -# if flag(old-locale) -# build-depends: time < 1.5, old-locale -# else -# build-depends: time >= 1.5 - - time >= 1.5 - -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="0.28" - -library: - # source-dirs: . # XXX includes Setup and uncommitted stuff - exposed-modules: - - Hledger.Cli - - Hledger.Cli.Main - - Hledger.Cli.CliOptions - - Hledger.Cli.DocFiles - - Hledger.Cli.Tests - - Hledger.Cli.Utils - - Hledger.Cli.Version - - Hledger.Cli.Add - - Hledger.Cli.Accounts - - Hledger.Cli.Balance - - Hledger.Cli.Balancesheet - - Hledger.Cli.Cashflow - - Hledger.Cli.Help - - Hledger.Cli.Histogram - - Hledger.Cli.Incomestatement - - Hledger.Cli.Info - - Hledger.Cli.Man - - Hledger.Cli.Print - - Hledger.Cli.Register - - Hledger.Cli.Stats - - Text.Tabular.AsciiWide - -executables: - hledger: - source-dirs: app - main: hledger-cli.hs - # if flag(threaded) - # ghc-options: -threaded - ghc-options: - -threaded - dependencies: - - hledger == 0.28 - -tests: - test: - source-dirs: test - main: test.hs - dependencies: - - hledger - - test-framework - - test-framework-hunit - -# XXX not supported -# benchmarks: -# bench: -# source-dirs: bench -# main: bench.hs -# other-modules: SimpleBench -# dependencies: -# - hledger -# - criterion -# - html -# - timeit diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal index c21dff96b..0716255d7 100644 --- a/hledger/hledger.cabal +++ b/hledger/hledger.cabal @@ -1,4 +1,4 @@ --- This file has been generated from package.yaml by hpack version 0.5.4. +-- This file has been generated from package.yaml by hpack version 0.14.0. -- -- see: https://github.com/sol/hpack @@ -7,16 +7,7 @@ version: 0.28 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 - financial transactions and produce useful reports. - hledger is a cross-platform program for tracking money, time, or - any other commodity, using double-entry accounting and a simple, - editable file format. It is inspired by and largely compatible - with ledger(1). hledger provides command-line, curses and web - interfaces, and aims to be a reliable, practical tool for daily - use. +description: This is hledger’s command-line interface. Its basic function is to read a plain text file describing financial transactions and produce useful reports. hledger is a cross-platform program for tracking money, time, or any other commodity, using double-entry accounting and a simple, editable file format. It is inspired by and largely compatible 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 @@ -25,115 +16,111 @@ homepage: http://hledger.org bug-reports: http://bugs.hledger.org cabal-version: >= 1.10 build-type: Simple -tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0 +tested-with: ghc ==7.6.3 ghc ==7.8.4 ghc ==7.10.3 ghc ==8.0 extra-source-files: + bench/10000x1000x10.journal CHANGES README.md test/test.hs - bench/10000x1000x10.journal data-files: doc/hledger.1 - doc/hledger.1.txt doc/hledger.1.info + doc/hledger.1.txt doc/other/hledger-api.1 - doc/other/hledger-api.1.txt doc/other/hledger-api.1.info + doc/other/hledger-api.1.txt doc/other/hledger-ui.1 - doc/other/hledger-ui.1.txt doc/other/hledger-ui.1.info + doc/other/hledger-ui.1.txt doc/other/hledger-web.1 - doc/other/hledger-web.1.txt doc/other/hledger-web.1.info - doc/other/hledger_journal.5 - doc/other/hledger_journal.5.txt - doc/other/hledger_journal.5.info + doc/other/hledger-web.1.txt doc/other/hledger_csv.5 - doc/other/hledger_csv.5.txt doc/other/hledger_csv.5.info + doc/other/hledger_csv.5.txt + doc/other/hledger_journal.5 + doc/other/hledger_journal.5.info + doc/other/hledger_journal.5.txt doc/other/hledger_timeclock.5 - doc/other/hledger_timeclock.5.txt doc/other/hledger_timeclock.5.info + doc/other/hledger_timeclock.5.txt doc/other/hledger_timedot.5 - doc/other/hledger_timedot.5.txt doc/other/hledger_timedot.5.info + doc/other/hledger_timedot.5.txt source-repository head type: git location: https://github.com/simonmichael/hledger -flag threaded - default: True - description: - Build with support for multithreaded execution - flag curses default: True - description: - On POSIX systems, enable curses support for auto-detecting terminal width. + description: On POSIX systems, enable curses support for auto-detecting terminal width. + manual: 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. + 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. + manual: False + +flag threaded + default: True + description: Build with support for multithreaded execution + manual: False 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="0.28" build-depends: - hledger-lib == 0.28 - , base >= 4.3 && < 5 - , base-compat >= 0.8.1 + base >=4.3 && <5 + , base-compat >=0.8.1 + , directory + , file-embed >=0.0.10 && <0.1 + , filepath + , process + , temporary + , tabular >=0.2 && <0.3 + , hledger-lib ==0.28 , bytestring , containers , unordered-containers - , cmdargs >= 0.10 && < 0.11 + , cmdargs >=0.10 && <0.11 , csv - , data-default >= 0.5 - , directory - , file-embed >= 0.0.10 && < 0.1 - , filepath - , haskeline >= 0.6 && <= 0.8 + , data-default >=0.5 + , haskeline >=0.6 && <=0.8 , HUnit , mtl , mtl-compat , old-time - , megaparsec >= 5 - , process + , megaparsec >=5 , regex-tdfa - , safe >= 0.2 - , split >= 0.1 && < 0.3 + , safe >=0.2 + , split >=0.1 && <0.3 , transformers - , temporary - , text >= 0.11 - , tabular >= 0.2 && < 0.3 - , utf8-string >= 0.3.5 && < 1.1 - , wizards == 1.0.* - - if impl(ghc >= 7.10) - -- ghc 7.10 requires shakespeare 2.0.2.2+ - build-depends: shakespeare >= 2.0.2.2 && < 2.1 - else - -- for older ghcs, allow shakespeare 1.x (which also requires shakespeare-text) - -- http://www.yesodweb.com/blog/2014/04/consolidation-progress + , text >=0.11 + , utf8-string >=0.3.5 && <1.1 + , wizards ==1.0.* + if impl(ghc >=7.10) build-depends: - shakespeare >= 1.0 && < 2.1 - ,shakespeare-text >= 1.0 && < 1.2 - - if flag(old-locale) - build-depends: time < 1.5, old-locale + shakespeare >=2.0.2.2 && <2.1 else - build-depends: time >= 1.5 - - if impl(ghc >= 7.4) - build-depends: pretty-show >= 1.6.4 - - if !os(windows) && flag(curses) - build-depends: terminfo - + build-depends: + shakespeare >=1.0 && <2.1 + , shakespeare-text >=1.0 && <1.2 + if flag(old-locale) + build-depends: + time <1.5 + , old-locale + else + build-depends: + time >=1.5 + if impl(ghc >=7.4) + build-depends: + pretty-show >=1.6.4 + if (!(os(windows))) && (flag(curses)) + build-depends: + terminfo exposed-modules: Hledger.Cli Hledger.Cli.Main @@ -156,6 +143,8 @@ library Hledger.Cli.Register Hledger.Cli.Stats Text.Tabular.AsciiWide + other-modules: + Paths_hledger default-language: Haskell2010 executable hledger @@ -163,57 +152,58 @@ executable 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 - if flag(threaded) - ghc-options: -threaded cpp-options: -DVERSION="0.28" build-depends: - hledger-lib == 0.28 - , base >= 4.3 && < 5 - , base-compat >= 0.8.1 + base >=4.3 && <5 + , base-compat >=0.8.1 + , directory + , file-embed >=0.0.10 && <0.1 + , filepath + , process + , temporary + , tabular >=0.2 && <0.3 + , hledger-lib ==0.28 , bytestring , containers , unordered-containers - , cmdargs >= 0.10 && < 0.11 + , cmdargs >=0.10 && <0.11 , csv - , data-default >= 0.5 - , directory - , file-embed >= 0.0.10 && < 0.1 - , filepath - , haskeline >= 0.6 && <= 0.8 + , data-default >=0.5 + , haskeline >=0.6 && <=0.8 , HUnit , mtl , mtl-compat , old-time - , parsec >= 3 - , process + , parsec >=3 , regex-tdfa - , safe >= 0.2 - , split >= 0.1 && < 0.3 - , temporary - , text >= 0.11 - , tabular >= 0.2 && < 0.3 - , utf8-string >= 0.3.5 && < 1.1 - , wizards == 1.0.* - , hledger == 0.28 - - if impl(ghc >= 7.10) - build-depends: shakespeare >= 2.0.2.2 && < 2.1 + , safe >=0.2 + , split >=0.1 && <0.3 + , text >=0.11 + , utf8-string >=0.3.5 && <1.1 + , wizards ==1.0.* + , hledger ==0.28 + if flag(threaded) + ghc-options: -threaded + if impl(ghc >=7.10) + build-depends: + shakespeare >=2.0.2.2 && <2.1 else build-depends: - shakespeare >= 1.0 && < 2.1 - ,shakespeare-text >= 1.0 && < 1.2 - + shakespeare >=1.0 && <2.1 + , shakespeare-text >=1.0 && <1.2 if flag(old-locale) - build-depends: time < 1.5, old-locale + build-depends: + time <1.5 + , old-locale else - build-depends: time >= 1.5 - - if impl(ghc >= 7.4) - build-depends: pretty-show >= 1.6.4 - - if !os(windows) && flag(curses) - build-depends: terminfo - + build-depends: + time >=1.5 + if impl(ghc >=7.4) + build-depends: + pretty-show >=1.6.4 + if (!(os(windows))) && (flag(curses)) + build-depends: + terminfo default-language: Haskell2010 test-suite test @@ -224,81 +214,85 @@ test-suite test 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="0.28" build-depends: - hledger-lib == 0.28 - , base >= 4.3 && < 5 - , base-compat >= 0.8.1 + base >=4.3 && <5 + , base-compat >=0.8.1 + , directory + , file-embed >=0.0.10 && <0.1 + , filepath + , process + , temporary + , tabular >=0.2 && <0.3 + , hledger-lib ==0.28 , bytestring , containers , unordered-containers - , cmdargs >= 0.10 && < 0.11 + , cmdargs >=0.10 && <0.11 , csv - , data-default >= 0.5 - , directory - , file-embed >= 0.0.10 && < 0.1 - , filepath - , haskeline >= 0.6 && <= 0.8 + , data-default >=0.5 + , haskeline >=0.6 && <=0.8 , HUnit , mtl , mtl-compat , old-time - , parsec >= 3 - , process + , parsec >=3 , regex-tdfa - , safe >= 0.2 - , split >= 0.1 && < 0.3 - , temporary - , text >= 0.11 - , tabular >= 0.2 && < 0.3 - , utf8-string >= 0.3.5 && < 1.1 - , wizards == 1.0.* + , safe >=0.2 + , split >=0.1 && <0.3 + , text >=0.11 + , utf8-string >=0.3.5 && <1.1 + , wizards ==1.0.* , hledger , test-framework , test-framework-hunit - - if impl(ghc >= 7.10) - build-depends: shakespeare >= 2.0.2.2 && < 2.1 + if impl(ghc >=7.10) + build-depends: + shakespeare >=2.0.2.2 && <2.1 else build-depends: - shakespeare >= 1.0 && < 2.1 - ,shakespeare-text >= 1.0 && < 1.2 - - if impl(ghc >= 7.4) - build-depends: pretty-show >= 1.6.4 - + shakespeare >=1.0 && <2.1 + , shakespeare-text >=1.0 && <1.2 + if impl(ghc >=7.4) + build-depends: + pretty-show >=1.6.4 if flag(old-locale) - build-depends: time < 1.5, old-locale + build-depends: + time <1.5 + , old-locale else - build-depends: time >= 1.5 - - if !os(windows) && flag(curses) - build-depends: terminfo - + build-depends: + time >=1.5 + if (!(os(windows))) && (flag(curses)) + build-depends: + terminfo default-language: Haskell2010 benchmark bench - type: exitcode-stdio-1.0 - hs-source-dirs: bench - main-is: bench.hs - other-modules: SimpleBench - ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures - ghc-options: -fno-warn-type-defaults -fno-warn-orphans + type: exitcode-stdio-1.0 + hs-source-dirs: + bench + main-is: bench.hs + other-modules: + SimpleBench + 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: hledger-lib, - hledger, - base >= 4.3 && < 5, - base-compat >= 0.8.1, - criterion, - html, - tabular >= 0.2 && < 0.3, - temporary, - timeit, - process, - file-embed >= 0.0.10 && < 0.1, - filepath, - directory - + build-depends: + base >=4.3 && <5 + , base-compat >=0.8.1 + , directory + , file-embed >=0.0.10 && <0.1 + , filepath + , process + , temporary + , tabular >=0.2 && <0.3 + , hledger-lib + , hledger + , criterion + , html + , timeit if flag(old-locale) - build-depends: time < 1.5, old-locale + build-depends: + time <1.5 + , old-locale else - build-depends: time >= 1.5 - + build-depends: + time >=1.5 diff --git a/hledger/package.yaml b/hledger/package.yaml new file mode 100644 index 000000000..d5a87d9ab --- /dev/null +++ b/hledger/package.yaml @@ -0,0 +1,272 @@ +name: hledger +version: '0.28' +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 + financial transactions and produce useful reports. + hledger is a cross-platform program for tracking money, time, or + any other commodity, using double-entry accounting and a simple, + editable file format. It is inspired by and largely compatible + with ledger(1). hledger provides command-line, curses and web + interfaces, and aims to be a reliable, practical tool for daily + use.' +category: Finance, Console +author: Simon Michael +maintainer: Simon Michael +license: GPL +github: simonmichael/hledger +homepage: http://hledger.org +bug-reports: http://bugs.hledger.org +extra-source-files: +- CHANGES +- README.md +- test/test.hs +- bench/10000x1000x10.journal +ghc-options: +- -Wall +- -fno-warn-unused-do-bind +- -fno-warn-name-shadowing +- -fno-warn-missing-signatures +- -fno-warn-type-defaults +- -fno-warn-orphans +dependencies: +- base >=4.3 && <5 +- base-compat >=0.8.1 +- directory +- file-embed >=0.0.10 && <0.1 +- filepath +- process +- temporary +- tabular >=0.2 && <0.3 +library: + cpp-options: -DVERSION="0.28" + exposed-modules: + - Hledger.Cli + - Hledger.Cli.Main + - Hledger.Cli.CliOptions + - Hledger.Cli.DocFiles + - Hledger.Cli.Tests + - Hledger.Cli.Utils + - Hledger.Cli.Version + - Hledger.Cli.Add + - Hledger.Cli.Accounts + - Hledger.Cli.Balance + - Hledger.Cli.Balancesheet + - Hledger.Cli.Cashflow + - Hledger.Cli.Help + - Hledger.Cli.Histogram + - Hledger.Cli.Incomestatement + - Hledger.Cli.Info + - Hledger.Cli.Man + - Hledger.Cli.Print + - Hledger.Cli.Register + - Hledger.Cli.Stats + - Text.Tabular.AsciiWide + dependencies: + - hledger-lib ==0.28 + - bytestring + - containers + - unordered-containers + - cmdargs >=0.10 && <0.11 + - csv + - data-default >=0.5 + - haskeline >=0.6 && <=0.8 + - HUnit + - mtl + - mtl-compat + - old-time + - megaparsec >=5 + - regex-tdfa + - safe >=0.2 + - split >=0.1 && <0.3 + - transformers + - text >=0.11 + - utf8-string >=0.3.5 && <1.1 + - wizards ==1.0.* + when: + - condition: impl(ghc >=7.10) + then: + dependencies: + - shakespeare >=2.0.2.2 && <2.1 + else: + dependencies: + - shakespeare >=1.0 && <2.1 + - shakespeare-text >=1.0 && <1.2 + - condition: flag(old-locale) + then: + dependencies: + - time <1.5 + - old-locale + else: + dependencies: + - time >=1.5 + - condition: impl(ghc >=7.4) + dependencies: + - pretty-show >=1.6.4 + - condition: (!(os(windows))) && (flag(curses)) + dependencies: + - terminfo +executables: + hledger: + main: hledger-cli.hs + source-dirs: app + cpp-options: -DVERSION="0.28" + dependencies: + - hledger-lib ==0.28 + - bytestring + - containers + - unordered-containers + - cmdargs >=0.10 && <0.11 + - csv + - data-default >=0.5 + - haskeline >=0.6 && <=0.8 + - HUnit + - mtl + - mtl-compat + - old-time + - parsec >=3 + - regex-tdfa + - safe >=0.2 + - split >=0.1 && <0.3 + - text >=0.11 + - utf8-string >=0.3.5 && <1.1 + - wizards ==1.0.* + - hledger ==0.28 + when: + - condition: flag(threaded) + ghc-options: -threaded + - condition: impl(ghc >=7.10) + then: + dependencies: + - shakespeare >=2.0.2.2 && <2.1 + else: + dependencies: + - shakespeare >=1.0 && <2.1 + - shakespeare-text >=1.0 && <1.2 + - condition: flag(old-locale) + then: + dependencies: + - time <1.5 + - old-locale + else: + dependencies: + - time >=1.5 + - condition: impl(ghc >=7.4) + dependencies: + - pretty-show >=1.6.4 + - condition: (!(os(windows))) && (flag(curses)) + dependencies: + - terminfo +tests: + test: + main: test.hs + source-dirs: test + cpp-options: -DVERSION="0.28" + dependencies: + - hledger-lib ==0.28 + - bytestring + - containers + - unordered-containers + - cmdargs >=0.10 && <0.11 + - csv + - data-default >=0.5 + - haskeline >=0.6 && <=0.8 + - HUnit + - mtl + - mtl-compat + - old-time + - parsec >=3 + - regex-tdfa + - safe >=0.2 + - split >=0.1 && <0.3 + - text >=0.11 + - utf8-string >=0.3.5 && <1.1 + - wizards ==1.0.* + - hledger + - test-framework + - test-framework-hunit + when: + - condition: impl(ghc >=7.10) + then: + dependencies: + - shakespeare >=2.0.2.2 && <2.1 + else: + dependencies: + - shakespeare >=1.0 && <2.1 + - shakespeare-text >=1.0 && <1.2 + - condition: impl(ghc >=7.4) + dependencies: + - pretty-show >=1.6.4 + - condition: flag(old-locale) + then: + dependencies: + - time <1.5 + - old-locale + else: + dependencies: + - time >=1.5 + - condition: (!(os(windows))) && (flag(curses)) + dependencies: + - terminfo +benchmarks: + bench: + main: bench.hs + source-dirs: bench + dependencies: + - hledger-lib + - hledger + - criterion + - html + - timeit + when: + - condition: flag(old-locale) + then: + dependencies: + - time <1.5 + - old-locale + else: + dependencies: + - time >=1.5 +flags: + curses: + description: On POSIX systems, enable curses support for auto-detecting terminal + width. + manual: false + default: true + threaded: + description: Build with support for multithreaded execution + manual: false + default: true + 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.' + manual: false + default: false +data-files: +- doc/hledger.1 +- doc/hledger.1.txt +- doc/hledger.1.info +- doc/other/hledger-api.1 +- doc/other/hledger-api.1.txt +- doc/other/hledger-api.1.info +- doc/other/hledger-ui.1 +- doc/other/hledger-ui.1.txt +- doc/other/hledger-ui.1.info +- doc/other/hledger-web.1 +- doc/other/hledger-web.1.txt +- doc/other/hledger-web.1.info +- doc/other/hledger_journal.5 +- doc/other/hledger_journal.5.txt +- doc/other/hledger_journal.5.info +- doc/other/hledger_csv.5 +- doc/other/hledger_csv.5.txt +- doc/other/hledger_csv.5.info +- doc/other/hledger_timeclock.5 +- doc/other/hledger_timeclock.5.txt +- doc/other/hledger_timeclock.5.info +- doc/other/hledger_timedot.5 +- doc/other/hledger_timedot.5.txt +- doc/other/hledger_timedot.5.info +stability: stable +tested-with: ghc ==7.6.3 ghc ==7.8.4 ghc ==7.10.3 ghc ==8.0