From 690b017f022f03d8118d2beea9ca89e89b83006b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 29 Mar 2012 07:45:04 +0200 Subject: [PATCH] Get everything to build --- .gitmodules | 3 +++ authenticate | 2 +- http-conduit | 2 +- sources.txt | 2 ++ tagstream-conduit | 1 + xml | 2 +- yesod-test/Yesod/Test/TransversingCSS.hs | 3 --- 7 files changed, 9 insertions(+), 6 deletions(-) create mode 160000 tagstream-conduit diff --git a/.gitmodules b/.gitmodules index bb88eb61..8cd88253 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "crypto-conduit"] path = crypto-conduit url = https://github.com/snoyberg/crypto-conduit +[submodule "tagstream-conduit"] + path = tagstream-conduit + url = https://github.com/snoyberg/tagstream-conduit diff --git a/authenticate b/authenticate index 7419d01b..d142d8c2 160000 --- a/authenticate +++ b/authenticate @@ -1 +1 @@ -Subproject commit 7419d01ba326c2f5a0ce68fb4c078dffa1648707 +Subproject commit d142d8c214570e130463cd225efd7f0333245d33 diff --git a/http-conduit b/http-conduit index ff245949..b13b1cb8 160000 --- a/http-conduit +++ b/http-conduit @@ -1 +1 @@ -Subproject commit ff2459496a99a23c247466b85838c350ecf0a3fa +Subproject commit b13b1cb88444326fc32407740c6c7c37ad89f0cb diff --git a/sources.txt b/sources.txt index ecf2c057..33ce2723 100644 --- a/sources.txt +++ b/sources.txt @@ -1,7 +1,9 @@ ./http-conduit ./xml/xml-conduit +./xml/xml2html ./authenticate/authenticate ./crypto-conduit +./tagstream-conduit ./yaml ./yesod-routes ./yesod-core diff --git a/tagstream-conduit b/tagstream-conduit new file mode 160000 index 00000000..63452aa6 --- /dev/null +++ b/tagstream-conduit @@ -0,0 +1 @@ +Subproject commit 63452aa66875820df21d0977a570e0d45a77e82f diff --git a/xml b/xml index c94288ef..71be879f 160000 --- a/xml +++ b/xml @@ -1 +1 @@ -Subproject commit c94288efbcd41e83206f49b147c728ce359d2f1f +Subproject commit 71be879f7de50a6bb05516f37edcb7bd6ef7a606 diff --git a/yesod-test/Yesod/Test/TransversingCSS.hs b/yesod-test/Yesod/Test/TransversingCSS.hs index 862117ea..b74bb129 100644 --- a/yesod-test/Yesod/Test/TransversingCSS.hs +++ b/yesod-test/Yesod/Test/TransversingCSS.hs @@ -38,10 +38,7 @@ module Yesod.Test.TransversingCSS ( ) where -import Text.XML.HXT.Core -import qualified Data.List as DL import Yesod.Test.CssQuery -import Data.Text (unpack) import qualified Data.Text as T import Yesod.Test.HtmlParse (parseHtml) import Control.Applicative ((<$>), (<*>))