diff --git a/.gitignore b/.gitignore index fbbe6f2..ca01a7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /megaparsec-6.5.0.tar.gz +/megaparsec-7.0.5.tar.gz diff --git a/ghc-megaparsec.spec b/ghc-megaparsec.spec index 3214e59..ffa2320 100644 --- a/ghc-megaparsec.spec +++ b/ghc-megaparsec.spec @@ -4,19 +4,15 @@ %global pkg_name megaparsec %global pkgver %{pkg_name}-%{version} -# hangs except on ppc64le -%bcond_with tests - Name: ghc-%{pkg_name} -Version: 6.5.0 -Release: 3%{?dist} +Version: 7.0.5 +Release: 1%{?dist} Summary: Monadic parser combinators License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: @@ -37,13 +33,6 @@ BuildRequires: ghc-parser-combinators-devel BuildRequires: ghc-scientific-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel -# hspec-discover -BuildRequires: ghc-hspec-discover-devel -%if %{with tests} -BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-hspec-devel -BuildRequires: ghc-hspec-expectations-devel -%endif # End cabal-rpm deps %description @@ -86,7 +75,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -102,10 +90,6 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install -%check -%cabal_test - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE.md @@ -127,6 +111,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Jul 25 2019 Jens Petersen - 7.0.5-1 +- update to 7.0.5 + * Thu Jul 25 2019 Fedora Release Engineering - 6.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/megaparsec-6.5.0.cabal b/megaparsec-6.5.0.cabal deleted file mode 100644 index 848f9c0..0000000 --- a/megaparsec-6.5.0.cabal +++ /dev/null @@ -1,156 +0,0 @@ -name: megaparsec -version: 6.5.0 -x-revision: 4 -cabal-version: 1.18 -tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.1 -license: BSD2 -license-file: LICENSE.md -author: Megaparsec contributors, - Paolo Martini , - Daan Leijen - -maintainer: Mark Karpov -homepage: https://github.com/mrkkrp/megaparsec -bug-reports: https://github.com/mrkkrp/megaparsec/issues -category: Parsing -synopsis: Monadic parser combinators -build-type: Simple -description: - - This is an industrial-strength monadic parser combinator library. - Megaparsec is a feature-rich package that strikes a nice balance between - speed, flexibility, and quality of parse errors. - -extra-doc-files: AUTHORS.md - , CHANGELOG.md - , README.md - -source-repository head - type: git - location: https://github.com/mrkkrp/megaparsec.git - -flag dev - description: Turn on development settings. - manual: True - default: False - -library - build-depends: base >= 4.7 && < 5.0 - , bytestring >= 0.2 && < 0.11 - , case-insensitive >= 1.2 && < 1.3 - , containers >= 0.5 && < 0.7 - , deepseq >= 1.3 && < 1.5 - , mtl >= 2.0 && < 3.0 - , parser-combinators >= 0.4 && < 2.0 - , scientific >= 0.3.1 && < 0.4 - , text >= 0.2 && < 1.3 - , transformers >= 0.4 && < 0.6 - if !impl(ghc >= 8.0) - build-depends: fail == 4.9.* - , semigroups == 0.18.* - if !impl(ghc >= 7.10) - build-depends: void == 0.7.* - exposed-modules: Text.Megaparsec - , Text.Megaparsec.Byte - , Text.Megaparsec.Byte.Lexer - , Text.Megaparsec.Char - , Text.Megaparsec.Char.Lexer - , Text.Megaparsec.Error - , Text.Megaparsec.Error.Builder - , Text.Megaparsec.Expr - , Text.Megaparsec.Internal - , Text.Megaparsec.Perm - , Text.Megaparsec.Pos - , Text.Megaparsec.Stream - other-modules: Text.Megaparsec.Class - , Text.Megaparsec.State - if flag(dev) - ghc-options: -O0 -Wall -Werror - else - ghc-options: -O2 -Wall - if flag(dev) && impl(ghc >= 8.0) - ghc-options: -Wcompat - -Wincomplete-record-updates - -Wincomplete-uni-patterns - -Wnoncanonical-monad-instances - -Wnoncanonical-monadfail-instances - default-language: Haskell2010 - -test-suite tests - main-is: Main.hs - hs-source-dirs: tests - type: exitcode-stdio-1.0 - if flag(dev) - ghc-options: -O0 -Wall -Werror - else - ghc-options: -O2 -Wall - other-modules: Spec - , Control.Applicative.CombinatorsSpec - , Control.Monad.CombinatorsSpec - , Test.Hspec.Megaparsec - , Test.Hspec.Megaparsec.AdHoc - , Text.Megaparsec.Byte.LexerSpec - , Text.Megaparsec.ByteSpec - , Text.Megaparsec.Char.LexerSpec - , Text.Megaparsec.CharSpec - , Text.Megaparsec.ErrorSpec - , Text.Megaparsec.ExprSpec - , Text.Megaparsec.PermSpec - , Text.Megaparsec.PosSpec - , Text.Megaparsec.StreamSpec - , Text.MegaparsecSpec - build-depends: QuickCheck >= 2.7 && < 2.13 - , base >= 4.7 && < 5.0 - , bytestring >= 0.2 && < 0.11 - , containers >= 0.5 && < 0.7 - , hspec >= 2.0 && < 3.0 - , hspec-expectations >= 0.5 && < 0.9 - , megaparsec - , mtl >= 2.0 && < 3.0 - , scientific >= 0.3.1 && < 0.4 - , text >= 0.2 && < 1.3 - , transformers >= 0.4 && < 0.6 - build-tools: hspec-discover >= 2.0 && < 3.0 - if !impl(ghc >= 8.0) - build-depends: semigroups == 0.18.* - if !impl(ghc >= 7.10) - build-depends: void == 0.7.* - default-language: Haskell2010 - -benchmark bench-speed - main-is: Main.hs - hs-source-dirs: bench/speed - type: exitcode-stdio-1.0 - build-depends: base >= 4.7 && < 5.0 - , criterion >= 0.6.2.1 && < 1.6 - , deepseq >= 1.3 && < 1.5 - , megaparsec - , text >= 0.2 && < 1.3 - if !impl(ghc >= 8.0) - build-depends: semigroups == 0.18.* - if !impl(ghc >= 7.10) - build-depends: void == 0.7.* - if flag(dev) - ghc-options: -O2 -Wall -Werror - else - ghc-options: -O2 -Wall - default-language: Haskell2010 - -benchmark bench-memory - main-is: Main.hs - hs-source-dirs: bench/memory - type: exitcode-stdio-1.0 - build-depends: base >= 4.7 && < 5.0 - , deepseq >= 1.3 && < 1.5 - , megaparsec - , text >= 0.2 && < 1.3 - , weigh >= 0.0.4 - if !impl(ghc >= 8.0) - build-depends: semigroups == 0.18.* - if !impl(ghc >= 7.10) - build-depends: void == 0.7.* - if flag(dev) - ghc-options: -O2 -Wall -Werror - else - ghc-options: -O2 -Wall - default-language: Haskell2010 diff --git a/sources b/sources index 42dbc0e..fa361b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (megaparsec-6.5.0.tar.gz) = 4a8194909f2779bd82226a1f8fb6cce089820fa960249fdd723a4f54aa0c0d52436b4835431327be1164a7698d59059e866b694477407fae4d93c1ae42664011 +SHA512 (megaparsec-7.0.5.tar.gz) = a804025b0f069f56856c4cbcf8f3c2b9852087e9c93875fb93fd0fb131a2a7ffe381f0b6d1a8743a8993331c29fb8e0168e178bf9ef688ee0e18a370183cd388