Use time-http

diff --git a/Rakka.cabal b/Rakka.cabal
index f9cd261cc84764cc3bb2ed098f254c26e8a3c71b..089f3f63ac2de575db5f0fdc2eafdfcc61e2c2cc 100644 (file)
--- a/Rakka.cabal
+++ b/Rakka.cabal
@@ -13,6 +13,7 @@ Category:      Web
 Tested-With:   GHC == 6.12.1
 Cabal-Version: >= 1.6
 Build-Type:    Custom
+
 Data-Files:
     defaultPages/Feed.xml
     defaultPages/Help/SampleImage/Large.xml
@@ -28,6 +29,7 @@ Data-Files:
     defaultPages/StyleSheet/Default.xml
     rc.d/NetBSD/rakka.in
     schemas/rakka-page-1.0.rng
+
 Extra-Source-Files:
     Rakka.buildinfo.in
     configure
@@ -61,33 +63,35 @@ Flag build-test-suite
 
 Executable rakka
     Build-Depends:
-        FileManip,
-        HTTP,
-        HsHyperEstraier,
-        HsOpenSSL,
-        HsSVN >= 0.3.2,
-        Lucu  >= 0.5,
-        base,
-        bytestring,
-        containers,
-        dataenc,
-        directory,
-        filepath,
-        utf8-string,
-        hslogger,
-        hxt,
-        hxt-xpath,
-        magic,
-        mtl,
-        network,
-        parsec,
-        stm,
-        time,
-        time-w3c,
-        unix,
-        zlib
+        FileManip       == 0.3.*,
+        HsHyperEstraier == 0.3.*,
+        HsOpenSSL       == 0.8.*,
+        HsSVN           == 0.4.*,
+        Lucu            == 0.6.*,
+        base            == 4.2.*,
+        bytestring      == 0.9.*,
+        containers      == 0.3.*,
+        dataenc         == 0.13.*,
+        directory       == 1.0.*,
+        filepath        == 1.1.*,
+        utf8-string     == 0.3.*,
+        hslogger        == 1.0.*,
+        hxt             == 8.5.*,
+        hxt-xpath       == 8.5.*,
+        magic           == 1.0.*,
+        mtl             == 1.1.*,
+        network         == 2.2.*,
+        parsec          == 3.0.*,
+        stm             == 2.1.*,
+        time            == 1.1.*,
+        time-http       == 0.1.*,
+        time-w3c        == 0.1.*,
+        unix            == 2.4.*,
+        zlib            == 0.5.*
+
     Main-Is:
         Main.hs
+
     Other-Modules:
         Rakka.Attachment
         Rakka.Authorization
@@ -124,9 +128,14 @@ Executable rakka
         Rakka.Wiki.Engine
         Rakka.Wiki.Formatter
         Rakka.Wiki.Parser
+
     Extensions:
-        Arrows, ExistentialQuantification, ScopedTypeVariables,
-        DeriveDataTypeable, FlexibleInstances
+        Arrows
+        ExistentialQuantification
+        ScopedTypeVariables
+        DeriveDataTypeable
+        FlexibleInstances
+
     GHC-Options:
         -Wall -threaded
 
@@ -136,13 +145,18 @@ Executable RakkaUnitTest
         Build-Depends: HUnit
     else
         Buildable: False
+
     Main-Is:
         RakkaUnitTest.hs
+
     Hs-Source-Dirs:
         ., tests
+
     Other-Modules:
         WikiParserTest
+
     Extensions:
         Arrows
+
     GHC-Options:
         -Wall -Werror

diff --git a/Rakka/Resource/Search.hs b/Rakka/Resource/Search.hs
index 993788ded4b17001ce8cc75047549330ebdce3fe..0543684249401256f00cec51f809e0f7e2dacb09 100644 (file)
--- a/Rakka/Resource/Search.hs
+++ b/Rakka/Resource/Search.hs
@@ -8,9 +8,9 @@ import           Control.Monad.Trans
 import           Data.List
 import           Data.Maybe
 import           Data.Time
+import qualified Data.Time.RFC1123 as RFC1123
 import qualified Data.Time.W3C as W3C
 import           Network.HTTP.Lucu
-import           Network.HTTP.Lucu.RFC1123DateTime
 import           Network.URI hiding (query, fragment)
 import           Rakka.Environment
 import           Rakka.Page
@@ -285,7 +285,7 @@ searchResultToXHTML env
                         >>>
                         arrIO utcToLocalZonedTime
                         >>>
-                        arr formatRFC1123DateTime
+                        arr RFC1123.format
                         >>>
                         mkText
                       )

diff --git a/Rakka/Wiki/Interpreter/PageList.hs b/Rakka/Wiki/Interpreter/PageList.hs
index 3d5ce246b5e511f7de4f1f6623f54c0eb994cdee..2fe9d305fc46509926a60aa6b1ddff9d22a5c403 100644 (file)
--- a/Rakka/Wiki/Interpreter/PageList.hs
+++ b/Rakka/Wiki/Interpreter/PageList.hs
@@ -6,7 +6,7 @@ module Rakka.Wiki.Interpreter.PageList
 import           Control.Monad
 import           Data.Maybe
 import           Data.Time
-import           Network.HTTP.Lucu.RFC1123DateTime
+import qualified Data.Time.RFC1123 as RFC1123
 import           Network.URI
 import           Rakka.Storage
 import           Rakka.SystemConfig
@@ -91,7 +91,7 @@ recentUpdatesInterp
                                      , linkText     = Nothing
                                      }
                         , Block ( Div [("class", "date")]
-                                  [Inline (Text (formatRFC1123DateTime lastMod))]
+                                  [Inline (Text (RFC1123.format lastMod))]
                                 )
                         ]
                         ++