From 6529017036918e42746b3463a88ecb96304ef29d Mon Sep 17 00:00:00 2001 From: pho Date: Sat, 24 Apr 2021 11:12:09 +0000 Subject: Update to hledger-1.21 The change log is too long to paste here. See http://hackage.haskell.org/package/hledger-1.21/changelog --- finance/hledger/Makefile | 41 +++++++++++++++-------- finance/hledger/common.mk | 17 ---------- finance/hledger/distinfo | 12 ++++--- finance/hledger/patches/patch-app_hledger-cli.hs | 15 +++++++++ finance/hledger/patches/patch-hledger.cabal | 42 ++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 35 deletions(-) delete mode 100644 finance/hledger/common.mk create mode 100644 finance/hledger/patches/patch-app_hledger-cli.hs create mode 100644 finance/hledger/patches/patch-hledger.cabal (limited to 'finance') diff --git a/finance/hledger/Makefile b/finance/hledger/Makefile index aa612efb512..93f6308da5f 100644 --- a/finance/hledger/Makefile +++ b/finance/hledger/Makefile @@ -1,26 +1,41 @@ -# $NetBSD: Makefile,v 1.2 2020/03/30 17:52:39 riastradh Exp $ +# $NetBSD: Makefile,v 1.3 2021/04/24 11:12:09 pho Exp $ -.include "../../finance/hledger/common.mk" - -HASKELL_PKG_NAME= hledger -CATEGORIES= finance +DISTNAME= hledger-1.21 +PKGNAME= ${DISTNAME} +CATEGORIES= finance MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://github.com/simonmichael/hledger/ COMMENT= Plain-text accounting tool LICENSE= gnu-gpl-v3 -USE_LANGUAGES= # none - -.include "../../devel/hs-utility-ht/buildlink3.mk" -.include "../../devel/hs-wizards/buildlink3.mk" +.include "../../converters/hs-aeson/buildlink3.mk" +.include "../../devel/hs-ansi-terminal/buildlink3.mk" +.include "../../devel/hs-base-compat-batteries/buildlink3.mk" +.include "../../devel/hs-cmdargs/buildlink3.mk" +.include "../../devel/hs-data-default/buildlink3.mk" +.include "../../finance/hs-Decimal/buildlink3.mk" +.include "../../textproc/hs-Diff/buildlink3.mk" +.include "../../misc/hs-extra/buildlink3.mk" +.include "../../devel/hs-hashable/buildlink3.mk" .include "../../finance/hledger-lib/buildlink3.mk" +.include "../../textproc/hs-lucid/buildlink3.mk" .include "../../math/hs-math-functions/buildlink3.mk" -.include "../../mk/haskell.mk" +.include "../../textproc/hs-megaparsec/buildlink3.mk" +.include "../../time/hs-old-time/buildlink3.mk" +.include "../../textproc/hs-regex-tdfa/buildlink3.mk" +.include "../../devel/hs-safe/buildlink3.mk" +.include "../../textproc/hs-shakespeare/buildlink3.mk" +.include "../../devel/hs-split/buildlink3.mk" +.include "../../devel/hs-tabular/buildlink3.mk" +.include "../../devel/hs-tasty/buildlink3.mk" .include "../../sysutils/hs-temporary/buildlink3.mk" +.include "../../devel/hs-timeit/buildlink3.mk" +.include "../../devel/hs-unordered-containers/buildlink3.mk" +.include "../../devel/hs-utf8-string/buildlink3.mk" +.include "../../devel/hs-utility-ht/buildlink3.mk" +.include "../../devel/hs-wizards/buildlink3.mk" +.include "../../mk/haskell.mk" .include "../../textproc/hs-Diff/buildlink3.mk" -.include "../../textproc/hs-lucid/buildlink3.mk" -.include "../../textproc/hs-shakespeare/buildlink3.mk" .include "../../mk/bsd.pkg.mk" # XXX Kludge: We need to run this in a UTF-8 locale; otherwise GHC is diff --git a/finance/hledger/common.mk b/finance/hledger/common.mk deleted file mode 100644 index 95ab4dcd12b..00000000000 --- a/finance/hledger/common.mk +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: common.mk,v 1.1 2020/03/30 16:52:48 riastradh Exp $ - -# used by finance/hledger -# used by finance/hledger-lib -# to be used by finance/hledger-ui -# to be used by finance/hledger-web - -HLEDGER_VERSION= 1.17.1.1 -DISTNAME= hledger-${HLEDGER_VERSION} -PKGNAME= ${HASKELL_PKG_NAME}-${HLEDGER_VERSION} -MASTER_SITES= ${MASTER_SITE_GITHUB:=simonmichael/} -GITHUB_PROJECT= hledger -GITHUB_TAG= ${DISTNAME} - -WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${DISTNAME}/${HASKELL_PKG_NAME} - -DISTINFO_FILE= ../../finance/hledger/distinfo diff --git a/finance/hledger/distinfo b/finance/hledger/distinfo index 89ab2305488..6534f470f29 100644 --- a/finance/hledger/distinfo +++ b/finance/hledger/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.1 2020/03/30 16:52:48 riastradh Exp $ +$NetBSD: distinfo,v 1.2 2021/04/24 11:12:09 pho Exp $ -SHA1 (hledger-1.17.1.1.tar.gz) = c293bf7ef81d3423c13a2c8598d665d6214d5154 -RMD160 (hledger-1.17.1.1.tar.gz) = 6dbd8f4c43cc897830413acd9a7894d96683018d -SHA512 (hledger-1.17.1.1.tar.gz) = 3d1d34a307ca4687c7740a591047c7e4cda2b8e779e675696cc8cdca3cb669f71f4e15a3c30cbef9ec0784d853b2103f14797e84ea7f2c3002134ab9c50bb3e5 -Size (hledger-1.17.1.1.tar.gz) = 1796221 bytes +SHA1 (hledger-1.21.tar.gz) = 1ebf07f6c7d551b46e5527602dbf4f6705fa66ff +RMD160 (hledger-1.21.tar.gz) = 3317f14967ddebbd1ed09567cdcf8ccb8c419132 +SHA512 (hledger-1.21.tar.gz) = 4ae5e9dc0160759f85b5c9d9ae4d4faeb2a63a41dd5376e658ac6fa13ff2b72b5e808ed0d52ed50d83e9bade3ce8839c23aabbbf6baccf236b579b07898dd3ba +Size (hledger-1.21.tar.gz) = 850008 bytes +SHA1 (patch-app_hledger-cli.hs) = 068998f7e14360f5da13e9abf568f387ec83de16 +SHA1 (patch-hledger.cabal) = 5b4053ca7fec98b27d787decde37ff536a02ef79 diff --git a/finance/hledger/patches/patch-app_hledger-cli.hs b/finance/hledger/patches/patch-app_hledger-cli.hs new file mode 100644 index 00000000000..2d9b66243a9 --- /dev/null +++ b/finance/hledger/patches/patch-app_hledger-cli.hs @@ -0,0 +1,15 @@ +$NetBSD: patch-app_hledger-cli.hs,v 1.1 2021/04/24 11:12:09 pho Exp $ + +GHC 9 fails to build a Main module whose 'main' is merely imported +from somewhere else. Possibly a compiler bug? + +--- app/hledger-cli.hs.orig 2021-04-24 11:06:54.613572938 +0000 ++++ app/hledger-cli.hs +@@ -3,4 +3,6 @@ + + module Main (main) + where +-import Hledger.Cli.Main (main) ++import qualified Hledger.Cli.Main as M ++ ++main = M.main diff --git a/finance/hledger/patches/patch-hledger.cabal b/finance/hledger/patches/patch-hledger.cabal new file mode 100644 index 00000000000..1ce1d837bb4 --- /dev/null +++ b/finance/hledger/patches/patch-hledger.cabal @@ -0,0 +1,42 @@ +$NetBSD: patch-hledger.cabal,v 1.1 2021/04/24 11:12:09 pho Exp $ + +Fix build with GHC 9. + +--- hledger.cabal.orig 2021-03-10 16:29:46.000000000 +0000 ++++ hledger.cabal +@@ -142,7 +142,7 @@ library + , Diff + , aeson >=1 + , ansi-terminal >=0.9 +- , base >=4.9 && <4.15 ++ , base >=4.9 && <5 + , base-compat-batteries >=0.10.1 && <0.12 + , bytestring + , cmdargs >=0.10 +@@ -192,7 +192,7 @@ executable hledger + Decimal >=0.5.1 + , aeson >=1 + , ansi-terminal >=0.9 +- , base >=4.9 && <4.15 ++ , base >=4.9 && <5 + , base-compat-batteries >=0.10.1 && <0.12 + , bytestring + , cmdargs >=0.10 +@@ -242,7 +242,7 @@ test-suite unittest + Decimal >=0.5.1 + , aeson >=1 + , ansi-terminal >=0.9 +- , base >=4.9 && <4.15 ++ , base >=4.9 && <5 + , base-compat-batteries >=0.10.1 && <0.12 + , bytestring + , cmdargs >=0.10 +@@ -289,7 +289,7 @@ benchmark bench + Decimal >=0.5.1 + , aeson >=1 + , ansi-terminal >=0.9 +- , base >=4.9 && <4.15 ++ , base >=4.9 && <5 + , base-compat-batteries >=0.10.1 && <0.12 + , bytestring + , cmdargs >=0.10 -- cgit v1.2.3