ghc-happstack-server/happstack-server-time-compat.patch

34 lines
1.9 KiB
Diff
Raw Normal View History

2015-09-29 05:35:41 +00:00
diff -up happstack-server-7.4.4/happstack-server.cabal~ happstack-server-7.4.4/happstack-server.cabal
--- happstack-server-7.4.4/happstack-server.cabal~ 2015-05-15 10:22:24.000000000 +0900
+++ happstack-server-7.4.4/happstack-server.cabal 2015-09-29 14:33:12.521350229 +0900
@@ -93,7 +93,6 @@ Library
2014-05-08 10:25:27 +00:00
syb,
2015-09-29 05:35:41 +00:00
text >= 0.10 && < 1.3,
2014-05-08 10:25:27 +00:00
time,
- time-compat,
2015-09-29 05:35:41 +00:00
threads >= 0.5,
transformers >= 0.1.3 && < 0.5,
transformers-base >= 0.4 && < 0.5,
diff -up happstack-server-7.4.4/src/Happstack/Server/FileServe/BuildingBlocks.hs~ happstack-server-7.4.4/src/Happstack/Server/FileServe/BuildingBlocks.hs
--- happstack-server-7.4.4/src/Happstack/Server/FileServe/BuildingBlocks.hs~ 2015-05-15 10:22:24.000000000 +0900
+++ happstack-server-7.4.4/src/Happstack/Server/FileServe/BuildingBlocks.hs 2015-09-29 14:34:35.210452384 +0900
@@ -65,7 +65,6 @@ import Data.List (sor
import Data.Maybe (fromMaybe)
2014-05-08 10:25:27 +00:00
import Data.Map (Map)
import qualified Data.Map as Map
-import Data.Time.Compat (toUTCTime)
import Filesystem.Path.CurrentOS (commonPrefix, encodeString, decodeString, collapse, append)
import Happstack.Server.Monads (ServerMonad(askRq), FilterMonad, WebMonad)
import Happstack.Server.Response (ToMessage(toResponse), ifModifiedSince, forbidden, ok, seeOther)
2015-09-29 05:35:41 +00:00
@@ -78,6 +77,10 @@ import Text.Blaze.Html
2014-05-08 10:25:27 +00:00
import qualified Text.Blaze.Html5 as H
import qualified Text.Blaze.Html5.Attributes as A
+-- Fedora change to avoid packaging time-compat:
+--import Data.Time.Compat (toUTCTime)
+toUTCTime = id
+
2015-09-29 05:35:41 +00:00
#if MIN_VERSION_time(1,5,0)
import Data.Time (UTCTime, formatTime, defaultTimeLocale)
#else