CVS commit: pkgsrc/lang/spago

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/spago
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Tue, 31 Oct 2023 12:21:14 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Tue Oct 31 12:21:13 UTC 2023

Modified Files:
        pkgsrc/lang/spago: Makefile PLIST distinfo
        pkgsrc/lang/spago/patches: patch-src_Spago_Watch.hs
Added Files:
        pkgsrc/lang/spago/patches: patch-src_Spago_Version.hs
Removed Files:
        pkgsrc/lang/spago/patches: patch-src_Spago_Bower.hs

Log Message:
lang/spago: Update to 0.21.0

No change log is provided by the upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/spago/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/spago/PLIST pkgsrc/lang/spago/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/lang/spago/patches/patch-src_Spago_Bower.hs
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/spago/patches/patch-src_Spago_Version.hs
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/spago/patches/patch-src_Spago_Watch.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/spago/Makefile
diff -u pkgsrc/lang/spago/Makefile:1.9 pkgsrc/lang/spago/Makefile:1.10
--- pkgsrc/lang/spago/Makefile:1.9      Mon Oct  9 04:54:38 2023
+++ pkgsrc/lang/spago/Makefile  Tue Oct 31 12:21:13 2023
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2023/10/09 04:54:38 pho Exp $
+# $NetBSD: Makefile,v 1.10 2023/10/31 12:21:13 pho Exp $
 
-DISTNAME=      spago-0.20.9
+# NOTE: spago is getting rewritten in PureScript, and this Haskell
+# implementation is being phased out. We should remove this package and
+# have users install the new implementation via npm when it gets mature
+# and/or the old one bitrots further. It's already bitrotting.
+DISTNAME=      spago-0.21.0
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   7
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=purescript/}
 DISTFILES=     ${DEFAULT_DISTFILES}
@@ -32,6 +35,12 @@ REPLACE_INTERPRETER+=        node
 REPLACE.node.old=      .*node
 REPLACE.node.new=      ${PREFIX}/bin/node
 
+# Use crypton instead of outdated cryptonite.
+SUBST_CLASSES+=                crypton
+SUBST_STAGE.crypton=   post-extract
+SUBST_FILES.crypton=   spago.cabal
+SUBST_SED.crypton=     -e 's/cryptonite/crypton/g'
+
 HASKELL_UNRESTRICT_DEPENDENCIES+=      \
        text
 
@@ -56,7 +65,7 @@ HASKELL_ENABLE_LIBRARY_PROFILING=     no
 .include "../../devel/hs-ansi-terminal/buildlink3.mk"
 .include "../../devel/hs-async-pool/buildlink3.mk"
 .include "../../www/hs-bower-json/buildlink3.mk"
-.include "../../security/hs-cryptonite/buildlink3.mk"
+.include "../../security/hs-crypton/buildlink3.mk"
 .include "../../lang/dhall/buildlink3.mk"
 .include "../../devel/hs-either/buildlink3.mk"
 .include "../../devel/hs-file-embed/buildlink3.mk"
@@ -82,9 +91,11 @@ HASKELL_ENABLE_LIBRARY_PROFILING=    no
 .include "../../devel/hs-turtle/buildlink3.mk"
 .include "../../devel/hs-unliftio/buildlink3.mk"
 .include "../../devel/hs-unordered-containers/buildlink3.mk"
+.include "../../net/hs-uri-encode/buildlink3.mk"
 .include "../../devel/hs-utf8-string/buildlink3.mk"
 .include "../../devel/hs-versions/buildlink3.mk"
 .include "../../devel/hs-with-utf8/buildlink3.mk"
+.include "../../textproc/hs-yaml/buildlink3.mk"
 .include "../../archivers/hs-zlib/buildlink3.mk"
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/spago/PLIST
diff -u pkgsrc/lang/spago/PLIST:1.2 pkgsrc/lang/spago/PLIST:1.3
--- pkgsrc/lang/spago/PLIST:1.2 Mon Jan 30 07:47:32 2023
+++ pkgsrc/lang/spago/PLIST     Tue Oct 31 12:21:13 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2023/01/30 07:47:32 pho Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/10/31 12:21:13 pho Exp $
 bin/spago
 lib/${PKGNAME}/${HS_VERSION}/package-description
 lib/${PKGNAME}/${HS_VERSION}/package-id
@@ -21,6 +21,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Spago/Git
 lib/${HS_PLATFORM}/${HS_PKGID}/Spago/GitHub.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Spago/GlobalCache.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Spago/Messages.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Spago/NewConfig.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Spago/PackageSet.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Spago/Packages.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Spago/Prelude.hi
@@ -33,7 +34,7 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Spago/Typ
 lib/${HS_PLATFORM}/${HS_PKGID}/Spago/Version.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Spago/Watch.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/Spago-Async.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Spago-Bower.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Spago-Build.html
@@ -52,6 +53,7 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Spago-GitHub.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Spago-GlobalCache.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Spago-Messages.html
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Spago-NewConfig.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Spago-PackageSet.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Spago-Packages.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Spago-Prelude.html
@@ -105,10 +107,12 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Y.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/quick-jump.css
+${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/spago.haddock
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/synopsis.png
Index: pkgsrc/lang/spago/distinfo
diff -u pkgsrc/lang/spago/distinfo:1.2 pkgsrc/lang/spago/distinfo:1.3
--- pkgsrc/lang/spago/distinfo:1.2      Mon Jan 30 07:47:32 2023
+++ pkgsrc/lang/spago/distinfo  Tue Oct 31 12:21:13 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2023/01/30 07:47:32 pho Exp $
+$NetBSD: distinfo,v 1.3 2023/10/31 12:21:13 pho Exp $
 
 BLAKE2s (spago/docs-search-app-0.0.10.js) = 6688bba140b19751323a75faa6e3bc9919903ee83452af71b7cacb1de3de2cc2
 SHA512 (spago/docs-search-app-0.0.10.js) = 3489977e2f5bad60231ec866809cac156d085cdf4d6222fb1260c48ecee922d42a0ac2f81e99ddce57701ba278bc9cb05d99c924cb41aba21474553b74073e7c
@@ -12,8 +12,8 @@ Size (spago/purescript-docs-search-0.0.1
 BLAKE2s (spago/purescript-docs-search-0.0.11) = e5f03da04530b8ba4f56ec868c1aff5ab49b3239c4aa9a4bfee7e4ed0f5f0174
 SHA512 (spago/purescript-docs-search-0.0.11) = 1b3f659f04fafe13aa1b87f3e193875c359c377d48609be39a412f0b41dd668ebe18f65a423da05ba4ff6239d1dcd0d6e3c051b538452feeb3998d9ba6161cdf
 Size (spago/purescript-docs-search-0.0.11) = 426985 bytes
-BLAKE2s (spago/spago-0.20.9.tar.gz) = 253d1d1a3366e1c240ac5857a5b84cc34d6ba70136ce84c3fc16dc6fd8a17183
-SHA512 (spago/spago-0.20.9.tar.gz) = 0aeec66999b8bc84a2cff97e863a956ba0fc507af6e0dad7ab1c7ea22fad37a6ee269e53cac89ca80418fbd8e2cc80e10f3d351f9dc2f93f2a29ab6ec46e098d
-Size (spago/spago-0.20.9.tar.gz) = 136020 bytes
-SHA1 (patch-src_Spago_Bower.hs) = 8bbedecd2206c794de516b9378c3cd0001680966
-SHA1 (patch-src_Spago_Watch.hs) = c626158190a335a35bb677d567aa18834c4f689e
+BLAKE2s (spago/spago-0.21.0.tar.gz) = b983154f5d278f5363ffef6404f2e015b8e7da06b900a9c2e532a7a723d8e4c0
+SHA512 (spago/spago-0.21.0.tar.gz) = 134b265e032e64190e6a5584a5154d639b662a4b8a8ed94a787a58f6506ac3688cdd925385dc0538a82d43e6baf1f61ab8eb2341123b888d2904f19cfc3d54bb
+Size (spago/spago-0.21.0.tar.gz) = 207729 bytes
+SHA1 (patch-src_Spago_Version.hs) = 4b78ca114e56d16aa4796b33e2c17968b0627d6d
+SHA1 (patch-src_Spago_Watch.hs) = ab5bc44b39a38bc72eed85e520dfe19158af1d59

Index: pkgsrc/lang/spago/patches/patch-src_Spago_Watch.hs
diff -u pkgsrc/lang/spago/patches/patch-src_Spago_Watch.hs:1.1 pkgsrc/lang/spago/patches/patch-src_Spago_Watch.hs:1.2
--- pkgsrc/lang/spago/patches/patch-src_Spago_Watch.hs:1.1      Mon Jan 30 07:47:32 2023
+++ pkgsrc/lang/spago/patches/patch-src_Spago_Watch.hs  Tue Oct 31 12:21:13 2023
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_Spago_Watch.hs,v 1.1 2023/01/30 07:47:32 pho Exp $
+$NetBSD: patch-src_Spago_Watch.hs,v 1.2 2023/10/31 12:21:13 pho Exp $
 
 Fix build with fsnotify-0.4: debouncing has been removed; there's not even
 a configuration for that now.
 
---- src/Spago/Watch.hs.orig    2023-01-30 07:42:23.819176897 +0000
+--- src/Spago/Watch.hs.orig    2023-10-31 12:02:13.554006930 +0000
 +++ src/Spago/Watch.hs
 @@ -30,7 +30,7 @@ watch
    => Set.Set Glob.Pattern -> ClearScreen -> AllowIgnored -> RIO env ()

Added files:

Index: pkgsrc/lang/spago/patches/patch-src_Spago_Version.hs
diff -u /dev/null pkgsrc/lang/spago/patches/patch-src_Spago_Version.hs:1.1
--- /dev/null   Tue Oct 31 12:21:13 2023
+++ pkgsrc/lang/spago/patches/patch-src_Spago_Version.hs        Tue Oct 31 12:21:13 2023
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_Spago_Version.hs,v 1.1 2023/10/31 12:21:13 pho Exp $
+
+Fix build with versions-6.0.
+
+--- src/Spago/Version.hs.orig  2023-10-31 12:11:08.160531352 +0000
++++ src/Spago/Version.hs
+@@ -60,19 +60,22 @@ getCurrentVersion = do
+ 
+   case Safe.maximumMay tags of
+     Nothing -> do
+-      logInfo $ display $ "No git version tags found, so assuming current version is " <> unparseVersion mempty
+-      pure mempty
++      logInfo $ display $ "No git version tags found, so assuming current version is " <> unparseVersion semVerZero
++      pure semVerZero
+     Just maxVersion -> do
+       logInfo $ display $ "Found current version from git tag: " <> unparseVersion maxVersion
+       pure maxVersion
++  where
++    semVerZero :: SemVer
++    semVerZero = SemVer 0 0 0 Nothing Nothing
+ 
+ 
+ getNextVersion :: VersionBump -> SemVer -> Either Text SemVer
+ getNextVersion spec currentV@SemVer{..} =
+   case spec of
+-    Major -> Right $ SemVer (_svMajor + 1) 0 0 [] mempty
+-    Minor -> Right $ SemVer _svMajor (_svMinor + 1) 0 [] mempty
+-    Patch -> Right $ SemVer _svMajor _svMinor (_svPatch + 1) [] mempty
++    Major -> Right $ SemVer (_svMajor + 1) 0 0 Nothing Nothing
++    Minor -> Right $ SemVer _svMajor (_svMinor + 1) 0 Nothing Nothing
++    Patch -> Right $ SemVer _svMajor _svMinor (_svPatch + 1) Nothing Nothing
+     Exact newV
+       | currentV < newV -> Right newV
+       | otherwise -> do

Prev by Date: CVS commit: pkgsrc/net/hoogle
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/net/hoogle
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index