summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorpho <pho@pkgsrc.org>2022-09-07 02:53:51 +0000
committerpho <pho@pkgsrc.org>2022-09-07 02:53:51 +0000
commit9750e7bbaa8e1513df5d55daa3f9fea20689631a (patch)
tree9c28922c45f02fda517b70b8abd2c7e7ef6a9eab /lang
parenta3751d8ea266e4dca135843a477a07feae7ee70c (diff)
downloadpkgsrc-9750e7bbaa8e1513df5d55daa3f9fea20689631a.tar.gz
lang/purescript: Update to 0.15.4
Release notes are too long to paste here: * 0.15.4: https://github.com/purescript/purescript/releases/tag/v0.15.4 * 0.15.3: https://github.com/purescript/purescript/releases/tag/v0.15.3 * 0.15.2: https://github.com/purescript/purescript/releases/tag/v0.15.2 * 0.15.0: https://github.com/purescript/purescript/releases/tag/v0.15.0 * 0.14.9: https://github.com/purescript/purescript/releases/tag/v0.14.9 * 0.14.8: https://github.com/purescript/purescript/releases/tag/v0.14.8 * 0.14.7: https://github.com/purescript/purescript/releases/tag/v0.14.7
Diffstat (limited to 'lang')
-rw-r--r--lang/purescript/Makefile33
-rw-r--r--lang/purescript/PLIST89
-rw-r--r--lang/purescript/distinfo16
-rw-r--r--lang/purescript/patches/patch-app_Main.hs15
-rw-r--r--lang/purescript/patches/patch-purescript.cabal234
-rw-r--r--lang/purescript/patches/patch-src_Language_PureScript_CoreFn_ToJSON.hs338
-rw-r--r--lang/purescript/patches/patch-src_Language_PureScript_Docs_Types.hs54
-rw-r--r--lang/purescript/patches/patch-src_Language_PureScript_Errors_JSON.hs17
-rw-r--r--lang/purescript/patches/patch-src_Language_PureScript_Graph.hs25
-rw-r--r--lang/purescript/patches/patch-src_Language_PureScript_Ide_Error.hs24
-rw-r--r--lang/purescript/patches/patch-src_Language_PureScript_Publish.hs23
11 files changed, 119 insertions, 749 deletions
diff --git a/lang/purescript/Makefile b/lang/purescript/Makefile
index 868f02756f7..99aa0c2cfd6 100644
--- a/lang/purescript/Makefile
+++ b/lang/purescript/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2022/08/22 10:13:26 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/09/07 02:53:51 pho Exp $
-DISTNAME= purescript-0.14.5
+DISTNAME= purescript-0.15.4
PKGNAME= ${DISTNAME}
-PKGREVISION= 4
CATEGORIES= lang
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -30,6 +29,28 @@ HASKELL_ENABLE_LIBRARY_PROFILING= no
OPTPARSE_APPLICATIVE_EXECUTABLES+= purs
.include "../../devel/hs-optparse-applicative/application.mk"
+# Relax version constraints.
+SUBST_CLASSES+= cabal
+SUBST_STAGE.cabal= post-extract
+SUBST_FILES.cabal= purescript.cabal
+# These constraints can only be resolved with GHC 9.2.3 which we haven't
+# packaged yet.
+SUBST_SED.cabal+= -e 's/Cabal >=3.6.3.0 && <3.7/Cabal/'
+SUBST_SED.cabal+= -e 's/base >=4.16.2.0 && <4.17/base/'
+SUBST_SED.cabal+= -e 's/bytestring >=0.11.3.1 && <0.12/bytestring/'
+SUBST_SED.cabal+= -e 's/deepseq >=1.4.6.1 && <1.5/deepseq/'
+SUBST_SED.cabal+= -e 's/filepath >=1.4.2.2 && <1.5/filepath/'
+SUBST_SED.cabal+= -e 's/parsec >=3.1.15.0 && <3.2/parsec/'
+SUBST_SED.cabal+= -e 's/stm >=2.5.0.2 && <2.6/stm/'
+SUBST_SED.cabal+= -e 's/process ==1.6.13.1/process/'
+# These constraints can only be resolved with older packages than what we
+# provide.
+SUBST_SED.cabal+= -e 's/aeson >=2.0.3.0 && <2.1/aeson/'
+SUBST_SED.cabal+= -e 's/language-javascript ==0.7.0.0/language-javascript/'
+SUBST_SED.cabal+= -e 's/lens >=5.1.1 && <5.2/lens/'
+SUBST_SED.cabal+= -e 's/memory >=0.17.0 && <0.18/memory/'
+SUBST_SED.cabal+= -e 's/vector >=0.12.3.1 && <0.13/vector/'
+
# lib:purescript
.include "../../converters/hs-aeson/buildlink3.mk"
.include "../../converters/hs-aeson-better-errors/buildlink3.mk"
@@ -50,17 +71,16 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+= purs
.include "../../devel/hs-fsnotify/buildlink3.mk"
.include "../../textproc/hs-Glob/buildlink3.mk"
.include "../../lang/hs-language-javascript/buildlink3.mk"
+.include "../../devel/hs-lens/buildlink3.mk"
.include "../../devel/hs-lifted-async/buildlink3.mk"
.include "../../devel/hs-lifted-base/buildlink3.mk"
.include "../../devel/hs-memory/buildlink3.mk"
-.include "../../devel/hs-microlens/buildlink3.mk"
-.include "../../devel/hs-microlens-platform/buildlink3.mk"
.include "../../devel/hs-monad-control/buildlink3.mk"
.include "../../devel/hs-monad-logger/buildlink3.mk"
+.include "../../devel/hs-monoidal-containers/buildlink3.mk"
.include "../../devel/hs-parallel/buildlink3.mk"
.include "../../devel/hs-pattern-arrows/buildlink3.mk"
.include "../../devel/hs-protolude/buildlink3.mk"
-.include "../../lang/hs-purescript-cst/buildlink3.mk"
.include "../../textproc/hs-regex-tdfa/buildlink3.mk"
.include "../../devel/hs-safe/buildlink3.mk"
.include "../../math/hs-scientific/buildlink3.mk"
@@ -74,6 +94,7 @@ OPTPARSE_APPLICATIVE_EXECUTABLES+= purs
.include "../../devel/hs-these/buildlink3.mk"
.include "../../devel/hs-transformers-base/buildlink3.mk"
.include "../../devel/hs-transformers-compat/buildlink3.mk"
+.include "../../sysutils/hs-typed-process/buildlink3.mk"
.include "../../devel/hs-unordered-containers/buildlink3.mk"
.include "../../devel/hs-utf8-string/buildlink3.mk"
.include "../../devel/hs-vector/buildlink3.mk"
diff --git a/lang/purescript/PLIST b/lang/purescript/PLIST
index e9a9c856cb7..9e26e81f245 100644
--- a/lang/purescript/PLIST
+++ b/lang/purescript/PLIST
@@ -1,24 +1,54 @@
-@comment $NetBSD: PLIST,v 1.1 2022/02/23 16:22:33 pho Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/09/07 02:53:51 pho Exp $
bin/purs
lib/${PKGNAME}/${HS_VERSION}/package-description
lib/${PKGNAME}/${HS_VERSION}/package-id
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Supply.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Supply/Class.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/PureScript.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST/Binders.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST/Declarations.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST/Declarations/ChainId.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST/Exported.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST/Literals.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST/Operators.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST/SourcePos.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST/Traversals.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST/Utils.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Bundle.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Convert.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Errors.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Flatten.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Layout.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Lexer.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Monad.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Parser.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Positions.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Print.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Traversals.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Traversals/Type.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Types.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CST/Utils.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CodeGen.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CodeGen/JS.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CodeGen/JS/Common.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CodeGen/JS/Printer.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Comments.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Constants/Data/Generic/Rep.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Constants/Data/Newtype.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Constants/Prelude.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Constants/Prim.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn/Ann.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn/Binders.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn/CSE.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn/Desugar.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn/Expr.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn/FromJSON.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn/Laziness.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn/Meta.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn/Module.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn/Optimizer.hi
@@ -26,6 +56,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn/ToJSON.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreFn/Traversals.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreImp.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreImp/AST.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreImp/Module.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreImp/Optimizer.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreImp/Optimizer/Blocks.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreImp/Optimizer/Common.hi
@@ -33,6 +64,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreImp/Optimizer/Inliner.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreImp/Optimizer/MagicDo.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreImp/Optimizer/TCO.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/CoreImp/Optimizer/Unused.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Crash.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/AsHtml.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/AsMarkdown.hi
@@ -49,6 +81,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/RenderedCode/Types.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Tags.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Types.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Utils/MonoidExtras.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Environment.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Errors.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Errors/JSON.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Externs.hi
@@ -82,16 +115,20 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Interactive/Module.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Interactive/Parser.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Interactive/Printer.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Interactive/Types.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Label.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Linter.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Linter/Exhaustive.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Linter/Imports.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Linter/Wildcards.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Make.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Make/Actions.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Make/BuildPlan.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Make/Cache.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Make/Monad.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/ModuleDependencies.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Names.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Options.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/PSString.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Pretty.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Pretty/Common.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Pretty/Types.hi
@@ -99,8 +136,10 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Pretty/Values.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Publish.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Publish/BoxesHelpers.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Publish/ErrorsWarnings.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Publish/Registry/Compat.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Publish/Utils.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Renamer.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Roles.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Sugar.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Sugar/AdoNotation.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Sugar/BindingGroups.hi
@@ -121,9 +160,12 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Sugar/Operators/Types.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Sugar/TypeClasses.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Sugar/TypeClasses/Deriving.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Sugar/TypeDeclarations.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Traversals.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Deriving.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Entailment.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Entailment/Coercible.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Entailment/IntCompare.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Kinds.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Monad.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Roles.hi
@@ -133,25 +175,56 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Synonyms.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/TypeSearch.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Types.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Unify.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeClassDictionaries.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Types.hi
lib/${HS_PLATFORM}/${HS_PKGID}/Paths_purescript.hi
lib/${HS_PLATFORM}/${HS_PKGID}/System/IO/UTF8.hi
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Monad-Logger.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Monad-Supply-Class.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Monad-Supply.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Binders.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Declarations-ChainId.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Declarations.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Exported.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Literals.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Operators.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-SourcePos.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Traversals.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Utils.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Bundle.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Convert.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Errors.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Flatten.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Layout.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Lexer.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Monad.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Parser.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Positions.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Print.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Traversals-Type.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Traversals.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Types.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST-Utils.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CST.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CodeGen-JS-Common.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CodeGen-JS-Printer.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CodeGen-JS.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CodeGen.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Comments.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Constants-Data-Generic-Rep.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Constants-Data-Newtype.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Constants-Prelude.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Constants-Prim.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn-Ann.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn-Binders.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn-CSE.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn-Desugar.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn-Expr.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn-FromJSON.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn-Laziness.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn-Meta.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn-Module.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn-Optimizer.html
@@ -159,6 +232,7 @@ share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn-ToJSON.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn-Traversals.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreFn.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreImp-AST.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreImp-Module.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreImp-Optimizer-Blocks.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreImp-Optimizer-Common.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreImp-Optimizer-Inliner.html
@@ -167,6 +241,7 @@ share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreImp-Optimizer-T
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreImp-Optimizer-Unused.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreImp-Optimizer.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-CoreImp.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Crash.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-AsHtml.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-AsMarkdown.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Collect.html
@@ -183,6 +258,7 @@ share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Tags.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Types.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Utils-MonoidExtras.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Environment.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Errors-JSON.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Errors.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Externs.html
@@ -216,8 +292,10 @@ share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Interactive-Parser.
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Interactive-Printer.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Interactive-Types.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Interactive.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Label.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Linter-Exhaustive.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Linter-Imports.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Linter-Wildcards.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Linter.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Make-Actions.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Make-BuildPlan.html
@@ -225,16 +303,20 @@ share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Make-Cache.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Make-Monad.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Make.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-ModuleDependencies.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Names.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Options.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-PSString.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Pretty-Common.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Pretty-Types.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Pretty-Values.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Pretty.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Publish-BoxesHelpers.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Publish-ErrorsWarnings.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Publish-Registry-Compat.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Publish-Utils.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Publish.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Renamer.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Roles.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Sugar-AdoNotation.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Sugar-BindingGroups.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Sugar-CaseDeclarations.html
@@ -255,7 +337,10 @@ share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Sugar-TypeClasses-D
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Sugar-TypeClasses.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Sugar-TypeDeclarations.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Sugar.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Traversals.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Deriving.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Entailment-Coercible.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Entailment-IntCompare.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Entailment.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Kinds.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Monad.html
@@ -267,6 +352,8 @@ share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-TypeSea
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Types.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Unify.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeClassDictionaries.html
+share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Types.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/System-IO-UTF8.html
share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-36.html
diff --git a/lang/purescript/distinfo b/lang/purescript/distinfo
index 1975ec94106..0b3e7fe1d60 100644
--- a/lang/purescript/distinfo
+++ b/lang/purescript/distinfo
@@ -1,13 +1,5 @@
-$NetBSD: distinfo,v 1.1 2022/02/23 16:22:33 pho Exp $
+$NetBSD: distinfo,v 1.2 2022/09/07 02:53:51 pho Exp $
-BLAKE2s (purescript-0.14.5.tar.gz) = 79e67fc61551acf18fbdc81666444345ce2d5114a93a7f9323d5f313b693acae
-SHA512 (purescript-0.14.5.tar.gz) = 0b283f9538988323bd06b01db205916cd61fe8806cf0901ffd14b5a298f48fe8f9ccc59275058331655104222e78fc66375e4b96230ca1a92a5ece71453d2a6c
-Size (purescript-0.14.5.tar.gz) = 540327 bytes
-SHA1 (patch-app_Main.hs) = d522a384b245cef55deec8e114e46e0dc7db2772
-SHA1 (patch-purescript.cabal) = 30d2ba8248854653123ff053d62fa5ece6bd1f7c
-SHA1 (patch-src_Language_PureScript_CoreFn_ToJSON.hs) = eeff7a9f48c43a391405bd61175a7f75529ead24
-SHA1 (patch-src_Language_PureScript_Docs_Types.hs) = 20ed67a6382abe8dc59a947265c115497b0a0096
-SHA1 (patch-src_Language_PureScript_Errors_JSON.hs) = 441c229348b3aa4e8ac8c2f03a29044fe949c928
-SHA1 (patch-src_Language_PureScript_Graph.hs) = 7b3554e0273f0a1c4a5fac724e0d2d6e436b6813
-SHA1 (patch-src_Language_PureScript_Ide_Error.hs) = e2f23edd3774b5b2fa97593456207c5b3459170a
-SHA1 (patch-src_Language_PureScript_Publish.hs) = b3ca97415a77e4a7fe2c3cef8a189cd19953d0ac
+BLAKE2s (purescript-0.15.4.tar.gz) = bef501e953a2cfc2f86eaedd3e0d5d21d8741fe2e70d164cd8ad5bc28ddc3d5a
+SHA512 (purescript-0.15.4.tar.gz) = edcbffabe8ad8aa0bfbfb217343d826988ad63838b3312d07e396fa29f57c42486536d8389db524ba56a6c6ff3137cd20c4a15e389dc9c4bd5026cb907c12d82
+Size (purescript-0.15.4.tar.gz) = 760462 bytes
diff --git a/lang/purescript/patches/patch-app_Main.hs b/lang/purescript/patches/patch-app_Main.hs
deleted file mode 100644
index 651213461db..00000000000
--- a/lang/purescript/patches/patch-app_Main.hs
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-app_Main.hs,v 1.1 2022/02/23 16:22:33 pho Exp $
-
-Fix build with optparse-applicative-0.17
-
---- app/Main.hs.orig 2022-02-20 19:11:59.577636859 +0000
-+++ app/Main.hs
-@@ -48,7 +48,7 @@ main = do
- -- | Displays full command help when invoked with no arguments.
- execParserPure :: Opts.ParserInfo a -> [String] -> Opts.ParserResult a
- execParserPure pinfo [] = Opts.Failure $
-- Opts.parserFailure Opts.defaultPrefs pinfo Opts.ShowHelpText mempty
-+ Opts.parserFailure Opts.defaultPrefs pinfo (Opts.ShowHelpText Nothing) mempty
- execParserPure pinfo args = Opts.execParserPure Opts.defaultPrefs pinfo args
-
- versionInfo :: Opts.Parser (a -> a)
diff --git a/lang/purescript/patches/patch-purescript.cabal b/lang/purescript/patches/patch-purescript.cabal
deleted file mode 100644
index 161c198e4c2..00000000000
--- a/lang/purescript/patches/patch-purescript.cabal
+++ /dev/null
@@ -1,234 +0,0 @@
-$NetBSD: patch-purescript.cabal,v 1.1 2022/02/23 16:22:33 pho Exp $
-
-Fix build with GHC 9.2 and libraries from pkgsrc.
-
---- purescript.cabal.orig 2022-02-20 16:31:14.423955237 +0000
-+++ purescript.cabal
-@@ -206,38 +206,38 @@ library
-
- ghc-options: -Wall
- build-depends:
-- aeson >=1.5.6.0 && <1.6,
-+ aeson >=1.5.6.0,
- aeson-better-errors >=0.9.1.0 && <0.10,
- aeson-pretty >=0.8.8 && <0.9,
-- ansi-terminal >=0.10.3 && <0.11,
-+ ansi-terminal >=0.10.3,
- array >=0.5.4.0 && <0.6,
-- base >=4.14.1.0 && <4.15,
-- base-compat >=0.11.2 && <0.12,
-+ base >=4.14.1.0,
-+ base-compat >=0.11.2,
- blaze-html >=0.9.1.2 && <0.10,
- bower-json >=1.0.0.1 && <1.1,
- boxes >=0.1.5 && <0.2,
-- bytestring >=0.10.12.0 && <0.11,
-- Cabal >=3.2.1.0 && <3.3,
-+ bytestring >=0.10.12.0,
-+ Cabal >=3.2.1.0,
- cborg >=0.2.4.0 && <0.3,
- serialise >=0.2.3.0 && <0.3,
- cheapskate >=0.1.1.2 && <0.2,
- clock ==0.8.*,
- containers >=0.6.2.1 && <0.7,
-- cryptonite ==0.27.*,
-+ cryptonite >=0.27,
- data-ordlist >=0.4.7.0 && <0.5,
- deepseq >=1.4.4.0 && <1.5,
- directory >=1.3.6.0 && <1.4,
-- dlist >=0.8.0.8 && <0.9,
-+ dlist >=0.8.0.8,
- edit-distance >=0.2.2.1 && <0.3,
- file-embed >=0.0.13.0 && <0.1,
- filepath >=1.4.2.1 && <1.5,
- fsnotify >=0.3.0.1 && <0.4,
- Glob >=0.10.1 && <0.11,
- haskeline >=0.8.1.1 && <0.9,
-- language-javascript ==0.7.0.0,
-+ language-javascript >=0.7.0.0,
- lifted-async >=0.10.1.3 && <0.11,
- lifted-base >=0.2.3.12 && <0.3,
-- memory >=0.15.0 && <0.16,
-+ memory >=0.15.0,
- microlens >=0.4.11.2 && <0.5,
- microlens-platform >=0.4.1 && <0.5,
- monad-control >=1.0.2.3 && <1.1,
-@@ -252,8 +252,8 @@ library
- regex-tdfa >=1.3.1.0 && <1.4,
- safe >=0.3.19 && <0.4,
- scientific >=0.3.6.2 && <0.4,
-- semigroups >=0.19.1 && <0.20,
-- semialign >=1.1.0.1 && <1.2,
-+ semigroups >=0.19.1,
-+ semialign >=1.1.0.1,
- sourcemap >=0.1.6 && <0.2,
- split >=0.2.3.4 && <0.3,
- stm >=2.5.0.0 && <2.6,
-@@ -261,10 +261,10 @@ library
- syb >=0.7.2.1 && <0.8,
- text >=1.2.4.1 && <1.3,
- these >=1.1.1.1 && <1.2,
-- time >=1.9.3 && <1.10,
-+ time >=1.9.3,
- transformers >=0.5.6.2 && <0.6,
- transformers-base >=0.4.5.2 && <0.5,
-- transformers-compat >=0.6.6 && <0.7,
-+ transformers-compat >=0.6.6,
- unordered-containers >=0.2.13.0 && <0.3,
- utf8-string >=1.0.2 && <1.1,
- vector >=0.12.1.2 && <0.13
-@@ -303,38 +303,38 @@ executable purs
- -Wall -fno-warn-unused-do-bind -threaded -rtsopts -with-rtsopts=-N
-
- build-depends:
-- aeson >=1.5.6.0 && <1.6,
-+ aeson >=1.5.6.0,
- aeson-better-errors >=0.9.1.0 && <0.10,
- aeson-pretty >=0.8.8 && <0.9,
-- ansi-terminal >=0.10.3 && <0.11,
-+ ansi-terminal >=0.10.3,
- array >=0.5.4.0 && <0.6,
-- base >=4.14.1.0 && <4.15,
-- base-compat >=0.11.2 && <0.12,
-+ base >=4.14.1.0,
-+ base-compat >=0.11.2,
- blaze-html >=0.9.1.2 && <0.10,
- bower-json >=1.0.0.1 && <1.1,
- boxes >=0.1.5 && <0.2,
-- bytestring >=0.10.12.0 && <0.11,
-- Cabal >=3.2.1.0 && <3.3,
-+ bytestring >=0.10.12.0,
-+ Cabal >=3.2.1.0,
- cborg >=0.2.4.0 && <0.3,
- serialise >=0.2.3.0 && <0.3,
- cheapskate >=0.1.1.2 && <0.2,
- clock ==0.8.*,
- containers >=0.6.2.1 && <0.7,
-- cryptonite ==0.27.*,
-+ cryptonite >=0.27,
- data-ordlist >=0.4.7.0 && <0.5,
- deepseq >=1.4.4.0 && <1.5,
- directory >=1.3.6.0 && <1.4,
-- dlist >=0.8.0.8 && <0.9,
-+ dlist >=0.8.0.8,
- edit-distance >=0.2.2.1 && <0.3,
- file-embed >=0.0.13.0 && <0.1,
- filepath >=1.4.2.1 && <1.5,
- fsnotify >=0.3.0.1 && <0.4,
- Glob >=0.10.1 && <0.11,
- haskeline >=0.8.1.1 && <0.9,
-- language-javascript ==0.7.0.0,
-+ language-javascript >=0.7.0.0,
- lifted-async >=0.10.1.3 && <0.11,
- lifted-base >=0.2.3.12 && <0.3,
-- memory >=0.15.0 && <0.16,
-+ memory >=0.15.0,
- microlens >=0.4.11.2 && <0.5,
- microlens-platform >=0.4.1 && <0.5,
- monad-control >=1.0.2.3 && <1.1,
-@@ -349,8 +349,8 @@ executable purs
- regex-tdfa >=1.3.1.0 && <1.4,
- safe >=0.3.19 && <0.4,
- scientific >=0.3.6.2 && <0.4,
-- semigroups >=0.19.1 && <0.20,
-- semialign >=1.1.0.1 && <1.2,
-+ semigroups >=0.19.1,
-+ semialign >=1.1.0.1,
- sourcemap >=0.1.6 && <0.2,
- split >=0.2.3.4 && <0.3,
- stm >=2.5.0.0 && <2.6,
-@@ -358,10 +358,10 @@ executable purs
- syb >=0.7.2.1 && <0.8,
- text >=1.2.4.1 && <1.3,
- these >=1.1.1.1 && <1.2,
-- time >=1.9.3 && <1.10,
-+ time >=1.9.3,
- transformers >=0.5.6.2 && <0.6,
- transformers-base >=0.4.5.2 && <0.5,
-- transformers-compat >=0.6.6 && <0.7,
-+ transformers-compat >=0.6.6,
- unordered-containers >=0.2.13.0 && <0.3,
- utf8-string >=1.0.2 && <1.1,
- vector >=0.12.1.2 && <0.13,
-@@ -369,7 +369,7 @@ executable purs
- exceptions >=0.10.4 && <0.11,
- http-types >=0.12.3 && <0.13,
- network >=3.1.1.1 && <3.2,
-- optparse-applicative >=0.15.1.0 && <0.16,
-+ optparse-applicative >=0.15.1.0,
- purescript -any,
- wai >=3.2.3 && <3.3,
- wai-websockets >=3.0.1.2 && <3.1,
-@@ -434,38 +434,38 @@ test-suite tests
-
- ghc-options: -Wall
- build-depends:
-- aeson >=1.5.6.0 && <1.6,
-+ aeson >=1.5.6.0,
- aeson-better-errors >=0.9.1.0 && <0.10,
- aeson-pretty >=0.8.8 && <0.9,
-- ansi-terminal >=0.10.3 && <0.11,
-+ ansi-terminal >=0.10.3,
- array >=0.5.4.0 && <0.6,
-- base >=4.14.1.0 && <4.15,
-- base-compat >=0.11.2 && <0.12,
-+ base >=4.14.1.0,
-+ base-compat >=0.11.2,
- blaze-html >=0.9.1.2 && <0.10,
- bower-json >=1.0.0.1 && <1.1,
- boxes >=0.1.5 && <0.2,
-- bytestring >=0.10.12.0 && <0.11,
-- Cabal >=3.2.1.0 && <3.3,
-+ bytestring >=0.10.12.0,
-+ Cabal >=3.2.1.0,
- cborg >=0.2.4.0 && <0.3,
- serialise >=0.2.3.0 && <0.3,
- cheapskate >=0.1.1.2 && <0.2,
- clock ==0.8.*,
- containers >=0.6.2.1 && <0.7,
-- cryptonite ==0.27.*,
-+ cryptonite >=0.27,
- data-ordlist >=0.4.7.0 && <0.5,
- deepseq >=1.4.4.0 && <1.5,
- directory >=1.3.6.0 && <1.4,
-- dlist >=0.8.0.8 && <0.9,
-+ dlist >=0.8.0.8,
- edit-distance >=0.2.2.1 && <0.3,
- file-embed >=0.0.13.0 && <0.1,
- filepath >=1.4.2.1 && <1.5,
- fsnotify >=0.3.0.1 && <0.4,
- Glob >=0.10.1 && <0.11,
- haskeline >=0.8.1.1 && <0.9,
-- language-javascript ==0.7.0.0,
-+ language-javascript >=0.7.0.0,
- lifted-async >=0.10.1.3 && <0.11,
- lifted-base >=0.2.3.12 && <0.3,
-- memory >=0.15.0 && <0.16,
-+ memory >=0.15.0,
- microlens >=0.4.11.2 && <0.5,
- microlens-platform >=0.4.1 && <0.5,
- monad-control >=1.0.2.3 && <1.1,
-@@ -480,8 +480,8 @@ test-suite tests
- regex-tdfa >=1.3.1.0 && <1.4,
- safe >=0.3.19 && <0.4,
- scientific >=0.3.6.2 && <0.4,
-- semigroups >=0.19.1 && <0.20,
-- semialign >=1.1.0.1 && <1.2,
-+ semigroups >=0.19.1,
-+ semialign >=1.1.0.1,
- sourcemap >=0.1.6 && <0.2,
- split >=0.2.3.4 && <0.3,
- stm >=2.5.0.0 && <2.6,
-@@ -489,10 +489,10 @@ test-suite tests
- syb >=0.7.2.1 && <0.8,
- text >=1.2.4.1 && <1.3,
- these >=1.1.1.1 && <1.2,
-- time >=1.9.3 && <1.10,
-+ time >=1.9.3,
- transformers >=0.5.6.2 && <0.6,
- transformers-base >=0.4.5.2 && <0.5,
-- transformers-compat >=0.6.6 && <0.7,
-+ transformers-compat >=0.6.6,
- unordered-containers >=0.2.13.0 && <0.3,
- utf8-string >=1.0.2 && <1.1,
- vector >=0.12.1.2 && <0.13,
diff --git a/lang/purescript/patches/patch-src_Language_PureScript_CoreFn_ToJSON.hs b/lang/purescript/patches/patch-src_Language_PureScript_CoreFn_ToJSON.hs
deleted file mode 100644
index 85c1cfe6fd3..00000000000
--- a/lang/purescript/patches/patch-src_Language_PureScript_CoreFn_ToJSON.hs
+++ /dev/null
@@ -1,338 +0,0 @@
-$NetBSD: patch-src_Language_PureScript_CoreFn_ToJSON.hs,v 1.1 2022/02/23 16:22:33 pho Exp $
-
-Fix build with aeson-2.0
-
---- src/Language/PureScript/CoreFn/ToJSON.hs.orig 2022-02-20 17:44:35.893792664 +0000
-+++ src/Language/PureScript/CoreFn/ToJSON.hs
-@@ -13,6 +13,7 @@ import Control.Arrow ((***))
- import Data.Either (isLeft)
- import qualified Data.Map.Strict as M
- import Data.Aeson
-+import qualified Data.Aeson.Key as Key
- import Data.Version (Version, showVersion)
- import Data.Text (Text)
- import qualified Data.Text as T
-@@ -23,6 +24,10 @@ import Language.PureScript.Cor
- import Language.PureScript.Names
- import Language.PureScript.PSString (PSString)
-
-+mkKey :: String -> Key
-+{-# INLINE mkKey #-}
-+mkKey = Key.fromText . T.pack
-+
- constructorTypeToJSON :: ConstructorType -> Value
- constructorTypeToJSON ProductType = toJSON "ProductType"
- constructorTypeToJSON SumType = toJSON "SumType"
-@@ -30,61 +35,61 @@ constructorTypeToJSON SumType = toJSON "
- metaToJSON :: Meta -> Value
- metaToJSON (IsConstructor t is)
- = object
-- [ T.pack "metaType" .= "IsConstructor"
-- , T.pack "constructorType" .= constructorTypeToJSON t
-- , T.pack "identifiers" .= identToJSON `map` is
-- ]
--metaToJSON IsNewtype = object [ T.pack "metaType" .= "IsNewtype" ]
--metaToJSON IsTypeClassConstructor = object [ T.pack "metaType" .= "IsTypeClassConstructor" ]
--metaToJSON IsForeign = object [ T.pack "metaType" .= "IsForeign" ]
--metaToJSON IsWhere = object [ T.pack "metaType" .= "IsWhere" ]
-+ [ mkKey "metaType" .= "IsConstructor"
-+ , mkKey "constructorType" .= constructorTypeToJSON t
-+ , mkKey "identifiers" .= identToJSON `map` is
-+ ]
-+metaToJSON IsNewtype = object [ mkKey "metaType" .= "IsNewtype" ]
-+metaToJSON IsTypeClassConstructor = object [ mkKey "metaType" .= "IsTypeClassConstructor" ]
-+metaToJSON IsForeign = object [ mkKey "metaType" .= "IsForeign" ]
-+metaToJSON IsWhere = object [ mkKey "metaType" .= "IsWhere" ]
-
- sourceSpanToJSON :: SourceSpan -> Value
- sourceSpanToJSON (SourceSpan _ spanStart spanEnd) =
-- object [ T.pack "start" .= spanStart
-- , T.pack "end" .= spanEnd
-+ object [ mkKey "start" .= spanStart
-+ , mkKey "end" .= spanEnd
- ]
-
- annToJSON :: Ann -> Value
--annToJSON (ss, _, _, m) = object [ T.pack "sourceSpan" .= sourceSpanToJSON ss
-- , T.pack "meta" .= maybe Null metaToJSON m
-+annToJSON (ss, _, _, m) = object [ mkKey "sourceSpan" .= sourceSpanToJSON ss
-+ , mkKey "meta" .= maybe Null metaToJSON m
- ]
-
- literalToJSON :: (a -> Value) -> Literal a -> Value
- literalToJSON _ (NumericLiteral (Left n))
- = object
-- [ T.pack "literalType" .= "IntLiteral"
-- , T.pack "value" .= n
-+ [ mkKey "literalType" .= "IntLiteral"
-+ , mkKey "value" .= n
- ]
- literalToJSON _ (NumericLiteral (Right n))
- = object
-- [ T.pack "literalType" .= "NumberLiteral"
-- , T.pack "value" .= n
-+ [ mkKey "literalType" .= "NumberLiteral"
-+ , mkKey "value" .= n
- ]
- literalToJSON _ (StringLiteral s)
- = object
-- [ T.pack "literalType" .= "StringLiteral"
-- , T.pack "value" .= s
-+ [ mkKey "literalType" .= "StringLiteral"
-+ , mkKey "value" .= s
- ]
- literalToJSON _ (CharLiteral c)
- = object
-- [ T.pack "literalType" .= "CharLiteral"
-- , T.pack "value" .= c
-+ [ mkKey "literalType" .= "CharLiteral"
-+ , mkKey "value" .= c
- ]
- literalToJSON _ (BooleanLiteral b)
- = object
-- [ T.pack "literalType" .= "BooleanLiteral"
-- , T.pack "value" .= b
-+ [ mkKey "literalType" .= "BooleanLiteral"
-+ , mkKey "value" .= b
- ]
- literalToJSON t (ArrayLiteral xs)
- = object
-- [ T.pack "literalType" .= "ArrayLiteral"
-- , T.pack "value" .= map t xs
-+ [ mkKey "literalType" .= "ArrayLiteral"
-+ , mkKey "value" .= map t xs
- ]
- literalToJSON t (ObjectLiteral xs)
- = object
-- [ T.pack "literalType" .= "ObjectLiteral"
-- , T.pack "value" .= recordToJSON t xs
-+ [ mkKey "literalType" .= "ObjectLiteral"
-+ , mkKey "value" .= recordToJSON t xs
- ]
-
- identToJSON :: Ident -> Value
-@@ -95,8 +100,8 @@ properNameToJSON = toJSON . runProperNam
-
- qualifiedToJSON :: (a -> Text) -> Qualified a -> Value
- qualifiedToJSON f (Qualified mn a) = object
-- [ T.pack "moduleName" .= maybe Null moduleNameToJSON mn
-- , T.pack "identifier" .= toJSON (f a)
-+ [ mkKey "moduleName" .= maybe Null moduleNameToJSON mn
-+ , mkKey "identifier" .= toJSON (f a)
- ]
-
- moduleNameToJSON :: ModuleName -> Value
-@@ -104,22 +109,22 @@ moduleNameToJSON (ModuleName name) = toJ
-
- moduleToJSON :: Version -> Module Ann -> Value
- moduleToJSON v m = object
-- [ T.pack "sourceSpan" .= sourceSpanToJSON (moduleSourceSpan m)
-- , T.pack "moduleName" .= moduleNameToJSON (moduleName m)
-- , T.pack "modulePath" .= toJSON (modulePath m)
-- , T.pack "imports" .= map importToJSON (moduleImports m)
-- , T.pack "exports" .= map identToJSON (moduleExports m)
-- , T.pack "reExports" .= reExportsToJSON (moduleReExports m)
-- , T.pack "foreign" .= map identToJSON (moduleForeign m)
-- , T.pack "decls" .= map bindToJSON (moduleDecls m)
-- , T.pack "builtWith" .= toJSON (showVersion v)
-- , T.pack "comments" .= map toJSON (moduleComments m)
-+ [ mkKey "sourceSpan" .= sourceSpanToJSON (moduleSourceSpan m)
-+ , mkKey "moduleName" .= moduleNameToJSON (moduleName m)
-+ , mkKey "modulePath" .= toJSON (modulePath m)
-+ , mkKey "imports" .= map importToJSON (moduleImports m)
-+ , mkKey "exports" .= map identToJSON (moduleExports m)
-+ , mkKey "reExports" .= reExportsToJSON (moduleReExports m)
-+ , mkKey "foreign" .= map identToJSON (moduleForeign m)
-+ , mkKey "decls" .= map bindToJSON (moduleDecls m)
-+ , mkKey "builtWith" .= toJSON (showVersion v)
-+ , mkKey "comments" .= map toJSON (moduleComments m)
- ]
-
- where
- importToJSON (ann,mn) = object
-- [ T.pack "annotation" .= annToJSON ann
-- , T.pack "moduleName" .= moduleNameToJSON mn
-+ [ mkKey "annotation" .= annToJSON ann
-+ , mkKey "moduleName" .= moduleNameToJSON mn
- ]
-
- reExportsToJSON :: M.Map ModuleName [Ident] -> Value
-@@ -128,19 +133,19 @@ moduleToJSON v m = object
- bindToJSON :: Bind Ann -> Value
- bindToJSON (NonRec ann n e)
- = object
-- [ T.pack "bindType" .= "NonRec"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "identifier" .= identToJSON n
-- , T.pack "expression" .= exprToJSON e
-+ [ mkKey "bindType" .= "NonRec"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "identifier" .= identToJSON n
-+ , mkKey "expression" .= exprToJSON e
- ]
- bindToJSON (Rec bs)
- = object
-- [ T.pack "bindType" .= "Rec"
-- , T.pack "binds" .= map (\((ann, n), e)
-+ [ mkKey "bindType" .= "Rec"
-+ , mkKey "binds" .= map (\((ann, n), e)
- -> object
-- [ T.pack "identifier" .= identToJSON n
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "expression" .= exprToJSON e
-+ [ mkKey "identifier" .= identToJSON n
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "expression" .= exprToJSON e
- ]) bs
- ]
-
-@@ -148,86 +153,86 @@ recordToJSON :: (a -> Value) -> [(PSStri
- recordToJSON f = toJSON . map (toJSON *** f)
-
- exprToJSON :: Expr Ann -> Value
--exprToJSON (Var ann i) = object [ T.pack "type" .= toJSON "Var"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "value" .= qualifiedToJSON runIdent i
-- ]
--exprToJSON (Literal ann l) = object [ T.pack "type" .= "Literal"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "value" .= literalToJSON exprToJSON l
-- ]
--exprToJSON (Constructor ann d c is) = object [ T.pack "type" .= "Constructor"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "typeName" .= properNameToJSON d
-- , T.pack "constructorName" .= properNameToJSON c
-- , T.pack "fieldNames" .= map identToJSON is
-- ]
--exprToJSON (Accessor ann f r) = object [ T.pack "type" .= "Accessor"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "fieldName" .= f
-- , T.pack "expression" .= exprToJSON r
-- ]
--exprToJSON (ObjectUpdate ann r fs) = object [ T.pack "type" .= "ObjectUpdate"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "expression" .= exprToJSON r
-- , T.pack "updates" .= recordToJSON exprToJSON fs
-- ]
--exprToJSON (Abs ann p b) = object [ T.pack "type" .= "Abs"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "argument" .= identToJSON p
-- , T.pack "body" .= exprToJSON b
-- ]
--exprToJSON (App ann f x) = object [ T.pack "type" .= "App"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "abstraction" .= exprToJSON f
-- , T.pack "argument" .= exprToJSON x
-- ]
--exprToJSON (Case ann ss cs) = object [ T.pack "type" .= "Case"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "caseExpressions"
-+exprToJSON (Var ann i) = object [ mkKey "type" .= toJSON "Var"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "value" .= qualifiedToJSON runIdent i
-+ ]
-+exprToJSON (Literal ann l) = object [ mkKey "type" .= "Literal"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "value" .= literalToJSON exprToJSON l
-+ ]
-+exprToJSON (Constructor ann d c is) = object [ mkKey "type" .= "Constructor"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "typeName" .= properNameToJSON d
-+ , mkKey "constructorName" .= properNameToJSON c
-+ , mkKey "fieldNames" .= map identToJSON is
-+ ]
-+exprToJSON (Accessor ann f r) = object [ mkKey "type" .= "Accessor"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "fieldName" .= f
-+ , mkKey "expression" .= exprToJSON r
-+ ]
-+exprToJSON (ObjectUpdate ann r fs) = object [ mkKey "type" .= "ObjectUpdate"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "expression" .= exprToJSON r
-+ , mkKey "updates" .= recordToJSON exprToJSON fs
-+ ]
-+exprToJSON (Abs ann p b) = object [ mkKey "type" .= "Abs"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "argument" .= identToJSON p
-+ , mkKey "body" .= exprToJSON b
-+ ]
-+exprToJSON (App ann f x) = object [ mkKey "type" .= "App"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "abstraction" .= exprToJSON f
-+ , mkKey "argument" .= exprToJSON x
-+ ]
-+exprToJSON (Case ann ss cs) = object [ mkKey "type" .= "Case"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "caseExpressions"
- .= map exprToJSON ss
-- , T.pack "caseAlternatives"
-+ , mkKey "caseAlternatives"
- .= map caseAlternativeToJSON cs
- ]
--exprToJSON (Let ann bs e) = object [ T.pack "type" .= "Let"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "binds" .= map bindToJSON bs
-- , T.pack "expression" .= exprToJSON e
-+exprToJSON (Let ann bs e) = object [ mkKey "type" .= "Let"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "binds" .= map bindToJSON bs
-+ , mkKey "expression" .= exprToJSON e
- ]
-
- caseAlternativeToJSON :: CaseAlternative Ann -> Value
- caseAlternativeToJSON (CaseAlternative bs r') =
- let isGuarded = isLeft r'
- in object
-- [ T.pack "binders" .= toJSON (map binderToJSON bs)
-- , T.pack "isGuarded" .= toJSON isGuarded
-- , T.pack (if isGuarded then "expressions" else "expression")
-+ [ mkKey "binders" .= toJSON (map binderToJSON bs)
-+ , mkKey "isGuarded" .= toJSON isGuarded
-+ , mkKey (if isGuarded then "expressions" else "expression")
- .= case r' of
-- Left rs -> toJSON $ map (\(g, e) -> object [ T.pack "guard" .= exprToJSON g, T.pack "expression" .= exprToJSON e]) rs
-+ Left rs -> toJSON $ map (\(g, e) -> object [ mkKey "guard" .= exprToJSON g, mkKey "expression" .= exprToJSON e]) rs
- Right r -> exprToJSON r
- ]
-
- binderToJSON :: Binder Ann -> Value
--binderToJSON (VarBinder ann v) = object [ T.pack "binderType" .= "VarBinder"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "identifier" .= identToJSON v
-+binderToJSON (VarBinder ann v) = object [ mkKey "binderType" .= "VarBinder"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "identifier" .= identToJSON v
- ]
--binderToJSON (NullBinder ann) = object [ T.pack "binderType" .= "NullBinder"
-- , T.pack "annotation" .= annToJSON ann
-+binderToJSON (NullBinder ann) = object [ mkKey "binderType" .= "NullBinder"
-+ , mkKey "annotation" .= annToJSON ann
- ]
--binderToJSON (LiteralBinder ann l) = object [ T.pack "binderType" .= "LiteralBinder"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "literal" .= literalToJSON binderToJSON l
-+binderToJSON (LiteralBinder ann l) = object [ mkKey "binderType" .= "LiteralBinder"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "literal" .= literalToJSON binderToJSON l
- ]
--binderToJSON (ConstructorBinder ann d c bs) = object [ T.pack "binderType" .= "ConstructorBinder"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "typeName" .= qualifiedToJSON runProperName d
-- , T.pack "constructorName"
-+binderToJSON (ConstructorBinder ann d c bs) = object [ mkKey "binderType" .= "ConstructorBinder"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "typeName" .= qualifiedToJSON runProperName d
-+ , mkKey "constructorName"
- .= qualifiedToJSON runProperName c
-- , T.pack "binders" .= map binderToJSON bs
-+ , mkKey "binders" .= map binderToJSON bs
- ]
--binderToJSON (NamedBinder ann n b) = object [ T.pack "binderType" .= "NamedBinder"
-- , T.pack "annotation" .= annToJSON ann
-- , T.pack "identifier" .= identToJSON n
-- , T.pack "binder" .= binderToJSON b
-+binderToJSON (NamedBinder ann n b) = object [ mkKey "binderType" .= "NamedBinder"
-+ , mkKey "annotation" .= annToJSON ann
-+ , mkKey "identifier" .= identToJSON n
-+ , mkKey "binder" .= binderToJSON b
- ]
diff --git a/lang/purescript/patches/patch-src_Language_PureScript_Docs_Types.hs b/lang/purescript/patches/patch-src_Language_PureScript_Docs_Types.hs
deleted file mode 100644
index a162266b4b9..00000000000
--- a/lang/purescript/patches/patch-src_Language_PureScript_Docs_Types.hs
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-src_Language_PureScript_Docs_Types.hs,v 1.1 2022/02/23 16:22:33 pho Exp $
-
-Fix build with aeson-2.0
-
---- src/Language/PureScript/Docs/Types.hs.orig 2022-02-20 17:30:25.395973220 +0000
-+++ src/Language/PureScript/Docs/Types.hs
-@@ -20,6 +20,7 @@ import Data.Time.Clock (UTCTime)
- import qualified Data.Time.Format as TimeFormat
- import Data.Version
- import qualified Data.Aeson as A
-+import qualified Data.Aeson.Key as Key
- import qualified Data.Text as T
- import qualified Data.Vector as V
-
-@@ -702,7 +703,7 @@ asQualifiedProperName = fromAesonParser
- asModuleMap :: Parse PackageError (Map P.ModuleName PackageName)
- asModuleMap =
- Map.fromList <$>
-- eachInObjectWithKey (Right . P.moduleNameFromString)
-+ eachInObjectWithKey (Right . P.moduleNameFromString . Key.toText)
- (withText parsePackageName')
-
- -- This is here to preserve backwards compatibility with compilers which used
-@@ -722,7 +723,7 @@ bookmarksAsModuleMap =
-
- asResolvedDependencies :: Parse PackageError [(PackageName, Version)]
- asResolvedDependencies =
-- eachInObjectWithKey parsePackageName' asVersion
-+ eachInObjectWithKey (parsePackageName' . Key.toText) asVersion
-
- parsePackageName' :: Text -> Either PackageError PackageName
- parsePackageName' =
-@@ -751,10 +752,10 @@ instance A.ToJSON a => A.ToJSON (Package
- , "version" .= showVersion pkgVersion
- , "versionTag" .= pkgVersionTag
- , "modules" .= pkgModules
-- , "moduleMap" .= assocListToJSON P.runModuleName
-+ , "moduleMap" .= assocListToJSON (Key.fromText . P.runModuleName)
- runPackageName
- (Map.toList pkgModuleMap)
-- , "resolvedDependencies" .= assocListToJSON runPackageName
-+ , "resolvedDependencies" .= assocListToJSON (Key.fromText . runPackageName)
- (T.pack . showVersion)
- pkgResolvedDependencies
- , "github" .= pkgGithub
-@@ -840,7 +841,7 @@ instance A.ToJSON GithubRepo where
- --
- -- For example:
- -- @assocListToJSON T.pack T.pack [("a", "b")]@ will give @{"a": "b"}@.
--assocListToJSON :: (a -> Text) -> (b -> Text) -> [(a, b)] -> A.Value
-+assocListToJSON :: (a -> A.Key) -> (b -> Text) -> [(a, b)] -> A.Value
- assocListToJSON f g xs = A.object (map (uncurry (.=) . (f *** g)) xs)
-
- instance A.ToJSON a => A.ToJSON (InPackage a) where
diff --git a/lang/purescript/patches/patch-src_Language_PureScript_Errors_JSON.hs b/lang/purescript/patches/patch-src_Language_PureScript_Errors_JSON.hs
deleted file mode 100644
index a1fdca4fa92..00000000000
--- a/lang/purescript/patches/patch-src_Language_PureScript_Errors_JSON.hs
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_Language_PureScript_Errors_JSON.hs,v 1.1 2022/02/23 16:22:33 pho Exp $
-
-Fix build with GHC 9.2
-
---- src/Language/PureScript/Errors/JSON.hs.orig 2022-02-20 18:03:10.579584907 +0000
-+++ src/Language/PureScript/Errors/JSON.hs
-@@ -39,9 +39,9 @@ data JSONResult = JSONResult
- } deriving (Show, Eq)
-
- $(A.deriveJSON A.defaultOptions ''ErrorPosition)
-+$(A.deriveJSON A.defaultOptions ''ErrorSuggestion)
- $(A.deriveJSON A.defaultOptions ''JSONError)
- $(A.deriveJSON A.defaultOptions ''JSONResult)
--$(A.deriveJSON A.defaultOptions ''ErrorSuggestion)
-
- toJSONErrors :: Bool -> P.Level -> P.MultipleErrors -> [JSONError]
- toJSONErrors verbose level = map (toJSONError verbose level) . P.runMultipleErrors
diff --git a/lang/purescript/patches/patch-src_Language_PureScript_Graph.hs b/lang/purescript/patches/patch-src_Language_PureScript_Graph.hs
deleted file mode 100644
index 22ebe43b3ea..00000000000
--- a/lang/purescript/patches/patch-src_Language_PureScript_Graph.hs
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_Language_PureScript_Graph.hs,v 1.1 2022/02/23 16:22:33 pho Exp $
-
-Fix build with aeson-2.0
-
---- src/Language/PureScript/Graph.hs.orig 2022-02-20 17:59:47.559345082 +0000
-+++ src/Language/PureScript/Graph.hs
-@@ -3,7 +3,8 @@ module Language.PureScript.Graph (graph)
- import Prelude.Compat
-
- import qualified Data.Aeson as Json
--import qualified Data.HashMap.Strict as HashMap
-+import qualified Data.Aeson.Key as Key
-+import qualified Data.Aeson.KeyMap as KeyMap
- import qualified Data.Map as Map
-
- import Control.Monad (forM)
-@@ -44,7 +45,7 @@ moduleGraphToJSON
- moduleGraphToJSON paths = Json.Object . foldl' insert mempty
- where
- insert :: Json.Object -> (ModuleName, [ModuleName]) -> Json.Object
-- insert obj (mn, depends) = HashMap.insert (runModuleName mn) value obj
-+ insert obj (mn, depends) = KeyMap.insert (Key.fromText $ runModuleName mn) value obj
- where
- path = fromMaybe (Crash.internalError "missing module name in graph") $ Map.lookup mn paths
- value = Json.object
diff --git a/lang/purescript/patches/patch-src_Language_PureScript_Ide_Error.hs b/lang/purescript/patches/patch-src_Language_PureScript_Ide_Error.hs
deleted file mode 100644
index 756365e6ae5..00000000000
--- a/lang/purescript/patches/patch-src_Language_PureScript_Ide_Error.hs
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_Language_PureScript_Ide_Error.hs,v 1.1 2022/02/23 16:22:33 pho Exp $
-
-Fix build with aeson-2.0
-
---- src/Language/PureScript/Ide/Error.hs.orig 2022-02-20 18:04:21.957211592 +0000
-+++ src/Language/PureScript/Ide/Error.hs
-@@ -19,7 +19,7 @@ module Language.PureScript.Ide.Error
-
- import Data.Aeson
- import qualified Data.Aeson.Types as Aeson
--import qualified Data.HashMap.Lazy as HM
-+import qualified Data.Aeson.KeyMap as KM
- import qualified Data.Text as T
- import qualified Language.PureScript as P
- import Language.PureScript.Errors.JSON
-@@ -59,7 +59,7 @@ encodeRebuildErrors = toJSON . map encod
-
- insertTSCompletions name idents fields (Aeson.Object value) =
- Aeson.Object
-- (HM.insert "pursIde"
-+ (KM.insert "pursIde"
- (object [ "name" .= name
- , "completions" .= ordNub (map identCompletion idents ++ map fieldCompletion fields)
- ]) value)
diff --git a/lang/purescript/patches/patch-src_Language_PureScript_Publish.hs b/lang/purescript/patches/patch-src_Language_PureScript_Publish.hs
deleted file mode 100644
index 3af6ca36248..00000000000
--- a/lang/purescript/patches/patch-src_Language_PureScript_Publish.hs
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_Language_PureScript_Publish.hs,v 1.1 2022/02/23 16:22:33 pho Exp $
-
-Fix build with aeson-2.0
-
---- src/Language/PureScript/Publish.hs.orig 2022-02-20 18:01:35.029300166 +0000
-+++ src/Language/PureScript/Publish.hs
-@@ -23,6 +23,7 @@ import Control.Arrow ((***))
- import Control.Category ((>>>))
- import Control.Monad.Writer.Strict (MonadWriter, WriterT, runWriterT, tell)
-
-+import qualified Data.Aeson.Key as Key
- import Data.Aeson.BetterErrors (Parse, parse, keyMay, eachInObjectWithKey, key, asString, withString)
- import qualified Data.ByteString.Lazy as BL
- import Data.String (String, lines)
-@@ -321,7 +322,7 @@ parseResolutionsFile resolutionsFile = d
- -- "path" field is required.
- asResolutions :: Parse D.PackageError [(PackageName, (FilePath, DependencyStatus))]
- asResolutions =
-- eachInObjectWithKey parsePackageName $
-+ eachInObjectWithKey (parsePackageName . Key.toText) $
- (,) <$> key "path" asString
- <*> (maybe NoResolution ResolvedVersion <$> keyMay "version" asVersion)
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-09 07:15:21 +0000