update to 0.13.2.5

2021-08-05 01:55:22 +08:00 · 2021-08-05 01:55:22 +08:00 · 9098823e91
commit 9098823e91
parent 260df82f52
4 changed files with 211 additions and 202 deletions
--- a/.gitignore
+++ b/.gitignore
@ -17,3 +17,4 @@
 /attoparsec-0.13.2.2.tar.gz
 /attoparsec-0.13.2.3.tar.gz
 /attoparsec-0.13.2.4.tar.gz
+/attoparsec-0.13.2.5.tar.gz
--- a/attoparsec-0.13.2.5.cabal
+++ b/attoparsec-0.13.2.5.cabal
@ -1,196 +1,203 @@
-name:            attoparsec
-version:         0.13.2.4
-x-revision: 1
-license:         BSD3
-license-file:    LICENSE
-category:        Text, Parsing
-author:          Bryan O'Sullivan <bos@serpentine.com>
-maintainer:      Bryan O'Sullivan <bos@serpentine.com>, Ben Gamari <ben@smart-cactus.org>
-stability:       experimental
-tested-with:     GHC == 7.0.4, GHC == 7.2.2, 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
-synopsis:        Fast combinator parsing for bytestrings and text
-cabal-version:   >= 1.8
-homepage:        https://github.com/bos/attoparsec
-bug-reports:     https://github.com/bos/attoparsec/issues
-build-type:      Simple
-description:
-    A fast parser combinator library, aimed particularly at dealing
-    efficiently with network protocols and complicated text/binary
-    file formats.
-extra-source-files:
-    README.markdown
-    benchmarks/*.cabal
-    benchmarks/*.hs
-    benchmarks/*.txt
-    benchmarks/json-data/*.json
-    benchmarks/Makefile
-    benchmarks/med.txt.bz2
-    changelog.md
-    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: bytestring <0.11
-
-  build-depends: array,
-                 base >= 4.3 && < 5,
-                 bytestring <0.11,
-                 containers,
-                 deepseq,
-                 scientific >= 0.3.1 && < 0.4,
-                 transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.6,
-                 text >= 1.1.1.3
-  if impl(ghc < 7.4)
-    build-depends:
-      bytestring < 0.10.4.0
-
-  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
-
-  exposed-modules: Data.Attoparsec
-                   Data.Attoparsec.ByteString
-                   Data.Attoparsec.ByteString.Char8
-                   Data.Attoparsec.ByteString.Lazy
-                   Data.Attoparsec.Char8
-                   Data.Attoparsec.Combinator
-                   Data.Attoparsec.Internal
-                   Data.Attoparsec.Internal.Types
-                   Data.Attoparsec.Lazy
-                   Data.Attoparsec.Number
-                   Data.Attoparsec.Text
-                   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.Fhthagn
-                   Data.Attoparsec.Text.Buffer
-                   Data.Attoparsec.Text.FastSet
-                   Data.Attoparsec.Text.Internal
-  ghc-options: -O2 -Wall
-
-  if flag(developer)
-    ghc-prof-options: -auto-all
-    ghc-options: -Werror
-
-test-suite tests
-  type:           exitcode-stdio-1.0
-  hs-source-dirs: tests .
-  main-is:        QC.hs
-  other-modules:  QC.Buffer
-                  QC.ByteString
-                  QC.Combinator
-                  QC.Common
-                  QC.IPv6.Internal
-                  QC.IPv6.Types
-                  QC.Rechunked
-                  QC.Simple
-                  QC.Text
-                  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.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
-
-  if flag(developer)
-    ghc-options: -Werror
-
-  build-depends:
-    array,
-    base,
-    bytestring <0.11,
-    deepseq >= 1.1,
-    QuickCheck >= 2.13.2 && < 2.14,
-    quickcheck-unicode,
-    scientific,
-    tasty >= 0.11,
-    tasty-quickcheck >= 0.8,
-    text,
-    transformers,
-    vector
-
-  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.19
-
-benchmark benchmarks
-  type: exitcode-stdio-1.0
-  hs-source-dirs: benchmarks benchmarks/warp-3.0.1.1 .
-  ghc-options: -O2 -Wall -rtsopts
-  main-is: Benchmarks.hs
-  other-modules:
-    Common
-    HeadersByteString
-    HeadersByteString.Atto
-    HeadersText
-    Links
-    Network.Wai.Handler.Warp.ReadInt
-    Network.Wai.Handler.Warp.RequestHeader
-    Numbers
-    Sets
-    TextFastSet
-    Warp
-  ghc-options: -O2 -Wall
-
-  if flag(developer)
-    ghc-options: -Werror
-
-  build-depends:
-    array,
-    base == 4.*,
-    bytestring >= 0.10.4.0,
-    case-insensitive,
-    containers,
-    criterion >= 1.0,
-    deepseq >= 1.1,
-    directory,
-    filepath,
-    ghc-prim,
-    http-types,
-    parsec >= 3.1.2,
-    scientific,
-    text >= 1.1.1.0,
-    transformers,
-    unordered-containers,
-    vector
-
-  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.19
-
-source-repository head
-  type:     git
-  location: https://github.com/bos/attoparsec
-
+name:            attoparsec
+version:         0.13.2.5
+x-revision: 1
+license:         BSD3
+license-file:    LICENSE
+category:        Text, Parsing
+author:          Bryan O'Sullivan <bos@serpentine.com>
+maintainer:      Bryan O'Sullivan <bos@serpentine.com>, Ben Gamari <ben@smart-cactus.org>
+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
+synopsis:        Fast combinator parsing for bytestrings and text
+cabal-version:   2.0
+homepage:        https://github.com/bgamari/attoparsec
+bug-reports:     https://github.com/bgamari/attoparsec/issues
+build-type:      Simple
+description:
+    A fast parser combinator library, aimed particularly at dealing
+    efficiently with network protocols and complicated text/binary
+    file formats.
+extra-source-files:
+    README.markdown
+    benchmarks/*.cabal
+    benchmarks/*.hs
+    benchmarks/*.txt
+    benchmarks/json-data/*.json
+    benchmarks/Makefile
+    benchmarks/med.txt.bz2
+    changelog.md
+    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: array,
+                 base >= 4.3 && < 5,
+                 bytestring <0.12,
+                 containers,
+                 deepseq,
+                 scientific >= 0.3.1 && < 0.4,
+                 transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.6,
+                 text >= 1.1.1.3,
+                 ghc-prim <0.8
+  if impl(ghc < 7.4)
+    build-depends:
+      bytestring < 0.10.4.0
+
+  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
+
+  exposed-modules: Data.Attoparsec
+                   Data.Attoparsec.ByteString
+                   Data.Attoparsec.ByteString.Char8
+                   Data.Attoparsec.ByteString.Lazy
+                   Data.Attoparsec.Char8
+                   Data.Attoparsec.Combinator
+                   Data.Attoparsec.Internal
+                   Data.Attoparsec.Internal.Types
+                   Data.Attoparsec.Lazy
+                   Data.Attoparsec.Number
+                   Data.Attoparsec.Text
+                   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
+                   Data.Attoparsec.Text.Internal
+  ghc-options: -O2 -Wall
+
+  default-language: Haskell2010
+
+  if flag(developer)
+    ghc-prof-options: -auto-all
+    ghc-options: -Werror
+
+test-suite tests
+  type:           exitcode-stdio-1.0
+  hs-source-dirs: tests .
+  main-is:        QC.hs
+  other-modules:  QC.Buffer
+                  QC.ByteString
+                  QC.Combinator
+                  QC.Common
+                  QC.IPv6.Internal
+                  QC.IPv6.Types
+                  QC.Rechunked
+                  QC.Simple
+                  QC.Text
+                  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
+
+  if flag(developer)
+    ghc-options: -Werror
+
+  build-depends:
+    array,
+    base,
+    bytestring,
+    deepseq >= 1.1,
+    QuickCheck >= 2.13.2 && < 2.15,
+    quickcheck-unicode,
+    scientific,
+    tasty >= 0.11,
+    tasty-quickcheck >= 0.8,
+    text,
+    transformers,
+    vector
+
+  default-language: Haskell2010
+
+  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.19
+
+benchmark benchmarks
+  type: exitcode-stdio-1.0
+  hs-source-dirs: benchmarks benchmarks/warp-3.0.1.1 .
+  ghc-options: -O2 -Wall -rtsopts
+  main-is: Benchmarks.hs
+  other-modules:
+    Common
+    HeadersByteString
+    HeadersByteString.Atto
+    HeadersText
+    Links
+    Network.Wai.Handler.Warp.ReadInt
+    Network.Wai.Handler.Warp.RequestHeader
+    Numbers
+    Sets
+    TextFastSet
+    Warp
+  ghc-options: -O2 -Wall
+
+  if flag(developer)
+    ghc-options: -Werror
+
+  build-depends:
+    array,
+    base == 4.*,
+    bytestring >= 0.10.4.0,
+    case-insensitive,
+    containers,
+    criterion >= 1.0,
+    deepseq >= 1.1,
+    directory,
+    filepath,
+    ghc-prim,
+    http-types,
+    parsec >= 3.1.2,
+    scientific,
+    text >= 1.1.1.0,
+    transformers,
+    unordered-containers,
+    vector
+
+  default-language: Haskell2010
+
+  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.19
+
+source-repository head
+  type:     git
+  location: https://github.com/bgamari/attoparsec
+
--- a/ghc-attoparsec.spec
+++ b/ghc-attoparsec.spec
@ -7,8 +7,8 @@
 # testsuite missing deps: quickcheck-unicode

 Name:           ghc-%{pkg_name}
-Version:        0.13.2.4
-Release:        5%{?dist}
+Version:        0.13.2.5
+Release:        1%{?dist}
 Summary:        Fast combinator parsing for bytestrings and text

 License:        BSD
@ -19,6 +19,7 @@ Source1:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#
 # End cabal-rpm sources

 # Begin cabal-rpm deps:
+BuildRequires:  dos2unix
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-array-prof
@ -74,7 +75,7 @@ This package provides the Haskell %{pkg_name} profiling library.
 %prep
 # Begin cabal-rpm setup:
 %setup -q -n %{pkgver}
-cp -bp %{SOURCE1} %{pkg_name}.cabal
+dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal
 # End cabal-rpm setup


@ -112,8 +113,8 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal


 %changelog
-* Thu Aug  5 2021 Jens Petersen <petersen@redhat.com> - 0.13.2.4-5
- rebuild
+* Thu Aug  5 2021 Jens Petersen <petersen@redhat.com> - 0.13.2.5-1
+- update to 0.13.2.5

 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.2.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (attoparsec-0.13.2.4.tar.gz) = c2f94792ab4e68cfdbfbc92dfdc2cff08c9b96ef9b39608ed58bf25ba602e0ffd687c74b2d92045ff384e6c927cefb3774365218aebe9af01c153bdd3a29d946
+SHA512 (attoparsec-0.13.2.5.tar.gz) = 357545ebd003faff09485cdf89adee9f1f87b49ab9c26a133ef3d0ac165e3880eecd147431131ede425f5863f07ee79857fe2cbbfba1a3155abd70894f553c59