Tue Apr 30 13:34:16 2024 UTC (26d)
devel/hs-tasty: Fix build with GHC 9.8

This breaks build with the currently default GHC 9.6. Please bear with me
until I switch the default compiler.


(pho)
diff -r1.14 -r1.15 pkgsrc/devel/hs-tasty/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/hs-tasty/PLIST
cvs diff -r1.14 -r1.15 pkgsrc/devel/hs-tasty/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/hs-tasty/Makefile 2023/11/02 06:36:58 1.14
+++ pkgsrc/devel/hs-tasty/Makefile 2024/04/30 13:34:16 1.15
@@ -1,16 +1,19 @@ @@ -1,16 +1,19 @@
1# $NetBSD: Makefile,v 1.14 2023/11/02 06:36:58 pho Exp $ 1# $NetBSD: Makefile,v 1.15 2024/04/30 13:34:16 pho Exp $
2 2
3DISTNAME= tasty-1.5 3DISTNAME= tasty-1.5
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= devel 5CATEGORIES= devel
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Modern and extensible testing framework 8COMMENT= Modern and extensible testing framework
9LICENSE= mit 9LICENSE= mit
10 10
 11HASKELL_UNRESTRICT_DEPENDENCIES+= \
 12 ansi-terminal
 13
11.include "../../devel/hs-ansi-terminal/buildlink3.mk" 14.include "../../devel/hs-ansi-terminal/buildlink3.mk"
12.include "../../devel/hs-optparse-applicative/buildlink3.mk" 15.include "../../devel/hs-optparse-applicative/buildlink3.mk"
13.include "../../devel/hs-tagged/buildlink3.mk" 16.include "../../devel/hs-tagged/buildlink3.mk"
14.include "../../devel/hs-unbounded-delays/buildlink3.mk" 17.include "../../devel/hs-unbounded-delays/buildlink3.mk"
15.include "../../mk/haskell.mk" 18.include "../../mk/haskell.mk"
16.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/devel/hs-tasty/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/hs-tasty/PLIST 2023/10/30 03:17:47 1.5
+++ pkgsrc/devel/hs-tasty/PLIST 2024/04/30 13:34:16 1.6
@@ -1,16 +1,14 @@ @@ -1,16 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2023/10/30 03:17:47 pho Exp $ 1@comment $NetBSD: PLIST,v 1.6 2024/04/30 13:34:16 pho Exp $
2lib/tasty-${PKGVERSION}/${HS_VERSION}/package-description 
3lib/tasty-${PKGVERSION}/${HS_VERSION}/package-id 
4${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 2${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
5${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async.dyn_hi 3${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async.dyn_hi
6lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async.hi 4lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async.hi
7${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async.p_hi 5${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async.p_hi
8${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty.dyn_hi 6${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty.dyn_hi
9lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty.hi 7lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty.hi
10${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty.p_hi 8${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty.p_hi
11${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/CmdLine.dyn_hi 9${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/CmdLine.dyn_hi
12lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/CmdLine.hi 10lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/CmdLine.hi
13${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/CmdLine.p_hi 11${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/CmdLine.p_hi
14${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Core.dyn_hi 12${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Core.dyn_hi
15lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Core.hi 13lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Core.hi
16${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Core.p_hi 14${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Core.p_hi
@@ -69,26 +67,28 @@ ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_P @@ -69,26 +67,28 @@ ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_P
69lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Run.hi 67lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Run.hi
70${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Run.p_hi 68${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Run.p_hi
71${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners.dyn_hi 69${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners.dyn_hi
72lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners.hi 70lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners.hi
73${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners.p_hi 71${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners.p_hi
74${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners/Reducers.dyn_hi 72${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners/Reducers.dyn_hi
75lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners/Reducers.hi 73lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners/Reducers.hi
76${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners/Reducers.p_hi 74${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners/Reducers.p_hi
77${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners/Utils.dyn_hi 75${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners/Utils.dyn_hi
78lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners/Utils.hi 76lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners/Utils.hi
79${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners/Utils.p_hi 77${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Test/Tasty/Runners/Utils.p_hi
80lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a 78lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
81${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a 79${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 80lib/tasty-${PKGVERSION}/${HS_VERSION}/package-description
 81lib/tasty-${PKGVERSION}/${HS_VERSION}/package-id
82share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/LICENSE 82share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/LICENSE
83${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Ingredients-Basic.html 83${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Ingredients-Basic.html
84${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Ingredients-ConsoleReporter.html 84${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Ingredients-ConsoleReporter.html
85${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Ingredients.html 85${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Ingredients.html
86${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Options.html 86${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Options.html
87${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Patterns-Eval.html 87${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Patterns-Eval.html
88${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Patterns-Parser.html 88${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Patterns-Parser.html
89${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Patterns-Printer.html 89${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Patterns-Printer.html
90${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Patterns-Types.html 90${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Patterns-Types.html
91${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Providers-ConsoleFormat.html 91${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Providers-ConsoleFormat.html
92${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Providers.html 92${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Providers.html
93${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Runners.html 93${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty-Runners.html
94${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty.html 94${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/Test-Tasty.html
@@ -104,22 +104,20 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/tas @@ -104,22 +104,20 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/tas
104${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-I.html 104${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-I.html
105${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-L.html 105${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-L.html
106${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-M.html 106${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-M.html
107${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-N.html 107${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-N.html
108${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-O.html 108${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-O.html
109${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-P.html 109${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-P.html
110${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-Q.html 110${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-Q.html
111${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-R.html 111${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-R.html
112${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-S.html 112${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-S.html
113${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-T.html 113${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-T.html
114${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-U.html 114${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-U.html
115${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-W.html 115${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index-W.html
116${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index.html 116${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index.html
117${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/doc-index.json 
118${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/haddock-bundle.min.js 117${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/haddock-bundle.min.js
119${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/index.html 118${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/index.html
120${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/linuwial.css 119${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/linuwial.css
121${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/meta.json 120${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/meta.json
122${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/quick-jump.css 121${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/quick-jump.css
123${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/quick-jump.min.js 
124${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/synopsis.png 122${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/synopsis.png
125${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/tasty.haddock 123${PLIST.doc}share/doc/${HS_PLATFORM}/tasty-${PKGVERSION}/html/tasty.haddock