From 2d93a21955b43afa0b9b5e53a7cc714e2a6219e9480cf13d66ebd376ca143be7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2020 01:01:59 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:hledger revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/hledger?expand=0&rev=8 --- hledger.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hledger.changes b/hledger.changes index f52027f..fb9b1db 100644 --- a/hledger.changes +++ b/hledger.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 31 09:33:49 UTC 2020 - psimons@suse.com + +- Update hledger to version 1.18.1 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Wed Aug 19 07:37:40 UTC 2020 - Michel Normand From 831e5f570bbc230efa3d18bb3280bad5f0eed5c6a091df53e8c3a2d50d106c51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 11:41:15 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:hledger revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/hledger?expand=0&rev=9 --- hledger-1.18.1.tar.gz | 3 - hledger-1.19.tar.gz | 3 + hledger.cabal | 347 ------------------------------------------ hledger.changes | 137 +++++++++++++++++ hledger.spec | 4 +- 5 files changed, 141 insertions(+), 353 deletions(-) delete mode 100644 hledger-1.18.1.tar.gz create mode 100644 hledger-1.19.tar.gz delete mode 100644 hledger.cabal diff --git a/hledger-1.18.1.tar.gz b/hledger-1.18.1.tar.gz deleted file mode 100644 index 553dec9..0000000 --- a/hledger-1.18.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c88c9a1896a6c431854c76229f0fe8d9bc59b6560829a4af1b8fcbad85486fa -size 649319 diff --git a/hledger-1.19.tar.gz b/hledger-1.19.tar.gz new file mode 100644 index 0000000..ba7ed1a --- /dev/null +++ b/hledger-1.19.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1ab3b4035e37f7f55988f6b64f51543f5562d4767fa3f43ec021e46ef6d7b4d +size 671309 diff --git a/hledger.cabal b/hledger.cabal deleted file mode 100644 index de10248..0000000 --- a/hledger.cabal +++ /dev/null @@ -1,347 +0,0 @@ -cabal-version: 1.12 - --- This file has been generated from package.yaml by hpack version 0.33.0. --- --- see: https://github.com/sol/hpack --- --- hash: a143aaa15c1e629724eac79aa6eb29b5a1af4432366e8855450a1e53ee8c30e4 - -name: hledger -version: 1.18.1 -x-revision: 1 -synopsis: Command-line interface for the hledger accounting system -description: The command-line interface for the hledger accounting system. - Its basic function is to read a plain text file describing - financial transactions and produce useful reports. - . - hledger is a robust, cross-platform set of tools for tracking money, - time, or any other commodity, using double-entry accounting and a - simple, editable file format, with command-line, terminal and web - interfaces. It is a Haskell rewrite of Ledger, and one of the leading - implementations of Plain Text Accounting. Read more at: - -category: Finance, Console -stability: stable -homepage: http://hledger.org -bug-reports: http://bugs.hledger.org -author: Simon Michael -maintainer: Simon Michael -license: GPL-3 -license-file: LICENSE -tested-with: GHC==8.0.2, GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.0.20200123 -build-type: Simple -extra-source-files: - CHANGES.md - README.md - test/unittest.hs - bench/10000x1000x10.journal - hledger.1 - hledger.txt - hledger.info - embeddedfiles/hledger.1 - embeddedfiles/hledger.txt - embeddedfiles/hledger.info - embeddedfiles/hledger-ui.1 - embeddedfiles/hledger-ui.txt - embeddedfiles/hledger-ui.info - embeddedfiles/hledger-web.1 - embeddedfiles/hledger-web.txt - embeddedfiles/hledger-web.info - embeddedfiles/hledger_journal.5 - embeddedfiles/hledger_journal.txt - embeddedfiles/hledger_journal.info - embeddedfiles/hledger_csv.5 - embeddedfiles/hledger_csv.txt - embeddedfiles/hledger_csv.info - embeddedfiles/hledger_timeclock.5 - embeddedfiles/hledger_timeclock.txt - embeddedfiles/hledger_timeclock.info - embeddedfiles/hledger_timedot.5 - embeddedfiles/hledger_timedot.txt - embeddedfiles/hledger_timedot.info - Hledger/Cli/Commands/Accounts.txt - Hledger/Cli/Commands/Activity.txt - Hledger/Cli/Commands/Add.txt - Hledger/Cli/Commands/Balance.txt - Hledger/Cli/Commands/Balancesheet.txt - Hledger/Cli/Commands/Balancesheetequity.txt - Hledger/Cli/Commands/Cashflow.txt - Hledger/Cli/Commands/Checkdates.txt - Hledger/Cli/Commands/Checkdupes.txt - Hledger/Cli/Commands/Close.txt - Hledger/Cli/Commands/Commodities.txt - Hledger/Cli/Commands/Descriptions.txt - Hledger/Cli/Commands/Diff.txt - Hledger/Cli/Commands/Files.txt - Hledger/Cli/Commands/Help.txt - Hledger/Cli/Commands/Import.txt - Hledger/Cli/Commands/Incomestatement.txt - Hledger/Cli/Commands/Notes.txt - Hledger/Cli/Commands/Payees.txt - Hledger/Cli/Commands/Prices.txt - Hledger/Cli/Commands/Print.txt - Hledger/Cli/Commands/Printunique.txt - Hledger/Cli/Commands/Register.txt - Hledger/Cli/Commands/Registermatch.txt - Hledger/Cli/Commands/Rewrite.txt - Hledger/Cli/Commands/Roi.txt - Hledger/Cli/Commands/Stats.txt - Hledger/Cli/Commands/Tags.txt - Hledger/Cli/Commands/Test.txt - -source-repository head - type: git - location: https://github.com/simonmichael/hledger - -flag terminfo - description: On POSIX systems, build with the terminfo lib for detecting terminal width. - manual: False - default: True - -flag threaded - description: Build with support for multithreaded execution - manual: False - default: True - -library - exposed-modules: - Hledger.Cli - Hledger.Cli.Main - Hledger.Cli.CliOptions - Hledger.Cli.DocFiles - Hledger.Cli.Utils - Hledger.Cli.Anon - 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.Commodities - Hledger.Cli.Commands.Descriptions - Hledger.Cli.Commands.Diff - Hledger.Cli.Commands.Help - Hledger.Cli.Commands.Files - Hledger.Cli.Commands.Import - Hledger.Cli.Commands.Incomestatement - Hledger.Cli.Commands.Notes - Hledger.Cli.Commands.Payees - 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.Roi - 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.18.1" - build-depends: - Decimal >=0.5.1 - , Diff - , aeson >=1 - , ansi-terminal >=0.6.2.3 - , base >=4.9 && <4.15 - , base-compat-batteries >=0.10.1 && <0.12 - , bytestring - , cmdargs >=0.10 - , containers - , data-default >=0.5 - , directory - , extra >=1.6.3 - , filepath - , hashable >=1.2.4 - , haskeline >=0.6 - , hledger-lib >=1.18.1 && <1.19 - , lucid - , math-functions >=0.3.3.0 - , megaparsec >=7.0.0 && <8.1 - , mtl >=2.2.1 - , old-time - , parsec >=3 - , pretty-show >=1.6.4 - , process - , regex-tdfa - , safe >=0.2 - , shakespeare >=2.0.2.2 - , split >=0.1 - , tabular >=0.2 - , tasty >=1.2.3 - , temporary - , text >=0.11 - , time >=1.5 - , timeit - , transformers - , unordered-containers - , utf8-string >=0.3.5 - , utility-ht >=0.0.13 - , wizards >=1.0 - if (!(os(windows))) && (flag(terminfo)) - build-depends: - terminfo - 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 - cpp-options: -DVERSION="1.18.1" - build-depends: - Decimal >=0.5.1 - , aeson >=1 - , ansi-terminal >=0.6.2.3 - , base >=4.9 && <4.15 - , base-compat-batteries >=0.10.1 && <0.12 - , bytestring - , cmdargs >=0.10 - , containers - , data-default >=0.5 - , directory - , extra >=1.6.3 - , filepath - , haskeline >=0.6 - , hledger - , hledger-lib >=1.18.1 && <1.19 - , math-functions >=0.3.3.0 - , megaparsec >=7.0.0 && <8.1 - , mtl >=2.2.1 - , old-time - , parsec >=3 - , pretty-show >=1.6.4 - , process - , regex-tdfa - , safe >=0.2 - , shakespeare >=2.0.2.2 - , split >=0.1 - , tabular >=0.2 - , tasty >=1.2.3 - , temporary - , text >=0.11 - , time >=1.5 - , timeit - , transformers - , unordered-containers - , utf8-string >=0.3.5 - , utility-ht >=0.0.13 - , wizards >=1.0 - if (!(os(windows))) && (flag(terminfo)) - build-depends: - terminfo - if flag(threaded) - ghc-options: -threaded - default-language: Haskell2010 - -test-suite unittest - type: exitcode-stdio-1.0 - main-is: unittest.hs - 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 - cpp-options: -DVERSION="1.18.1" - build-depends: - Decimal >=0.5.1 - , aeson >=1 - , ansi-terminal >=0.6.2.3 - , base >=4.9 && <4.15 - , base-compat-batteries >=0.10.1 && <0.12 - , bytestring - , cmdargs >=0.10 - , containers - , data-default >=0.5 - , directory - , extra >=1.6.3 - , filepath - , haskeline >=0.6 - , hledger - , hledger-lib >=1.18.1 && <1.19 - , math-functions >=0.3.3.0 - , megaparsec >=7.0.0 && <8.1 - , mtl >=2.2.1 - , old-time - , parsec >=3 - , pretty-show >=1.6.4 - , process - , regex-tdfa - , safe >=0.2 - , shakespeare >=2.0.2.2 - , split >=0.1 - , tabular >=0.2 - , tasty >=1.2.3 - , temporary - , text >=0.11 - , time >=1.5 - , timeit - , transformers - , unordered-containers - , utf8-string >=0.3.5 - , utility-ht >=0.0.13 - , wizards >=1.0 - if (!(os(windows))) && (flag(terminfo)) - build-depends: - terminfo - default-language: Haskell2010 - -benchmark bench - type: exitcode-stdio-1.0 - main-is: bench.hs - 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 - build-depends: - Decimal >=0.5.1 - , aeson >=1 - , ansi-terminal >=0.6.2.3 - , base >=4.9 && <4.15 - , base-compat-batteries >=0.10.1 && <0.12 - , bytestring - , cmdargs >=0.10 - , containers - , criterion - , data-default >=0.5 - , directory - , extra >=1.6.3 - , filepath - , haskeline >=0.6 - , hledger - , hledger-lib >=1.18.1 && <1.19 - , html - , math-functions >=0.3.3.0 - , megaparsec >=7.0.0 && <8.1 - , mtl >=2.2.1 - , old-time - , parsec >=3 - , pretty-show >=1.6.4 - , process - , regex-tdfa - , safe >=0.2 - , shakespeare >=2.0.2.2 - , split >=0.1 - , tabular >=0.2 - , tasty >=1.2.3 - , temporary - , text >=0.11 - , time >=1.5 - , timeit - , transformers - , unordered-containers - , utf8-string >=0.3.5 - , utility-ht >=0.0.13 - , wizards >=1.0 - buildable: False - if (!(os(windows))) && (flag(terminfo)) - build-depends: - terminfo - default-language: Haskell2010 diff --git a/hledger.changes b/hledger.changes index fb9b1db..3a3191a 100644 --- a/hledger.changes +++ b/hledger.changes @@ -1,3 +1,140 @@ +------------------------------------------------------------------- +Thu Sep 3 02:00:39 UTC 2020 - psimons@suse.com + +- Update hledger to version 1.19. + # 1.19 2020-09-01 + + ## general + + - When parsing dates, the year is now required to have at least four + digits. So eg we no longer accept `200/1/1` as a valid date, it + would need to be written `0200/1/1`. This was done for.. reasons, + and is experimental; let us know if it causes you trouble. + + - The --color/--colour=WHEN command line option, support for the + NO_COLOR environment variable, and smarter autodetection of colour + terminals have been added (#1296) + + - Command line options taking a numeric argument are now validated + more carefully, preventing issues with unexpected negatives or Int + overflow. (Stephen Morgan) + + - In queries, you can now specify a quarter like `2020q1` or `q4` + (the q is case-insensitive). (#1247, Henning Thieleman, Stephen Morgan) + + - In report intervals, `fortnightly` has been added as a synonym for + `biweekly`. (Stephen Morgan) + + - -t and -l command line flags have been added as short forms of + --tree and --flat (#1286) + + - All reports displaying accounts now choose flat mode by default + (Stephen Morgan) + + - Reports now show at most 2 commodities of multicommodity amounts, + unless the --no-elide flag is used. This helps keep them readable by + default, since multicolumn, multicommodity balance reports otherwise + tend to become very wide, especially in tree mode. + + - Numbers with more than 255 decimal places, which we do not support, + now give an error instead of silently misparsing. (#1326) + + - Digit groups are now limited to at most 255 digits each. (#1326) + + - Account aliases (on command line or in journal) containing a bad + regular expression now give a more detailed error message. + + - A tab character could get parsed as part of a commodity symbol, with + confusing results. This no longer happens. (#1301, Dmitry Astapov) + + - Debug output is now organised better by debug level. + The levels are: + + 0. normal command output only (no warnings) + 1. useful warnings & most common troubleshooting info (valuation, eg) + 2. common troubleshooting info, more detail + 3. report options selection + 4. report generation + 5. report generation, more detail + 6. input file reading + 7. input file reading, more detail + 8. command line parsing + 9. any other rarely needed or more in-depth info + + - Added a missing lower bound for aeson, making cabal installs more + reliable. (#1268) + + - lib: parseAmountQueryTerm: allow whitespace around arg parts (#1312) + Whitespace around the operator, sign, or number is now tolerated. + + ## commands + + - account,bal,bs,cf,is: --drop now also works in tree mode (Stephen Morgan) + + - add: fix an error in the command line help (arguments are inputs, + not a query) + + - aregister: a new command showing a transaction-oriented account + register, like hledger-ui, hledger-web, or your bank statement. + Each line represents a whole transaction in one account, unlike + the register command which shows individual postings possibly from + multiple accounts. You might prefer aregister when reconciling + real-world asset/liability accounts, and register when reviewing + detailed revenues/expenses. (#1294) + + - bal,bs,cf,is: boring parents are now elided by default in tabular + balance reports too, like single-column reports. (Stephen Morgan) + + - bal,bs,cf,is: monthly column headings are no longer elided to just + the short month name, if multiple years are being displayed. + + - bal --budget's column headings are now end dates rather than + periods when appropriate (ie with --cumulative or --historical). + + - bs,cf,is: -%/--no-total no longer forces --no-total (Stephen Morgan) + + - bs,cf,is: --no-total now hides subtotals as well as the grand total + (Stephen Morgan) + + - codes: a new command for listing transaction codes + + - print: a new `sql` output format has been added (Dmitry Astapov) + + - roi: errors are now shown without a call stack + + - tags: add --parsed flag, hide empties without --empty. With the + --parsed flag, all tags or values are shown in the order they are + parsed from the input data, including duplicates. With -E/--empty, + any blank/empty values will also be shown, otherwise they are + omitted. + + ## journal format + + - account directives can specify a new `Cash` account type. This is a + subtype of `Asset`, denoting accounts which should be displayed + in `cashflow` reports. + + - The built-in regular expressions for choosing default account types + have been tweaked, and documentation for account types has been + improved. + + ## csv format + + - Inferring the appropriate default field separator based on file + extension (, for .csv, ; for .ssv, \t for .tsv) now works as + documented. + + - Conditional rule patterns can now be grouped with the `&` (AND) operator, + allowing more powerful matching. (Michael Sanders) + + - Invalid csv rules files now give clearer parse error messages. + (Dmitry Astapov) + + - "If tables", a compact bulk format for conditional rules, have been + added. (Dmitry Astapov) + + - csv conversion with a lot of conditional rules is now faster (Dmitry Astapov) + ------------------------------------------------------------------- Mon Aug 31 09:33:49 UTC 2020 - psimons@suse.com diff --git a/hledger.spec b/hledger.spec index debcd81..349bc2b 100644 --- a/hledger.spec +++ b/hledger.spec @@ -19,13 +19,12 @@ %global pkg_name hledger %bcond_with tests Name: %{pkg_name} -Version: 1.18.1 +Version: 1.19 Release: 0 Summary: Command-line interface for the hledger accounting system License: GPL-3.0-or-later URL: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{name}-%{version}/revision/1.cabal#/%{name}.cabal BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-Decimal-devel @@ -98,7 +97,6 @@ This package provides the Haskell %{name} library development files. %prep %autosetup -cp -p %{SOURCE1} %{name}.cabal %build %ghc_lib_build