Mon Oct 30 02:56:46 2023 UTC ()
textproc/hs-cheapskate: Fix build with GHC 9.6


(pho)
diff -r1.9 -r1.10 pkgsrc/textproc/hs-cheapskate/Makefile
diff -r1.4 -r1.5 pkgsrc/textproc/hs-cheapskate/distinfo
diff -r0 -r1.1 pkgsrc/textproc/hs-cheapskate/patches/patch-Cheapskate_Parse.hs
cvs diff -r1.9 -r1.10 pkgsrc/textproc/hs-cheapskate/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/hs-cheapskate/Makefile 2023/10/09 04:54:49 1.9
+++ pkgsrc/textproc/hs-cheapskate/Makefile 2023/10/30 02:56:46 1.10
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile,v 1.9 2023/10/09 04:54:49 pho Exp $ 1# $NetBSD: Makefile,v 1.10 2023/10/30 02:56:46 pho Exp $
2 2
3DISTNAME= cheapskate-0.1.1.2 3DISTNAME= cheapskate-0.1.1.2
4PKGREVISION= 6 4PKGREVISION= 6
5CATEGORIES= textproc 5CATEGORIES= textproc
6 6
7MAINTAINER= pho@cielonegro.org 7MAINTAINER= pho@cielonegro.org
8COMMENT= Experimental markdown processor 8COMMENT= Experimental markdown processor
9LICENSE= modified-bsd 9LICENSE= modified-bsd
10 10
11# Don't pull in wai and wai-extra as dependencies. 11# Don't pull in wai and wai-extra as dependencies.
12CONFIGURE_ARGS+= -f-dingus 12CONFIGURE_ARGS+= -f-dingus
13 13
14HASKELL_UNRESTRICT_DEPENDENCIES+= \ 14HASKELL_UNRESTRICT_DEPENDENCIES+= \
 15 mtl \
15 text 16 text
16 17
17.include "../../textproc/hs-blaze-html/buildlink3.mk" 18.include "../../textproc/hs-blaze-html/buildlink3.mk"
18.include "../../devel/hs-data-default/buildlink3.mk" 19.include "../../devel/hs-data-default/buildlink3.mk"
19.include "../../devel/hs-syb/buildlink3.mk" 20.include "../../devel/hs-syb/buildlink3.mk"
20.include "../../devel/hs-uniplate/buildlink3.mk" 21.include "../../devel/hs-uniplate/buildlink3.mk"
21.include "../../www/hs-xss-sanitize/buildlink3.mk" 22.include "../../www/hs-xss-sanitize/buildlink3.mk"
22.include "../../mk/haskell.mk" 23.include "../../mk/haskell.mk"
23.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/textproc/hs-cheapskate/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/hs-cheapskate/distinfo 2021/10/26 11:21:59 1.4
+++ pkgsrc/textproc/hs-cheapskate/distinfo 2023/10/30 02:56:46 1.5
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.4 2021/10/26 11:21:59 nia Exp $ 1$NetBSD: distinfo,v 1.5 2023/10/30 02:56:46 pho Exp $
2 2
3BLAKE2s (cheapskate-0.1.1.2.tar.gz) = 2e67974e0a0de8c409a4508b5ea12e2d5e80fcf65cea3f23a262e5c36ea97126 3BLAKE2s (cheapskate-0.1.1.2.tar.gz) = 2e67974e0a0de8c409a4508b5ea12e2d5e80fcf65cea3f23a262e5c36ea97126
4SHA512 (cheapskate-0.1.1.2.tar.gz) = b671ada413b8bd90f28b008c7bada4b744dedac2c7711090f1148dfa1643f7843f44e56c9a5a99fd0f71ded8393a0095b04fbdf73f70a707698dc9fb76ed1b45 4SHA512 (cheapskate-0.1.1.2.tar.gz) = b671ada413b8bd90f28b008c7bada4b744dedac2c7711090f1148dfa1643f7843f44e56c9a5a99fd0f71ded8393a0095b04fbdf73f70a707698dc9fb76ed1b45
5Size (cheapskate-0.1.1.2.tar.gz) = 27114 bytes 5Size (cheapskate-0.1.1.2.tar.gz) = 27114 bytes
 6SHA1 (patch-Cheapskate_Parse.hs) = 84f0b1aceecb6f67eea825de7627761d466ce0cb
File Added: pkgsrc/textproc/hs-cheapskate/patches/patch-Cheapskate_Parse.hs
$NetBSD: patch-Cheapskate_Parse.hs,v 1.1 2023/10/30 02:56:46 pho Exp $

Fix build with GHC 9.6. Functions from Control.Monad are no longer
re-exported by Prelude.

--- Cheapskate/Parse.hs.orig	2023-10-30 02:54:30.013924303 +0000
+++ Cheapskate/Parse.hs
@@ -6,6 +6,7 @@ import Cheapskate.ParserCombinators
 import Cheapskate.Util
 import Cheapskate.Inlines
 import Cheapskate.Types
+import Control.Monad
 import Data.Char hiding (Space)
 import qualified Data.Set as Set
 import Prelude hiding (takeWhile)