From 38ba60b76f799966839cc14635956a62a20162fe Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 22 Jan 2023 22:17:21 +0800 Subject: [PATCH] update to 0.14.4 --- .gitignore | 1 + ...-0.13.2.5.cabal => attoparsec-0.14.4.cabal | 85 +++++++++---------- ghc-attoparsec.spec | 22 ++++- sources | 2 +- 4 files changed, 59 insertions(+), 51 deletions(-) rename attoparsec-0.13.2.5.cabal => attoparsec-0.14.4.cabal (74%) diff --git a/.gitignore b/.gitignore index 404ece4..229819d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /attoparsec-0.13.2.3.tar.gz /attoparsec-0.13.2.4.tar.gz /attoparsec-0.13.2.5.tar.gz +/attoparsec-0.14.4.tar.gz diff --git a/attoparsec-0.13.2.5.cabal b/attoparsec-0.14.4.cabal similarity index 74% rename from attoparsec-0.13.2.5.cabal rename to attoparsec-0.14.4.cabal index 385e51a..6f6a21e 100644 --- a/attoparsec-0.13.2.5.cabal +++ b/attoparsec-0.14.4.cabal @@ -1,5 +1,5 @@ name: attoparsec -version: 0.13.2.5 +version: 0.14.4 x-revision: 2 license: BSD3 license-file: LICENSE @@ -7,7 +7,7 @@ category: Text, Parsing author: Bryan O'Sullivan maintainer: Bryan O'Sullivan , Ben Gamari stability: experimental -tested-with: GHC == 7.4.2, GHC ==7.6.3, GHC ==7.8.4, GHC ==7.10.3, GHC ==8.0.2, GHC ==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.1, GHC==8.10.1 +tested-with: GHC == 7.4.2, GHC ==7.6.3, GHC ==7.8.4, GHC ==7.10.3, GHC ==8.0.2, GHC ==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.4, GHC==8.10.7, GHC ==9.0.2, GHC ==9.2.1 synopsis: Fast combinator parsing for bytestrings and text cabal-version: 2.0 homepage: https://github.com/bgamari/attoparsec @@ -19,8 +19,6 @@ description: file formats. extra-source-files: README.markdown - benchmarks/*.cabal - benchmarks/*.hs benchmarks/*.txt benchmarks/json-data/*.json benchmarks/Makefile @@ -29,27 +27,42 @@ extra-source-files: examples/*.c examples/*.hs examples/Makefile - tests/*.hs - tests/QC/*.hs - tests/QC/IPv6/*.hs Flag developer Description: Whether to build the library in development mode Default: False Manual: True -library - build-depends: text <1.3 - +-- We need to test and benchmark these modules, +-- but do not want to expose them to end users +library attoparsec-internal + hs-source-dirs: internal build-depends: array, - base >= 4.3 && < 5, + base >= 4.5 && < 5, + bytestring <0.12, + text >= 1.1.1.3 + if !impl(ghc >= 8.0) + build-depends: semigroups >=0.16.1 && <0.21 + exposed-modules: Data.Attoparsec.ByteString.Buffer + Data.Attoparsec.ByteString.FastSet + Data.Attoparsec.Internal.Compat + Data.Attoparsec.Internal.Fhthagn + Data.Attoparsec.Text.Buffer + Data.Attoparsec.Text.FastSet + ghc-options: -O2 -Wall + default-language: Haskell2010 + +library + build-depends: array, + base >= 4.5 && < 5, bytestring <0.12, containers, deepseq, scientific >= 0.3.1 && < 0.4, - transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.6, + transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.7, text >= 1.1.1.3, - ghc-prim <0.8 + ghc-prim <0.10, + attoparsec-internal if impl(ghc < 7.4) build-depends: bytestring < 0.10.4.0 @@ -57,7 +70,7 @@ library if !impl(ghc >= 8.0) -- Data.Semigroup && Control.Monad.Fail are available in base-4.9+ build-depends: fail == 4.9.*, - semigroups >=0.16.1 && <0.20 + semigroups >=0.16.1 && <0.21 exposed-modules: Data.Attoparsec Data.Attoparsec.ByteString @@ -73,13 +86,7 @@ library Data.Attoparsec.Text.Lazy Data.Attoparsec.Types Data.Attoparsec.Zepto - other-modules: Data.Attoparsec.ByteString.Buffer - Data.Attoparsec.ByteString.FastSet - Data.Attoparsec.ByteString.Internal - Data.Attoparsec.Internal.Compat - Data.Attoparsec.Internal.Fhthagn - Data.Attoparsec.Text.Buffer - Data.Attoparsec.Text.FastSet + other-modules: Data.Attoparsec.ByteString.Internal Data.Attoparsec.Text.Internal ghc-options: -O2 -Wall @@ -89,9 +96,9 @@ library ghc-prof-options: -auto-all ghc-options: -Werror -test-suite tests +test-suite attoparsec-tests type: exitcode-stdio-1.0 - hs-source-dirs: tests . + hs-source-dirs: tests main-is: QC.hs other-modules: QC.Buffer QC.ByteString @@ -105,25 +112,6 @@ test-suite tests QC.Text.FastSet QC.Text.Regressions - other-modules: Data.Attoparsec.ByteString - Data.Attoparsec.ByteString.Buffer - Data.Attoparsec.ByteString.Char8 - Data.Attoparsec.ByteString.FastSet - Data.Attoparsec.ByteString.Internal - Data.Attoparsec.ByteString.Lazy - Data.Attoparsec.Combinator - Data.Attoparsec.Internal - Data.Attoparsec.Internal.Compat - Data.Attoparsec.Internal.Fhthagn - Data.Attoparsec.Internal.Types - Data.Attoparsec.Number - Data.Attoparsec.Text - Data.Attoparsec.Text.Buffer - Data.Attoparsec.Text.FastSet - Data.Attoparsec.Text.Internal - Data.Attoparsec.Text.Lazy - Data.Attoparsec.Zepto - ghc-options: -Wall -threaded -rtsopts @@ -132,6 +120,8 @@ test-suite tests build-depends: array, + attoparsec, + attoparsec-internal, base, bytestring, deepseq >= 1.1, @@ -151,13 +141,15 @@ test-suite tests build-depends: fail == 4.9.*, semigroups >=0.16.1 && <0.19 -benchmark benchmarks +benchmark attoparsec-benchmarks type: exitcode-stdio-1.0 - hs-source-dirs: benchmarks benchmarks/warp-3.0.1.1 . + hs-source-dirs: benchmarks benchmarks/warp-3.0.1.1 ghc-options: -O2 -Wall -rtsopts main-is: Benchmarks.hs other-modules: + Aeson Common + Genome HeadersByteString HeadersByteString.Atto HeadersText @@ -175,11 +167,12 @@ benchmark benchmarks build-depends: array, + attoparsec, + attoparsec-internal, base == 4.*, bytestring >= 0.10.4.0, case-insensitive, containers, - criterion >= 1.0, deepseq >= 1.1, directory, filepath, @@ -187,6 +180,7 @@ benchmark benchmarks http-types, parsec >= 3.1.2, scientific, + tasty-bench >= 0.3, text >= 1.1.1.0, transformers, unordered-containers, @@ -202,4 +196,3 @@ benchmark benchmarks source-repository head type: git location: https://github.com/bgamari/attoparsec - diff --git a/ghc-attoparsec.spec b/ghc-attoparsec.spec index e24827f..6b91288 100644 --- a/ghc-attoparsec.spec +++ b/ghc-attoparsec.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.9 +# generated by cabal-rpm-2.1.0 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name attoparsec @@ -7,11 +7,11 @@ # testsuite missing deps: quickcheck-unicode Name: ghc-%{pkg_name} -Version: 0.13.2.5 -Release: 4%{?dist} +Version: 0.14.4 +Release: 1%{?dist} Summary: Fast combinator parsing for bytestrings and text -License: BSD +License: BSD-3-Clause Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz @@ -22,6 +22,15 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# BuildRequires: dos2unix BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +BuildRequires: ghc-array-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-scientific-devel +BuildRequires: ghc-text-devel +BuildRequires: ghc-transformers-devel +%if %{with ghc_prof} BuildRequires: ghc-array-prof BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof @@ -30,6 +39,7 @@ BuildRequires: ghc-deepseq-prof BuildRequires: ghc-scientific-prof BuildRequires: ghc-text-prof BuildRequires: ghc-transformers-prof +%endif # End cabal-rpm deps %description @@ -113,6 +123,10 @@ dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal %changelog +* Sun Jan 22 2023 Jens Petersen - 0.14.4-1 +- https://hackage.haskell.org/package/attoparsec-0.14.4/changelog +- refresh to cabal-rpm-2.1.0 with SPDX migration + * Thu Jul 21 2022 Fedora Release Engineering - 0.13.2.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 0bce3a8..3dd89a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (attoparsec-0.13.2.5.tar.gz) = 357545ebd003faff09485cdf89adee9f1f87b49ab9c26a133ef3d0ac165e3880eecd147431131ede425f5863f07ee79857fe2cbbfba1a3155abd70894f553c59 +SHA512 (attoparsec-0.14.4.tar.gz) = 48aa7743b24def2db7041e3e0189d9844194c42b5d216ff5060806a80eb550200ddcb11e9321a910ac4881ffdd7381d80a4b88a73acfb29209c650eababb925b