From 205b3bf6b3bcde91a89fe14ba714a167c86a09aa Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 7 Jan 2012 18:10:11 +0200
Subject: [PATCH] Get crypto-conduit changes to compile

---
 yesod-static/Yesod/Static.hs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/yesod-static/Yesod/Static.hs b/yesod-static/Yesod/Static.hs
index e53459ab..549e91af 100644
--- a/yesod-static/Yesod/Static.hs
+++ b/yesod-static/Yesod/Static.hs
@@ -30,6 +30,7 @@ module Yesod.Static
     ( -- * Subsite
       Static (..)
     , Route (..)
+    , StaticRoute
       -- * Smart constructor
     , static
     , staticDevel
@@ -39,7 +40,6 @@ module Yesod.Static
     , staticFilesList
     , publicFiles
       -- * Hashing
-    , base64md5
 #ifdef TEST
     , getFileListPieces
 #endif
@@ -60,7 +60,6 @@ import Language.Haskell.TH.Syntax
 import Crypto.Conduit (hashFile)
 import Crypto.Hash.MD5 (MD5)
 
-import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString.Base64
 import qualified Data.ByteString.Char8 as S8
 import qualified Data.Serialize
@@ -75,9 +74,6 @@ import qualified Data.ByteString as S
 import Network.HTTP.Types (status301)
 import System.PosixCompat.Files (getFileStatus, modificationTime)
 import System.Posix.Types (EpochTime)
-import qualified Data.Conduit as C
-import qualified Data.Conduit.Binary as CB
-import qualified Data.Conduit.List as CL
 
 import Network.Wai.Application.Static
     ( StaticSettings (..)
@@ -95,6 +91,8 @@ import Network.Wai.Application.Static
 -- | Type used for the subsite with static contents.
 newtype Static = Static StaticSettings
 
+type StaticRoute = Route Static
+
 -- | Produce a default value of 'Static' for a given file
 -- folder.
 --
@@ -317,12 +315,11 @@ base64md5File :: Prelude.FilePath -> IO String
 base64md5File = fmap (base64 . encode) . hashFile
     where encode d = Data.Serialize.encode (d :: MD5)
 
-base64 :: MD5Digest -> String
+base64 :: S.ByteString -> String
 base64 = map tr
        . take 8
        . S8.unpack
        . Data.ByteString.Base64.encode
-       . Data.Serialize.encode
   where
     tr '+' = '-'
     tr '/' = '_'