From 075bfdad8fee8874f092228f750fbcc1016b5525 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Tue, 17 Oct 2017 15:39:01 -0400 Subject: [PATCH] Cleanup warnings and bump lts resolver --- Codec/Archive/Zip/Conduit/Internal.hs | 2 +- Codec/Archive/Zip/Conduit/UnZip.hs | 2 +- stack.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Codec/Archive/Zip/Conduit/Internal.hs b/Codec/Archive/Zip/Conduit/Internal.hs index 1037c53..0be2654 100644 --- a/Codec/Archive/Zip/Conduit/Internal.hs +++ b/Codec/Archive/Zip/Conduit/Internal.hs @@ -15,7 +15,7 @@ import qualified Data.ByteString as BS import qualified Data.Conduit as C import qualified Data.Conduit.Internal as CI import Data.Digest.CRC32 (crc32Update) -import Data.Word (Word8, Word16, Word32, Word64) +import Data.Word (Word8, Word32, Word64) import Codec.Archive.Zip.Conduit.Types diff --git a/Codec/Archive/Zip/Conduit/UnZip.hs b/Codec/Archive/Zip/Conduit/UnZip.hs index 7ce313e..4debd1b 100644 --- a/Codec/Archive/Zip/Conduit/UnZip.hs +++ b/Codec/Archive/Zip/Conduit/UnZip.hs @@ -152,7 +152,7 @@ unZipStream = next where centralBody sig = fail $ "Unknown header signature: " ++ show sig fileHeader = do ver <- G.getWord8 - G.getWord8 -- OS Version + _os <- G.getWord8 -- OS Version (could require 0 = DOS, but we ignore ext attrs altogether) when (ver > zipVersion) $ fail $ "Unsupported version: " ++ show ver gpf <- G.getWord16le -- when (gpf .&. complement (bit 1 .|. bit 2 .|. bit 3) /= 0) $ fail $ "Unsupported flags: " ++ show gpf diff --git a/stack.yaml b/stack.yaml index e79a206..0952036 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-8.13 +resolver: lts-8.24 packages: - '.' extra-deps: []