From 206b088a807a15378cba1e0615816bbf9b27767a Mon Sep 17 00:00:00 2001 From: Adithya Kumar Date: Mon, 28 Feb 2022 18:13:39 +0530 Subject: [PATCH] Update streamly to 0.8.2 --- default.nix | 8 ++++---- src/Streamly/Internal/LZ4.hs | 6 +++--- src/Streamly/LZ4.hs | 2 +- stack.yaml | 4 ++-- streamly-lz4.cabal | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/default.nix b/default.nix index 0106885..c038126 100644 --- a/default.nix +++ b/default.nix @@ -42,8 +42,8 @@ let haskellPackages = nixpkgs.haskell.lib.overrideCabal (super.callHackageDirect { pkg = "streamly"; - ver = "0.8.1"; - sha256 = "0ywyy7gxjnp32hx8kki0lfn94bnc9mzjh8g6mg65ff3vv28k2vdr"; + ver = "0.8.2"; + sha256 = "0jhsdd71kqw0k0aszg1qb1l0wbxl1r73hsmkdgch4vlx43snlc8a"; } {}) (old: { librarySystemDepends = @@ -57,8 +57,8 @@ let haskellPackages = unicode-data = super.callHackageDirect { pkg = "unicode-data"; - ver = "0.2.0"; - sha256 = "14crb68g79yyw87fgh49z2fn4glqx0zr53v6mapihaxzkikhkkc3"; + ver = "0.3.0"; + sha256 = "0izxxk7qgq22ammzmwc4cs4nlhzp7y55gzyas2a8bzhdpac1j7yx"; } {}; tasty-bench = diff --git a/src/Streamly/Internal/LZ4.hs b/src/Streamly/Internal/LZ4.hs index ba57a6f..43773b5 100644 --- a/src/Streamly/Internal/LZ4.hs +++ b/src/Streamly/Internal/LZ4.hs @@ -230,7 +230,7 @@ compressChunk :: -> Array.Array Word8 -> IO (Array.Array Word8) compressChunk cfg speed ctx arr = do - Array.unsafeAsPtr arr + Array.asPtrUnsafe (Array.unsafeCast arr) $ \src -> do let uncompLen = Array.byteLength arr speedC = unsafeIntToCInt speed @@ -294,7 +294,7 @@ decompressChunk :: -> Array.Array Word8 -> IO (Array.Array Word8) decompressChunk cfg ctx arr = do - Array.unsafeAsPtr arr + Array.asPtrUnsafe (Array.unsafeCast arr) $ \src -> do let hdrCompLen :: Ptr Int32 = src `plusPtr` compSizeOffset cfg compData = src `plusPtr` dataOffset cfg @@ -573,7 +573,7 @@ decompressChunksWithD :: -> Stream.Stream m (Array.Array Word8) decompressChunksWithD p s = do ((cfg, config), next) <- Stream.fromEffect $ second IsStream.toStreamD - <$> ArrayStream.foldArr_ (ArrayFold.fromParser p) (IsStream.fromStreamD s) + <$> ArrayStream.foldArr_ (ArrayFold.fromParserD p) (IsStream.fromStreamD s) decompressChunksRawD cfg (resizeChunksD cfg config next) -- XXX Merge this with BlockConfig? diff --git a/src/Streamly/LZ4.hs b/src/Streamly/LZ4.hs index 43cfc80..9fba797 100644 --- a/src/Streamly/LZ4.hs +++ b/src/Streamly/LZ4.hs @@ -32,7 +32,7 @@ -- Please build with -- [fusion-plugin](https://hackage.haskell.org/package/fusion-plugin) for best -- performance. See the [streamly build --- guide](https://streamly.composewell.com/streamly-0.8.0/Compiling.html) for +-- guide](https://streamly.composewell.com/streamly-0.8.2/Compiling.html) for -- more details. -- -- The APIs are not yet stable and may change in future. diff --git a/stack.yaml b/stack.yaml index 5f836a2..31575be 100644 --- a/stack.yaml +++ b/stack.yaml @@ -2,8 +2,8 @@ packages: - '.' resolver: lts-18.18 extra-deps: -- unicode-data-0.2.0 -- streamly-0.8.1 +- unicode-data-0.3.0 +- streamly-0.8.2 # Look at https://stackoverflow.com/questions/70045586/could-not-find-module-system-console-mintty-win32-when-compiling-test-framework flags: diff --git a/streamly-lz4.cabal b/streamly-lz4.cabal index 31e435f..7115bfc 100644 --- a/streamly-lz4.cabal +++ b/streamly-lz4.cabal @@ -59,7 +59,7 @@ library build-depends: base >= 4 && < 5 , fusion-plugin-types >= 0.1 && < 0.2 , exceptions >= 0.8 && < 0.11 - , streamly >= 0.8.1 && < 0.8.2 + , streamly == 0.8.2.* ghc-options: -Wall default-language: Haskell2010 default-extensions: @@ -77,7 +77,7 @@ test-suite test-lz4 hs-source-dirs: test main-is: Main.hs build-depends: streamly-lz4 - , streamly >= 0.8.1 && < 0.8.2 + , streamly == 0.8.2.* , base >= 4 && < 5 , QuickCheck >= 2.13.1 && < 2.15 , hspec >= 2.7 && < 2.9 @@ -92,7 +92,7 @@ benchmark bench-lz4 hs-source-dirs: benchmark main-is: Main.hs build-depends: streamly-lz4 - , streamly >= 0.8.1 && < 0.8.2 + , streamly == 0.8.2.* , base >= 4 && < 5 , gauge >= 0.2.5 && < 0.2.6 , directory >= 1.3.0 && < 1.3.8