pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/hs-pandoc-types Update to pandoc-types-1.20



details:   https://anonhg.NetBSD.org/pkgsrc/rev/81fc03c18d4c
branches:  trunk
changeset: 407911:81fc03c18d4c
user:      pho <pho%pkgsrc.org@localhost>
date:      Sat Jan 11 10:05:46 2020 +0000

description:
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.

diffstat:

 textproc/hs-pandoc-types/Makefile                         |   5 ++---
 textproc/hs-pandoc-types/buildlink3.mk                    |   7 +++----
 textproc/hs-pandoc-types/distinfo                         |  11 +++++------
 textproc/hs-pandoc-types/patches/patch-pandoc-types.cabal |  15 ---------------
 4 files changed, 10 insertions(+), 28 deletions(-)

diffs (78 lines):

diff -r 048cc6249921 -r 81fc03c18d4c textproc/hs-pandoc-types/Makefile
--- a/textproc/hs-pandoc-types/Makefile Sat Jan 11 09:59:05 2020 +0000
+++ b/textproc/hs-pandoc-types/Makefile Sat Jan 11 10:05:46 2020 +0000
@@ -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@localhost
@@ -11,5 +11,4 @@
 .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"
diff -r 048cc6249921 -r 81fc03c18d4c textproc/hs-pandoc-types/buildlink3.mk
--- a/textproc/hs-pandoc-types/buildlink3.mk    Sat Jan 11 09:59:05 2020 +0000
+++ b/textproc/hs-pandoc-types/buildlink3.mk    Sat Jan 11 10:05:46 2020 +0000
@@ -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
diff -r 048cc6249921 -r 81fc03c18d4c textproc/hs-pandoc-types/distinfo
--- a/textproc/hs-pandoc-types/distinfo Sat Jan 11 09:59:05 2020 +0000
+++ b/textproc/hs-pandoc-types/distinfo Sat Jan 11 10:05:46 2020 +0000
@@ -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
diff -r 048cc6249921 -r 81fc03c18d4c textproc/hs-pandoc-types/patches/patch-pandoc-types.cabal
--- a/textproc/hs-pandoc-types/patches/patch-pandoc-types.cabal Sat Jan 11 09:59:05 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-pandoc-types.cabal,v 1.1 2020/01/02 14:41:23 pho Exp $
-
-Relax the upper bound on semigroups
-
---- pandoc-types.cabal.orig    2019-09-24 16:16:57.000000000 +0000
-+++ pandoc-types.cabal
-@@ -57,7 +57,7 @@ Library
-                      transformers >= 0.2 && < 0.6,
-                      QuickCheck >= 2.4 && < 2.14
-   if !impl(ghc >= 8.0)
--    Build-depends:   semigroups == 0.18.*
-+    Build-depends:   semigroups >= 0.18
-   ghc-options:       -Wall
- 
- test-suite test-pandoc-types



Home | Main Index | Thread Index | Old Index