summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-11 15:42:06 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-11 15:42:06 -0400
commit3d26915b8c8e9a7ad03151eef98f52ee1ee9bf0a (patch)
tree6d1839309a1c5ddef86c2f913bfb5ebb48e9b2bf
parent5219b32e26277d355784b9d92aa34f7730040624 (diff)
allow to build when sandi is installed (don't use it yet)
-rw-r--r--Assistant/XMPP.hs2
-rw-r--r--Utility/Base64.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/XMPP.hs b/Assistant/XMPP.hs
index 0360ce860..09b7daf4e 100644
--- a/Assistant/XMPP.hs
+++ b/Assistant/XMPP.hs
@@ -21,7 +21,7 @@ import qualified Data.Map as M
import Data.ByteString (ByteString)
import qualified Data.ByteString as B
import Data.XML.Types
-import qualified Codec.Binary.Base64 as B64
+import qualified "dataenc" Codec.Binary.Base64 as B64
{- Name of the git-annex tag, in our own XML namespace.
- (Not using a namespace URL to avoid unnecessary bloat.) -}
diff --git a/Utility/Base64.hs b/Utility/Base64.hs
index ec660108a..0c6c8677a 100644
--- a/Utility/Base64.hs
+++ b/Utility/Base64.hs
@@ -7,7 +7,7 @@
module Utility.Base64 (toB64, fromB64Maybe, fromB64) where
-import Codec.Binary.Base64
+import "dataenc" Codec.Binary.Base64
import Data.Bits.Utils
import Control.Applicative
import Data.Maybe