Mon Oct 30 13:31:38 2023 UTC ()
converters/hs-aeson-better-errors: Fix build with GHC 9.6


(pho)
diff -r1.2 -r1.3 pkgsrc/converters/hs-aeson-better-errors/PLIST
diff -r1.2 -r1.3 pkgsrc/converters/hs-aeson-better-errors/distinfo
diff -r0 -r1.3 pkgsrc/converters/hs-aeson-better-errors/patches/patch-src_Data_Aeson_BetterErrors_Internal.hs
cvs diff -r1.2 -r1.3 pkgsrc/converters/hs-aeson-better-errors/PLIST (expand / switch to unified diff)

--- pkgsrc/converters/hs-aeson-better-errors/PLIST 2023/01/27 16:09:29 1.2
+++ pkgsrc/converters/hs-aeson-better-errors/PLIST 2023/10/30 13:31:38 1.3
@@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
1@comment $NetBSD: PLIST,v 1.2 2023/01/27 16:09:29 pho Exp $ 1@comment $NetBSD: PLIST,v 1.3 2023/10/30 13:31:38 pho Exp $
2lib/aeson-better-errors-${PKGVERSION}/${HS_VERSION}/package-description 2lib/aeson-better-errors-${PKGVERSION}/${HS_VERSION}/package-description
3lib/aeson-better-errors-${PKGVERSION}/${HS_VERSION}/package-id 3lib/aeson-better-errors-${PKGVERSION}/${HS_VERSION}/package-id
4${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors.dyn_hi 4${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors.dyn_hi
5lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors.hi 5lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors.hi
6${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors.p_hi 6${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors.p_hi
7${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Internal.dyn_hi 7${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Internal.dyn_hi
8lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Internal.hi 8lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Internal.hi
9${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Internal.p_hi 9${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Internal.p_hi
10${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Utils.dyn_hi 10${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Utils.dyn_hi
11lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Utils.hi 11lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Utils.hi
12${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Utils.p_hi 12${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors/Utils.p_hi
13lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a 13lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
14${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a 14${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
15${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 15${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
16${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/LICENSE 16share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/LICENSE
17${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/Data-Aeson-BetterErrors-Internal.html 17${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/Data-Aeson-BetterErrors-Internal.html
18${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/Data-Aeson-BetterErrors.html 18${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/Data-Aeson-BetterErrors.html
19${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/aeson-better-errors.haddock 19${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/aeson-better-errors.haddock
20${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/doc-index.html 20${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/doc-index.html
 21${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/doc-index.json
21${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/haddock-bundle.min.js 22${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/haddock-bundle.min.js
22${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/index.html 23${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/index.html
23${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/linuwial.css 24${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/linuwial.css
24${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/meta.json 25${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/meta.json
25${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/quick-jump.css 26${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/quick-jump.css
 27${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/quick-jump.min.js
26${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/synopsis.png 28${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/synopsis.png
cvs diff -r1.2 -r1.3 pkgsrc/converters/hs-aeson-better-errors/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/hs-aeson-better-errors/distinfo 2022/09/06 18:36:43 1.2
+++ pkgsrc/converters/hs-aeson-better-errors/distinfo 2023/10/30 13:31:38 1.3
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.2 2022/09/06 18:36:43 pho Exp $ 1$NetBSD: distinfo,v 1.3 2023/10/30 13:31:38 pho Exp $
2 2
3BLAKE2s (aeson-better-errors-0.9.1.1.tar.gz) = 0a1a2eab10d726175e96c3c0b4784ebad7c2a8c05181421f7c7a890fa853a124 3BLAKE2s (aeson-better-errors-0.9.1.1.tar.gz) = 0a1a2eab10d726175e96c3c0b4784ebad7c2a8c05181421f7c7a890fa853a124
4SHA512 (aeson-better-errors-0.9.1.1.tar.gz) = 9da060f700d1f62a43a2cde336e7440f684dff7e3859d9f4e4e6a318484373531add4da0b0fe63000450e606c37a95819eb5aed25c57fe31e35c9a20aee3f53a 4SHA512 (aeson-better-errors-0.9.1.1.tar.gz) = 9da060f700d1f62a43a2cde336e7440f684dff7e3859d9f4e4e6a318484373531add4da0b0fe63000450e606c37a95819eb5aed25c57fe31e35c9a20aee3f53a
5Size (aeson-better-errors-0.9.1.1.tar.gz) = 8585 bytes 5Size (aeson-better-errors-0.9.1.1.tar.gz) = 8585 bytes
 6SHA1 (patch-src_Data_Aeson_BetterErrors_Internal.hs) = 3dad6b3aa90c7fc4e9d8c0b74a6017bb789ffebd
File Added: pkgsrc/converters/hs-aeson-better-errors/patches/patch-src_Data_Aeson_BetterErrors_Internal.hs
$NetBSD: patch-src_Data_Aeson_BetterErrors_Internal.hs,v 1.3 2023/10/30 13:31:38 pho Exp $

Prelude no longer re-exports functions from Control.Monad.

--- src/Data/Aeson/BetterErrors/Internal.hs.orig	2023-10-30 13:30:13.086283230 +0000
+++ src/Data/Aeson/BetterErrors/Internal.hs
@@ -12,6 +12,7 @@ import Data.Foldable (foldMap)
 #endif
 
 import Control.Arrow (left)
+import Control.Monad
 import Control.Monad.Identity
 import Control.Monad.Reader
 import Control.Monad.Trans.Except