Received: by mail.netbsd.org (Postfix, from userid 605) id 3B86D84DE9; Sat, 11 Jan 2020 10:05:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B723684DE5 for ; Sat, 11 Jan 2020 10:05:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id y1oqFnolCn3v for ; Sat, 11 Jan 2020 10:05:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id F0F3684D33 for ; Sat, 11 Jan 2020 10:05:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EAD78FBF4; Sat, 11 Jan 2020 10:05:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157873714628900" MIME-Version: 1.0 Date: Sat, 11 Jan 2020 10:05:46 +0000 From: "Masatake Daimon" Subject: CVS commit: pkgsrc/textproc/hs-pandoc-types To: pkgsrc-changes@NetBSD.org Reply-To: pho@netbsd.org X-Mailer: log_accum Message-Id: <20200111100546.EAD78FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157873714628900 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: pho Date: Sat Jan 11 10:05:46 UTC 2020 Modified Files: pkgsrc/textproc/hs-pandoc-types: Makefile buildlink3.mk distinfo Removed Files: pkgsrc/textproc/hs-pandoc-types/patches: patch-pandoc-types.cabal Log Message: Update to pandoc-types-1.20 * Change all uses of String in type definitions to strict Text (Christian Despres) [API change]. The MetaValue instances using String have been kept, and parallel ones using Text were added. * Remove the Arbitrary Text orphan instance (Christian Despres). This instance should not have been in the Text.Pandoc.Arbitrary, since it would have been exported with the rest of the instances in that module. Instead, more shrink* functions were added to compensate for the absence of this instance. * Add Text.Pandoc.Legacy.Definition (Christian Despres). To ease the transition to Text, this module provides an interface compatible with the String one, so that any unqualified imports of Text.Pandoc.Definition in other packages can be replaced by Text.Pandoc.Legacy.Definition without other code changes. This is done with PatternSynonyms. Some of the constructors of the types Meta, MetaValue, Block, Inline, Format, and Citation required PatternSynonym handling. The Attr and Target types had to be redefined, and certain functions had to be rewritten to handle String or the old Attr and Target types in this module. This module otherwise exports the definitions in Text.Pandoc.Definition unchanged. This is not a perfect drop-in replacement, since some imports like Inline(..) will no longer work. This may also cause incomplete pattern warnings when used, since the coverage checker does not seem to be aware of PatternSynonyms. * Add Text.Pandoc.Legacy.Builder (Christian Despres). Like Text.Pandoc.Legacy.Definition, this modules provides a compatibility interface while the transition to Text takes place. Unlike that module, this module only requires redefining the ToMetaValue and HasMeta classes and a few functions so that they use the old types. No PatternSynonyms are required. * Change Semigroup/Monoid instance for Meta. Previously `<>` was left-biased, so if meta1 and meta2 both contained a field 'foo', the value from meta1 would be retained in `meta1 <> meta2`, and the value from meta2 ignored. This is counterintuitive and doesn't work well with pandoc; for example, we want to be able to override a value in an earlier `--metadata-file` with a later one on the command line. It also makes the behavior of metadata more like other things (such as reference links, where later definitions take precedence over earlier ones). Note that this change may break some current workflows, if one is relying on metadata fields that occur later in a document to be overridden by those occurring earlier. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/hs-pandoc-types/Makefile \ pkgsrc/textproc/hs-pandoc-types/buildlink3.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/hs-pandoc-types/distinfo cvs rdiff -u -r1.1 -r0 \ pkgsrc/textproc/hs-pandoc-types/patches/patch-pandoc-types.cabal Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157873714628900 Content-Disposition: inline Content-Length: 3266 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/hs-pandoc-types/Makefile diff -u pkgsrc/textproc/hs-pandoc-types/Makefile:1.18 pkgsrc/textproc/hs-pandoc-types/Makefile:1.19 --- pkgsrc/textproc/hs-pandoc-types/Makefile:1.18 Thu Jan 2 14:41:22 2020 +++ pkgsrc/textproc/hs-pandoc-types/Makefile Sat Jan 11 10:05:46 2020 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2020/01/02 14:41:22 pho Exp $ +# $NetBSD: Makefile,v 1.19 2020/01/11 10:05:46 pho Exp $ -DISTNAME= pandoc-types-1.17.6.1 +DISTNAME= pandoc-types-1.20 CATEGORIES= textproc MAINTAINER= szptvlfn@NetBSD.org @@ -11,5 +11,4 @@ LICENSE= gnu-gpl-v2 .include "../../converters/hs-aeson/buildlink3.mk" .include "../../devel/hs-QuickCheck/buildlink3.mk" .include "../../devel/hs-syb/buildlink3.mk" -.include "../../math/hs-semigroups/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/textproc/hs-pandoc-types/buildlink3.mk diff -u pkgsrc/textproc/hs-pandoc-types/buildlink3.mk:1.18 pkgsrc/textproc/hs-pandoc-types/buildlink3.mk:1.19 --- pkgsrc/textproc/hs-pandoc-types/buildlink3.mk:1.18 Thu Jan 2 14:41:22 2020 +++ pkgsrc/textproc/hs-pandoc-types/buildlink3.mk Sat Jan 11 10:05:46 2020 @@ -1,18 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.18 2020/01/02 14:41:22 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2020/01/11 10:05:46 pho Exp $ BUILDLINK_TREE+= hs-pandoc-types .if !defined(HS_PANDOC_TYPES_BUILDLINK3_MK) HS_PANDOC_TYPES_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-pandoc-types+= hs-pandoc-types>=1.17.6 -BUILDLINK_ABI_DEPENDS.hs-pandoc-types+= hs-pandoc-types>=1.17.6.1 +BUILDLINK_API_DEPENDS.hs-pandoc-types+= hs-pandoc-types>=1.20 +BUILDLINK_ABI_DEPENDS.hs-pandoc-types+= hs-pandoc-types>=1.20 BUILDLINK_PKGSRCDIR.hs-pandoc-types?= ../../textproc/hs-pandoc-types .include "../../converters/hs-aeson/buildlink3.mk" .include "../../devel/hs-QuickCheck/buildlink3.mk" .include "../../devel/hs-syb/buildlink3.mk" -.include "../../math/hs-semigroups/buildlink3.mk" .endif # HS_PANDOC_TYPES_BUILDLINK3_MK BUILDLINK_TREE+= -hs-pandoc-types Index: pkgsrc/textproc/hs-pandoc-types/distinfo diff -u pkgsrc/textproc/hs-pandoc-types/distinfo:1.3 pkgsrc/textproc/hs-pandoc-types/distinfo:1.4 --- pkgsrc/textproc/hs-pandoc-types/distinfo:1.3 Thu Jan 2 14:41:22 2020 +++ pkgsrc/textproc/hs-pandoc-types/distinfo Sat Jan 11 10:05:46 2020 @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.3 2020/01/02 14:41:22 pho Exp $ +$NetBSD: distinfo,v 1.4 2020/01/11 10:05:46 pho Exp $ -SHA1 (pandoc-types-1.17.6.1.tar.gz) = 908f0e9674533525ebceec40964bad693d487abf -RMD160 (pandoc-types-1.17.6.1.tar.gz) = 9672cb3876bc718b8df4767371541d2e9e212925 -SHA512 (pandoc-types-1.17.6.1.tar.gz) = f6de0793ad2680faf4595154ebe376e1830c93927f31b728e6e9aabdac467267cd7c2333b6ba420ab808da1228e7265d23455d87b8f93d81f04aa97888fab6e1 -Size (pandoc-types-1.17.6.1.tar.gz) = 26363 bytes -SHA1 (patch-pandoc-types.cabal) = 9af9b5437291b95871eab58cc9cfc0b73bacaa65 +SHA1 (pandoc-types-1.20.tar.gz) = d36120b3c3f3122d16884eefeb3a54e16d7490d4 +RMD160 (pandoc-types-1.20.tar.gz) = d4f7b60ba3bef2c0f725e43a90d6d109dba4a9dc +SHA512 (pandoc-types-1.20.tar.gz) = 36c658093237246a344dc65bf9e214b250ea1a0aecf9931d80299f44ee152553c4326948bfae8e0f3e5aaabe93bc7a9aca0c79383e48b0f9d2696383df2b40ee +Size (pandoc-types-1.20.tar.gz) = 29505 bytes --_----------=_157873714628900--