From f200e9caec4e5a3a66589aeace90354dbe885692 Mon Sep 17 00:00:00 2001 From: Greg Weber Date: Sun, 28 Aug 2011 13:13:55 -0700 Subject: [PATCH] pass static directory onto wai-app-static --- yesod-static/Yesod/Static.hs | 4 ++-- yesod-static/yesod-static.cabal | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yesod-static/Yesod/Static.hs b/yesod-static/Yesod/Static.hs index 45340add..f26813b7 100644 --- a/yesod-static/Yesod/Static.hs +++ b/yesod-static/Yesod/Static.hs @@ -87,13 +87,13 @@ newtype Static = Static StaticSettings static :: Prelude.FilePath -> IO Static static dir = do hashLookup <- cachedETagLookup dir - return $ Static $ webAppSettingsWithLookup hashLookup + return $ Static $ webAppSettingsWithLookup (toFilePath dir) hashLookup -- | like static, but checks to see if the file has changed staticDevel :: Prelude.FilePath -> IO Static staticDevel dir = do hashLookup <- cachedETagLookupDevel dir - return $ Static $ webAppSettingsWithLookup hashLookup + return $ Static $ webAppSettingsWithLookup (toFilePath dir) hashLookup -- | Produces a 'Static' based on embedding file contents in the executable at -- compile time. diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index dbae5362..5c11f79c 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -1,5 +1,5 @@ name: yesod-static -version: 0.3.0 +version: 0.3.0.1 license: BSD3 license-file: LICENSE author: Michael Snoyman @@ -28,7 +28,7 @@ library , template-haskell , directory >= 1.0 && < 1.2 , transformers >= 0.2 && < 0.3 - , wai-app-static >= 0.3.2 && < 0.4 + , wai-app-static >= 0.3.2.1 && < 0.4 , wai >= 0.4 && < 0.5 , text >= 0.5 && < 1.0 , file-embed >= 0.0.4.1 && < 0.5