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
--- 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,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2023/01/27 16:09:29 pho Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/10/30 13:31:38 pho Exp $
lib/aeson-better-errors-${PKGVERSION}/${HS_VERSION}/package-description
lib/aeson-better-errors-${PKGVERSION}/${HS_VERSION}/package-id
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Aeson/BetterErrors.dyn_hi
@@ -13,14 +13,16 @@
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/LICENSE
${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/Data-Aeson-BetterErrors-Internal.html
${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/Data-Aeson-BetterErrors.html
${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/aeson-better-errors.haddock
${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/doc-index.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/doc-index.json
${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/haddock-bundle.min.js
${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/index.html
${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/linuwial.css
${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/meta.json
${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/quick-jump.min.js
${PLIST.doc}share/doc/${HS_PLATFORM}/aeson-better-errors-${PKGVERSION}/html/synopsis.png
--- 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 @@
-$NetBSD: distinfo,v 1.2 2022/09/06 18:36:43 pho Exp $
+$NetBSD: distinfo,v 1.3 2023/10/30 13:31:38 pho Exp $
BLAKE2s (aeson-better-errors-0.9.1.1.tar.gz) = 0a1a2eab10d726175e96c3c0b4784ebad7c2a8c05181421f7c7a890fa853a124
SHA512 (aeson-better-errors-0.9.1.1.tar.gz) = 9da060f700d1f62a43a2cde336e7440f684dff7e3859d9f4e4e6a318484373531add4da0b0fe63000450e606c37a95819eb5aed25c57fe31e35c9a20aee3f53a
Size (aeson-better-errors-0.9.1.1.tar.gz) = 8585 bytes
+SHA1 (patch-src_Data_Aeson_BetterErrors_Internal.hs) = 3dad6b3aa90c7fc4e9d8c0b74a6017bb789ffebd
$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