Skip to content
Browse files

Changes for HAppS 0.9.3 and GHC 6.10.

  • Loading branch information...
1 parent 960d02e commit 17454b086134a91df0a5a682615a41fee0f19fc0 @jgm committed
Showing with 14 additions and 12 deletions.
  1. +1 −1 Gitit.hs
  2. +13 −11 gitit.cabal
View
2 Gitit.hs
@@ -68,7 +68,7 @@ main = do
update $ SetConfig conf
hPutStrLn stderr $ "Starting server on port " ++ show (portNumber conf)
let debugger = if (debugMode conf) then debugFilter else id
- tid <- forkIO $ simpleHTTP (Conf { port = portNumber conf }) $ debugger $
+ tid <- forkIO $ simpleHTTP (Conf { validator = Nothing, port = portNumber conf }) $ debugger $
[ dir "stylesheets" [ fileServe [] $ (staticDir conf) </> "stylesheets" ]
, dir "images" [ fileServe [] $ (staticDir conf) </> "images" ]
, dir "javascripts" [ fileServe [] $ (staticDir conf) </> "javascripts" ]
View
24 gitit.cabal
@@ -1,5 +1,6 @@
name: gitit
version: 0.2
+Cabal-version: >= 1.2
build-type: Simple
synopsis: Wiki using HAppS, git, and pandoc.
description: Gitit is a wiki program. HAppS is used for the web
@@ -28,17 +29,18 @@ data-files: stylesheets/gitit.css, stylesheets/hk-pyg.css,
data/post-update, data/FrontPage.page, data/Help.page,
README.markdown, data/SampleConfig.hs
-hs-source-dirs: .
-executable: gitit
-main-is: Gitit.hs
-other-modules: Gitit.State, Gitit.Git, Paths_gitit
-build-depends: base, parsec < 3, pretty, xhtml, containers, pandoc
+Executable gitit
+ hs-source-dirs: .
+ main-is: Gitit.hs
+ other-modules: Gitit.State, Gitit.Git, Paths_gitit
+ build-depends: base >=3, parsec < 3, pretty, xhtml, containers, pandoc
>= 1.1, process, filepath, directory, mtl, cgi,
network, old-time, highlighting-kate, bytestring,
- utf8-string, HAppS-Server == 0.9.2.1,
- HAppS-State == 0.9.2.1, HAppS-Data == 0.9.2.1,
- Crypto, HTTP
-
-ghc-options: -Wall -threaded
-ghc-prof-options: -auto-all
+ utf8-string, HAppS-Server >= 0.9.3 && < 0.9.4,
+ HAppS-State >= 0.9.3 && < 0.9.4,
+ HAppS-Data >= 0.9.3 && < 0.9.4, Crypto, HTTP
+ if impl(ghc >= 6.10)
+ build-depends: base >= 4, syb
+ ghc-options: -Wall -threaded
+ ghc-prof-options: -auto-all

0 comments on commit 17454b0

Please sign in to comment.
Something went wrong with that request. Please try again.