diff --git a/ghc-pandoc-types.changes b/ghc-pandoc-types.changes index f03a9ff..a91ab56 100644 --- a/ghc-pandoc-types.changes +++ b/ghc-pandoc-types.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Mon May 14 17:02:11 UTC 2018 - psimons@suse.com + +- Update pandoc-types to version 1.17.4.2 revision 1. + * Import Semigroups when needed rather than using CPP. + * Bump criterion upper bound. + * Add Semigroup instances for Pandoc, Meta, Inlines, Blocks + (if base >= 4.9). This is needed for the library to compile + with ghc 8.4. + * Bumped criterion upper bound. + * Bumped upper bounds for criterion and QuickCheck. + * Added Walkable instances for `[Inline] Inline` and `[Block] Block`. + * Provide default implementation for walk (Albert Krewinkel). + The implementations for `walk` and `walkM` are very similar, so a + default method is provided which implements the former in terms of the + latter. This change should not affect performance, as the `Identity` + functor, which is used in the default definition, is a newtype that + should be eliminated at compile time. (This requires a dependency + on transformers for ghc 7.8.x.) + * Force optimizations when compiling Walk module (Albert Krewinkel). + * Add `Applicative m` to the context of walkM (Albert Krewinkel). + The acceptance of AMP makes this a natural change. + * Add `Walkable [Block]` and `Walkable [Inline]` instances (Albert + Krewinkel). + * Factored out duplicate code in Walk. + * Added benchmark. + * Text.Pandoc.JSON: Use `walk` instead of `bottomUp` in the + `ToJSONFilter` instance for `a -> [a]`. Note that behavior will be + slightly different, since bottomUp's treatment of a function `[a] -> [a]` + is to apply it to each sublist of a list, while walk applies it only to + maximal sublists. Usually the latter behavior is what is wanted, and the + former can be simulated when needed. But there may be existing filters + that need to be rewritten in light of the new behavior. + * Better consistency in simpleTable and table (jgm/pandoc#3648). + If `headers` is empty, we populate it with empty cells, using the rows + to determine number of columns. We also ensure that there are numcols + alignments and column widths. + * Make sure Div and Span occur in Arbitrary instances. + * Bump dependency upper bounds. + * Removed unused mapConst. + ------------------------------------------------------------------- Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 1d1b2cf..2148700 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-pandoc-types # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,14 +19,14 @@ %global pkg_name pandoc-types %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.17.0.5 +Version: 1.17.4.2 Release: 0 Summary: Types for representing a structured document -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/4.cabal#/%{pkg_name}.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-aeson-devel @@ -35,6 +35,7 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-syb-devel +BuildRequires: ghc-transformers-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-string-qq-devel @@ -93,7 +94,7 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %ghc_pkg_recache %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %doc changelog diff --git a/pandoc-types-1.17.0.5.tar.gz b/pandoc-types-1.17.0.5.tar.gz deleted file mode 100644 index 0898a47..0000000 --- a/pandoc-types-1.17.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3 -size 21898 diff --git a/pandoc-types-1.17.4.2.tar.gz b/pandoc-types-1.17.4.2.tar.gz new file mode 100644 index 0000000..29be17e --- /dev/null +++ b/pandoc-types-1.17.4.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57e15e0a8c74f1acc96259d24eb77a6febbc182a1fd8092af8c431e7a3263eca +size 24035 diff --git a/pandoc-types.cabal b/pandoc-types.cabal index a9aa74b..29de62b 100644 --- a/pandoc-types.cabal +++ b/pandoc-types.cabal @@ -1,6 +1,6 @@ Name: pandoc-types -Version: 1.17.0.5 -x-revision: 4 +Version: 1.17.4.2 +x-revision: 1 Synopsis: Types for representing a structured document Description: @Text.Pandoc.Definition@ defines the 'Pandoc' data structure, which is used by pandoc to represent @@ -29,7 +29,7 @@ License-file: LICENSE Author: John MacFarlane Maintainer: jgm@berkeley.edu Bug-Reports: https://github.com/jgm/pandoc-types/issues -Copyright: (c) 2006-2015 John MacFarlane +Copyright: (c) 2006-2017 John MacFarlane Category: Text Build-type: Simple Cabal-version: >=1.8 @@ -47,17 +47,21 @@ Library Text.Pandoc.JSON Text.Pandoc.Arbitrary Other-modules: Paths_pandoc_types - Build-depends: base >= 4 && < 5, + Build-depends: base >= 4.8 && < 5, containers >= 0.3, syb >= 0.1 && < 0.8, ghc-prim >= 0.2, bytestring >= 0.9 && < 0.11, - aeson >= 0.6.2 && < 1.3, + aeson >= 0.6.2 && < 1.4, + transformers >= 0.2 && < 0.6, QuickCheck >= 2 + if !impl(ghc >= 8.0) + Build-depends: semigroups == 0.18.* if impl(ghc < 7.10) Build-depends: deepseq-generics >= 0.1 && < 0.2 else Build-depends: deepseq >= 1.4.1 && < 1.5 + ghc-options: -Wall test-suite test-pandoc-types type: exitcode-stdio-1.0 @@ -66,13 +70,22 @@ test-suite test-pandoc-types build-depends: base, pandoc-types, syb, - aeson >= 0.6.2 && < 1.3, + aeson >= 0.6.2 && < 1.4, containers >= 0.3, bytestring >= 0.9 && < 0.11, test-framework >= 0.3 && < 0.9, test-framework-hunit >= 0.2 && < 0.4, test-framework-quickcheck2 >= 0.2.9 && < 0.4, - QuickCheck >= 2.4 && < 2.11, + QuickCheck >= 2.4 && < 2.12, HUnit >= 1.2 && < 1.7, string-qq == 0.0.2 - ghc-options: -threaded -rtsopts -with-rtsopts=-N + ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall -O2 + +benchmark benchmark-pandoc-types + type: exitcode-stdio-1.0 + main-is: bench.hs + hs-source-dirs: benchmark + build-depends: pandoc-types, + base >= 4.2 && < 5, + criterion >= 1.0 && < 1.5 + ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind -O2