CVS commit: pkgsrc/finance/hledger-lib

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Feb  1 10:28:58 UTC 2025

Modified Files:
        pkgsrc/finance/hledger-lib: Makefile PLIST buildlink3.mk distinfo

Log Message:
finance/hledger-lib: update to hledger-lib-1.41

# 2024-12-09 1.41

Breaking changes

- New/refactored modules (Hledger.Write.*) and types (Spreadsheet) to help
  abstract rendering in various output formats, eg HTML, FODS and beancount.
  Spreadsheet is an abstraction for tabular reports, in addition to the
  tabular package we already use; there may be some overlap.
  (Henning Thielemann)

- Rename displayDepth/prrDepth to displayIndent/prrIndent, and make them
  correspond to the number of indentation steps.
  (These are about indentation for rendering, not account depth.) [#2246]

Improvements

- Add Hledger.Data.Currency, currencySymbolToCode, currencyCodeToSymbol
- AmountFormat: add displayQuotes flag to control enclosing quotes
- InputOpts: add `posting_account_tags_` flag to control account tags on postings
- Support ghc 9.10 and base 4.20.
  Note, when built with ghc 9.10.1, hledger error messages are displayed with two extra trailing newlines.

Other API/doc changes

- Hledger.Utils.IO: cleanup; rgb' now takes Float arguments instead of Word8
- rename jinferredcommodities to jinferredcommoditystyles
- rename jcommodities to jdeclaredcommodities
- move/rename nullsourcepos
- document isBlockActive, matcherMatches
- posting*AsLines: fix some docs

# 1.40 2024-09-09

Breaking changes

- Some constructors of the Interval type have been renamed for clarity.
- Hledger.Read.CsvUtils has moved to Hledger.Write.Csv. (Henning Thielemann)
- Tabular report rendering code has been added/reworked to allow new output formats and more reuse. (Henning Thielemann)

Improvements

- Added `journalDbg` debug output helper.

- Allow doclayout 0.5.

# 1.34 2024-06-01

Improvements

- InputOpts has a new `_defer` flag for internal use instead of overusing `strict_`
- journalCheckBalanceAssertions has moved to JournalChecks


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/finance/hledger-lib/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/finance/hledger-lib/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/finance/hledger-lib/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/finance/hledger-lib/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/finance/hledger-lib/Makefile
diff -u pkgsrc/finance/hledger-lib/Makefile:1.20 pkgsrc/finance/hledger-lib/Makefile:1.21
--- pkgsrc/finance/hledger-lib/Makefile:1.20    Thu Jan  9 23:24:41 2025
+++ pkgsrc/finance/hledger-lib/Makefile Sat Feb  1 10:28:58 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2025/01/09 23:24:41 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2025/02/01 10:28:58 pho Exp $
 
-DISTNAME=      hledger-lib-1.33.1
+DISTNAME=      hledger-lib-1.41
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   3
 CATEGORIES=    finance
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -13,10 +12,13 @@ LICENSE=    gnu-gpl-v3
 # keeps getting swapped in and out and never finishes the compilation.
 HASKELL_OPTIMIZATION_LEVEL=    1
 
+.include "../../finance/hs-Decimal/buildlink3.mk"
+.include "../../textproc/hs-Glob/buildlink3.mk"
 .include "../../converters/hs-aeson/buildlink3.mk"
 .include "../../converters/hs-aeson-pretty/buildlink3.mk"
 .include "../../devel/hs-ansi-terminal/buildlink3.mk"
 .include "../../devel/hs-base-compat/buildlink3.mk"
+.include "../../textproc/hs-blaze-html/buildlink3.mk"
 .include "../../textproc/hs-blaze-markup/buildlink3.mk"
 .include "../../devel/hs-call-stack/buildlink3.mk"
 .include "../../textproc/hs-cassava/buildlink3.mk"
@@ -24,12 +26,11 @@ HASKELL_OPTIMIZATION_LEVEL= 1
 .include "../../devel/hs-cmdargs/buildlink3.mk"
 .include "../../devel/hs-colour/buildlink3.mk"
 .include "../../devel/hs-data-default/buildlink3.mk"
-.include "../../finance/hs-Decimal/buildlink3.mk"
 .include "../../textproc/hs-doclayout/buildlink3.mk"
 .include "../../misc/hs-extra/buildlink3.mk"
 .include "../../devel/hs-file-embed/buildlink3.mk"
-.include "../../textproc/hs-Glob/buildlink3.mk"
 .include "../../devel/hs-hashtables/buildlink3.mk"
+.include "../../textproc/hs-lucid/buildlink3.mk"
 .include "../../textproc/hs-megaparsec/buildlink3.mk"
 .include "../../devel/hs-microlens/buildlink3.mk"
 .include "../../devel/hs-microlens-th/buildlink3.mk"
@@ -41,11 +42,9 @@ HASKELL_OPTIMIZATION_LEVEL=  1
 .include "../../devel/hs-tasty/buildlink3.mk"
 .include "../../devel/hs-tasty-hunit/buildlink3.mk"
 .include "../../devel/hs-terminal-size/buildlink3.mk"
-.include "../../textproc/hs-text-ansi/buildlink3.mk"
 .include "../../devel/hs-timeit/buildlink3.mk"
 .include "../../devel/hs-uglymemo/buildlink3.mk"
 .include "../../devel/hs-unordered-containers/buildlink3.mk"
 .include "../../devel/hs-utf8-string/buildlink3.mk"
-.include "../../misc/hs-pager/buildlink3.mk"
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/finance/hledger-lib/PLIST
diff -u pkgsrc/finance/hledger-lib/PLIST:1.5 pkgsrc/finance/hledger-lib/PLIST:1.6
--- pkgsrc/finance/hledger-lib/PLIST:1.5        Thu May  2 11:59:34 2024
+++ pkgsrc/finance/hledger-lib/PLIST    Sat Feb  1 10:28:58 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2024/05/02 11:59:34 pho Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/02/01 10:28:58 pho Exp $
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Hledger.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger.p_hi
@@ -17,6 +17,9 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Data/Balancing.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Data/Balancing.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Data/Balancing.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Data/Currency.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Data/Currency.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Data/Currency.p_hi
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Data/Dates.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Data/Dates.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Data/Dates.p_hi
@@ -83,9 +86,6 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Read/CsvReader.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Read/CsvReader.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Read/CsvReader.p_hi
-${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Read/CsvUtils.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Read/CsvUtils.hi
-${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Read/CsvUtils.p_hi
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Read/InputOptions.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Read/InputOptions.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Read/InputOptions.p_hi
@@ -152,12 +152,33 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Utils/Text.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Utils/Text.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Utils/Text.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Beancount.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Beancount.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Beancount.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Csv.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Csv.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Csv.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Html.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Html.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Html.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Html/Attribute.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Html/Attribute.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Html/Attribute.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Html/Blaze.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Html/Blaze.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Html/Blaze.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Html/Lucid.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Html/Lucid.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Html/Lucid.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Ods.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Ods.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Ods.p_hi
+${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Spreadsheet.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Spreadsheet.hi
+${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Hledger/Write/Spreadsheet.p_hi
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_hledger_lib.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Paths_hledger_lib.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_hledger_lib.p_hi
-${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Megaparsec/Custom.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Text/Megaparsec/Custom.hi
-${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Megaparsec/Custom.p_hi
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Tabular/AsciiWide.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Text/Tabular/AsciiWide.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Tabular/AsciiWide.p_hi
@@ -174,6 +195,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Data-AccountName.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Data-Amount.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Data-Balancing.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Data-Currency.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Data-Dates.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Data-Errors.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Data-Journal.html
@@ -196,7 +218,6 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Query.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Read-Common.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Read-CsvReader.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Read-CsvUtils.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Read-InputOptions.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Read-JournalReader.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Read-RulesReader.html
@@ -220,8 +241,17 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Utils-Test.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Utils-Text.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Utils.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Write-Beancount.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Write-Csv.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Write-Html-Attribute.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Write-Html-Blaze.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Write-Html-Lucid.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Write-Html.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Write-Ods.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger-Write-Spreadsheet.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Hledger.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-Tabular-AsciiWide.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Text-WideString.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-43.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-64.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-94.html

Index: pkgsrc/finance/hledger-lib/buildlink3.mk
diff -u pkgsrc/finance/hledger-lib/buildlink3.mk:1.18 pkgsrc/finance/hledger-lib/buildlink3.mk:1.19
--- pkgsrc/finance/hledger-lib/buildlink3.mk:1.18       Thu Jan  9 23:24:41 2025
+++ pkgsrc/finance/hledger-lib/buildlink3.mk    Sat Feb  1 10:28:58 2025
@@ -1,18 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.18 2025/01/09 23:24:41 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2025/02/01 10:28:58 pho Exp $
 
 BUILDLINK_TREE+=       hledger-lib
 
 .if !defined(HLEDGER_LIB_BUILDLINK3_MK)
 HLEDGER_LIB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hledger-lib+=    hledger-lib>=1.33.1
-BUILDLINK_ABI_DEPENDS.hledger-lib+=    hledger-lib>=1.33.1nb3
+BUILDLINK_API_DEPENDS.hledger-lib+=    hledger-lib>=1.41
+BUILDLINK_ABI_DEPENDS.hledger-lib+=    hledger-lib>=1.41
 BUILDLINK_PKGSRCDIR.hledger-lib?=      ../../finance/hledger-lib
 
+.include "../../finance/hs-Decimal/buildlink3.mk"
+.include "../../textproc/hs-Glob/buildlink3.mk"
 .include "../../converters/hs-aeson/buildlink3.mk"
 .include "../../converters/hs-aeson-pretty/buildlink3.mk"
 .include "../../devel/hs-ansi-terminal/buildlink3.mk"
 .include "../../devel/hs-base-compat/buildlink3.mk"
+.include "../../textproc/hs-blaze-html/buildlink3.mk"
 .include "../../textproc/hs-blaze-markup/buildlink3.mk"
 .include "../../devel/hs-call-stack/buildlink3.mk"
 .include "../../textproc/hs-cassava/buildlink3.mk"
@@ -20,12 +23,11 @@ BUILDLINK_PKGSRCDIR.hledger-lib?=   ../../
 .include "../../devel/hs-cmdargs/buildlink3.mk"
 .include "../../devel/hs-colour/buildlink3.mk"
 .include "../../devel/hs-data-default/buildlink3.mk"
-.include "../../finance/hs-Decimal/buildlink3.mk"
 .include "../../textproc/hs-doclayout/buildlink3.mk"
 .include "../../misc/hs-extra/buildlink3.mk"
 .include "../../devel/hs-file-embed/buildlink3.mk"
-.include "../../textproc/hs-Glob/buildlink3.mk"
 .include "../../devel/hs-hashtables/buildlink3.mk"
+.include "../../textproc/hs-lucid/buildlink3.mk"
 .include "../../textproc/hs-megaparsec/buildlink3.mk"
 .include "../../devel/hs-microlens/buildlink3.mk"
 .include "../../devel/hs-microlens-th/buildlink3.mk"
@@ -37,12 +39,10 @@ BUILDLINK_PKGSRCDIR.hledger-lib?=   ../../
 .include "../../devel/hs-tasty/buildlink3.mk"
 .include "../../devel/hs-tasty-hunit/buildlink3.mk"
 .include "../../devel/hs-terminal-size/buildlink3.mk"
-.include "../../textproc/hs-text-ansi/buildlink3.mk"
 .include "../../devel/hs-timeit/buildlink3.mk"
 .include "../../devel/hs-uglymemo/buildlink3.mk"
 .include "../../devel/hs-unordered-containers/buildlink3.mk"
 .include "../../devel/hs-utf8-string/buildlink3.mk"
-.include "../../misc/hs-pager/buildlink3.mk"
 .endif # HLEDGER_LIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -hledger-lib

Index: pkgsrc/finance/hledger-lib/distinfo
diff -u pkgsrc/finance/hledger-lib/distinfo:1.7 pkgsrc/finance/hledger-lib/distinfo:1.8
--- pkgsrc/finance/hledger-lib/distinfo:1.7     Thu May  2 11:59:34 2024
+++ pkgsrc/finance/hledger-lib/distinfo Sat Feb  1 10:28:58 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2024/05/02 11:59:34 pho Exp $
+$NetBSD: distinfo,v 1.8 2025/02/01 10:28:58 pho Exp $
 
-BLAKE2s (hledger-lib-1.33.1.tar.gz) = 32b7ec526db2345e690575f5b570b1cf490561c47fbf907c131ac8b40926e20c
-SHA512 (hledger-lib-1.33.1.tar.gz) = 79c40f71ba9b1dc232f14ca01d5e0e3f9847065d912a0f40bf3a789b6c138ca85641fe511ecafc8be096d624179881dbc7456d36a68aa899614acd5339265688
-Size (hledger-lib-1.33.1.tar.gz) = 321341 bytes
+BLAKE2s (hledger-lib-1.41.tar.gz) = 8c8f96820ff409e224873a15505c13c2bb16db4eeb8af041b99cdb2ae413bea3
+SHA512 (hledger-lib-1.41.tar.gz) = c6090ebdad52b4e143bcf9281582523bfb10ca6204cbc97873f96b54ce0f3bc443dd3ddead8b6f6fb64efea9de1ba69e42095ada9932bc6931e0dd79afece620
+Size (hledger-lib-1.41.tar.gz) = 341256 bytes