From b847043a6c7cb5ad1b63dea5fd8a28af7e9156835c97523b7c39dcf55c445d8f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 May 2017 11:39:42 +0000 Subject: [PATCH] synchronize with lts:8 at 27d82acd4aecec9d6ec7f65048ad62d72911ed17 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-conduit-extra?expand=0&rev=27 --- conduit-extra-1.1.15.tar.gz | 3 - conduit-extra-1.1.16.tar.gz | 3 + conduit-extra.cabal | 123 ------------------------------------ ghc-conduit-extra.changes | 5 ++ ghc-conduit-extra.spec | 4 +- 5 files changed, 9 insertions(+), 129 deletions(-) delete mode 100644 conduit-extra-1.1.15.tar.gz create mode 100644 conduit-extra-1.1.16.tar.gz delete mode 100644 conduit-extra.cabal diff --git a/conduit-extra-1.1.15.tar.gz b/conduit-extra-1.1.15.tar.gz deleted file mode 100644 index 03f750e..0000000 --- a/conduit-extra-1.1.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bef29eb0db59c236519b0c5cac82183ed7741a535a57e0772aac1158e90bb8d -size 34666 diff --git a/conduit-extra-1.1.16.tar.gz b/conduit-extra-1.1.16.tar.gz new file mode 100644 index 0000000..723d96d --- /dev/null +++ b/conduit-extra-1.1.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd72c1bacd5f59a74a73a0aa115b8314f0a1dc1b24d939e52a983113c960f8d5 +size 34402 diff --git a/conduit-extra.cabal b/conduit-extra.cabal deleted file mode 100644 index 7fe739a..0000000 --- a/conduit-extra.cabal +++ /dev/null @@ -1,123 +0,0 @@ -Name: conduit-extra -Version: 1.1.15 -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.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 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.1 && < 1.3 - - -- No version bounds necessary, since they're inherited - -- from conduit. - , bytestring - , exceptions >= 0.6 && < 0.9 - , 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 - - 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.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 e34e0f4..265e714 100644 --- a/ghc-conduit-extra.changes +++ b/ghc-conduit-extra.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/ghc-conduit-extra.spec b/ghc-conduit-extra.spec index fbef3e5..04dde86 100644 --- a/ghc-conduit-extra.spec +++ b/ghc-conduit-extra.spec @@ -19,14 +19,13 @@ %global pkg_name conduit-extra %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.1.15 +Version: 1.1.16 Release: 0 Summary: Batteries included conduit: adapters for common libraries License: MIT Group: Development/Languages/Other 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,7 +73,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