hledger-web 0.18 → 0.18.1

raw patch · 2 files changed

+15/−8 lines, 2 filesdep +blaze-markupdep ~blaze-htmldep ~hledgerdep ~hledger-lib

Dependencies added: blaze-markup

Dependency ranges changed: blaze-html, hledger, hledger-lib

Files

• hledger-web.cabal +14/−7
• hledger-web.hs +1/−1

@@ -1,5 +1,5 @@ name:           hledger-web-version: 0.18+version: 0.18.1 category:       Finance synopsis:       A web interface for the hledger accounting tool. description:    @@ -47,6 +47,10 @@     Description:   Build with support for multithreaded execution.     Default:       True +flag blaze_html_0_5+    description:   Use the newer 0.5 version of blaze-html and blaze-markup.+    default:       False+ flag dev     Description:   Turn on development settings, like auto-reload templates.     Default:       False@@ -61,9 +65,6 @@     else         Buildable: False -    if flag(threaded)-        ghc-options:   -threaded-     exposed-modules:                       Hledger.Web.Application     other-modules:@@ -122,8 +123,8 @@                      Hledger.Web.Handlers      build-depends:-                     hledger == 0.18-                   , hledger-lib == 0.18+                     hledger == 0.18.1+                   , hledger-lib == 0.18.1                    , base                          >= 4          && < 5                    , cabal-file-th                    , cmdargs >= 0.9.1   && < 0.10@@ -141,7 +142,6 @@                    , yesod-core                    , yesod-default                    , yesod-static-                   , blaze-html                    < 0.5                    , clientsession                    , hamlet                    , network-conduit@@ -153,6 +153,13 @@                    , wai-extra                    , warp                    , yaml+    if flag(blaze_html_0_5)+      build-depends:+                     blaze-html               >= 0.5     && < 0.6+                   , blaze-markup             >= 0.5.1   && < 0.6+    else+      build-depends:+                     blaze-html               >= 0.4     && < 0.5     -- if flag(production)

@@ -42,7 +42,7 @@   | "help" `in_` (rawopts_ $ cliopts_ opts)            = putStr (showModeHelp webmode) >> exitSuccess   | "version" `in_` (rawopts_ $ cliopts_ opts)         = putStrLn prognameandversion >> exitSuccess   | "binary-filename" `in_` (rawopts_ $ cliopts_ opts) = putStrLn (binaryfilename progname)-  | otherwise                                          = journalFilePathFromOpts (cliopts_ opts) >>= ensureJournalFileExists >> withJournalDo' opts web+  | otherwise                                          = journalFilePathFromOpts (cliopts_ opts) >>= requireJournalFileExists >> withJournalDo' opts web  withJournalDo' :: WebOpts -> (WebOpts -> Journal -> IO ()) -> IO () withJournalDo' opts cmd = do