Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A4A1A859D5 for ; Mon, 30 Oct 2023 15:39:59 +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 wV0iXZuZrqLB for ; Mon, 30 Oct 2023 15:39:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B1157859E7 for ; Mon, 30 Oct 2023 15:39:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AA170FADC; Mon, 30 Oct 2023 15:39:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169868039746610" MIME-Version: 1.0 Date: Mon, 30 Oct 2023 15:39:57 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/lang/idris To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20231030153957.AA170FADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169868039746610 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Mon Oct 30 15:39:57 UTC 2023 Modified Files: pkgsrc/lang/idris: Makefile PLIST distinfo pkgsrc/lang/idris/patches: patch-src_Idris_Package_Parser.hs Added Files: pkgsrc/lang/idris/patches: patch-src_IRTS_Compiler.hs patch-src_Idris_AbsSyntax.hs patch-src_Idris_Core_Constraints.hs patch-src_Idris_Core_Elaborate.hs patch-src_Idris_Core_Evaluate.hs patch-src_Idris_Core_ProofState.hs patch-src_Idris_Core_ProofTerm.hs patch-src_Idris_Core_TT.hs patch-src_Idris_Core_Typecheck.hs patch-src_Idris_Coverage.hs patch-src_Idris_DSL.hs patch-src_Idris_Erasure.hs patch-src_Idris_Imports.hs patch-src_Idris_PartialEval.hs patch-src_Idris_Prover.hs patch-src_Idris_Termination.hs Log Message: lang/idris: Fix build with GHC 9.6 To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/idris/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/idris/PLIST cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/idris/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/lang/idris/patches/patch-src_IRTS_Compiler.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_AbsSyntax.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_Core_Constraints.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_Core_Elaborate.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_Core_Evaluate.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_Core_ProofState.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_Core_ProofTerm.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_Core_Typecheck.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_Coverage.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_DSL.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_Erasure.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_Imports.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_PartialEval.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_Prover.hs \ pkgsrc/lang/idris/patches/patch-src_Idris_Termination.hs cvs rdiff -u -r0 -r1.3 pkgsrc/lang/idris/patches/patch-src_Idris_Core_TT.hs cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/lang/idris/patches/patch-src_Idris_Package_Parser.hs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169868039746610 Content-Disposition: inline Content-Length: 18808 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/idris/Makefile diff -u pkgsrc/lang/idris/Makefile:1.17 pkgsrc/lang/idris/Makefile:1.18 --- pkgsrc/lang/idris/Makefile:1.17 Mon Oct 9 04:54:38 2023 +++ pkgsrc/lang/idris/Makefile Mon Oct 30 15:39:56 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2023/10/09 04:54:38 pho Exp $ +# $NetBSD: Makefile,v 1.18 2023/10/30 15:39:56 pho Exp $ DISTNAME= idris-1.3.4 PKGNAME= ${DISTNAME} @@ -14,12 +14,17 @@ LICENSE= modified-bsd # built: https://github.com/idris-lang/Idris2 HASKELL_UNRESTRICT_DEPENDENCIES+= \ aeson \ + ansi-terminal \ + ansi-wl-pprint \ bytestring \ fsnotify \ libffi \ + mtl \ network \ optparse-applicative \ text \ + transformers \ + unix \ vector CONFIGURE_ARGS+= -f release Index: pkgsrc/lang/idris/PLIST diff -u pkgsrc/lang/idris/PLIST:1.4 pkgsrc/lang/idris/PLIST:1.5 --- pkgsrc/lang/idris/PLIST:1.4 Fri Jan 27 03:06:29 2023 +++ pkgsrc/lang/idris/PLIST Mon Oct 30 15:39:56 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2023/01/27 03:06:29 pho Exp $ +@comment $NetBSD: PLIST,v 1.5 2023/10/30 15:39:56 pho Exp $ bin/idris bin/idris-codegen-c bin/idris-codegen-javascript @@ -122,7 +122,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Util/Syst lib/${HS_PLATFORM}/${HS_PKGID}/Version_idris.hi lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a man/man1/idris.1 -${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE +share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/CHANGELOG.md ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/CITATION.md ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/CONTRIBUTING.md @@ -265,6 +265,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-W.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Z.html ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.json ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/haddock-bundle.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/idris-tutorial.pdf ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/idris.haddock @@ -273,6 +274,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/man/idris.1 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/meta.json ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.css +${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.min.js ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/samples/ST/Composite.idr ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/samples/ST/Graphics/Draw.idr ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/samples/ST/Graphics/Turtle.idr Index: pkgsrc/lang/idris/distinfo diff -u pkgsrc/lang/idris/distinfo:1.9 pkgsrc/lang/idris/distinfo:1.10 --- pkgsrc/lang/idris/distinfo:1.9 Fri Jan 27 03:06:29 2023 +++ pkgsrc/lang/idris/distinfo Mon Oct 30 15:39:56 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2023/01/27 03:06:29 pho Exp $ +$NetBSD: distinfo,v 1.10 2023/10/30 15:39:56 pho Exp $ BLAKE2s (idris-1.3.4.tar.gz) = 5ecd1bf45becb897e273e9890a3aa3293bdf591d85b17d3c67e4a7f5ab98ae95 SHA512 (idris-1.3.4.tar.gz) = 362c0442e5a38fc67d24e4b33728bc251ee49d14be9faacbbe924da171ce462e613cf975f8c0756fc6c8254807e98adfccfc2a6966dc32813cbadb3f25521f7c @@ -6,8 +6,24 @@ Size (idris-1.3.4.tar.gz) = 1720240 byte SHA1 (patch-Setup.hs) = 61ce92edfa6bbb8812c7888ce12fde979e85439b SHA1 (patch-rts_Makefile) = fe88269e184aa0d80e13723c9e4fe47aba68eb3e SHA1 (patch-rts_idris__net.c) = fcb226e8752c34661fc1a81fff11e41342c3e0f8 +SHA1 (patch-src_IRTS_Compiler.hs) = f7543ef86f5cdb0147a05a480e198aaae9977bf7 SHA1 (patch-src_IRTS_System.hs) = 4451e03f4e9095fcac9e014eb7ad4b997d5e308d -SHA1 (patch-src_Idris_Package_Parser.hs) = 3394ec6fbf1323f4331d614426b48377815b7347 +SHA1 (patch-src_Idris_AbsSyntax.hs) = 08289a30559e32110d8283aaf539fadc636fcdca +SHA1 (patch-src_Idris_Core_Constraints.hs) = c9efc4c2b1c14305504d6751d859281c0e11e88c +SHA1 (patch-src_Idris_Core_Elaborate.hs) = 8a82ecc7cf6d2abe45bdf6caab5ffdd312f7af59 +SHA1 (patch-src_Idris_Core_Evaluate.hs) = b4d00adb2ad26fcbf9f237a714e01432bfb30440 +SHA1 (patch-src_Idris_Core_ProofState.hs) = 637a2a7a4a3ad9c495877618136025497df9a5d6 +SHA1 (patch-src_Idris_Core_ProofTerm.hs) = c5b1d4628d582af2075649e734be48b06791fb6c +SHA1 (patch-src_Idris_Core_TT.hs) = f798c54b789f657c26b1d85309438c595396d974 +SHA1 (patch-src_Idris_Core_Typecheck.hs) = 6e3f2c07c2d2e37f9a20972a727bb4946271cf1f +SHA1 (patch-src_Idris_Coverage.hs) = 1e71eb180b0cdcd09e624458f114ef08b47591c3 +SHA1 (patch-src_Idris_DSL.hs) = 9c01b9ca53899a547b9043df6b9c2529e9cff9c7 +SHA1 (patch-src_Idris_Erasure.hs) = 3fbb056f0108781acfbe254245a2a8cee96a4426 +SHA1 (patch-src_Idris_Imports.hs) = 899d720d2175722d93f0cd458a6e5ae83e190132 +SHA1 (patch-src_Idris_Package_Parser.hs) = d62f21803f998c9a472b0834a46052b4ec4d9568 SHA1 (patch-src_Idris_Parser_Data.hs) = 5b6d2d3944233fba22e93d631f92de49e64b35a8 SHA1 (patch-src_Idris_Parser_Helpers.hs) = bfd9b16dafa0581147c6b22e5d4e43ae2b701f96 SHA1 (patch-src_Idris_Parser_Ops.hs) = 2ebc3ffc1c909362c4945e556056d5428a8d0a25 +SHA1 (patch-src_Idris_PartialEval.hs) = b6b1e53295e51491231cb83107f553ae4f0fc152 +SHA1 (patch-src_Idris_Prover.hs) = ee7b387dec619800c3a7ce20f3349a29fcc59b0f +SHA1 (patch-src_Idris_Termination.hs) = d8b7ed833677ff7ffff601c027a72a45a682930b Index: pkgsrc/lang/idris/patches/patch-src_Idris_Package_Parser.hs diff -u pkgsrc/lang/idris/patches/patch-src_Idris_Package_Parser.hs:1.1 pkgsrc/lang/idris/patches/patch-src_Idris_Package_Parser.hs:1.2 --- pkgsrc/lang/idris/patches/patch-src_Idris_Package_Parser.hs:1.1 Mon Jan 20 23:32:38 2020 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Package_Parser.hs Mon Oct 30 15:39:57 2023 @@ -1,10 +1,18 @@ -$NetBSD: patch-src_Idris_Package_Parser.hs,v 1.1 2020/01/20 23:32:38 pho Exp $ +$NetBSD: patch-src_Idris_Package_Parser.hs,v 1.2 2023/10/30 15:39:57 pho Exp $ -Fix build with GHC 8.8 +Fix build with GHC 9.6 ---- src/Idris/Package/Parser.hs.orig 2020-01-20 13:57:35.633471081 +0000 +--- src/Idris/Package/Parser.hs.orig 2001-09-09 01:46:40.000000000 +0000 +++ src/Idris/Package/Parser.hs -@@ -64,7 +64,7 @@ pPkgName = (either fail pure . pkgName = +@@ -19,6 +19,7 @@ import Idris.Parser.Helpers (Parser, Par + someSpace, stringLiteral) + + import Control.Applicative ++import Control.Monad + import Control.Monad.State.Strict + import Data.List (union) + import qualified Options.Applicative as Opts +@@ -64,7 +65,7 @@ pPkgName = (either fail pure . pkgName = -- | Parses a filename. -- | -- | Treated for now as an identifier or a double-quoted string. Added files: Index: pkgsrc/lang/idris/patches/patch-src_IRTS_Compiler.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_IRTS_Compiler.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_IRTS_Compiler.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_IRTS_Compiler.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/IRTS/Compiler.hs.orig 2023-10-30 15:22:07.966102866 +0000 ++++ src/IRTS/Compiler.hs +@@ -32,6 +32,7 @@ import IRTS.Simplified + import Prelude hiding (id, (.)) + + import Control.Category ++import Control.Monad + import Control.Monad.State + import Data.List + import qualified Data.Map as M Index: pkgsrc/lang/idris/patches/patch-src_Idris_AbsSyntax.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_AbsSyntax.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_AbsSyntax.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_AbsSyntax.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/AbsSyntax.hs.orig 2023-10-30 15:14:13.810516673 +0000 ++++ src/Idris/AbsSyntax.hs +@@ -27,6 +27,7 @@ import System.Directory (canonicalizePat + import System.IO + + import Control.Applicative ++import Control.Monad + import Control.Monad.State + import Prelude hiding (Applicative, Foldable, Traversable, (<$>)) + Index: pkgsrc/lang/idris/patches/patch-src_Idris_Core_Constraints.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_Core_Constraints.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Core_Constraints.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_Core_Constraints.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/Core/Constraints.hs.orig 2023-10-30 15:02:15.256279527 +0000 ++++ src/Idris/Core/Constraints.hs +@@ -11,6 +11,7 @@ module Idris.Core.Constraints ( ucheck ) + import Idris.Core.TT (ConstraintFC(..), Err'(..), TC(..), UConstraint(..), + UExp(..)) + ++import Control.Monad + import Control.Monad.State.Strict + import Data.List (partition) + import qualified Data.Map.Strict as M Index: pkgsrc/lang/idris/patches/patch-src_Idris_Core_Elaborate.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_Core_Elaborate.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Core_Elaborate.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_Core_Elaborate.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/Core/Elaborate.hs.orig 2023-10-30 15:13:01.357690530 +0000 ++++ src/Idris/Core/Elaborate.hs +@@ -24,6 +24,7 @@ import Idris.Core.TT + import Idris.Core.Typecheck + import Idris.Core.Unify + ++import Control.Monad + import Control.Monad.State.Strict + import Data.List + Index: pkgsrc/lang/idris/patches/patch-src_Idris_Core_Evaluate.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_Core_Evaluate.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Core_Evaluate.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_Core_Evaluate.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/Core/Evaluate.hs.orig 2023-10-30 15:01:22.103657898 +0000 ++++ src/Idris/Core/Evaluate.hs +@@ -37,6 +37,7 @@ module Idris.Core.Evaluate(normalise, no + import Idris.Core.CaseTree + import Idris.Core.TT + ++import Control.Monad + import Control.Monad.State + import Data.List + import Data.Maybe (listToMaybe) Index: pkgsrc/lang/idris/patches/patch-src_Idris_Core_ProofState.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_Core_ProofState.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Core_ProofState.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_Core_ProofState.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/Core/ProofState.hs.orig 2023-10-30 15:09:52.111432787 +0000 ++++ src/Idris/Core/ProofState.hs +@@ -28,6 +28,7 @@ import Idris.Core.WHNF + + import Util.Pretty hiding (fill) + ++import Control.Monad + import Control.Monad.State.Strict + import Data.List + Index: pkgsrc/lang/idris/patches/patch-src_Idris_Core_ProofTerm.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_Core_ProofTerm.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Core_ProofTerm.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_Core_ProofTerm.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/Core/ProofTerm.hs.orig 2023-10-30 15:03:14.424585697 +0000 ++++ src/Idris/Core/ProofTerm.hs +@@ -19,6 +19,7 @@ module Idris.Core.ProofTerm( + import Idris.Core.Evaluate + import Idris.Core.TT + ++import Control.Monad + import Control.Monad.State.Strict + + -- | A zipper over terms, in order to efficiently update proof terms. Index: pkgsrc/lang/idris/patches/patch-src_Idris_Core_Typecheck.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_Core_Typecheck.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Core_Typecheck.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_Core_Typecheck.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/Core/Typecheck.hs.orig 2023-10-30 15:04:06.947604795 +0000 ++++ src/Idris/Core/Typecheck.hs +@@ -14,6 +14,7 @@ module Idris.Core.Typecheck where + import Idris.Core.Evaluate + import Idris.Core.TT + ++import Control.Monad + import Control.Monad.State + + -- To check conversion, normalise each term wrt the current environment. Index: pkgsrc/lang/idris/patches/patch-src_Idris_Coverage.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_Coverage.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Coverage.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_Coverage.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/Coverage.hs.orig 2023-10-30 15:15:26.614652915 +0000 ++++ src/Idris/Coverage.hs +@@ -17,6 +17,7 @@ import Idris.Delaborate + import Idris.Elab.Utils + import Idris.Error + ++import Control.Monad + import Control.Monad.State.Strict + import Data.Char + import Data.List Index: pkgsrc/lang/idris/patches/patch-src_Idris_DSL.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_DSL.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_DSL.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_DSL.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/DSL.hs.orig 2023-10-30 15:16:11.630050396 +0000 ++++ src/Idris/DSL.hs +@@ -13,6 +13,7 @@ module Idris.DSL (debindApp, desugar) wh + import Idris.AbsSyntax + import Idris.Core.TT + ++import Control.Monad + import Control.Monad.State.Strict + import Data.Generics.Uniplate.Data (transform) + Index: pkgsrc/lang/idris/patches/patch-src_Idris_Erasure.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_Erasure.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Erasure.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_Erasure.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/Erasure.hs.orig 2023-10-30 15:20:01.707406987 +0000 ++++ src/Idris/Erasure.hs +@@ -22,6 +22,7 @@ import Prelude hiding (id, (.)) + + import Control.Arrow + import Control.Category ++import Control.Monad + import Control.Monad.State + import Data.IntMap (IntMap) + import qualified Data.IntMap as IM Index: pkgsrc/lang/idris/patches/patch-src_Idris_Imports.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_Imports.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Imports.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_Imports.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/Imports.hs.orig 2023-10-30 15:16:52.335069114 +0000 ++++ src/Idris/Imports.hs +@@ -16,6 +16,7 @@ import Idris.Core.TT + import Idris.Error + import IRTS.System (getIdrisLibDir) + ++import Control.Monad + import Control.Monad.State.Strict + import Data.Char (isAlpha, isDigit, toLower) + import Data.List (isSuffixOf) Index: pkgsrc/lang/idris/patches/patch-src_Idris_PartialEval.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_PartialEval.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_PartialEval.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_PartialEval.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/PartialEval.hs.orig 2023-10-30 15:18:39.376326262 +0000 ++++ src/Idris/PartialEval.hs +@@ -19,6 +19,7 @@ import Idris.Core.Evaluate + import Idris.Core.TT + import Idris.Delaborate + ++import Control.Monad + import Control.Monad.State + + -- | Data type representing binding-time annotations for partial evaluation of arguments Index: pkgsrc/lang/idris/patches/patch-src_Idris_Prover.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_Prover.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Prover.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_Prover.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/Prover.hs.orig 2023-10-30 15:22:58.734795932 +0000 ++++ src/Idris/Prover.hs +@@ -39,6 +39,7 @@ import Idris.TypeSearch (searchByType) + import Util.Pretty + + import Control.DeepSeq ++import Control.Monad + import Control.Monad.State.Strict + import System.Console.Haskeline + import System.Console.Haskeline.History Index: pkgsrc/lang/idris/patches/patch-src_Idris_Termination.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_Termination.hs:1.1 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Termination.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_Termination.hs,v 1.1 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/Termination.hs.orig 2023-10-30 15:17:42.248510837 +0000 ++++ src/Idris/Termination.hs +@@ -19,6 +19,7 @@ import Idris.Error + import Idris.Options + import Idris.Output (iWarn) + ++import Control.Monad + import Control.Monad.State.Strict + import Data.Either + import Data.List Index: pkgsrc/lang/idris/patches/patch-src_Idris_Core_TT.hs diff -u /dev/null pkgsrc/lang/idris/patches/patch-src_Idris_Core_TT.hs:1.3 --- /dev/null Mon Oct 30 15:39:57 2023 +++ pkgsrc/lang/idris/patches/patch-src_Idris_Core_TT.hs Mon Oct 30 15:39:57 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_Idris_Core_TT.hs,v 1.3 2023/10/30 15:39:57 pho Exp $ + +Prelude no longer re-exports functions from Control.Monad. + +--- src/Idris/Core/TT.hs.orig 2023-10-30 14:59:16.958812363 +0000 ++++ src/Idris/Core/TT.hs +@@ -70,6 +70,7 @@ import qualified Prelude as S (Semigroup + import Control.Applicative (Alternative, Applicative(..)) + import qualified Control.Applicative as A (Alternative(..)) + import Control.DeepSeq (($!!)) ++import Control.Monad + import qualified Control.Monad.Fail as Fail + import Control.Monad.State.Strict + import Data.Binary hiding (get, put) --_----------=_169868039746610--