From 1fa4d090568a8d1378223777fc8f2cf1474878d7852a009cd4248f7a77e6b731 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Oct 2018 02:01:25 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-pandoc-types revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-pandoc-types?expand=0&rev=65 --- ghc-pandoc-types.changes | 9 ++++ ghc-pandoc-types.spec | 4 +- pandoc-types-1.17.5.2.tar.gz | 3 -- pandoc-types-1.17.5.3.tar.gz | 3 ++ pandoc-types.cabal | 92 ++++++++++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 4 deletions(-) delete mode 100644 pandoc-types-1.17.5.2.tar.gz create mode 100644 pandoc-types-1.17.5.3.tar.gz create mode 100644 pandoc-types.cabal diff --git a/ghc-pandoc-types.changes b/ghc-pandoc-types.changes index babe5bf..e6b19d6 100644 --- a/ghc-pandoc-types.changes +++ b/ghc-pandoc-types.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Oct 22 10:35:50 UTC 2018 - psimons@suse.com + +- Update pandoc-types to version 1.17.5.3. + [1.17.5.3] + + * For ghc < 7.10, constrain deepseq-generics to >= 0.2, which no + longer exprots NFData from deepseq. Add deepseq dependency. + ------------------------------------------------------------------- Sat Oct 20 02:01:51 UTC 2018 - psimons@suse.com diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index 947a160..b1b8c74 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -19,13 +19,14 @@ %global pkg_name pandoc-types %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.17.5.2 +Version: 1.17.5.3 Release: 0 Summary: Types for representing a structured document 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-aeson-devel @@ -75,6 +76,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/pandoc-types-1.17.5.2.tar.gz b/pandoc-types-1.17.5.2.tar.gz deleted file mode 100644 index d79602c..0000000 --- a/pandoc-types-1.17.5.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b5f1b93f252b769ccfae04e5ccd18fe32f45094cbcb32b6c29d50989ba1f742 -size 25740 diff --git a/pandoc-types-1.17.5.3.tar.gz b/pandoc-types-1.17.5.3.tar.gz new file mode 100644 index 0000000..d3781a6 --- /dev/null +++ b/pandoc-types-1.17.5.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2d0b618f026ed83b834e136ba97e5318c2708541b0a0a7d7b157d794c532bfb +size 26041 diff --git a/pandoc-types.cabal b/pandoc-types.cabal new file mode 100644 index 0000000..a37af2b --- /dev/null +++ b/pandoc-types.cabal @@ -0,0 +1,92 @@ +Name: pandoc-types +Version: 1.17.5.3 +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 + structured documents. This module used to live + in the pandoc package, but starting with pandoc 1.7, it + has been split off, so that other packages can use it + without drawing in all of pandoc's dependencies, and + pandoc itself can depend on packages (like citeproc-hs) + that use them. + . + @Text.Pandoc.Builder@ provides functions for building + up @Pandoc@ structures programmatically. + . + @Text.Pandoc.Generic@ provides generic functions for + manipulating Pandoc documents. + . + @Text.Pandoc.Walk@ provides faster, nongeneric functions + for manipulating Pandoc documents. + . + @Text.Pandoc.JSON@ provides functions for serializing + and deserializing a @Pandoc@ structure to and from JSON. + +Homepage: http://johnmacfarlane.net/pandoc +License: BSD3 +License-file: LICENSE +Author: John MacFarlane +Maintainer: jgm@berkeley.edu +Bug-Reports: https://github.com/jgm/pandoc-types/issues +Copyright: (c) 2006-2017 John MacFarlane +Category: Text +Build-type: Simple +Cabal-version: >=1.8 +Tested-With: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1 +Extra-Source-Files: changelog +Source-repository head + type: git + location: git://github.com/jgm/pandoc-types.git + +Library + Exposed-modules: Text.Pandoc.Definition + Text.Pandoc.Generic + Text.Pandoc.Walk + Text.Pandoc.Builder + Text.Pandoc.JSON + Text.Pandoc.Arbitrary + Other-modules: Paths_pandoc_types + Build-depends: base >= 4.5 && < 5, + containers >= 0.3, + syb >= 0.1 && < 0.8, + ghc-prim >= 0.2, + bytestring >= 0.9 && < 0.11, + aeson >= 0.6.2 && < 1.5, + transformers >= 0.2 && < 0.6, + QuickCheck >= 2.4 && < 2.13 + if !impl(ghc >= 8.0) + Build-depends: semigroups == 0.18.* + if impl(ghc < 7.10) + Build-depends: deepseq-generics >= 0.2 && < 0.3, + deepseq >= 1.3 && < 1.5 + else + Build-depends: deepseq >= 1.4.1 && < 1.5 + ghc-options: -Wall + +test-suite test-pandoc-types + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: test-pandoc-types.hs + build-depends: base, + pandoc-types, + syb, + aeson >= 0.6.2 && < 1.5, + 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.13, + HUnit >= 1.2 && < 1.7, + string-qq == 0.0.2 + 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.5 && < 5, + criterion >= 1.0 && < 1.6 + ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind -O2 From 293124fb72010b6ebac867dc5e4cd909a8e8bc8836a7758a3b7303c0c5f85b69 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Oct 2018 02:01:38 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-pandoc-types revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-pandoc-types?expand=0&rev=66 --- ghc-pandoc-types.changes | 9 ++++ ghc-pandoc-types.spec | 4 +- pandoc-types-1.17.5.3.tar.gz | 3 -- pandoc-types-1.17.5.4.tar.gz | 3 ++ pandoc-types.cabal | 92 ------------------------------------ 5 files changed, 13 insertions(+), 98 deletions(-) delete mode 100644 pandoc-types-1.17.5.3.tar.gz create mode 100644 pandoc-types-1.17.5.4.tar.gz delete mode 100644 pandoc-types.cabal diff --git a/ghc-pandoc-types.changes b/ghc-pandoc-types.changes index e6b19d6..c43746f 100644 --- a/ghc-pandoc-types.changes +++ b/ghc-pandoc-types.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Oct 29 09:03:16 UTC 2018 - psimons@suse.com + +- Update pandoc-types to version 1.17.5.4. + [1.17.5.4] + + * Put NFData in scope for ghc < 7.10. + * Reduce deepseq lower bound for ghc < 7.10. + ------------------------------------------------------------------- Mon Oct 22 10:35:50 UTC 2018 - psimons@suse.com diff --git a/ghc-pandoc-types.spec b/ghc-pandoc-types.spec index b1b8c74..0aa6c10 100644 --- a/ghc-pandoc-types.spec +++ b/ghc-pandoc-types.spec @@ -19,14 +19,13 @@ %global pkg_name pandoc-types %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.17.5.3 +Version: 1.17.5.4 Release: 0 Summary: Types for representing a structured document 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-aeson-devel @@ -76,7 +75,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/pandoc-types-1.17.5.3.tar.gz b/pandoc-types-1.17.5.3.tar.gz deleted file mode 100644 index d3781a6..0000000 --- a/pandoc-types-1.17.5.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2d0b618f026ed83b834e136ba97e5318c2708541b0a0a7d7b157d794c532bfb -size 26041 diff --git a/pandoc-types-1.17.5.4.tar.gz b/pandoc-types-1.17.5.4.tar.gz new file mode 100644 index 0000000..0fdf1e5 --- /dev/null +++ b/pandoc-types-1.17.5.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32aca86c510bd23c6bd54ce1a37ca005f4b84f077ab8e835a522833cf5179327 +size 26080 diff --git a/pandoc-types.cabal b/pandoc-types.cabal deleted file mode 100644 index a37af2b..0000000 --- a/pandoc-types.cabal +++ /dev/null @@ -1,92 +0,0 @@ -Name: pandoc-types -Version: 1.17.5.3 -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 - structured documents. This module used to live - in the pandoc package, but starting with pandoc 1.7, it - has been split off, so that other packages can use it - without drawing in all of pandoc's dependencies, and - pandoc itself can depend on packages (like citeproc-hs) - that use them. - . - @Text.Pandoc.Builder@ provides functions for building - up @Pandoc@ structures programmatically. - . - @Text.Pandoc.Generic@ provides generic functions for - manipulating Pandoc documents. - . - @Text.Pandoc.Walk@ provides faster, nongeneric functions - for manipulating Pandoc documents. - . - @Text.Pandoc.JSON@ provides functions for serializing - and deserializing a @Pandoc@ structure to and from JSON. - -Homepage: http://johnmacfarlane.net/pandoc -License: BSD3 -License-file: LICENSE -Author: John MacFarlane -Maintainer: jgm@berkeley.edu -Bug-Reports: https://github.com/jgm/pandoc-types/issues -Copyright: (c) 2006-2017 John MacFarlane -Category: Text -Build-type: Simple -Cabal-version: >=1.8 -Tested-With: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1 -Extra-Source-Files: changelog -Source-repository head - type: git - location: git://github.com/jgm/pandoc-types.git - -Library - Exposed-modules: Text.Pandoc.Definition - Text.Pandoc.Generic - Text.Pandoc.Walk - Text.Pandoc.Builder - Text.Pandoc.JSON - Text.Pandoc.Arbitrary - Other-modules: Paths_pandoc_types - Build-depends: base >= 4.5 && < 5, - containers >= 0.3, - syb >= 0.1 && < 0.8, - ghc-prim >= 0.2, - bytestring >= 0.9 && < 0.11, - aeson >= 0.6.2 && < 1.5, - transformers >= 0.2 && < 0.6, - QuickCheck >= 2.4 && < 2.13 - if !impl(ghc >= 8.0) - Build-depends: semigroups == 0.18.* - if impl(ghc < 7.10) - Build-depends: deepseq-generics >= 0.2 && < 0.3, - deepseq >= 1.3 && < 1.5 - else - Build-depends: deepseq >= 1.4.1 && < 1.5 - ghc-options: -Wall - -test-suite test-pandoc-types - type: exitcode-stdio-1.0 - hs-source-dirs: test - main-is: test-pandoc-types.hs - build-depends: base, - pandoc-types, - syb, - aeson >= 0.6.2 && < 1.5, - 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.13, - HUnit >= 1.2 && < 1.7, - string-qq == 0.0.2 - 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.5 && < 5, - criterion >= 1.0 && < 1.6 - ghc-options: -rtsopts -Wall -fno-warn-unused-do-bind -O2