clckwrks 0.19.0 → 0.19.1

raw patch · 4 files changed

+10/−7 lines, 4 filesdep ~acid-statedep ~tagsoup

Dependency ranges changed: acid-state, tagsoup

Files

• Clckwrks/Acid.hs +2/−2
• Clckwrks/GetOpts.hs +1/−1
• Clckwrks/Monad.hs +4/−1
• clckwrks.cabal +3/−3

@@ -10,8 +10,8 @@ import Control.Concurrent          (killThread, forkIO) import Control.Monad.Reader        (ask) import Control.Monad.State         (modify)-import Data.Acid                   (AcidState, Query, Update, makeAcidic)-import Data.Acid.Local             (openLocalStateFrom, createArchive, createCheckpointAndClose)+import Data.Acid                   (AcidState, Query, Update, createArchive, makeAcidic)+import Data.Acid.Local             (openLocalStateFrom, createCheckpointAndClose) import Data.Acid.Remote            (acidServer, skipAuthenticationCheck) import Data.Data                   (Data, Typeable) import Data.Maybe                  (fromMaybe)

@@ -30,7 +30,7 @@     , Option [] ["http-port"]     (ReqArg setPort "port")         ("Port to bind http server, default: " ++ show (clckPort def))     , Option [] ["https-port"]    (ReqArg setTLSPort "port")      ("Port to bind https server, default:" ++ maybe "disabled." show (clckTLSPort <$> (clckTLS def)))     , Option [] ["tls-cert"]      (ReqArg setTLSCert "path")      ("Path to tls .cert file. (required for https).")-    , Option [] ["tls-key"]       (ReqArg setTLSKey "path")      ("Path to tls .key file. (required for https).")+    , Option [] ["tls-key"]       (ReqArg setTLSKey "path")       ("Path to tls .key file. (required for https).")     , Option [] ["hide-port"]     (NoArg setHidePort)             "Do not show the port number in the URL"     , Option [] ["hostname"]      (ReqArg setHostname "hostname") ("Server hostename, default: " ++ show (clckHostname def))     , Option [] ["jquery-path"]   (ReqArg setJQueryPath   "path") ("path to jquery directory, default: " ++ show (clckJQueryPath def))

@@ -66,7 +66,7 @@ import Control.Monad                 (MonadPlus, foldM) import Control.Monad.State           (MonadState, StateT, evalStateT, execStateT, get, mapStateT, modify, put, runStateT) import Control.Monad.Reader          (MonadReader, ReaderT, mapReaderT)-import Control.Monad.Trans           (MonadIO(liftIO), lift)+import Control.Monad.Trans           (MonadIO(liftIO), MonadTrans(lift)) import Control.Concurrent.STM        (TVar, readTVar, writeTVar, atomically) import Data.Acid                     (AcidState, EventState, EventResult, QueryEvent, UpdateEvent) import Data.Acid.Advanced            (query', update')@@ -209,6 +209,9 @@     deriving (Functor, Applicative, Alternative, Monad, MonadIO, MonadPlus, ServerMonad, HasRqData, FilterMonad r, WebMonad r, MonadState ClckState)  instance (Happstack m) => Happstack (ClckT url m)++instance MonadTrans (ClckT url) where+    lift = ClckT . lift . lift  -- | evaluate a 'ClckT' returning the inner monad --

@@ -1,5 +1,5 @@ Name:                clckwrks-Version:             0.19.0+Version:             0.19.1 Synopsis:            A secure, reliable content management system (CMS) and blogging platform Description:         clckwrks (pronounced, clockworks) aims to compete                      directly with popular PHP-based blogging and CMS@@ -64,7 +64,7 @@                    Paths_clckwrks    Build-depends:-     acid-state                   >= 0.11 && < 0.12,+     acid-state                   >= 0.12 && < 0.13,      aeson                        >= 0.5 && < 0.7,      attoparsec                   == 0.10.*,      base                           < 5,@@ -92,7 +92,7 @@      reform-hsp                   >= 0.2 && < 0.3,      safecopy                     >= 0.6,      stm                          >= 2.2 && <2.5,-     tagsoup                      == 0.12.*,+     tagsoup                      >= 0.12 && < 0.14,      text                         == 0.11.*,      time                         >= 1.2 && <1.5,      uuid                         == 1.2.*,