From d70ab341bc5e1bcb592ffd83d6b04c6129c682c131abe45e6933686ebd061bf6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Sep 2017 02:10:07 +0000 Subject: [PATCH 01/12] osc copypac from project:devel:languages:haskell:lts:9 package:ghc-conduit-extra revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=33 --- conduit-extra-1.1.16.tar.gz | 3 --- conduit-extra-1.1.17.tar.gz | 3 +++ ghc-conduit-extra.changes | 6 ++++++ ghc-conduit-extra.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 conduit-extra-1.1.16.tar.gz create mode 100644 conduit-extra-1.1.17.tar.gz diff --git a/conduit-extra-1.1.16.tar.gz b/conduit-extra-1.1.16.tar.gz deleted file mode 100644 index 723d96d..0000000 --- a/conduit-extra-1.1.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd72c1bacd5f59a74a73a0aa115b8314f0a1dc1b24d939e52a983113c960f8d5 -size 34402 diff --git a/conduit-extra-1.1.17.tar.gz b/conduit-extra-1.1.17.tar.gz new file mode 100644 index 0000000..262621b --- /dev/null +++ b/conduit-extra-1.1.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:768e44686ce1ae362fce2ca766e18638129efb9e5348a361c65a123749c20a06 +size 34439 diff --git a/ghc-conduit-extra.changes b/ghc-conduit-extra.changes index 70417c3..b3e8d24 100644 --- a/ghc-conduit-extra.changes +++ b/ghc-conduit-extra.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 13 06:59:04 UTC 2017 - psimons@suse.com + +- Update to version 1.1.17. + A more detailed change log is not available. + ------------------------------------------------------------------- Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index 4670aa6..7f31e73 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -19,7 +19,7 @@ %global pkg_name conduit-extra %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.1.16 +Version: 1.1.17 Release: 0 Summary: Batteries included conduit: adapters for common libraries License: MIT From 53cf84a0f33d30539ea52a3dbbcd945e5a2891b47d075bc3d300b039193abf02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Dec 2017 19:45:42 +0000 Subject: [PATCH 02/12] osc copypac from project:devel:languages:haskell:lts:10 package:ghc-conduit-extra revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=35 --- conduit-extra-1.1.17.tar.gz | 3 --- conduit-extra-1.2.2.tar.gz | 3 +++ ghc-conduit-extra.changes | 6 ++++++ ghc-conduit-extra.spec | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 conduit-extra-1.1.17.tar.gz create mode 100644 conduit-extra-1.2.2.tar.gz diff --git a/conduit-extra-1.1.17.tar.gz b/conduit-extra-1.1.17.tar.gz deleted file mode 100644 index 262621b..0000000 --- a/conduit-extra-1.1.17.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:768e44686ce1ae362fce2ca766e18638129efb9e5348a361c65a123749c20a06 -size 34439 diff --git a/conduit-extra-1.2.2.tar.gz b/conduit-extra-1.2.2.tar.gz new file mode 100644 index 0000000..22b753d --- /dev/null +++ b/conduit-extra-1.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:316ea12ea1382ff33c1ada720dcc282ed330eaaf4bc2bc156b8ec797fc0e6c11 +size 36132 diff --git a/ghc-conduit-extra.changes b/ghc-conduit-extra.changes index b3e8d24..ef8ec71 100644 --- a/ghc-conduit-extra.changes +++ b/ghc-conduit-extra.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 21 19:12:02 UTC 2017 - psimons@suse.com + +- Update to version 1.2.2. + A more detailed change log is not available. + ------------------------------------------------------------------- Wed Sep 13 06:59:04 UTC 2017 - psimons@suse.com diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index 7f31e73..d170da3 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -19,7 +19,7 @@ %global pkg_name conduit-extra %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.1.17 +Version: 1.2.2 Release: 0 Summary: Batteries included conduit: adapters for common libraries License: MIT @@ -46,6 +46,8 @@ BuildRequires: ghc-streaming-commons-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-base-devel BuildRequires: ghc-transformers-devel +BuildRequires: ghc-typed-process-devel +BuildRequires: ghc-unliftio-core-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-bytestring-builder-devel From 74aa5b681a6b2626a598aa509b9feec48e55586069326b5294484b1f0777fbea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Dec 2017 11:52:05 +0000 Subject: [PATCH 03/12] osc copypac from project:devel:languages:haskell:lts:10 package:ghc-conduit-extra revision:4, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=36 --- conduit-extra-1.2.2.tar.gz | 3 --- conduit-extra-1.2.3.tar.gz | 3 +++ ghc-conduit-extra.changes | 6 ++++++ ghc-conduit-extra.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 conduit-extra-1.2.2.tar.gz create mode 100644 conduit-extra-1.2.3.tar.gz diff --git a/conduit-extra-1.2.2.tar.gz b/conduit-extra-1.2.2.tar.gz deleted file mode 100644 index 22b753d..0000000 --- a/conduit-extra-1.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:316ea12ea1382ff33c1ada720dcc282ed330eaaf4bc2bc156b8ec797fc0e6c11 -size 36132 diff --git a/conduit-extra-1.2.3.tar.gz b/conduit-extra-1.2.3.tar.gz new file mode 100644 index 0000000..e04c024 --- /dev/null +++ b/conduit-extra-1.2.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73292dfd99665dad1504f46e048851f5016661db17f65cc8686c2de6e44441b1 +size 36641 diff --git a/ghc-conduit-extra.changes b/ghc-conduit-extra.changes index ef8ec71..7ad30c3 100644 --- a/ghc-conduit-extra.changes +++ b/ghc-conduit-extra.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 27 16:58:37 UTC 2017 - psimons@suse.com + +- Update to version 1.2.3. + A more detailed change log is not available. + ------------------------------------------------------------------- Thu Dec 21 19:12:02 UTC 2017 - psimons@suse.com diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index d170da3..66e5e40 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -19,7 +19,7 @@ %global pkg_name conduit-extra %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.2 +Version: 1.2.3 Release: 0 Summary: Batteries included conduit: adapters for common libraries License: MIT From 4c71503cb45db6eddd524bb2efc40082a5ca49deb79bde8289756ded6b598c49 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 3 Jan 2018 02:16:29 +0000 Subject: [PATCH 04/12] osc copypac from project:devel:languages:haskell:lts:10 package:ghc-conduit-extra revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=37 --- conduit-extra-1.2.3.1.tar.gz | 3 +++ conduit-extra-1.2.3.tar.gz | 3 --- ghc-conduit-extra.changes | 6 ++++++ ghc-conduit-extra.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 conduit-extra-1.2.3.1.tar.gz delete mode 100644 conduit-extra-1.2.3.tar.gz diff --git a/conduit-extra-1.2.3.1.tar.gz b/conduit-extra-1.2.3.1.tar.gz new file mode 100644 index 0000000..47dafda --- /dev/null +++ b/conduit-extra-1.2.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a07cbd8685d1d35c7080e711d77b93164adf3dee0733eae5f9af1894306637e +size 36952 diff --git a/conduit-extra-1.2.3.tar.gz b/conduit-extra-1.2.3.tar.gz deleted file mode 100644 index e04c024..0000000 --- a/conduit-extra-1.2.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73292dfd99665dad1504f46e048851f5016661db17f65cc8686c2de6e44441b1 -size 36641 diff --git a/ghc-conduit-extra.changes b/ghc-conduit-extra.changes index 7ad30c3..48dae3b 100644 --- a/ghc-conduit-extra.changes +++ b/ghc-conduit-extra.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 1 10:18:42 UTC 2018 - psimons@suse.com + +- Update to version 1.2.3.1. + A more detailed change log is not available. + ------------------------------------------------------------------- Wed Dec 27 16:58:37 UTC 2017 - psimons@suse.com diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index 66e5e40..9a27962 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-conduit-extra # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name conduit-extra %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.3 +Version: 1.2.3.1 Release: 0 Summary: Batteries included conduit: adapters for common libraries License: MIT From 5d0eb90302b52f254be5aea2298e7ade63826bb2d8aa339bb08f3d7f76a47879 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 Jan 2018 02:16:53 +0000 Subject: [PATCH 05/12] osc copypac from project:devel:languages:haskell:lts:10 package:ghc-conduit-extra revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=38 --- conduit-extra-1.2.3.1.tar.gz | 3 --- conduit-extra-1.2.3.2.tar.gz | 3 +++ ghc-conduit-extra.changes | 6 ++++++ ghc-conduit-extra.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 conduit-extra-1.2.3.1.tar.gz create mode 100644 conduit-extra-1.2.3.2.tar.gz diff --git a/conduit-extra-1.2.3.1.tar.gz b/conduit-extra-1.2.3.1.tar.gz deleted file mode 100644 index 47dafda..0000000 --- a/conduit-extra-1.2.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a07cbd8685d1d35c7080e711d77b93164adf3dee0733eae5f9af1894306637e -size 36952 diff --git a/conduit-extra-1.2.3.2.tar.gz b/conduit-extra-1.2.3.2.tar.gz new file mode 100644 index 0000000..50f1c78 --- /dev/null +++ b/conduit-extra-1.2.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d5b66284703a4b9fb96a4c6a2213727208639871a675da9755e9a963fa230f6 +size 37014 diff --git a/ghc-conduit-extra.changes b/ghc-conduit-extra.changes index 48dae3b..b073d8d 100644 --- a/ghc-conduit-extra.changes +++ b/ghc-conduit-extra.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 8 03:01:50 UTC 2018 - psimons@suse.com + +- Update to version 1.2.3.2. + A more detailed change log is not available. + ------------------------------------------------------------------- Mon Jan 1 10:18:42 UTC 2018 - psimons@suse.com diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index 9a27962..c91e194 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -19,7 +19,7 @@ %global pkg_name conduit-extra %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.3.1 +Version: 1.2.3.2 Release: 0 Summary: Batteries included conduit: adapters for common libraries License: MIT From 37e41f7358f7ceb05073ed5d52f5132cae9f114acbbfbe4466b2d24674c60939 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 8 Mar 2018 02:17:55 +0000 Subject: [PATCH 06/12] osc copypac from project:devel:languages:haskell:lts:10 package:ghc-conduit-extra revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=39 --- conduit-extra.cabal | 128 +++++++++++++++++++++++++++++++++++++++++ ghc-conduit-extra.spec | 2 + 2 files changed, 130 insertions(+) create mode 100644 conduit-extra.cabal diff --git a/conduit-extra.cabal b/conduit-extra.cabal new file mode 100644 index 0000000..cd78965 --- /dev/null +++ b/conduit-extra.cabal @@ -0,0 +1,128 @@ +Name: conduit-extra +Version: 1.2.3.2 +x-revision: 1 +Synopsis: Batteries included conduit: adapters for common libraries. +Description: + The conduit package itself maintains relative small dependencies. The purpose of this package is to collect commonly used utility functions wrapping other library dependencies, without depending on heavier-weight dependencies. The basic idea is that this package should only depend on haskell-platform packages and conduit. +License: MIT +License-file: LICENSE +Author: Michael Snoyman +Maintainer: michael@snoyman.com +Category: Data, Conduit +Build-type: Simple +Cabal-version: >=1.8 +Homepage: http://github.com/snoyberg/conduit +extra-source-files: + test/random + test/filesystem/*.txt + test/filesystem/bin/*.txt + ChangeLog.md + README.md + +Library + Exposed-modules: Data.Conduit.Attoparsec + Data.Conduit.Binary + Data.Conduit.Blaze + Data.Conduit.ByteString.Builder + Data.Conduit.Filesystem + Data.Conduit.Foldl + Data.Conduit.Lazy + Data.Conduit.Network + Data.Conduit.Network.UDP + Data.Conduit.Process + Data.Conduit.Text + Data.Conduit.Zlib + if !os(windows) + Exposed-modules: Data.Conduit.Network.Unix + if impl(ghc >= 7.8) + Exposed-modules: Data.Conduit.Process.Typed + + if arch(x86_64) || arch(i386) + -- These architectures are able to perform unaligned memory accesses + cpp-options: -DALLOW_UNALIGNED_ACCESS + + Build-depends: base >= 4.5 && < 5 + , conduit >= 1.2.8 && < 1.3 + + , bytestring >= 0.10.2 + , exceptions + , monad-control + , text + , transformers + , transformers-base + + , async + , attoparsec >= 0.10 + , blaze-builder >= 0.3 + , directory + , filepath + , network >= 2.3 + , primitive >= 0.5 + , process + , resourcet >= 1.1 + , stm + , streaming-commons >= 0.1.16 && < 0.2 + , unliftio-core + if impl(ghc >= 7.8) + build-depends: typed-process >= 0.2 + + ghc-options: -Wall + +test-suite test + hs-source-dirs: test + main-is: Spec.hs + type: exitcode-stdio-1.0 + ghc-options: -threaded + cpp-options: -DTEST + build-depends: conduit + , conduit-extra + , base + , hspec >= 1.3 + + , async + , attoparsec + , blaze-builder + , bytestring-builder + , bytestring + , exceptions + , process + , resourcet + , QuickCheck + , stm + , streaming-commons + , text + , transformers + , transformers-base + , directory + ghc-options: -Wall + if os(windows) + cpp-options: -DWINDOWS + other-modules: Data.Conduit.AttoparsecSpec + Data.Conduit.BinarySpec + Data.Conduit.ByteString.BuilderSpec + Data.Conduit.ExtraSpec + Data.Conduit.FilesystemSpec + Data.Conduit.LazySpec + Data.Conduit.NetworkSpec + Data.Conduit.ProcessSpec + Data.Conduit.Process.TypedSpec + Data.Conduit.TextSpec + Data.Conduit.ZlibSpec + +benchmark blaze + type: exitcode-stdio-1.0 + hs-source-dirs: bench + build-depends: base + , blaze-builder + , conduit + , conduit-extra + , criterion + , bytestring + , bytestring-builder + , transformers + main-is: blaze.hs + ghc-options: -Wall -O2 -rtsopts + +source-repository head + type: git + location: git://github.com/snoyberg/conduit.git diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index c91e194..304194c 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -26,6 +26,7 @@ License: MIT Group: Development/Libraries/Haskell 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-async-devel BuildRequires: ghc-attoparsec-devel @@ -74,6 +75,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build From b7b00808358709d26ca53af69db07d90ea7966d70b6c7b8dc45a24b0c6472c30 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Apr 2018 14:53:19 +0000 Subject: [PATCH 07/12] osc copypac from project:devel:languages:haskell:lts:11 package:ghc-conduit-extra revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=40 --- conduit-extra-1.2.3.2.tar.gz | 3 - conduit-extra-1.3.0.tar.gz | 3 + conduit-extra.cabal | 128 ----------------------------------- ghc-conduit-extra.changes | 122 +-------------------------------- ghc-conduit-extra.spec | 10 +-- 5 files changed, 8 insertions(+), 258 deletions(-) delete mode 100644 conduit-extra-1.2.3.2.tar.gz create mode 100644 conduit-extra-1.3.0.tar.gz delete mode 100644 conduit-extra.cabal diff --git a/conduit-extra-1.2.3.2.tar.gz b/conduit-extra-1.2.3.2.tar.gz deleted file mode 100644 index 50f1c78..0000000 --- a/conduit-extra-1.2.3.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d5b66284703a4b9fb96a4c6a2213727208639871a675da9755e9a963fa230f6 -size 37014 diff --git a/conduit-extra-1.3.0.tar.gz b/conduit-extra-1.3.0.tar.gz new file mode 100644 index 0000000..5a2f5ff --- /dev/null +++ b/conduit-extra-1.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c41c925fc53d9ba2e640c7cdca72c492b28c0d45f1a82e94baef8dfa65922ae +size 32716 diff --git a/conduit-extra.cabal b/conduit-extra.cabal deleted file mode 100644 index cd78965..0000000 --- a/conduit-extra.cabal +++ /dev/null @@ -1,128 +0,0 @@ -Name: conduit-extra -Version: 1.2.3.2 -x-revision: 1 -Synopsis: Batteries included conduit: adapters for common libraries. -Description: - The conduit package itself maintains relative small dependencies. The purpose of this package is to collect commonly used utility functions wrapping other library dependencies, without depending on heavier-weight dependencies. The basic idea is that this package should only depend on haskell-platform packages and conduit. -License: MIT -License-file: LICENSE -Author: Michael Snoyman -Maintainer: michael@snoyman.com -Category: Data, Conduit -Build-type: Simple -Cabal-version: >=1.8 -Homepage: http://github.com/snoyberg/conduit -extra-source-files: - test/random - test/filesystem/*.txt - test/filesystem/bin/*.txt - ChangeLog.md - README.md - -Library - Exposed-modules: Data.Conduit.Attoparsec - Data.Conduit.Binary - Data.Conduit.Blaze - Data.Conduit.ByteString.Builder - Data.Conduit.Filesystem - Data.Conduit.Foldl - Data.Conduit.Lazy - Data.Conduit.Network - Data.Conduit.Network.UDP - Data.Conduit.Process - Data.Conduit.Text - Data.Conduit.Zlib - if !os(windows) - Exposed-modules: Data.Conduit.Network.Unix - if impl(ghc >= 7.8) - Exposed-modules: Data.Conduit.Process.Typed - - if arch(x86_64) || arch(i386) - -- These architectures are able to perform unaligned memory accesses - cpp-options: -DALLOW_UNALIGNED_ACCESS - - Build-depends: base >= 4.5 && < 5 - , conduit >= 1.2.8 && < 1.3 - - , bytestring >= 0.10.2 - , exceptions - , monad-control - , text - , transformers - , transformers-base - - , async - , attoparsec >= 0.10 - , blaze-builder >= 0.3 - , directory - , filepath - , network >= 2.3 - , primitive >= 0.5 - , process - , resourcet >= 1.1 - , stm - , streaming-commons >= 0.1.16 && < 0.2 - , unliftio-core - if impl(ghc >= 7.8) - build-depends: typed-process >= 0.2 - - ghc-options: -Wall - -test-suite test - hs-source-dirs: test - main-is: Spec.hs - type: exitcode-stdio-1.0 - ghc-options: -threaded - cpp-options: -DTEST - build-depends: conduit - , conduit-extra - , base - , hspec >= 1.3 - - , async - , attoparsec - , blaze-builder - , bytestring-builder - , bytestring - , exceptions - , process - , resourcet - , QuickCheck - , stm - , streaming-commons - , text - , transformers - , transformers-base - , directory - ghc-options: -Wall - if os(windows) - cpp-options: -DWINDOWS - other-modules: Data.Conduit.AttoparsecSpec - Data.Conduit.BinarySpec - Data.Conduit.ByteString.BuilderSpec - Data.Conduit.ExtraSpec - Data.Conduit.FilesystemSpec - Data.Conduit.LazySpec - Data.Conduit.NetworkSpec - Data.Conduit.ProcessSpec - Data.Conduit.Process.TypedSpec - Data.Conduit.TextSpec - Data.Conduit.ZlibSpec - -benchmark blaze - type: exitcode-stdio-1.0 - hs-source-dirs: bench - build-depends: base - , blaze-builder - , conduit - , conduit-extra - , criterion - , bytestring - , bytestring-builder - , transformers - main-is: blaze.hs - ghc-options: -Wall -O2 -rtsopts - -source-repository head - type: git - location: git://github.com/snoyberg/conduit.git diff --git a/ghc-conduit-extra.changes b/ghc-conduit-extra.changes index b073d8d..3e1894f 100644 --- a/ghc-conduit-extra.changes +++ b/ghc-conduit-extra.changes @@ -1,124 +1,6 @@ ------------------------------------------------------------------- -Mon Jan 8 03:01:50 UTC 2018 - psimons@suse.com +Wed Mar 14 16:55:44 UTC 2018 - psimons@suse.com -- Update to version 1.2.3.2. +- Update conduit-extra to version 1.3.0. A more detailed change log is not available. -------------------------------------------------------------------- -Mon Jan 1 10:18:42 UTC 2018 - psimons@suse.com - -- Update to version 1.2.3.1. - A more detailed change log is not available. - -------------------------------------------------------------------- -Wed Dec 27 16:58:37 UTC 2017 - psimons@suse.com - -- Update to version 1.2.3. - A more detailed change log is not available. - -------------------------------------------------------------------- -Thu Dec 21 19:12:02 UTC 2017 - psimons@suse.com - -- Update to version 1.2.2. - A more detailed change log is not available. - -------------------------------------------------------------------- -Wed Sep 13 06:59:04 UTC 2017 - psimons@suse.com - -- Update to version 1.1.17. - A more detailed change log is not available. - -------------------------------------------------------------------- -Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com - -- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. - -------------------------------------------------------------------- -Mon May 22 08:08:55 UTC 2017 - psimons@suse.com - -- Update to version 1.1.16 with cabal2obs. - -------------------------------------------------------------------- -Mon Mar 27 12:41:01 UTC 2017 - psimons@suse.com - -- Update to version 1.1.15 revision 1 with cabal2obs. - -------------------------------------------------------------------- -Mon Nov 14 09:30:04 UTC 2016 - psimons@suse.com - -- Update to version 1.1.15 with cabal2obs. - -------------------------------------------------------------------- -Mon Sep 26 06:52:26 UTC 2016 - psimons@suse.com - -- Update to version 1.1.13.3 with cabal2obs. - -------------------------------------------------------------------- -Sun Jul 17 13:17:59 UTC 2016 - psimons@suse.com - -- Update to version 1.1.13.2 revision 0 with cabal2obs. - -------------------------------------------------------------------- -Sun Jul 10 15:30:34 UTC 2016 - mimi.vx@gmail.com - -- update to 1.1.13.2 -* Fix alignment issues on non-X86 archs - -------------------------------------------------------------------- -Sun Apr 3 15:14:52 UTC 2016 - mimi.vx@gmail.com - -- update to 1.1.13.1 -* Add sinkStorable and sinkStorableEx - -------------------------------------------------------------------- -Thu Mar 31 08:36:42 UTC 2016 - mimi.vx@gmail.com - -- update to 1.1.12.1 -* Add sourceProcessWithStreams -* Fix accidentally breaking change in sourceProcessWithConsumer type signature - -------------------------------------------------------------------- -Mon Mar 7 09:32:33 UTC 2016 - mimi.vx@gmail.com - -- update to 1.1.11 -* withCheckedProcessCleanup - -------------------------------------------------------------------- -Wed Feb 17 09:13:57 UTC 2016 - mimi.vx@gmail.com - -- update to 1.1.10.1 -* multiple combinator for Data.Conduit.Zlib - -------------------------------------------------------------------- -Mon Feb 15 19:54:55 UTC 2016 - mimi.vx@gmail.com - -- update to 1.1.9.3 - -------------------------------------------------------------------- -Mon Dec 7 10:41:01 UTC 2015 - mimi.vx@gmail.com - -- update to 1.1.9.2 - -------------------------------------------------------------------- -Mon Jul 27 07:24:38 UTC 2015 - mimi.vx@gmail.com - -- update to 1.1.9.1 - -------------------------------------------------------------------- -Sun May 31 20:31:58 UTC 2015 - mimi.vx@gmail.com - -- update to 1.1.9 -* detectUtf - -------------------------------------------------------------------- -Sun May 17 15:06:03 UTC 2015 - mimi.vx@gmail.com - -- update to 1.1.8 -* Adding buffer size to sourceHandleRange [#213](https://github.com/snoyberg/conduit/pull/213) -* Make Binary.lines O(n) instead of O(n^2) [#209](https://github.com/snoyberg/conduit/pull/209) - -------------------------------------------------------------------- -Wed Apr 22 08:23:09 UTC 2015 - mimi.vx@gmail.com - -- initial commit - diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index 304194c..d514967 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -19,24 +19,20 @@ %global pkg_name conduit-extra %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.3.2 +Version: 1.3.0 Release: 0 Summary: Batteries included conduit: adapters for common libraries License: MIT Group: Development/Libraries/Haskell 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/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-async-devel BuildRequires: ghc-attoparsec-devel -BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-conduit-devel BuildRequires: ghc-directory-devel -BuildRequires: ghc-exceptions-devel BuildRequires: ghc-filepath-devel -BuildRequires: ghc-monad-control-devel BuildRequires: ghc-network-devel BuildRequires: ghc-primitive-devel BuildRequires: ghc-process-devel @@ -45,14 +41,15 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-stm-devel BuildRequires: ghc-streaming-commons-devel BuildRequires: ghc-text-devel -BuildRequires: ghc-transformers-base-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-typed-process-devel BuildRequires: ghc-unliftio-core-devel %if %{with tests} BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-bytestring-builder-devel +BuildRequires: ghc-exceptions-devel BuildRequires: ghc-hspec-devel +BuildRequires: ghc-transformers-base-devel %endif %description @@ -75,7 +72,6 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build From 43b6930e2835b0a46605e670bb344ca9e7ef2c7b5bb91389562668759e6b554c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 13 Apr 2018 13:34:06 +0000 Subject: [PATCH 08/12] osc copypac from project:devel:languages:haskell:lts:11 package:ghc-conduit-extra revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=41 --- ghc-conduit-extra.changes | 96 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/ghc-conduit-extra.changes b/ghc-conduit-extra.changes index 3e1894f..939ac64 100644 --- a/ghc-conduit-extra.changes +++ b/ghc-conduit-extra.changes @@ -1,6 +1,100 @@ ------------------------------------------------------------------- -Wed Mar 14 16:55:44 UTC 2018 - psimons@suse.com +Thu Apr 12 08:31:45 UTC 2018 - psimons@suse.com - Update conduit-extra to version 1.3.0. A more detailed change log is not available. +------------------------------------------------------------------- +Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com + +- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. + +------------------------------------------------------------------- +Mon May 22 08:08:55 UTC 2017 - psimons@suse.com + +- Update to version 1.1.16 with cabal2obs. + +------------------------------------------------------------------- +Mon Mar 27 12:41:01 UTC 2017 - psimons@suse.com + +- Update to version 1.1.15 revision 1 with cabal2obs. + +------------------------------------------------------------------- +Mon Nov 14 09:30:04 UTC 2016 - psimons@suse.com + +- Update to version 1.1.15 with cabal2obs. + +------------------------------------------------------------------- +Mon Sep 26 06:52:26 UTC 2016 - psimons@suse.com + +- Update to version 1.1.13.3 with cabal2obs. + +------------------------------------------------------------------- +Sun Jul 17 13:17:59 UTC 2016 - psimons@suse.com + +- Update to version 1.1.13.2 revision 0 with cabal2obs. + +------------------------------------------------------------------- +Sun Jul 10 15:30:34 UTC 2016 - mimi.vx@gmail.com + +- update to 1.1.13.2 +* Fix alignment issues on non-X86 archs + +------------------------------------------------------------------- +Sun Apr 3 15:14:52 UTC 2016 - mimi.vx@gmail.com + +- update to 1.1.13.1 +* Add sinkStorable and sinkStorableEx + +------------------------------------------------------------------- +Thu Mar 31 08:36:42 UTC 2016 - mimi.vx@gmail.com + +- update to 1.1.12.1 +* Add sourceProcessWithStreams +* Fix accidentally breaking change in sourceProcessWithConsumer type signature + +------------------------------------------------------------------- +Mon Mar 7 09:32:33 UTC 2016 - mimi.vx@gmail.com + +- update to 1.1.11 +* withCheckedProcessCleanup + +------------------------------------------------------------------- +Wed Feb 17 09:13:57 UTC 2016 - mimi.vx@gmail.com + +- update to 1.1.10.1 +* multiple combinator for Data.Conduit.Zlib + +------------------------------------------------------------------- +Mon Feb 15 19:54:55 UTC 2016 - mimi.vx@gmail.com + +- update to 1.1.9.3 + +------------------------------------------------------------------- +Mon Dec 7 10:41:01 UTC 2015 - mimi.vx@gmail.com + +- update to 1.1.9.2 + +------------------------------------------------------------------- +Mon Jul 27 07:24:38 UTC 2015 - mimi.vx@gmail.com + +- update to 1.1.9.1 + +------------------------------------------------------------------- +Sun May 31 20:31:58 UTC 2015 - mimi.vx@gmail.com + +- update to 1.1.9 +* detectUtf + +------------------------------------------------------------------- +Sun May 17 15:06:03 UTC 2015 - mimi.vx@gmail.com + +- update to 1.1.8 +* Adding buffer size to sourceHandleRange [#213](https://github.com/snoyberg/conduit/pull/213) +* Make Binary.lines O(n) instead of O(n^2) [#209](https://github.com/snoyberg/conduit/pull/209) + +------------------------------------------------------------------- +Wed Apr 22 08:23:09 UTC 2015 - mimi.vx@gmail.com + +- initial commit + From 4a7943002f286084e81a6e296a39bc9612f30c57306e0be5126c155bd8082f8b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 26 Apr 2018 07:16:48 +0000 Subject: [PATCH 09/12] osc copypac from project:devel:languages:haskell:lts:11 package:ghc-conduit-extra revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=42 --- ghc-conduit-extra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index d514967..e300d76 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -89,7 +89,7 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_pkg_recache %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %doc ChangeLog.md README.md From 97e94bbb58191171357ec161829feca1efe6d66d84df1b22a5335f9674c5fb15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 14 May 2018 13:16:00 +0000 Subject: [PATCH 10/12] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-conduit-extra revision:1, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=43 --- ghc-conduit-extra.changes | 100 -------------------------------------- 1 file changed, 100 deletions(-) delete mode 100644 ghc-conduit-extra.changes diff --git a/ghc-conduit-extra.changes b/ghc-conduit-extra.changes deleted file mode 100644 index 939ac64..0000000 --- a/ghc-conduit-extra.changes +++ /dev/null @@ -1,100 +0,0 @@ -------------------------------------------------------------------- -Thu Apr 12 08:31:45 UTC 2018 - psimons@suse.com - -- Update conduit-extra to version 1.3.0. - A more detailed change log is not available. - -------------------------------------------------------------------- -Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com - -- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. - -------------------------------------------------------------------- -Mon May 22 08:08:55 UTC 2017 - psimons@suse.com - -- Update to version 1.1.16 with cabal2obs. - -------------------------------------------------------------------- -Mon Mar 27 12:41:01 UTC 2017 - psimons@suse.com - -- Update to version 1.1.15 revision 1 with cabal2obs. - -------------------------------------------------------------------- -Mon Nov 14 09:30:04 UTC 2016 - psimons@suse.com - -- Update to version 1.1.15 with cabal2obs. - -------------------------------------------------------------------- -Mon Sep 26 06:52:26 UTC 2016 - psimons@suse.com - -- Update to version 1.1.13.3 with cabal2obs. - -------------------------------------------------------------------- -Sun Jul 17 13:17:59 UTC 2016 - psimons@suse.com - -- Update to version 1.1.13.2 revision 0 with cabal2obs. - -------------------------------------------------------------------- -Sun Jul 10 15:30:34 UTC 2016 - mimi.vx@gmail.com - -- update to 1.1.13.2 -* Fix alignment issues on non-X86 archs - -------------------------------------------------------------------- -Sun Apr 3 15:14:52 UTC 2016 - mimi.vx@gmail.com - -- update to 1.1.13.1 -* Add sinkStorable and sinkStorableEx - -------------------------------------------------------------------- -Thu Mar 31 08:36:42 UTC 2016 - mimi.vx@gmail.com - -- update to 1.1.12.1 -* Add sourceProcessWithStreams -* Fix accidentally breaking change in sourceProcessWithConsumer type signature - -------------------------------------------------------------------- -Mon Mar 7 09:32:33 UTC 2016 - mimi.vx@gmail.com - -- update to 1.1.11 -* withCheckedProcessCleanup - -------------------------------------------------------------------- -Wed Feb 17 09:13:57 UTC 2016 - mimi.vx@gmail.com - -- update to 1.1.10.1 -* multiple combinator for Data.Conduit.Zlib - -------------------------------------------------------------------- -Mon Feb 15 19:54:55 UTC 2016 - mimi.vx@gmail.com - -- update to 1.1.9.3 - -------------------------------------------------------------------- -Mon Dec 7 10:41:01 UTC 2015 - mimi.vx@gmail.com - -- update to 1.1.9.2 - -------------------------------------------------------------------- -Mon Jul 27 07:24:38 UTC 2015 - mimi.vx@gmail.com - -- update to 1.1.9.1 - -------------------------------------------------------------------- -Sun May 31 20:31:58 UTC 2015 - mimi.vx@gmail.com - -- update to 1.1.9 -* detectUtf - -------------------------------------------------------------------- -Sun May 17 15:06:03 UTC 2015 - mimi.vx@gmail.com - -- update to 1.1.8 -* Adding buffer size to sourceHandleRange [#213](https://github.com/snoyberg/conduit/pull/213) -* Make Binary.lines O(n) instead of O(n^2) [#209](https://github.com/snoyberg/conduit/pull/209) - -------------------------------------------------------------------- -Wed Apr 22 08:23:09 UTC 2015 - mimi.vx@gmail.com - -- initial commit - From e5536cf620d62a753f5cbd3d1e1732be10419072aaa061506e452d4db82950e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 14 May 2018 15:20:17 +0000 Subject: [PATCH 11/12] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-conduit-extra revision:2, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=44 --- ghc-conduit-extra.changes | 94 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 ghc-conduit-extra.changes diff --git a/ghc-conduit-extra.changes b/ghc-conduit-extra.changes new file mode 100644 index 0000000..70417c3 --- /dev/null +++ b/ghc-conduit-extra.changes @@ -0,0 +1,94 @@ +------------------------------------------------------------------- +Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com + +- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf. + +------------------------------------------------------------------- +Mon May 22 08:08:55 UTC 2017 - psimons@suse.com + +- Update to version 1.1.16 with cabal2obs. + +------------------------------------------------------------------- +Mon Mar 27 12:41:01 UTC 2017 - psimons@suse.com + +- Update to version 1.1.15 revision 1 with cabal2obs. + +------------------------------------------------------------------- +Mon Nov 14 09:30:04 UTC 2016 - psimons@suse.com + +- Update to version 1.1.15 with cabal2obs. + +------------------------------------------------------------------- +Mon Sep 26 06:52:26 UTC 2016 - psimons@suse.com + +- Update to version 1.1.13.3 with cabal2obs. + +------------------------------------------------------------------- +Sun Jul 17 13:17:59 UTC 2016 - psimons@suse.com + +- Update to version 1.1.13.2 revision 0 with cabal2obs. + +------------------------------------------------------------------- +Sun Jul 10 15:30:34 UTC 2016 - mimi.vx@gmail.com + +- update to 1.1.13.2 +* Fix alignment issues on non-X86 archs + +------------------------------------------------------------------- +Sun Apr 3 15:14:52 UTC 2016 - mimi.vx@gmail.com + +- update to 1.1.13.1 +* Add sinkStorable and sinkStorableEx + +------------------------------------------------------------------- +Thu Mar 31 08:36:42 UTC 2016 - mimi.vx@gmail.com + +- update to 1.1.12.1 +* Add sourceProcessWithStreams +* Fix accidentally breaking change in sourceProcessWithConsumer type signature + +------------------------------------------------------------------- +Mon Mar 7 09:32:33 UTC 2016 - mimi.vx@gmail.com + +- update to 1.1.11 +* withCheckedProcessCleanup + +------------------------------------------------------------------- +Wed Feb 17 09:13:57 UTC 2016 - mimi.vx@gmail.com + +- update to 1.1.10.1 +* multiple combinator for Data.Conduit.Zlib + +------------------------------------------------------------------- +Mon Feb 15 19:54:55 UTC 2016 - mimi.vx@gmail.com + +- update to 1.1.9.3 + +------------------------------------------------------------------- +Mon Dec 7 10:41:01 UTC 2015 - mimi.vx@gmail.com + +- update to 1.1.9.2 + +------------------------------------------------------------------- +Mon Jul 27 07:24:38 UTC 2015 - mimi.vx@gmail.com + +- update to 1.1.9.1 + +------------------------------------------------------------------- +Sun May 31 20:31:58 UTC 2015 - mimi.vx@gmail.com + +- update to 1.1.9 +* detectUtf + +------------------------------------------------------------------- +Sun May 17 15:06:03 UTC 2015 - mimi.vx@gmail.com + +- update to 1.1.8 +* Adding buffer size to sourceHandleRange [#213](https://github.com/snoyberg/conduit/pull/213) +* Make Binary.lines O(n) instead of O(n^2) [#209](https://github.com/snoyberg/conduit/pull/209) + +------------------------------------------------------------------- +Wed Apr 22 08:23:09 UTC 2015 - mimi.vx@gmail.com + +- initial commit + From a63f4808b1101e4d10da27537ce2e767e87b0f3b202e8404ffbb4790a438e377 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 May 2018 18:23:33 +0000 Subject: [PATCH 12/12] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-conduit-extra revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=45 --- ghc-conduit-extra.changes | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ghc-conduit-extra.changes b/ghc-conduit-extra.changes index 70417c3..b174cac 100644 --- a/ghc-conduit-extra.changes +++ b/ghc-conduit-extra.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon May 14 17:02:11 UTC 2018 - psimons@suse.com + +- Update conduit-extra to version 1.3.0. + * Switch over to unliftio + * Upgrade to conduit 1.3.0 + * Fix withSinkFileBuilder [#344](https://github.com/snoyberg/conduit/pull/344) + * Fix typo in implementation of `withProcess_` + * Added `withLoggedProcess_` + * Add missing `hClose` to `withSinkFileCautious` + * `sinkHandleBuilder`, `sinkHandleFlush`, `BuilderInput`, and `FlushInput` + [#336](https://github.com/snoyberg/conduit/pull/336) + * `withSinkFileCautious` + * `Data.Conduit.Process.Typed` + * `withSourceFile`, `withSinkFile`, and `withSinkFileBuilder` + * Added the `posOffset` field to the + `Data.Conduit.Attoparsec.Position` data type + [#331](https://github.com/snoyberg/conduit/issues/331). + * Speed up `sinkHandle` by not flushing after every output operation. + [#322](https://github.com/snoyberg/conduit/issues/322) + ------------------------------------------------------------------- Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com