Update to cheapskate-0.1.1.2
cheapskate 0.1.1.1 (24 Jan 2020) * Add Paths_cheapskate to other-modules * Support base 4.13 (Fumiaki Kinoshita)
This commit is contained in:
parent
0937070663
commit
7140de8d26
4 changed files with 49 additions and 82 deletions
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.1 2020/01/19 12:08:08 pho Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2021/04/24 17:25:42 pho Exp $
|
||||
|
||||
DISTNAME= cheapskate-0.1.1.1
|
||||
DISTNAME= cheapskate-0.1.1.2
|
||||
CATEGORIES= textproc
|
||||
|
||||
MAINTAINER= pho@cielonegro.org
|
||||
|
|
|
@ -1,44 +1,44 @@
|
|||
@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:15 rillig Exp $
|
||||
@comment $NetBSD: PLIST,v 1.2 2021/04/24 17:25:42 pho Exp $
|
||||
bin/cheapskate
|
||||
${HS_INTF}/package-description
|
||||
${HS_INTF}/package-id
|
||||
${HS_IMPL}/Cheapskate.dyn_hi
|
||||
${HS_IMPL}/Cheapskate.hi
|
||||
${HS_IMPL}/Cheapskate.p_hi
|
||||
${HS_IMPL}/Cheapskate/Html.dyn_hi
|
||||
${HS_IMPL}/Cheapskate/Html.hi
|
||||
${HS_IMPL}/Cheapskate/Html.p_hi
|
||||
${HS_IMPL}/Cheapskate/Inlines.dyn_hi
|
||||
${HS_IMPL}/Cheapskate/Inlines.hi
|
||||
${HS_IMPL}/Cheapskate/Inlines.p_hi
|
||||
${HS_IMPL}/Cheapskate/Parse.dyn_hi
|
||||
${HS_IMPL}/Cheapskate/Parse.hi
|
||||
${HS_IMPL}/Cheapskate/Parse.p_hi
|
||||
${HS_IMPL}/Cheapskate/ParserCombinators.dyn_hi
|
||||
${HS_IMPL}/Cheapskate/ParserCombinators.hi
|
||||
${HS_IMPL}/Cheapskate/ParserCombinators.p_hi
|
||||
${HS_IMPL}/Cheapskate/Types.dyn_hi
|
||||
${HS_IMPL}/Cheapskate/Types.hi
|
||||
${HS_IMPL}/Cheapskate/Types.p_hi
|
||||
${HS_IMPL}/Cheapskate/Util.dyn_hi
|
||||
${HS_IMPL}/Cheapskate/Util.hi
|
||||
${HS_IMPL}/Cheapskate/Util.p_hi
|
||||
${HS_IMPL}/Paths_cheapskate.dyn_hi
|
||||
${HS_IMPL}/Paths_cheapskate.hi
|
||||
${HS_IMPL}/Paths_cheapskate.p_hi
|
||||
${HS_IMPL}/libHS${HS_PKGID}.a
|
||||
${HS_IMPL}/libHS${HS_PKGID}_p.a
|
||||
lib/cheapskate-${PKGVERSION}/${HS_VERSION}/package-description
|
||||
lib/cheapskate-${PKGVERSION}/${HS_VERSION}/package-id
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate.dyn_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate.hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate.p_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Html.dyn_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Html.hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Html.p_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Inlines.dyn_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Inlines.hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Inlines.p_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Parse.dyn_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Parse.hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Parse.p_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/ParserCombinators.dyn_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/ParserCombinators.hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/ParserCombinators.p_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Types.dyn_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Types.hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Types.p_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Util.dyn_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Util.hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Cheapskate/Util.p_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Paths_cheapskate.dyn_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Paths_cheapskate.hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/Paths_cheapskate.p_hi
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
|
||||
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
|
||||
lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
|
||||
${HS_DOCS}/LICENSE
|
||||
${HS_DOCS}/html/Cheapskate-Html.html
|
||||
${HS_DOCS}/html/Cheapskate-Parse.html
|
||||
${HS_DOCS}/html/Cheapskate-Types.html
|
||||
${HS_DOCS}/html/Cheapskate.html
|
||||
${HS_DOCS}/html/cheapskate.haddock
|
||||
${HS_DOCS}/html/doc-index.html
|
||||
${HS_DOCS}/html/haddock-bundle.min.js
|
||||
${HS_DOCS}/html/index.html
|
||||
${HS_DOCS}/html/linuwial.css
|
||||
${HS_DOCS}/html/meta.json
|
||||
${HS_DOCS}/html/quick-jump.css
|
||||
${HS_DOCS}/html/synopsis.png
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/LICENSE
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/html/Cheapskate-Html.html
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/html/Cheapskate-Parse.html
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/html/Cheapskate-Types.html
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/html/Cheapskate.html
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/html/cheapskate.haddock
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/html/doc-index.html
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/html/haddock-bundle.min.js
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/html/index.html
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/html/linuwial.css
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/html/meta.json
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/html/quick-jump.css
|
||||
share/doc/${HS_PLATFORM}/cheapskate-${PKGVERSION}/html/synopsis.png
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
$NetBSD: distinfo,v 1.1 2020/01/19 12:08:08 pho Exp $
|
||||
$NetBSD: distinfo,v 1.2 2021/04/24 17:25:42 pho Exp $
|
||||
|
||||
SHA1 (cheapskate-0.1.1.1.tar.gz) = 2bbe9c32b2099a6666a2631dc9874df2bb3e8b22
|
||||
RMD160 (cheapskate-0.1.1.1.tar.gz) = 335c13460d81489e153063915307223646322abc
|
||||
SHA512 (cheapskate-0.1.1.1.tar.gz) = 551fdf43f8ed8e15ed4a5ac1649f319477cc80762a34499eed58c7c77e1f3e2bc0c4f9887aac7632f341e825c202850617d0572fa6cb748104bbf2874dfba353
|
||||
Size (cheapskate-0.1.1.1.tar.gz) = 27077 bytes
|
||||
SHA1 (patch-Cheapskate_ParserCombinators.hs) = 7a9d984294af467960436de1f13481e476b9c4b0
|
||||
SHA1 (cheapskate-0.1.1.2.tar.gz) = 154974fc8a986fc5178b7d7287702e8ccffaf0bf
|
||||
RMD160 (cheapskate-0.1.1.2.tar.gz) = 124b166a60d14fee14dd64bbcd5b9b862b983c7a
|
||||
SHA512 (cheapskate-0.1.1.2.tar.gz) = b671ada413b8bd90f28b008c7bada4b744dedac2c7711090f1148dfa1643f7843f44e56c9a5a99fd0f71ded8393a0095b04fbdf73f70a707698dc9fb76ed1b45
|
||||
Size (cheapskate-0.1.1.2.tar.gz) = 27114 bytes
|
||||
|
|
|
@ -1,32 +0,0 @@
|
|||
$NetBSD: patch-Cheapskate_ParserCombinators.hs,v 1.1 2020/01/19 12:08:08 pho Exp $
|
||||
|
||||
Fix build with recent GHC.
|
||||
|
||||
--- Cheapskate/ParserCombinators.hs.orig 2020-01-19 12:04:49.545981538 +0000
|
||||
+++ Cheapskate/ParserCombinators.hs
|
||||
@@ -35,6 +35,7 @@ import Prelude hiding (takeWhile)
|
||||
import Data.Text (Text)
|
||||
import qualified Data.Text as T
|
||||
import Control.Monad
|
||||
+import Control.Monad.Fail
|
||||
import Control.Applicative
|
||||
import qualified Data.Set as Set
|
||||
|
||||
@@ -109,7 +110,6 @@ instance Alternative Parser where
|
||||
|
||||
instance Monad Parser where
|
||||
return x = Parser $ \st -> Right (st, x)
|
||||
- fail e = Parser $ \st -> Left $ ParseError (position st) e
|
||||
p >>= g = Parser $ \st ->
|
||||
case evalParser p st of
|
||||
Left e -> Left e
|
||||
@@ -117,6 +117,9 @@ instance Monad Parser where
|
||||
{-# INLINE return #-}
|
||||
{-# INLINE (>>=) #-}
|
||||
|
||||
+instance MonadFail Parser where
|
||||
+ fail e = Parser $ \st -> Left $ ParseError (position st) e
|
||||
+
|
||||
instance MonadPlus Parser where
|
||||
mzero = Parser $ \st -> Left $ ParseError (position st) "(mzero)"
|
||||
mplus p1 p2 = Parser $ \st ->
|
Loading…
Reference in a new issue