diff --git a/authenticate b/authenticate index e1a2d68c..09d40810 160000 --- a/authenticate +++ b/authenticate @@ -1 +1 @@ -Subproject commit e1a2d68cddfc97354ad5bbf2b4ead7a756d8cc1a +Subproject commit 09d4081079831658b8977cb1e0734330299289b2 diff --git a/http-conduit b/http-conduit new file mode 160000 index 00000000..cfcbefe9 --- /dev/null +++ b/http-conduit @@ -0,0 +1 @@ +Subproject commit cfcbefe93ecea0b84225294b4edc133fd921d8db diff --git a/package-list.sh b/package-list.sh index 41b38a9c..45fc6790 100644 --- a/package-list.sh +++ b/package-list.sh @@ -1,6 +1,7 @@ #!/bin/bash -pkgs=( ./yesod-routes +pkgs=( ./http-conduit + ./yesod-routes ./yesod-core ./yesod-json ./yesod-static diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index c7467162..4103f6b9 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -42,7 +42,7 @@ library , persistent >= 0.7 && < 0.8 , persistent-template >= 0.7 && < 0.8 , SHA >= 1.4.1.3 && < 1.6 - , http-conduit >= 1.1 && < 1.2 + , http-conduit >= 1.2 && < 1.3 , aeson >= 0.5 , pwstore-fast >= 2.2 && < 3 , lifted-base >= 0.1 && < 0.2 diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index f7f94152..ecb0e1f2 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -79,7 +79,7 @@ library , aeson >= 0.5 , fast-logger >= 0.0.1 , wai-logger >= 0.0.1 - , conduit >= 0.0 && < 0.1 + , conduit >= 0.0 && < 0.2 , lifted-base >= 0.1 && < 0.2 exposed-modules: Yesod.Content diff --git a/yesod-json/yesod-json.cabal b/yesod-json/yesod-json.cabal index a5b65405..3e05ffa4 100644 --- a/yesod-json/yesod-json.cabal +++ b/yesod-json/yesod-json.cabal @@ -23,7 +23,7 @@ library , containers >= 0.2 , blaze-builder , attoparsec-conduit >= 0.0 && < 0.1 - , conduit >= 0.0 && < 0.1 + , conduit >= 0.0 && < 0.2 , transformers >= 0.2.2 && < 0.3 , wai >= 1.0 && < 1.1 , wai-extra >= 1.0 && < 1.1