remove depends on old-local and transformers-compat. By the time GHC 8.0.2 was released time 1.5 and transformers 0.4 were already available.

Author: stepcut

happstack-server.cabal

@@ -91,18 +91,16 @@ Library
                        html,
                        monad-control          >= 1.0  && < 1.1,
                        mtl                    >= 2.2  && < 2.4,
-                       old-locale,
                        parsec                            < 4,
                        process,
                        sendfile               >= 0.7.1 && < 0.8,
                        system-filepath        >= 0.3.1,
                        syb,
                        text                   >= 0.10  && < 2.2,
-                       time,
+                       time                   >= 1.5,
                        threads                >= 0.5,
                        transformers           >= 0.1.3 && < 0.7,
                        transformers-base      >= 0.4   && < 0.5,
-                       transformers-compat    >= 0.3   && < 0.8,
                        utf8-string            >= 0.3.4 && < 1.1,
                        xhtml                              < 3000.4,
                        zlib

src/Happstack/Server/FileServe/BuildingBlocks.hs

@@ -64,6 +64,7 @@ import Data.List                    (sort)
 import Data.Maybe                   (fromMaybe)
 import           Data.Map           (Map)
 import qualified Data.Map           as Map
+import Data.Time                    (UTCTime, formatTime, defaultTimeLocale)
 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)
@@ -76,13 +77,6 @@ import           Text.Blaze.Html             ((!))
 import qualified Text.Blaze.Html5            as H
 import qualified Text.Blaze.Html5.Attributes as A
 
-#if MIN_VERSION_time(1,5,0)
-import Data.Time     (UTCTime, formatTime, defaultTimeLocale)
-#else
-import System.Locale (defaultTimeLocale)
-import Data.Time     (UTCTime, formatTime)
-#endif
-
 -- * Mime-Type / Content-Type
 
 -- |a 'Map' from file extensions to content-types

src/Happstack/Server/Internal/Clock.hs

@@ -9,19 +9,12 @@ module Happstack.Server.Internal.Clock
 
 import Control.Concurrent
 import Control.Monad
+import qualified Data.ByteString.Char8 as B
 import Data.IORef
 import Data.Time.Clock       (UTCTime)
 import Data.Time.Clock.POSIX (POSIXTime, getPOSIXTime, posixSecondsToUTCTime)
-import System.IO.Unsafe
-
-#if MIN_VERSION_time(1,5,0)
 import Data.Time.Format (formatTime, defaultTimeLocale)
-#else
-import Data.Time.Format (formatTime)
-import System.Locale    (defaultTimeLocale)
-#endif
-
-import qualified Data.ByteString.Char8 as B
+import System.IO.Unsafe
 
 data DateCache = DateCache {
       cachedPOSIXTime :: !(IORef POSIXTime)

src/Happstack/Server/Internal/Cookie.hs

@@ -25,16 +25,13 @@ import Data.Data             (Data, Typeable)
 import Data.List             ((\\), intersperse)
 import Data.Time.Clock       (UTCTime, addUTCTime, diffUTCTime)
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
+import Data.Time.Format      (formatTime, defaultTimeLocale)
 import Happstack.Server.Internal.Clock (getApproximateUTCTime)
 import Network.URI           (escapeURIString)
 import Text.ParserCombinators.Parsec hiding (token)
 
-#if MIN_VERSION_time(1,5,0)
-import Data.Time.Format (formatTime, defaultTimeLocale)
-#else
-import Data.Time.Format (formatTime)
-import System.Locale    (defaultTimeLocale)
-#endif
+
+
 
 -- | a type for HTTP cookies. Usually created using 'mkCookie'.
 data Cookie = Cookie

src/Happstack/Server/Internal/LogFormat.hs

@@ -4,12 +4,7 @@ module Happstack.Server.Internal.LogFormat
   , formatRequestCombined
   ) where
 
-#if MIN_VERSION_time(1,5,0)
 import Data.Time.Format (FormatTime(..), formatTime, defaultTimeLocale)
-#else
-import Data.Time.Format (FormatTime(..), formatTime)
-import System.Locale    (defaultTimeLocale)
-#endif
 
 -- | Format the time as describe in the Apache combined log format.
 --   http://httpd.apache.org/docs/2.2/logs.html#combined

src/Happstack/Server/Response.hs

@@ -37,6 +37,7 @@ import qualified Data.Text                       as T
 import qualified Data.Text.Encoding              as T
 import qualified Data.Text.Lazy                  as LT
 import qualified Data.Text.Lazy.Encoding         as LT
+import Data.Time                                 (UTCTime, formatTime, defaultTimeLocale)
 import           Happstack.Server.Internal.Monads         (FilterMonad(composeFilter))
 import           Happstack.Server.Internal.Types
 import           Happstack.Server.Types          (Response(..), Request(..), nullRsFlags, getHeader, noContentLength, redirect, result, setHeader, setHeaderBS)
@@ -46,12 +47,6 @@ import qualified Text.Blaze.Html.Renderer.Utf8   as Blaze
 import           Text.Html                       (Html, renderHtml)
 import qualified Text.XHtml                      as XHtml (Html, renderHtml)
 
-#if MIN_VERSION_time(1,5,0)
-import Data.Time     (UTCTime, formatTime, defaultTimeLocale)
-#else
-import Data.Time     (UTCTime, formatTime)
-import System.Locale (defaultTimeLocale)
-#endif
 
 -- | A low-level function to build a 'Response' from a content-type
 -- and a 'ByteString'.

src/Happstack/Server/SimpleHTTP.hs

@@ -30,9 +30,9 @@
 -- > import Happstack.Server
 -- > main = simpleHTTP nullConf $ ok "Hello World!"
 --
--- By default the server will listen on port 8000. Run the app and point your browser at: <http://localhost:8000/>
+-- By default the server will listen on port 8000. Run the app and point your browser at: <http:\/\/localhost:8000\/>
 --
--- For FastCGI support see: <http://hackage.haskell.org/package/happstack-fastcgi>
+-- For FastCGI support see: <http:\/\/hackage.haskell.org\/package\/happstack-fastcgi>
 -----------------------------------------------------------------------------
 module Happstack.Server.SimpleHTTP
     ( -- * SimpleHTTP