diff --git a/Makefile b/Makefile index 75c74ff906..eb275a30a9 100644 --- a/Makefile +++ b/Makefile @@ -185,7 +185,7 @@ no-th-webapp-stage1: Build/EvilSplicer # and not overwritten.) cp -uR tmp/splices/* tmp/no-th-tree || true # Some additional dependencies needed by the expanded splices. - sed -i 's/^ Build-Depends: / Build-Depends: yesod-routes, yesod-core, shakespeare-css, shakespeare-js, shakespeare, blaze-markup, file-embed, wai-app-static, /' tmp/no-th-tree/git-annex.cabal + sed -i 's/^ Build-Depends: / Build-Depends: yesod-routes, yesod-core, shakespeare-css, shakespeare-js, shakespeare, blaze-markup, file-embed, wai-app-static, unordered-containers, /' tmp/no-th-tree/git-annex.cabal # Avoid warnings due to sometimes unused imports added for the splices. sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports /i' tmp/no-th-tree/git-annex.cabal sed -i 's/Extensions: /Extensions: MagicHash /i' tmp/no-th-tree/git-annex.cabal diff --git a/standalone/no-th/evilsplicer-headers.hs b/standalone/no-th/evilsplicer-headers.hs index 7e224789f3..8c99109bca 100644 --- a/standalone/no-th/evilsplicer-headers.hs +++ b/standalone/no-th/evilsplicer-headers.hs @@ -10,6 +10,8 @@ import qualified Data.Set import qualified Data.Set as Data.Set.Base import qualified Data.Map import qualified Data.Map as Data.Map.Base +import qualified Data.HashMap.Strict +import qualified Data.HashMap.Strict as Data.HashMap.Base import qualified Data.Foldable import qualified Data.Text import qualified Data.Text.Lazy.Builder @@ -34,8 +36,12 @@ import qualified GHC.IO import qualified Data.ByteString.Unsafe import qualified Data.ByteString.Char8 import qualified Database.Persist.Class as Database.Persist.Class.PersistField +import qualified Database.Persist as Database.Persist.Class.PersistField import qualified Database.Persist.Sql as Database.Persist.Sql.Class import qualified Database.Persist.Sql as Database.Persist.Types.Base +import qualified Control.Monad.Logger +import qualified Control.Monad.IO.Class +import qualified Control.Monad.Trans.Control import Database.Persist.Sql (fromPersistValue) {- End EvilSplicer headers. -}