From 542a8288a8480cd9e367d11bbf180ae905876dec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 13 Jul 2014 19:24:38 -0400 Subject: [PATCH] fix build with path-pieces-0.1.4 --- Assistant/WebApp/Types.hs | 2 ++ git-annex.cabal | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Assistant/WebApp/Types.hs b/Assistant/WebApp/Types.hs index cc4518018c..974ec28ac3 100644 --- a/Assistant/WebApp/Types.hs +++ b/Assistant/WebApp/Types.hs @@ -154,9 +154,11 @@ data RemovableDrive = RemovableDrive data RepoKey = RepoKey KeyId | NoRepoKey deriving (Read, Show, Eq, Ord) +#if ! MIN_VERSION_path_pieces(0,1,4) instance PathPiece Bool where toPathPiece = pack . show fromPathPiece = readish . unpack +#endif instance PathPiece RemovableDrive where toPathPiece = pack . show diff --git a/git-annex.cabal b/git-annex.cabal index 942fb37bb7..0318f934ba 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -191,7 +191,7 @@ Executable git-annex yesod, yesod-default, yesod-static, yesod-form, yesod-core, http-types, transformers, wai, wai-extra, warp, warp-tls, blaze-builder, crypto-api, hamlet, clientsession, - template-haskell, data-default, aeson, + template-haskell, data-default, aeson, path-pieces, shakespeare CPP-Options: -DWITH_WEBAPP if flag(Webapp) && flag (Webapp-secure)