de01fdf · hakyll · git.iko.soy

git.iko.soy/hakyll

on master help sign in

Use cryptohash instead of hopenssl

de01fdfJasper Van der Jeugt15 years ago

hakyll.cabal+1−1

compare with master

unifiedsplit

@@ -64,10 +64,10 @@ Library

64 blaze-html >= 0.4 && < 0.6,

65 bytestring >= 0.9 && < 1.0,

66 containers >= 0.3 && < 1.0,

67+ cryptohash >= 0.7 && < 0.8,

67 directory >= 1.0 && < 1.3,

68 directory >= 1.0 && < 1.3,

68 filepath >= 1.0 && < 2.0,

69 filepath >= 1.0 && < 2.0,

69 hamlet >= 0.7 && < 0.9,

70 hamlet >= 0.7 && < 0.9,

70− hopenssl >= 1.4 && < 1.7,

71 mtl >= 1 && < 3.0,

72 old-locale >= 1.0 && < 2.0,

73 old-time >= 1.0 && < 1.3,

src/Hakyll/Core/Resource/Provider.hs+4−6

@@ -20,14 +20,12 @@ module Hakyll.Core.Resource.Provider

21import Control.Applicative ((<$>))

22import Control.Concurrent (MVar, readMVar, modifyMVar_, newMVar)

23−import Control.Monad ((<=<))

24−import Data.Word (Word8)

25import Data.Map (Map)

23import Data.Map (Map)

26import qualified Data.Map as M

24import qualified Data.Map as M

26+import qualified Crypto.Hash.MD5 as MD5

27+import qualified Data.ByteString as B

28import qualified Data.ByteString.Lazy as LB

29−import OpenSSL.Digest.ByteString.Lazy (digest)

30−import OpenSSL.Digest (MessageDigest (MD5))

32import Hakyll.Core.Store

30import Hakyll.Core.Store

33import Hakyll.Core.Resource

31import Hakyll.Core.Resource

@@ -60,8 +58,8 @@ resourceExists provider = flip elem $ resourceList provider

61-- | Retrieve a digest for a given resource

59-- | Retrieve a digest for a given resource

62--

60--

63−resourceDigest :: ResourceProvider -> Resource -> IO [Word8]

61+resourceDigest :: ResourceProvider -> Resource -> IO B.ByteString

64−resourceDigest provider = digest MD5 <=< resourceLBS provider

62+resourceDigest provider = fmap MD5.hashlazy . resourceLBS provider

66-- | Check if a resource was modified

64-- | Check if a resource was modified

67--

65--