Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C395185967 for ; Mon, 30 Oct 2023 10:07:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 3I0i5ooZRIws for ; Mon, 30 Oct 2023 10:07:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D156C84D28 for ; Mon, 30 Oct 2023 10:07:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CAAA7FADC; Mon, 30 Oct 2023 10:07:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1698660426197330" MIME-Version: 1.0 Date: Mon, 30 Oct 2023 10:07:06 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/lang/hs-purescript-cst To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20231030100706.CAAA7FADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1698660426197330 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Mon Oct 30 10:07:06 UTC 2023 Modified Files: pkgsrc/lang/hs-purescript-cst: Makefile PLIST distinfo Added Files: pkgsrc/lang/hs-purescript-cst/patches: patch-src_Control_Monad_Supply.hs Log Message: lang/hs-purescript-cst: Fix build with GHC 9.6 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/hs-purescript-cst/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/hs-purescript-cst/PLIST cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/hs-purescript-cst/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/hs-purescript-cst/patches/patch-src_Control_Monad_Supply.hs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1698660426197330 Content-Disposition: inline Content-Length: 4974 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/hs-purescript-cst/Makefile diff -u pkgsrc/lang/hs-purescript-cst/Makefile:1.9 pkgsrc/lang/hs-purescript-cst/Makefile:1.10 --- pkgsrc/lang/hs-purescript-cst/Makefile:1.9 Mon Oct 9 04:54:38 2023 +++ pkgsrc/lang/hs-purescript-cst/Makefile Mon Oct 30 10:07:06 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2023/10/09 04:54:38 pho Exp $ +# $NetBSD: Makefile,v 1.10 2023/10/30 10:07:06 pho Exp $ DISTNAME= purescript-cst-0.5.0.0 PKGREVISION= 3 @@ -16,6 +16,7 @@ HASKELL_UNRESTRICT_DEPENDENCIES+= \ base-compat \ bytestring \ happy \ + mtl \ semigroups \ text \ vector Index: pkgsrc/lang/hs-purescript-cst/PLIST diff -u pkgsrc/lang/hs-purescript-cst/PLIST:1.2 pkgsrc/lang/hs-purescript-cst/PLIST:1.3 --- pkgsrc/lang/hs-purescript-cst/PLIST:1.2 Fri Jan 27 03:24:24 2023 +++ pkgsrc/lang/hs-purescript-cst/PLIST Mon Oct 30 10:07:06 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2023/01/27 03:24:24 pho Exp $ +@comment $NetBSD: PLIST,v 1.3 2023/10/30 10:07:06 pho Exp $ lib/purescript-cst-${PKGVERSION}/${HS_VERSION}/package-description lib/purescript-cst-${PKGVERSION}/${HS_VERSION}/package-id ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so @@ -115,7 +115,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Paths_pur ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_purescript_cst.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a -${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/LICENSE +share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/LICENSE ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/Control-Monad-Supply-Class.html ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/Control-Monad-Supply.html ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/Language-PureScript-AST-Binders.html @@ -176,10 +176,12 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/pur ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/doc-index-V.html ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/doc-index-W.html ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/doc-index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/doc-index.json ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/haddock-bundle.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/index.html ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/linuwial.css ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/meta.json ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/purescript-cst.haddock ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/quick-jump.css +${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/quick-jump.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/purescript-cst-${PKGVERSION}/html/synopsis.png Index: pkgsrc/lang/hs-purescript-cst/distinfo diff -u pkgsrc/lang/hs-purescript-cst/distinfo:1.3 pkgsrc/lang/hs-purescript-cst/distinfo:1.4 --- pkgsrc/lang/hs-purescript-cst/distinfo:1.3 Fri Jan 27 03:24:24 2023 +++ pkgsrc/lang/hs-purescript-cst/distinfo Mon Oct 30 10:07:06 2023 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.3 2023/01/27 03:24:24 pho Exp $ +$NetBSD: distinfo,v 1.4 2023/10/30 10:07:06 pho Exp $ BLAKE2s (purescript-cst-0.5.0.0.tar.gz) = 1ec9b24a2ff57794eaaf9e3d610a8b6b79031c5bbb9f0764baf8629665f39ae2 SHA512 (purescript-cst-0.5.0.0.tar.gz) = 105688ba58787cd3d101e63ed806a113588f3c75f1977a7d8a4931e59ada6883ac74d2520185bc1af3b44509195dc84b0a85007856c4a78926a3feb75a55a6c4 Size (purescript-cst-0.5.0.0.tar.gz) = 80616 bytes +SHA1 (patch-src_Control_Monad_Supply.hs) = 687d240e4ceff4c219ee29ee04797fc39fc1b795 SHA1 (patch-src_Language_PureScript_AST_Declarations.hs) = 47f66a587a113ef56aa4a58d75cc56f2eb0e0d7c SHA1 (patch-src_Language_PureScript_CST_Parser.y) = ba484266aac19a9c38f395fa6aeb3394c2e609d6 SHA1 (patch-src_Language_PureScript_Names.hs) = 2a318f048ba9cf564c066e2704226766e26e884d Added files: Index: pkgsrc/lang/hs-purescript-cst/patches/patch-src_Control_Monad_Supply.hs diff -u /dev/null pkgsrc/lang/hs-purescript-cst/patches/patch-src_Control_Monad_Supply.hs:1.1 --- /dev/null Mon Oct 30 10:07:06 2023 +++ pkgsrc/lang/hs-purescript-cst/patches/patch-src_Control_Monad_Supply.hs Mon Oct 30 10:07:06 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Control_Monad_Supply.hs,v 1.1 2023/10/30 10:07:06 pho Exp $ + +Prelude no longer re-exports MonadPlus from Control.Monad + +--- src/Control/Monad/Supply.hs.orig 2023-10-30 10:02:40.533191403 +0000 ++++ src/Control/Monad/Supply.hs +@@ -6,6 +6,7 @@ module Control.Monad.Supply where + import Prelude.Compat + + import Control.Applicative ++import Control.Monad + import Control.Monad.Error.Class (MonadError(..)) + import Control.Monad.Reader + import Control.Monad.State --_----------=_1698660426197330--