CVS commit: pkgsrc/lang/purescript

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Tue Oct 31 07:38:56 UTC 2023

Modified Files:
        pkgsrc/lang/purescript: Makefile PLIST distinfo
Added Files:
        pkgsrc/lang/purescript/patches: patch-app_Command_Docs.hs
            patch-app_Command_Docs_Html.hs patch-src_Control_Monad_Supply.hs
            patch-src_Language_PureScript_Errors.hs
            patch-src_Language_PureScript_Renamer.hs
            patch-src_Language_PureScript_Sugar_Operators_Common.hs
            patch-src_Language_PureScript_TypeChecker_Entailment.hs
            patch-src_Language_PureScript_TypeChecker_Monad.hs

Log Message:
lang/purescript: Update to 0.15.12

The change log is too long to paste here. See
https://github.com/purescript/purescript/releases


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/purescript/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/purescript/PLIST \
    pkgsrc/lang/purescript/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/purescript/patches/patch-app_Command_Docs.hs \
    pkgsrc/lang/purescript/patches/patch-app_Command_Docs_Html.hs \
    pkgsrc/lang/purescript/patches/patch-src_Control_Monad_Supply.hs \
    pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_Errors.hs \
    pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_Renamer.hs \
    pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_Sugar_Operators_Common.hs \
    pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_TypeChecker_Entailment.hs \
    pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_TypeChecker_Monad.hs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/purescript/Makefile
diff -u pkgsrc/lang/purescript/Makefile:1.12 pkgsrc/lang/purescript/Makefile:1.13
--- pkgsrc/lang/purescript/Makefile:1.12        Mon Oct  9 04:54:38 2023
+++ pkgsrc/lang/purescript/Makefile     Tue Oct 31 07:38:55 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2023/10/09 04:54:38 pho Exp $
+# $NetBSD: Makefile,v 1.13 2023/10/31 07:38:55 pho Exp $
 
-DISTNAME=      purescript-0.15.7
+DISTNAME=      purescript-0.15.12
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   2
 CATEGORIES=    lang
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -17,17 +16,31 @@ CONFIGURE_ARGS+=    -f release
 HASKELL_UNRESTRICT_DEPENDENCIES+=      \
        Cabal   \
        aeson   \
+       ansi-terminal   \
+       ansi-wl-pprint  \
        base    \
+       cryptonite      \
        happy   \
        language-javascript     \
        lens    \
        memory  \
+       mtl     \
+       optparse-applicative    \
        process \
+       semialign       \
        template-haskell        \
        text    \
+       these   \
        time    \
+       transformers    \
        vector
 
+# Use crypton instead of outdated cryptonite.
+SUBST_CLASSES+=                crypton
+SUBST_STAGE.crypton=   post-extract
+SUBST_FILES.crypton=   purescript.cabal
+SUBST_SED.crypton=     -e 's/cryptonite/crypton/g'
+
 # If purs is to be linked dynamically, it will depend on more than 180
 # shared objects and the dynamic linker will spend several seconds to
 # resolve symbols on startup. This is unacceptable because purs tends to be
@@ -54,7 +67,7 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+=    purs
 .include "../../devel/hs-cborg/buildlink3.mk"
 .include "../../textproc/hs-cheapskate/buildlink3.mk"
 .include "../../time/hs-clock/buildlink3.mk"
-.include "../../security/hs-cryptonite/buildlink3.mk"
+.include "../../security/hs-crypton/buildlink3.mk"
 .include "../../devel/hs-data-ordlist/buildlink3.mk"
 .include "../../devel/hs-dlist/buildlink3.mk"
 .include "../../textproc/hs-edit-distance/buildlink3.mk"
@@ -85,7 +98,7 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+=    purs
 .include "../../devel/hs-vector/buildlink3.mk"
 .include "../../devel/hs-witherable/buildlink3.mk"
 
-# exe:purescript
+# exe:purs
 .include "../../textproc/hs-ansi-wl-pprint/buildlink3.mk"
 .include "../../net/hs-network/buildlink3.mk"
 

Index: pkgsrc/lang/purescript/PLIST
diff -u pkgsrc/lang/purescript/PLIST:1.3 pkgsrc/lang/purescript/PLIST:1.4
--- pkgsrc/lang/purescript/PLIST:1.3    Mon Jan 30 06:25:44 2023
+++ pkgsrc/lang/purescript/PLIST        Tue Oct 31 07:38:55 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2023/01/30 06:25:44 pho Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/10/31 07:38:55 pho Exp $
 bin/purs
 lib/${PKGNAME}/${HS_VERSION}/package-description
 lib/${PKGNAME}/${HS_VERSION}/package-id
@@ -360,7 +360,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Paths_pur
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/IO/UTF8.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/System/IO/UTF8.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
-${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE
+share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Monad-Logger.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Monad-Supply-Class.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Monad-Supply.html
@@ -565,10 +565,12 @@ ${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/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/purescript.haddock
 ${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/synopsis.png
Index: pkgsrc/lang/purescript/distinfo
diff -u pkgsrc/lang/purescript/distinfo:1.3 pkgsrc/lang/purescript/distinfo:1.4
--- pkgsrc/lang/purescript/distinfo:1.3 Mon Jan 30 06:25:44 2023
+++ pkgsrc/lang/purescript/distinfo     Tue Oct 31 07:38:55 2023
@@ -1,5 +1,13 @@
-$NetBSD: distinfo,v 1.3 2023/01/30 06:25:44 pho Exp $
+$NetBSD: distinfo,v 1.4 2023/10/31 07:38:55 pho Exp $
 
-BLAKE2s (purescript-0.15.7.tar.gz) = bea26ff28f40c18c5fed3da023cdd007db960a81e08a3c97e6f2ded1eb558c15
-SHA512 (purescript-0.15.7.tar.gz) = 118823cc4fc43bc9d76ee73eeb2faaf6c4fee8487ed30b01a5e0b35eae6a1701218d41dd6eb985c69b0c3b3de2f59caa9c99bade45b8aa272c16febaeacaf931
-Size (purescript-0.15.7.tar.gz) = 837109 bytes
+BLAKE2s (purescript-0.15.12.tar.gz) = 322940beeea9c43fa59e1f7ea5d5224900847e76f2054285881655a12a2bf4d1
+SHA512 (purescript-0.15.12.tar.gz) = e4d53a8f72574e3e3e41527f7daf019acf951c073bb2e18921f291c412bf0e6587e2cb26bbad1ed0d397b4425ebca536e995243fe44adaa15f7c242bcbb0a393
+Size (purescript-0.15.12.tar.gz) = 854162 bytes
+SHA1 (patch-app_Command_Docs.hs) = eef45b27b8c825ac2ee5ccde01e6ddb23fe2ac42
+SHA1 (patch-app_Command_Docs_Html.hs) = 0e129659af4d5bdc3a999a770864f9168565ac86
+SHA1 (patch-src_Control_Monad_Supply.hs) = 7e71a43457ed1969c960579ef6a48d40bd69b53a
+SHA1 (patch-src_Language_PureScript_Errors.hs) = 1ec6e83da287ef1a3792dac990d7e95f0eab7e01
+SHA1 (patch-src_Language_PureScript_Renamer.hs) = 55156318114a19d6175fea1d82efec72d5f63f09
+SHA1 (patch-src_Language_PureScript_Sugar_Operators_Common.hs) = b40e0857547a694053e5a397680a57728fc7d286
+SHA1 (patch-src_Language_PureScript_TypeChecker_Entailment.hs) = 7dc707fea43760532887e71e2ea4fd714389f73f
+SHA1 (patch-src_Language_PureScript_TypeChecker_Monad.hs) = 953ef2acbb8f1a31aa6497dade3e32ceb2ae2b02

Added files:

Index: pkgsrc/lang/purescript/patches/patch-app_Command_Docs.hs
diff -u /dev/null pkgsrc/lang/purescript/patches/patch-app_Command_Docs.hs:1.1
--- /dev/null   Tue Oct 31 07:38:56 2023
+++ pkgsrc/lang/purescript/patches/patch-app_Command_Docs.hs    Tue Oct 31 07:38:56 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-app_Command_Docs.hs,v 1.1 2023/10/31 07:38:56 pho Exp $
+
+Control.Monad.Writer no longer re-exports functions from Control.Monad.
+
+--- app/Command/Docs.hs.orig   2023-10-31 07:24:25.835974146 +0000
++++ app/Command/Docs.hs
+@@ -6,7 +6,7 @@ import Prelude
+ import Command.Docs.Html (asHtml, writeHtmlModules)
+ import Command.Docs.Markdown (asMarkdown, writeMarkdownModules)
+ import Control.Applicative (Alternative(..), optional)
+-import Control.Monad.Writer (when)
++import Control.Monad (when)
+ import Control.Monad.Trans.Except (runExceptT)
+ import Data.Maybe (fromMaybe)
+ import Data.Text qualified as T
Index: pkgsrc/lang/purescript/patches/patch-app_Command_Docs_Html.hs
diff -u /dev/null pkgsrc/lang/purescript/patches/patch-app_Command_Docs_Html.hs:1.1
--- /dev/null   Tue Oct 31 07:38:56 2023
+++ pkgsrc/lang/purescript/patches/patch-app_Command_Docs_Html.hs       Tue Oct 31 07:38:56 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-app_Command_Docs_Html.hs,v 1.1 2023/10/31 07:38:56 pho Exp $
+
+Control.Monad.Writer no longer re-exports functions from Control.Monad.
+
+--- app/Command/Docs/Html.hs.orig      2023-10-31 07:23:39.912549451 +0000
++++ app/Command/Docs/Html.hs
+@@ -9,7 +9,7 @@ import Prelude
+ 
+ import Control.Applicative (Alternative(..))
+ import Control.Arrow ((&&&))
+-import Control.Monad.Writer (guard)
++import Control.Monad (guard)
+ import Data.List (sort)
+ import Data.Text (Text)
+ import Data.Text.Lazy (toStrict)
Index: pkgsrc/lang/purescript/patches/patch-src_Control_Monad_Supply.hs
diff -u /dev/null pkgsrc/lang/purescript/patches/patch-src_Control_Monad_Supply.hs:1.1
--- /dev/null   Tue Oct 31 07:38:56 2023
+++ pkgsrc/lang/purescript/patches/patch-src_Control_Monad_Supply.hs    Tue Oct 31 07:38:56 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_Control_Monad_Supply.hs,v 1.1 2023/10/31 07:38:56 pho Exp $
+
+Control.Monad.Reader no longer re-exports MonadPlus from Control.Monad.
+
+--- src/Control/Monad/Supply.hs.orig   2023-10-31 07:05:24.089544664 +0000
++++ src/Control/Monad/Supply.hs
+@@ -6,8 +6,9 @@ module Control.Monad.Supply where
+ import Prelude
+ 
+ import Control.Applicative (Alternative)
++import Control.Monad (MonadPlus)
+ import Control.Monad.Error.Class (MonadError(..))
+-import Control.Monad.Reader (MonadPlus, MonadReader, MonadTrans)
++import Control.Monad.Reader (MonadReader, MonadTrans)
+ import Control.Monad.State (StateT(..))
+ import Control.Monad.Writer (MonadWriter)
+ 
Index: pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_Errors.hs
diff -u /dev/null pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_Errors.hs:1.1
--- /dev/null   Tue Oct 31 07:38:56 2023
+++ pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_Errors.hs      Tue Oct 31 07:38:56 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_Language_PureScript_Errors.hs,v 1.1 2023/10/31 07:38:56 pho Exp $
+
+Control.Monad.Writer no longer re-exports data types from Data.Monoid.
+
+--- src/Language/PureScript/Errors.hs.orig     2023-10-31 07:16:13.742377229 +0000
++++ src/Language/PureScript/Errors.hs
+@@ -12,7 +12,7 @@ import Control.Lens (both, head1, over)
+ import Control.Monad (forM, unless)
+ import Control.Monad.Error.Class (MonadError(..))
+ import Control.Monad.Trans.State.Lazy (State, evalState, get, put)
+-import Control.Monad.Writer (Last(..), MonadWriter(..), censor)
++import Control.Monad.Writer (MonadWriter(..), censor)
+ import Data.Bifunctor (first, second)
+ import Data.Bitraversable (bitraverse)
+ import Data.Char (isSpace)
+@@ -27,6 +27,7 @@ import Data.List.NonEmpty qualified as N
+ import Data.List.NonEmpty (NonEmpty((:|)))
+ import Data.Maybe (maybeToList, fromMaybe, isJust, mapMaybe)
+ import Data.Map qualified as M
++import Data.Monoid (Last(..))
+ import Data.Ord (Down(..))
+ import Data.Set qualified as S
+ import Data.Text qualified as T
Index: pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_Renamer.hs
diff -u /dev/null pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_Renamer.hs:1.1
--- /dev/null   Tue Oct 31 07:38:56 2023
+++ pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_Renamer.hs     Tue Oct 31 07:38:56 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Language_PureScript_Renamer.hs,v 1.1 2023/10/31 07:38:56 pho Exp $
+
+Control.Monad.State no longer re-exports functions from Control.Monad.
+
+--- src/Language/PureScript/Renamer.hs.orig    2023-10-31 07:14:26.857968378 +0000
++++ src/Language/PureScript/Renamer.hs
+@@ -5,7 +5,8 @@ module Language.PureScript.Renamer (rena
+ 
+ import Prelude
+ 
+-import Control.Monad.State (MonadState(..), State, gets, modify, runState, (>=>))
++import Control.Monad ((>=>))
++import Control.Monad.State (MonadState(..), State, gets, modify, runState)
+ 
+ import Data.Functor ((<&>))
+ import Data.List (find)
Index: pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_Sugar_Operators_Common.hs
diff -u /dev/null pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_Sugar_Operators_Common.hs:1.1
--- /dev/null   Tue Oct 31 07:38:56 2023
+++ pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_Sugar_Operators_Common.hs      Tue Oct 31 07:38:56 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Language_PureScript_Sugar_Operators_Common.hs,v 1.1 2023/10/31 07:38:56 pho Exp $
+
+Control.Monad.State no longer re-exports functions from Control.Monad.
+
+--- src/Language/PureScript/Sugar/Operators/Common.hs.orig     2023-10-31 07:22:06.185842060 +0000
++++ src/Language/PureScript/Sugar/Operators/Common.hs
+@@ -2,7 +2,7 @@ module Language.PureScript.Sugar.Operato
+ 
+ import Prelude
+ 
+-import Control.Monad.State (guard, join)
++import Control.Monad (guard, join)
+ import Control.Monad.Except (MonadError(..))
+ 
+ import Data.Either (rights)
Index: pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_TypeChecker_Entailment.hs
diff -u /dev/null pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_TypeChecker_Entailment.hs:1.1
--- /dev/null   Tue Oct 31 07:38:56 2023
+++ pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_TypeChecker_Entailment.hs      Tue Oct 31 07:38:56 2023
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_Language_PureScript_TypeChecker_Entailment.hs,v 1.1 2023/10/31 07:38:56 pho Exp $
+
+Control.Monad.State no longer re-exports functions from Control.Monad.
+
+--- src/Language/PureScript/TypeChecker/Entailment.hs.orig     2023-10-31 07:20:17.099461014 +0000
++++ src/Language/PureScript/TypeChecker/Entailment.hs
+@@ -14,10 +14,11 @@ import Prelude
+ import Protolude (ordNub)
+ 
+ import Control.Arrow (second, (&&&))
++import Control.Monad (foldM, guard, join, zipWithM, zipWithM_, (<=<))
+ import Control.Monad.Error.Class (MonadError(..))
+-import Control.Monad.State (MonadState(..), MonadTrans(..), StateT(..), evalStateT, execStateT, foldM, gets, guard, join, modify, zipWithM, zipWithM_, (<=<))
++import Control.Monad.State (MonadState(..), MonadTrans(..), StateT(..), evalStateT, execStateT, gets, modify)
+ import Control.Monad.Supply.Class (MonadSupply(..))
+-import Control.Monad.Writer (Any(..), MonadWriter(..), WriterT(..))
++import Control.Monad.Writer (MonadWriter(..), WriterT(..))
+ 
+ import Data.Either (lefts, partitionEithers)
+ import Data.Foldable (for_, fold, toList)
+@@ -26,6 +27,7 @@ import Data.Functor (($>))
+ import Data.List (delete, findIndices, minimumBy, nubBy, sortOn, tails)
+ import Data.Maybe (catMaybes, fromMaybe, listToMaybe, mapMaybe)
+ import Data.Map qualified as M
++import Data.Monoid (Any(..))
+ import Data.Set qualified as S
+ import Data.Traversable (for)
+ import Data.Text (Text, stripPrefix, stripSuffix)
Index: pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_TypeChecker_Monad.hs
diff -u /dev/null pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_TypeChecker_Monad.hs:1.1
--- /dev/null   Tue Oct 31 07:38:56 2023
+++ pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_TypeChecker_Monad.hs   Tue Oct 31 07:38:56 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_Language_PureScript_TypeChecker_Monad.hs,v 1.1 2023/10/31 07:38:56 pho Exp $
+
+Control.Monad.State no longer re-exports functions from Control.Monad.
+
+--- src/Language/PureScript/TypeChecker/Monad.hs.orig  2023-10-31 07:18:13.109321834 +0000
++++ src/Language/PureScript/TypeChecker/Monad.hs
+@@ -8,8 +8,9 @@ module Language.PureScript.TypeChecker.M
+ import Prelude
+ 
+ import Control.Arrow (second)
++import Control.Monad (forM_, guard, join, when, (<=<))
+ import Control.Monad.Error.Class (MonadError(..))
+-import Control.Monad.State (MonadState(..), StateT(..), forM_, gets, guard, join, modify, when, (<=<))
++import Control.Monad.State (MonadState(..), StateT(..), gets, modify)
+ import Control.Monad.Writer.Class (MonadWriter(..), censor)
+ 
+ import Data.Maybe (fromMaybe)