zlib 0.6.2 → 0.6.2.1

raw patch · 3 files changed

+31/−8 lines, 3 filesdep ~basedep ~tastydep ~tasty-hunit

Dependency ranges changed: base, tasty, tasty-hunit, tasty-quickcheck

Files

• Codec/Compression/Zlib/Stream.hsc +16/−0
• changelog +6/−0
• zlib.cabal +9/−8

@@ -123,6 +123,9 @@ import Control.Applicative (Applicative(..)) #endif import Control.Monad (ap,liftM)+#if MIN_VERSION_base(4,9,0)+import qualified Control.Monad.Fail as Fail+#endif #if __GLASGOW_HASKELL__ >= 702 #if __GLASGOW_HASKELL__ >= 708 import Control.Monad.ST.Strict@@ -373,8 +376,21 @@   (>>=)  = thenZ --  m >>= f = (m `thenZ` \a -> consistencyCheck `thenZ_` returnZ a) `thenZ` f   (>>)   = (*>)++#if !MIN_VERSION_base(4,8,0)   return = pure+#endif++#if !MIN_VERSION_base(4,9,0)   fail   = (finalise >>) . failZ+#elif !MIN_VERSION_base(4,13,0)+  fail   = Fail.fail+#endif++#if MIN_VERSION_base(4,9,0)+instance Fail.MonadFail Stream where+  fail   = (finalise >>) . failZ+#endif  returnZ :: a -> Stream a returnZ a = Z $ \_ inBuf outBuf outOffset outLength ->

@@ -1,3 +1,9 @@+See also http://pvp.haskell.org/faq++0.6.2.1 Herbert Valerio Riedel <hvr@gnu.org> August 2019++ * Add support for GHC 8.8 / base-4.13+ 0.6.2 Herbert Valerio Riedel <hvr@gnu.org> March 2018   * New cabal flag 'pkg-config' for discovering 'zlib` via pkg-config(1) (#16)

@@ -1,5 +1,7 @@+cabal-version:   >= 1.10 name:            zlib-version:         0.6.2+version:         0.6.2.1+ copyright:       (c) 2006-2016 Duncan Coutts license:         BSD3 license-file:    LICENSE@@ -19,8 +21,7 @@                  tasks and for the few cases where more control is needed it                  provides access to the full zlib feature set. build-type:      Simple-cabal-version:   >= 1.10-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.1, GHC==8.0.2, GHC ==8.2.2, GHC ==8.4.1+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.1, GHC==8.0.2, GHC ==8.2.2, GHC ==8.4.4, GHC==8.6.4  extra-source-files: changelog                     -- zlib C sources (for Windows)@@ -67,8 +68,8 @@     other-extensions: DeriveGeneric   if impl(ghc >= 7.6)     other-extensions: CApiFFI-  build-depends:   base >= 4 && < 5,-                   bytestring >= 0.9 && < 0.12+  build-depends:   base >= 4 && < 4.14,+                   bytestring >= 0.9 && < 0.11   if impl(ghc >= 7.2 && < 7.6)     build-depends: ghc-prim   includes:        zlib.h@@ -103,7 +104,7 @@   default-language: Haskell2010   build-depends:   base, bytestring, zlib,                    QuickCheck       == 2.*,-                   tasty            >= 0.8 && < 0.12,-                   tasty-quickcheck == 0.8.*,-                   tasty-hunit      >= 0.8 && < 0.10+                   tasty            >= 0.8 && < 1.3,+                   tasty-quickcheck >= 0.8 && < 0.11,+                   tasty-hunit      >= 0.8 && < 0.11   ghc-options:     -Wall