rpms
/
ghc-happstack-server
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update time-compat patch

This commit is contained in:
Jens Petersen 2015-09-29 14:35:41 +09:00
parent 7b5e1c6552
commit 348bd55fcd
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
happstack-server-time-compat.patch
View File

@ -1,24 +1,26 @@
--- happstack-server-7.3.9/happstack-server.cabal.orig 2015-03-04 00:22:58.607285588 +0900
+++ happstack-server-7.3.9/happstack-server.cabal 2015-03-04 00:23:29.666225638 +0900
@@ -93,7 +93,6 @@
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
syb,
text >= 0.10 && < 1.3,
text >= 0.10 && < 1.3,
time,
- time-compat,
threads >= 0.5,
transformers >= 0.1.3 && < 0.5,
transformers-base >= 0.4 && < 0.5,
--- happstack-server-7.3.4/src/Happstack/Server/FileServe/BuildingBlocks.hs~ 2014-03-11 05:29:33.000000000 +0900
+++ happstack-server-7.3.4/src/Happstack/Server/FileServe/BuildingBlocks.hs 2014-04-02 10:26:17.195355663 +0900
@@ -66,7 +66,6 @@
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)
import Data.Map (Map)
import qualified Data.Map as Map
import Data.Time (UTCTime, formatTime)
-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)
@@ -80,6 +79,10 @@
@@ -78,6 +77,10 @@ import Text.Blaze.Html
import qualified Text.Blaze.Html5 as H
import qualified Text.Blaze.Html5.Attributes as A
@ -26,6 +28,6 @@
+--import Data.Time.Compat (toUTCTime)
+toUTCTime = id
+
-- * Mime-Type / Content-Type
-- |a 'Map' from file extensions to content-types
#if MIN_VERSION_time(1,5,0)
import Data.Time (UTCTime, formatTime, defaultTimeLocale)
#else