From a6e417a8cf08f4c8412a459555057a4618d7a252e893fa0a07dc1596fe3d968f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 9 Feb 2022 13:44:51 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-attoparsec revision:20, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-attoparsec?expand=0&rev=61 --- attoparsec-0.14.2.tar.gz | 3 - attoparsec-0.14.4.tar.gz | 3 + attoparsec.cabal | 401 +++++++++++++++++++-------------------- ghc-attoparsec.changes | 9 + ghc-attoparsec.spec | 9 +- 5 files changed, 215 insertions(+), 210 deletions(-) delete mode 100644 attoparsec-0.14.2.tar.gz create mode 100644 attoparsec-0.14.4.tar.gz diff --git a/attoparsec-0.14.2.tar.gz b/attoparsec-0.14.2.tar.gz deleted file mode 100644 index 54f5b49..0000000 --- a/attoparsec-0.14.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fcbf1d289f5b3d12352360d813d354abf473bf539a8c091265c22653462f494 -size 162905 diff --git a/attoparsec-0.14.4.tar.gz b/attoparsec-0.14.4.tar.gz new file mode 100644 index 0000000..a98c875 --- /dev/null +++ b/attoparsec-0.14.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f337fe58624565de12426f607c23e60c7b09c86b4e3adfc827ca188c9979e6c +size 160701 diff --git a/attoparsec.cabal b/attoparsec.cabal index 6150771..424501c 100644 --- a/attoparsec.cabal +++ b/attoparsec.cabal @@ -1,203 +1,198 @@ -name: attoparsec -version: 0.14.2 -x-revision: 2 -license: BSD3 -license-file: LICENSE -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.4, GHC==8.10.4, GHC == 9.0.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.5 && < 5, - bytestring <0.12, - containers, - deepseq, - scientific >= 0.3.1 && < 0.4, - transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.7, - text >= 1.1.1.3, - ghc-prim <0.9 - 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.21 - - 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 - +name: attoparsec +version: 0.14.4 +x-revision: 1 +license: BSD3 +license-file: LICENSE +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.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 +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/*.txt + benchmarks/json-data/*.json + benchmarks/Makefile + benchmarks/med.txt.bz2 + changelog.md + examples/*.c + examples/*.hs + examples/Makefile + +Flag developer + Description: Whether to build the library in development mode + Default: False + Manual: True + +-- 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.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.7, + text >= 1.1.1.3, + ghc-prim <0.9, + attoparsec-internal + 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.21 + + 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.Internal + Data.Attoparsec.Text.Internal + ghc-options: -O2 -Wall + + default-language: Haskell2010 + + if flag(developer) + ghc-prof-options: -auto-all + ghc-options: -Werror + +test-suite attoparsec-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 + + ghc-options: + -Wall -threaded -rtsopts + + if flag(developer) + ghc-options: -Werror + + build-depends: + array, + attoparsec, + attoparsec-internal, + 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 attoparsec-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: + Aeson + Common + Genome + 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, + attoparsec, + attoparsec-internal, + base == 4.*, + bytestring >= 0.10.4.0, + case-insensitive, + containers, + deepseq >= 1.1, + directory, + filepath, + ghc-prim, + http-types, + parsec >= 3.1.2, + scientific, + tasty-bench >= 0.3, + 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 diff --git a/ghc-attoparsec.changes b/ghc-attoparsec.changes index bc1784b..a4e8987 100644 --- a/ghc-attoparsec.changes +++ b/ghc-attoparsec.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Feb 4 12:15:20 UTC 2022 - psimons@suse.com + +- Update attoparsec to version 0.14.4 revision 1. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/attoparsec-0.14.4/src/changelog.md + ------------------------------------------------------------------- Sat Nov 20 17:29:22 UTC 2021 - psimons@suse.com diff --git a/ghc-attoparsec.spec b/ghc-attoparsec.spec index 8cac828..5e81d3a 100644 --- a/ghc-attoparsec.spec +++ b/ghc-attoparsec.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-attoparsec # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,16 @@ %global pkg_name attoparsec +%global has_internal_sub_libraries 1 %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.14.2 +Version: 0.14.4 Release: 0 Summary: Fast combinator parsing for bytestrings and text License: BSD-3-Clause 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/2.cabal#/%{pkg_name}.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-bytestring-devel @@ -63,7 +64,7 @@ This package provides the Haskell %{pkg_name} library development files. cp -p %{SOURCE1} %{pkg_name}.cabal %build -%ghc_lib_build +%ghc_lib_build_without_haddock %install %ghc_lib_install From 460f2686f2f3c34985da8d276971110699ff510bdbb80f07208a6d4b5af1c204 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 11 Feb 2022 02:01:38 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-attoparsec revision:21, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-attoparsec?expand=0&rev=62 --- ghc-attoparsec.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-attoparsec.changes b/ghc-attoparsec.changes index a4e8987..8a71ed0 100644 --- a/ghc-attoparsec.changes +++ b/ghc-attoparsec.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Feb 4 12:15:20 UTC 2022 - psimons@suse.com +Sun Jan 16 18:41:59 UTC 2022 - Peter Simons - Update attoparsec to version 0.14.4 revision 1. Upstream has edited the change log file since the last release in