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

fix build with path-pieces-0.1.4

Browse source
This commit is contained in:
Joey Hess 2014-07-13 19:24:38 -04:00
parent d4b6458efd
commit 542a8288a8
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/WebApp/Types.hs
View file

@ -154,9 +154,11 @@ data RemovableDrive = RemovableDrive
data RepoKey = RepoKey KeyId | NoRepoKey data RepoKey = RepoKey KeyId | NoRepoKey
deriving (Read, Show, Eq, Ord) deriving (Read, Show, Eq, Ord)
#if ! MIN_VERSION_path_pieces(0,1,4)
instance PathPiece Bool where instance PathPiece Bool where
toPathPiece = pack . show toPathPiece = pack . show
fromPathPiece = readish . unpack fromPathPiece = readish . unpack
#endif
instance PathPiece RemovableDrive where instance PathPiece RemovableDrive where
toPathPiece = pack . show toPathPiece = pack . show

2
git-annex.cabal
View file

@ -191,7 +191,7 @@ Executable git-annex
yesod, yesod-default, yesod-static, yesod-form, yesod-core, yesod, yesod-default, yesod-static, yesod-form, yesod-core,
http-types, transformers, wai, wai-extra, warp, warp-tls, http-types, transformers, wai, wai-extra, warp, warp-tls,
blaze-builder, crypto-api, hamlet, clientsession, blaze-builder, crypto-api, hamlet, clientsession,
template-haskell, data-default, aeson, template-haskell, data-default, aeson, path-pieces,
shakespeare shakespeare
CPP-Options: -DWITH_WEBAPP CPP-Options: -DWITH_WEBAPP
if flag(Webapp) && flag (Webapp-secure) if flag(Webapp) && flag (Webapp-secure)