wai-app-static 2.0.0.3 → 2.0.0.4

raw patch · 3 files changed

+12/−13 lines, 3 filesdep +byteabledep +cryptohashdep +cryptohash-conduitdep −cerealdep −crypto-apidep −crypto-conduit

Dependencies added: byteable, cryptohash, cryptohash-conduit

Dependencies removed: cereal, crypto-api, crypto-conduit, cryptohash-cryptoapi

Files

• WaiAppStatic/Storage/Embedded/Runtime.hs +3/−3
• WaiAppStatic/Storage/Filesystem.hs +5/−5
• wai-app-static.cabal +4/−5

@@ -15,8 +15,8 @@ import qualified Data.Text as T import Data.Ord import qualified Data.ByteString as S-import qualified Crypto.Classes as CR-import Crypto.Hash.CryptoAPI (hash', MD5)+import Crypto.Hash (hash, MD5, Digest)+import Data.Byteable (toBytes) import qualified Data.ByteString.Base64 as B64 import WaiAppStatic.Storage.Filesystem (defaultFileServerSettings) import System.FilePath (isPathSeparator)@@ -95,4 +95,4 @@     }  runHash :: ByteString -> ByteString-runHash = B64.encode . CR.encode . (hash' :: S.ByteString -> MD5)+runHash = B64.encode . toBytes . (hash :: S.ByteString -> Digest MD5)

@@ -25,9 +25,9 @@ import Network.Mime import System.PosixCompat.Files (fileSize, getFileStatus, modificationTime, isRegularFile) import Data.Maybe (catMaybes)-import qualified Crypto.Conduit-import Data.Serialize (encode)-import Crypto.Hash.CryptoAPI (MD5)+import qualified Crypto.Hash.Conduit (hashFile)+import Data.Byteable (toBytes)+import Crypto.Hash (MD5, Digest) import qualified Data.ByteString.Base64 as B64  -- | Construct a new path from a root and some @Pieces@.@@ -117,8 +117,8 @@ -- exists. hashFile :: FilePath -> IO ByteString hashFile fp = do-    h <- Crypto.Conduit.hashFile (F.encodeString fp)-    return $ B64.encode $ encode (h :: MD5)+    h <- Crypto.Hash.Conduit.hashFile (F.encodeString fp)+    return $ B64.encode $ toBytes (h :: Digest MD5)  hashFileIfExists :: ETagLookup hashFileIfExists fp = do

@@ -1,5 +1,5 @@ name:            wai-app-static-version:         2.0.0.3+version:         2.0.0.4 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -37,15 +37,14 @@                    , text                      >= 0.7                    , blaze-builder             >= 0.2.1.4                    , base64-bytestring         >= 0.1-                   , crypto-api                >= 0.12.2-                   , cryptohash-cryptoapi      >= 0.1.0+                   , byteable+                   , cryptohash                >= 0.11+                   , cryptohash-conduit        >= 0.1.0                    , system-filepath           >= 0.4                    , system-fileio             >= 0.3                    , http-date                    , blaze-html                >= 0.5                    , blaze-markup              >= 0.5.1-                   , crypto-conduit            >= 0.4-                   , cereal                    >= 0.3.5                    , mime-types                >= 0.1      && < 0.2                    , unordered-containers      >= 0.2                    , template-haskell          >= 2.7