From e15ff24525141f19de7946ab4d96e4987451d0ae Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 23 Feb 2019 12:43:32 +0800 Subject: [PATCH] update cabal-doctest to 1.0.6 --- .gitignore | 1 + distributive-0.5.3.cabal | 214 +++++++++++++++++++-------------------- ghc-distributive.spec | 13 ++- sources | 2 +- 4 files changed, 120 insertions(+), 110 deletions(-) diff --git a/.gitignore b/.gitignore index 25d79e5..6afae64 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /base-orphans-0.5.4.tar.gz /cabal-doctest-1.0.4.tar.gz /distributive-0.5.3.tar.gz +/cabal-doctest-1.0.6.tar.gz diff --git a/distributive-0.5.3.cabal b/distributive-0.5.3.cabal index b98e59f..6ed1891 100644 --- a/distributive-0.5.3.cabal +++ b/distributive-0.5.3.cabal @@ -1,107 +1,107 @@ -name: distributive -category: Data Structures -version: 0.5.3 -x-revision: 6 -license: BSD3 -cabal-version: >= 1.8 -license-file: LICENSE -author: Edward A. Kmett -maintainer: Edward A. Kmett -stability: provisional -homepage: http://github.com/ekmett/distributive/ -bug-reports: http://github.com/ekmett/distributive/issues -copyright: Copyright (C) 2011-2016 Edward A. Kmett -synopsis: Distributive functors -- Dual to Traversable -description: Distributive functors -- Dual to Traversable -build-type: Custom -extra-source-files: - .travis.yml - .vim.custom - config - travis-cabal-apt-install - CHANGELOG.markdown - README.markdown - Warning.hs - -source-repository head - type: git - location: git://github.com/ekmett/distributive.git - -custom-setup - setup-depends: - base >= 4 && <5, - Cabal, - cabal-doctest >= 1 && <1.1 - -flag semigroups - manual: True - default: True - description: - You can disable the use of the `semigroups` package using `-f-semigroups`. - . - Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. - -flag tagged - manual: True - default: True - description: - You can disable the use of the `tagged` package using `-f-tagged`. - . - Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. - -library - build-depends: - base >= 4 && < 5, - base-orphans >= 0.5.2 && < 1, - transformers >= 0.2 && < 0.6, - transformers-compat >= 0.3 && < 1 - - hs-source-dirs: src - exposed-modules: - Data.Distributive - - if impl(ghc>=7.2) - exposed-modules: Data.Distributive.Generic - - if flag(tagged) - build-depends: tagged >= 0.7 && < 1 - - if impl(ghc>=7.2 && < 7.6) - build-depends: ghc-prim - - if impl(ghc < 8.0) - if flag(semigroups) - -- we need Functor Semi.Min etc. - build-depends: semigroups >= 0.13 && < 1 - - if impl(ghc < 7.8) - hs-source-dirs: src-compat - other-modules: Data.Coerce - - ghc-options: -Wall - --- Verify the results of the examples -test-suite doctests - type: exitcode-stdio-1.0 - main-is: doctests.hs - build-depends: - base >= 4, - distributive, - doctest >= 0.11.1 && <0.17 - ghc-options: -Wall -threaded - hs-source-dirs: tests - -test-suite spec - type: exitcode-stdio-1.0 - hs-source-dirs: tests - - build-depends: - base >= 4 && < 5, - distributive, - generic-deriving >= 1.11 && < 2, - hspec >= 2 && < 3 - - main-is: Spec.hs - other-modules: GenericsSpec - - ghc-options: -Wall -threaded -rtsopts +name: distributive +category: Data Structures +version: 0.5.3 +x-revision: 6 +license: BSD3 +cabal-version: >= 1.8 +license-file: LICENSE +author: Edward A. Kmett +maintainer: Edward A. Kmett +stability: provisional +homepage: http://github.com/ekmett/distributive/ +bug-reports: http://github.com/ekmett/distributive/issues +copyright: Copyright (C) 2011-2016 Edward A. Kmett +synopsis: Distributive functors -- Dual to Traversable +description: Distributive functors -- Dual to Traversable +build-type: Custom +extra-source-files: + .travis.yml + .vim.custom + config + travis-cabal-apt-install + CHANGELOG.markdown + README.markdown + Warning.hs + +source-repository head + type: git + location: git://github.com/ekmett/distributive.git + +custom-setup + setup-depends: + base >= 4 && <5, + Cabal, + cabal-doctest >= 1 && <1.1 + +flag semigroups + manual: True + default: True + description: + You can disable the use of the `semigroups` package using `-f-semigroups`. + . + Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. + +flag tagged + manual: True + default: True + description: + You can disable the use of the `tagged` package using `-f-tagged`. + . + Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. + +library + build-depends: + base >= 4 && < 5, + base-orphans >= 0.5.2 && < 1, + transformers >= 0.2 && < 0.6, + transformers-compat >= 0.3 && < 1 + + hs-source-dirs: src + exposed-modules: + Data.Distributive + + if impl(ghc>=7.2) + exposed-modules: Data.Distributive.Generic + + if flag(tagged) + build-depends: tagged >= 0.7 && < 1 + + if impl(ghc>=7.2 && < 7.6) + build-depends: ghc-prim + + if impl(ghc < 8.0) + if flag(semigroups) + -- we need Functor Semi.Min etc. + build-depends: semigroups >= 0.13 && < 1 + + if impl(ghc < 7.8) + hs-source-dirs: src-compat + other-modules: Data.Coerce + + ghc-options: -Wall + +-- Verify the results of the examples +test-suite doctests + type: exitcode-stdio-1.0 + main-is: doctests.hs + build-depends: + base >= 4, + distributive, + doctest >= 0.11.1 && <0.17 + ghc-options: -Wall -threaded + hs-source-dirs: tests + +test-suite spec + type: exitcode-stdio-1.0 + hs-source-dirs: tests + + build-depends: + base >= 4 && < 5, + distributive, + generic-deriving >= 1.11 && < 2, + hspec >= 2 && < 3 + + main-is: Spec.hs + other-modules: GenericsSpec + + ghc-options: -Wall -threaded -rtsopts diff --git a/ghc-distributive.spec b/ghc-distributive.spec index 8183347..f0b73eb 100644 --- a/ghc-distributive.spec +++ b/ghc-distributive.spec @@ -4,7 +4,7 @@ %global pkg_name distributive %global pkgver %{pkg_name}-%{version} -%global cabaldoctest cabal-doctest-1.0.4 +%global cabaldoctest cabal-doctest-1.0.6 %global subpkgs %{cabaldoctest} %bcond_with tests @@ -12,7 +12,7 @@ Name: ghc-%{pkg_name} Version: 0.5.3 # can only be reset when all subpkgs bumped -Release: 10%{?dist} +Release: 11%{?dist} Summary: Distributive functors -- Dual to Traversable License: BSD @@ -72,6 +72,12 @@ This package provides the Haskell %{pkg_name} library development files. cp -bp %{SOURCE2} %{pkg_name}.cabal # End cabal-rpm setup +( +cd %{cabaldoctest} +cabal-tweak-dep-ver Cabal '<2.1' '<2.5' +cabal-tweak-dep-ver base '<4.11' '<4.12' +) + %build # Begin cabal-rpm build: @@ -110,6 +116,9 @@ cp -bp %{SOURCE2} %{pkg_name}.cabal %changelog +* Sat Feb 23 2019 Jens Petersen - 0.5.3-11 +- update cabal-doctest to 1.0.6 + * Sun Feb 17 2019 Jens Petersen - 0.5.3-10 - refresh to cabal-rpm-0.13 diff --git a/sources b/sources index 45a3598..d38143e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cabal-doctest-1.0.4.tar.gz) = c468f7776a0dde8531b7e47af6f8722e73b0108d69393c7d859f162219aa5f730ec4159b474d643eb918dd40e53efce1f6f0a4b0eb97e32203af08f764e3ea0b SHA512 (distributive-0.5.3.tar.gz) = 34d6019dc4588d1a10a40daa09822b01660da9c485d06a28722727ca1d7850eeda676da255792335e38be509a2539c02e11a404d9c45618ae064d90718cad280 +SHA512 (cabal-doctest-1.0.6.tar.gz) = f009c91f9e9d2406a2ccb7049d554291527dcb3846fd63828147e03fc4c893223929261745ab5a8fb036bcf16b3c286587d3de8daa0fff330fb3c2d6b25fa399