mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

update build deps

Browse source
This commit is contained in:
Joey Hess 2012-07-26 05:13:27 -04:00
parent 9d6b59d0e2
commit 6cecc26206
4 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Utility/WebApp.hs
View file

@ -25,7 +25,7 @@ import Control.Exception
import Crypto.Random import Crypto.Random
import Data.Digest.Pure.SHA import Data.Digest.Pure.SHA
import qualified Data.ByteString.Lazy as L import qualified Data.ByteString.Lazy as L
import Data.AssocList import Data.List
import qualified Data.Text as T import qualified Data.Text as T
import qualified Data.Text.Encoding as TE import qualified Data.Text.Encoding as TE
import Blaze.ByteString.Builder.Char.Utf8 (fromText) import Blaze.ByteString.Builder.Char.Utf8 (fromText)
@ -130,7 +130,7 @@ checkAuthToken extractToken = do
webapp <- getYesod webapp <- getYesod
req <- getRequest req <- getRequest
let params = reqGetParams req let params = reqGetParams req
if lookupDef "" "auth" params == extractToken webapp if lookup "auth" params == Just (extractToken webapp)
then return Authorized then return Authorized
else return AuthenticationRequired else return AuthenticationRequired

5
debian/control vendored
View file

@ -24,12 +24,17 @@ Build-Depends:
libghc-stm-dev (>= 2.3), libghc-stm-dev (>= 2.3),
libghc-dbus-dev, libghc-dbus-dev,
libghc-yesod-dev, libghc-yesod-dev,
libghc-yesod-static-dev,
libghc-case-insensitive-dev, libghc-case-insensitive-dev,
libghc-http-types-dev, libghc-http-types-dev,
libghc-transformers-dev, libghc-transformers-dev,
libghc-wai-dev, libghc-wai-dev,
libghc-wai-logger-dev, libghc-wai-logger-dev,
libghc-warp-dev, libghc-warp-dev,
libghc-blaze-builder-dev,
libghc-blaze-html-dev,
libghc-crypto-api-dev,
libghc-hamlet-dev,
ikiwiki, ikiwiki,
perlmagick, perlmagick,
git, git,

8
doc/install.mdwn
View file

@ -23,7 +23,8 @@ it yourself and [[manually_build_with_cabal|install/cabal]].
## Installation by hand ## Installation by hand
To build and use git-annex, you will need: This is not recommended, it's easier to let cabal pull in the many haskell
libraries. To build and use git-annex by hand, you will need:
* Haskell stuff * Haskell stuff
* [The Haskell Platform](http://haskell.org/platform/) (GHC 7.4 or newer) * [The Haskell Platform](http://haskell.org/platform/) (GHC 7.4 or newer)
@ -49,12 +50,17 @@ To build and use git-annex, you will need:
(Linux only) (Linux only)
* [dbus](http://hackage.haskell.org/package/dbus) * [dbus](http://hackage.haskell.org/package/dbus)
* [yesod](http://hackage.haskell.org/package/yesod) * [yesod](http://hackage.haskell.org/package/yesod)
* [yesod-static](http://hackage.haskell.org/package/yesod-static)
* [case-insensitive](http://hackage.haskell.org/package/case-insensitive) * [case-insensitive](http://hackage.haskell.org/package/case-insensitive)
* [http-types](http://hackage.haskell.org/package/http-types) * [http-types](http://hackage.haskell.org/package/http-types)
* [transformers](http://hackage.haskell.org/package/transformers) * [transformers](http://hackage.haskell.org/package/transformers)
* [wai](http://hackage.haskell.org/package/wai) * [wai](http://hackage.haskell.org/package/wai)
* [wai-logger](http://hackage.haskell.org/package/wai-logger) * [wai-logger](http://hackage.haskell.org/package/wai-logger)
* [warp](http://hackage.haskell.org/package/warp) * [warp](http://hackage.haskell.org/package/warp)
* [blaze-builder](http://hackage.haskell.org/package/blaze-builder)
* [blaze-html](http://hackage.haskell.org/package/blaze-html)
* [crypto-api](http://hackage.haskell.org/package/crypto-api)
* [hamlet](http://hackage.haskell.org/package/hamlet)
* Shell commands * Shell commands
* [git](http://git-scm.com/) * [git](http://git-scm.com/)
* [uuid](http://www.ossp.org/pkg/lib/uuid/) * [uuid](http://www.ossp.org/pkg/lib/uuid/)

7
git-annex.cabal
View file

@ -46,8 +46,7 @@ Executable git-annex
unix, containers, utf8-string, network, mtl, bytestring, old-locale, time, unix, containers, utf8-string, network, mtl, bytestring, old-locale, time,
pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP, pcre-light, extensible-exceptions, dataenc, SHA, process, json, HTTP,
base == 4.5.*, monad-control, transformers-base, lifted-base, base == 4.5.*, monad-control, transformers-base, lifted-base,
IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process
case-insensitive, http-types, transformers, wai, wai-logger, warp
-- Need to list these because they're generated from .hsc files. -- Need to list these because they're generated from .hsc files.
Other-Modules: Utility.Touch Utility.Mounts Other-Modules: Utility.Touch Utility.Mounts
Include-Dirs: Utility Include-Dirs: Utility
@ -75,7 +74,9 @@ Executable git-annex
CPP-Options: -DWITH_DBUS CPP-Options: -DWITH_DBUS
if flag(Webapp) if flag(Webapp)
Build-Depends: yesod Build-Depends: yesod, yesod-static, case-insensitive, http-types,
transformers, wai, wai-logger, warp, blaze-builder, blaze-html,
crypto-api, hamlet
CPP-Options: -DWITH_WEBAPP CPP-Options: -DWITH_WEBAPP
if (os(darwin)) if (os(darwin))