Sat May 4 09:41:25 2024 UTC (24d)
lang/purescript: Update to 0.15.15

Release notes are too long to paste here:
https://github.com/purescript/purescript/releases/tag/v0.15.15
https://github.com/purescript/purescript/releases/tag/v0.15.14
https://github.com/purescript/purescript/releases/tag/v0.15.13


(pho)
diff -r1.14 -r1.15 pkgsrc/lang/purescript/Makefile
diff -r1.4 -r1.5 pkgsrc/lang/purescript/PLIST
diff -r1.4 -r1.5 pkgsrc/lang/purescript/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_TypeChecker_Entailment.hs
cvs diff -r1.14 -r1.15 pkgsrc/lang/purescript/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/purescript/Makefile 2023/11/02 06:37:10 1.14
+++ pkgsrc/lang/purescript/Makefile 2024/05/04 09:41:24 1.15
@@ -1,57 +1,59 @@ @@ -1,57 +1,59 @@
1# $NetBSD: Makefile,v 1.14 2023/11/02 06:37:10 pho Exp $ 1# $NetBSD: Makefile,v 1.15 2024/05/04 09:41:24 pho Exp $
2 2
3DISTNAME= purescript-0.15.12 3DISTNAME= purescript-0.15.15
4PKGNAME= ${DISTNAME} 4PKGNAME= ${DISTNAME}
5PKGREVISION= 1 
6CATEGORIES= lang 5CATEGORIES= lang
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.purescript.org/ 8HOMEPAGE= http://www.purescript.org/
10COMMENT= Strongly typed programming language that compiles to JavaScript 9COMMENT= Strongly typed programming language that compiles to JavaScript
11LICENSE= modified-bsd 10LICENSE= modified-bsd
12 11
13USE_TOOLS+= happy 12USE_TOOLS+= happy
14 13
15CONFIGURE_ARGS+= -f release 14CONFIGURE_ARGS+= -f release
16 15
17HASKELL_UNRESTRICT_DEPENDENCIES+= \ 
18 Cabal \ 
19 aeson \ 
20 ansi-terminal \ 
21 ansi-wl-pprint \ 
22 base \ 
23 cryptonite \ 
24 happy \ 
25 language-javascript \ 
26 lens \ 
27 memory \ 
28 mtl \ 
29 optparse-applicative \ 
30 process \ 
31 semialign \ 
32 template-haskell \ 
33 text \ 
34 these \ 
35 time \ 
36 transformers \ 
37 vector 
38 
39# Use crypton instead of outdated cryptonite. 16# Use crypton instead of outdated cryptonite.
40SUBST_CLASSES+= crypton 17SUBST_CLASSES+= crypton
41SUBST_STAGE.crypton= post-extract 18SUBST_STAGE.crypton= post-extract
42SUBST_FILES.crypton= purescript.cabal 19SUBST_FILES.crypton= purescript.cabal
43SUBST_SED.crypton= -e 's/cryptonite/crypton/g' 20SUBST_SED.crypton= -e 's/cryptonite/crypton/g'
44 21
 22HASKELL_UNRESTRICT_DEPENDENCIES+= \
 23 Cabal \
 24 aeson \
 25 ansi-terminal \
 26 ansi-wl-pprint \
 27 base \
 28 bytestring \
 29 crypton \
 30 deepseq \
 31 happy \
 32 language-javascript \
 33 lens \
 34 memory \
 35 mtl \
 36 network \
 37 optparse-applicative \
 38 process \
 39 semialign \
 40 template-haskell \
 41 text \
 42 these \
 43 time \
 44 transformers \
 45 vector
 46
45# If purs is to be linked dynamically, it will depend on more than 180 47# If purs is to be linked dynamically, it will depend on more than 180
46# shared objects and the dynamic linker will spend several seconds to 48# shared objects and the dynamic linker will spend several seconds to
47# resolve symbols on startup. This is unacceptable because purs tends to be 49# resolve symbols on startup. This is unacceptable because purs tends to be
48# launched very frequently by build systems. This wastes storage, but time 50# launched very frequently by build systems. This wastes storage, but time
49# is more expensive than disks. 51# is more expensive than disks.
50HASKELL_ENABLE_DYNAMIC_EXECUTABLE= no 52HASKELL_ENABLE_DYNAMIC_EXECUTABLE= no
51 53
52# It makes no sense to build the profiling library because this package 54# It makes no sense to build the profiling library because this package
53# isn't meant to be used as a library. 55# isn't meant to be used as a library.
54HASKELL_ENABLE_LIBRARY_PROFILING= no 56HASKELL_ENABLE_LIBRARY_PROFILING= no
55 57
56# purs is built with optparse-applicative, and can generate shell 58# purs is built with optparse-applicative, and can generate shell
57# completion scripts automatically. 59# completion scripts automatically.
cvs diff -r1.4 -r1.5 pkgsrc/lang/purescript/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/purescript/PLIST 2023/10/31 07:38:55 1.4
+++ pkgsrc/lang/purescript/PLIST 2024/05/04 09:41:24 1.5
@@ -1,17 +1,15 @@ @@ -1,17 +1,15 @@
1@comment $NetBSD: PLIST,v 1.4 2023/10/31 07:38:55 pho Exp $ 1@comment $NetBSD: PLIST,v 1.5 2024/05/04 09:41:24 pho Exp $
2bin/purs 2bin/purs
3lib/${PKGNAME}/${HS_VERSION}/package-description 
4lib/${PKGNAME}/${HS_VERSION}/package-id 
5${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 3${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
6${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger.dyn_hi 4${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger.dyn_hi
7lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger.hi 5lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Logger.hi
8${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Supply.dyn_hi 6${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Supply.dyn_hi
9lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Supply.hi 7lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Supply.hi
10${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Supply/Class.dyn_hi 8${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Supply/Class.dyn_hi
11lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Supply/Class.hi 9lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Supply/Class.hi
12${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/PureScript.dyn_hi 10${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/PureScript.dyn_hi
13lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/PureScript.hi 11lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/PureScript.hi
14${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript.dyn_hi 12${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript.dyn_hi
15lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript.hi 13lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript.hi
16${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST.dyn_hi 14${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST.dyn_hi
17lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST.hi 15lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/AST.hi
@@ -157,26 +155,28 @@ ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_P @@ -157,26 +155,28 @@ ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_P
157lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Tags.hi 155lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Tags.hi
158${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Types.dyn_hi 156${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Types.dyn_hi
159lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Types.hi 157lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Types.hi
160${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Utils/MonoidExtras.dyn_hi 158${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Utils/MonoidExtras.dyn_hi
161lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Utils/MonoidExtras.hi 159lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Docs/Utils/MonoidExtras.hi
162${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Environment.dyn_hi 160${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Environment.dyn_hi
163lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Environment.hi 161lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Environment.hi
164${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Errors.dyn_hi 162${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Errors.dyn_hi
165lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Errors.hi 163lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Errors.hi
166${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Errors/JSON.dyn_hi 164${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Errors/JSON.dyn_hi
167lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Errors/JSON.hi 165lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Errors/JSON.hi
168${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Externs.dyn_hi 166${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Externs.dyn_hi
169lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Externs.hi 167lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Externs.hi
 168${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Glob.dyn_hi
 169lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Glob.hi
170${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Graph.dyn_hi 170${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Graph.dyn_hi
171lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Graph.hi 171lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Graph.hi
172${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Hierarchy.dyn_hi 172${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Hierarchy.dyn_hi
173lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Hierarchy.hi 173lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Hierarchy.hi
174${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide.dyn_hi 174${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide.dyn_hi
175lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide.hi 175lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide.hi
176${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/CaseSplit.dyn_hi 176${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/CaseSplit.dyn_hi
177lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/CaseSplit.hi 177lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/CaseSplit.hi
178${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/Command.dyn_hi 178${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/Command.dyn_hi
179lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/Command.hi 179lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/Command.hi
180${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/Completion.dyn_hi 180${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/Completion.dyn_hi
181lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/Completion.hi 181lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/Completion.hi
182${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/Error.dyn_hi 182${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Ide/Error.dyn_hi
@@ -350,26 +350,28 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Language/ @@ -350,26 +350,28 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Language/
350${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Types.dyn_hi 350${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Types.dyn_hi
351lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Types.hi 351lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Types.hi
352${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Unify.dyn_hi 352${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Unify.dyn_hi
353lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Unify.hi 353lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeChecker/Unify.hi
354${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeClassDictionaries.dyn_hi 354${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeClassDictionaries.dyn_hi
355lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeClassDictionaries.hi 355lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/TypeClassDictionaries.hi
356${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Types.dyn_hi 356${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Types.dyn_hi
357lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Types.hi 357lib/${HS_PLATFORM}/${HS_PKGID}/Language/PureScript/Types.hi
358${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_purescript.dyn_hi 358${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_purescript.dyn_hi
359lib/${HS_PLATFORM}/${HS_PKGID}/Paths_purescript.hi 359lib/${HS_PLATFORM}/${HS_PKGID}/Paths_purescript.hi
360${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/IO/UTF8.dyn_hi 360${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/IO/UTF8.dyn_hi
361lib/${HS_PLATFORM}/${HS_PKGID}/System/IO/UTF8.hi 361lib/${HS_PLATFORM}/${HS_PKGID}/System/IO/UTF8.hi
362lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a 362lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
 363lib/${PKGNAME}/${HS_VERSION}/package-description
 364lib/${PKGNAME}/${HS_VERSION}/package-id
363share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE 365share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE
364${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Monad-Logger.html 366${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Monad-Logger.html
365${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Monad-Supply-Class.html 367${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Monad-Supply-Class.html
366${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Monad-Supply.html 368${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Control-Monad-Supply.html
367${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Binders.html 369${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Binders.html
368${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Declarations-ChainId.html 370${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Declarations-ChainId.html
369${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Declarations.html 371${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Declarations.html
370${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Exported.html 372${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Exported.html
371${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Literals.html 373${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Literals.html
372${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Operators.html 374${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Operators.html
373${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-SourcePos.html 375${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-SourcePos.html
374${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Traversals.html 376${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Traversals.html
375${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Utils.html 377${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-AST-Utils.html
@@ -430,26 +432,27 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P @@ -430,26 +432,27 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P
430${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Prim.html 432${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Prim.html
431${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Render.html 433${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Render.html
432${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-RenderedCode-RenderType.html 434${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-RenderedCode-RenderType.html
433${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-RenderedCode-Types.html 435${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-RenderedCode-Types.html
434${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-RenderedCode.html 436${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-RenderedCode.html
435${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Tags.html 437${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Tags.html
436${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Types.html 438${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Types.html
437${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Utils-MonoidExtras.html 439${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs-Utils-MonoidExtras.html
438${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs.html 440${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Docs.html
439${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Environment.html 441${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Environment.html
440${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Errors-JSON.html 442${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Errors-JSON.html
441${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Errors.html 443${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Errors.html
442${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Externs.html 444${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Externs.html
 445${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Glob.html
443${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Graph.html 446${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Graph.html
444${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Hierarchy.html 447${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Hierarchy.html
445${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-CaseSplit.html 448${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-CaseSplit.html
446${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Command.html 449${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Command.html
447${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Completion.html 450${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Completion.html
448${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Error.html 451${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Error.html
449${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Externs.html 452${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Externs.html
450${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Filter-Declaration.html 453${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Filter-Declaration.html
451${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Filter-Imports.html 454${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Filter-Imports.html
452${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Filter.html 455${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Filter.html
453${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Imports-Actions.html 456${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Imports-Actions.html
454${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Imports.html 457${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Imports.html
455${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Logging.html 458${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Ide-Logging.html
@@ -526,27 +529,26 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P @@ -526,27 +529,26 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P
526${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Monad.html 529${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Monad.html
527${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Roles.html 530${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Roles.html
528${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Skolems.html 531${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Skolems.html
529${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Subsumption.html 532${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Subsumption.html
530${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Synonyms.html 533${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Synonyms.html
531${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-TypeSearch.html 534${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-TypeSearch.html
532${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Types.html 535${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Types.html
533${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Unify.html 536${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker-Unify.html
534${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker.html 537${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeChecker.html
535${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeClassDictionaries.html 538${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-TypeClassDictionaries.html
536${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Types.html 539${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript-Types.html
537${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript.html 540${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Language-PureScript.html
538${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/System-IO-UTF8.html 541${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/System-IO-UTF8.html
539${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-36.html 
540${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-45.html 542${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-45.html
541${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-95.html 543${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-95.html
542${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-A.html 544${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-A.html
543${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-All.html 545${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-All.html
544${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-B.html 546${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-B.html
545${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-C.html 547${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-C.html
546${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-D.html 548${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-D.html
547${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-E.html 549${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-E.html
548${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-F.html 550${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-F.html
549${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-G.html 551${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-G.html
550${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-H.html 552${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-H.html
551${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-I.html 553${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-I.html
552${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-J.html 554${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-J.html
@@ -555,22 +557,20 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P @@ -555,22 +557,20 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P
555${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-M.html 557${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-M.html
556${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-N.html 558${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-N.html
557${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-O.html 559${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-O.html
558${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-P.html 560${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-P.html
559${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Q.html 561${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Q.html
560${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-R.html 562${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-R.html
561${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-S.html 563${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-S.html
562${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-T.html 564${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-T.html
563${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-U.html 565${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-U.html
564${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-V.html 566${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-V.html
565${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-W.html 567${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-W.html
566${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Z.html 568${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Z.html
567${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.html 569${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.html
568${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.json 
569${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/haddock-bundle.min.js 570${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/haddock-bundle.min.js
570${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/index.html 571${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/index.html
571${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/linuwial.css 572${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/linuwial.css
572${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/meta.json 573${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/meta.json
573${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/purescript.haddock 574${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/purescript.haddock
574${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.css 575${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.css
575${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.min.js 
576${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/synopsis.png 576${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/synopsis.png
cvs diff -r1.4 -r1.5 pkgsrc/lang/purescript/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/purescript/distinfo 2023/10/31 07:38:55 1.4
+++ pkgsrc/lang/purescript/distinfo 2024/05/04 09:41:24 1.5
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.4 2023/10/31 07:38:55 pho Exp $ 1$NetBSD: distinfo,v 1.5 2024/05/04 09:41:24 pho Exp $
2 2
3BLAKE2s (purescript-0.15.12.tar.gz) = 322940beeea9c43fa59e1f7ea5d5224900847e76f2054285881655a12a2bf4d1 3BLAKE2s (purescript-0.15.15.tar.gz) = f86e0f5089b8e43a7a0c7adc9fb265162eb7e5506d794aec2a9c2a970b9ca92b
4SHA512 (purescript-0.15.12.tar.gz) = e4d53a8f72574e3e3e41527f7daf019acf951c073bb2e18921f291c412bf0e6587e2cb26bbad1ed0d397b4425ebca536e995243fe44adaa15f7c242bcbb0a393 4SHA512 (purescript-0.15.15.tar.gz) = 54a313c7a52e68b0f93d00bead1b127370cc390571574775479bd1084ff18e6394ca2de1e31929b6a82da6ed54f910fd60a1cb7b5c4fba9a781880098f5bf1f2
5Size (purescript-0.15.12.tar.gz) = 854162 bytes 5Size (purescript-0.15.15.tar.gz) = 860706 bytes
6SHA1 (patch-app_Command_Docs.hs) = eef45b27b8c825ac2ee5ccde01e6ddb23fe2ac42 6SHA1 (patch-app_Command_Docs.hs) = eef45b27b8c825ac2ee5ccde01e6ddb23fe2ac42
7SHA1 (patch-app_Command_Docs_Html.hs) = 0e129659af4d5bdc3a999a770864f9168565ac86 7SHA1 (patch-app_Command_Docs_Html.hs) = 0e129659af4d5bdc3a999a770864f9168565ac86
8SHA1 (patch-src_Control_Monad_Supply.hs) = 7e71a43457ed1969c960579ef6a48d40bd69b53a 8SHA1 (patch-src_Control_Monad_Supply.hs) = 7e71a43457ed1969c960579ef6a48d40bd69b53a
9SHA1 (patch-src_Language_PureScript_Errors.hs) = 1ec6e83da287ef1a3792dac990d7e95f0eab7e01 9SHA1 (patch-src_Language_PureScript_Errors.hs) = 1ec6e83da287ef1a3792dac990d7e95f0eab7e01
10SHA1 (patch-src_Language_PureScript_Renamer.hs) = 55156318114a19d6175fea1d82efec72d5f63f09 10SHA1 (patch-src_Language_PureScript_Renamer.hs) = 55156318114a19d6175fea1d82efec72d5f63f09
11SHA1 (patch-src_Language_PureScript_Sugar_Operators_Common.hs) = b40e0857547a694053e5a397680a57728fc7d286 11SHA1 (patch-src_Language_PureScript_Sugar_Operators_Common.hs) = b40e0857547a694053e5a397680a57728fc7d286
12SHA1 (patch-src_Language_PureScript_TypeChecker_Entailment.hs) = 7dc707fea43760532887e71e2ea4fd714389f73f 12SHA1 (patch-src_Language_PureScript_TypeChecker_Entailment.hs) = 69938101c1f6883c35d9a5cd270bfcff5935bddb
13SHA1 (patch-src_Language_PureScript_TypeChecker_Monad.hs) = 953ef2acbb8f1a31aa6497dade3e32ceb2ae2b02 13SHA1 (patch-src_Language_PureScript_TypeChecker_Monad.hs) = 953ef2acbb8f1a31aa6497dade3e32ceb2ae2b02
cvs diff -r1.1 -r1.2 pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_TypeChecker_Entailment.hs (expand / switch to unified diff)

--- pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_TypeChecker_Entailment.hs 2023/10/31 07:38:56 1.1
+++ pkgsrc/lang/purescript/patches/patch-src_Language_PureScript_TypeChecker_Entailment.hs 2024/05/04 09:41:24 1.2
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-src_Language_PureScript_TypeChecker_Entailment.hs,v 1.1 2023/10/31 07:38:56 pho Exp $ 1$NetBSD: patch-src_Language_PureScript_TypeChecker_Entailment.hs,v 1.2 2024/05/04 09:41:24 pho Exp $
2 2
3Control.Monad.State no longer re-exports functions from Control.Monad. 3Control.Monad.State no longer re-exports functions from Control.Monad.
4 4
5--- src/Language/PureScript/TypeChecker/Entailment.hs.orig 2023-10-31 07:20:17.099461014 +0000 5--- src/Language/PureScript/TypeChecker/Entailment.hs.orig 2023-11-04 02:42:45.000000000 +0000
6+++ src/Language/PureScript/TypeChecker/Entailment.hs 6+++ src/Language/PureScript/TypeChecker/Entailment.hs
7@@ -14,10 +14,11 @@ import Prelude 7@@ -14,10 +14,11 @@ import Prelude
8 import Protolude (ordNub) 8 import Protolude (ordNub, headMay)
9  9
10 import Control.Arrow (second, (&&&)) 10 import Control.Arrow (second, (&&&))
11+import Control.Monad (foldM, guard, join, zipWithM, zipWithM_, (<=<)) 11+import Control.Monad (foldM, guard, join, zipWithM, zipWithM_, (<=<))
12 import Control.Monad.Error.Class (MonadError(..)) 12 import Control.Monad.Error.Class (MonadError(..))
13-import Control.Monad.State (MonadState(..), MonadTrans(..), StateT(..), evalStateT, execStateT, foldM, gets, guard, join, modify, zipWithM, zipWithM_, (<=<)) 13-import Control.Monad.State (MonadState(..), MonadTrans(..), StateT(..), evalStateT, execStateT, foldM, gets, guard, join, modify, zipWithM, zipWithM_, (<=<))
14+import Control.Monad.State (MonadState(..), MonadTrans(..), StateT(..), evalStateT, execStateT, gets, modify) 14+import Control.Monad.State (MonadState(..), MonadTrans(..), StateT(..), evalStateT, execStateT, gets, modify)
15 import Control.Monad.Supply.Class (MonadSupply(..)) 15 import Control.Monad.Supply.Class (MonadSupply(..))
16-import Control.Monad.Writer (Any(..), MonadWriter(..), WriterT(..)) 16-import Control.Monad.Writer (Any(..), MonadWriter(..), WriterT(..))
17+import Control.Monad.Writer (MonadWriter(..), WriterT(..)) 17+import Control.Monad.Writer (MonadWriter(..), WriterT(..))
18  18
19 import Data.Either (lefts, partitionEithers) 19 import Data.Either (lefts, partitionEithers)
20 import Data.Foldable (for_, fold, toList) 20 import Data.Foldable (for_, fold, toList)
21@@ -26,6 +27,7 @@ import Data.Functor (($>)) 21@@ -26,6 +27,7 @@ import Data.Functor (($>), (<&>))
22 import Data.List (delete, findIndices, minimumBy, nubBy, sortOn, tails) 22 import Data.List (delete, findIndices, minimumBy, nubBy, sortOn, tails)
23 import Data.Maybe (catMaybes, fromMaybe, listToMaybe, mapMaybe) 23 import Data.Maybe (catMaybes, fromMaybe, listToMaybe, mapMaybe)
24 import Data.Map qualified as M 24 import Data.Map qualified as M
25+import Data.Monoid (Any(..)) 25+import Data.Monoid (Any(..))
26 import Data.Set qualified as S 26 import Data.Set qualified as S
27 import Data.Traversable (for) 27 import Data.Traversable (for)
28 import Data.Text (Text, stripPrefix, stripSuffix) 28 import Data.Text (Text, stripPrefix, stripSuffix)