From f6107c166dfb1c299a6c380e39e0e8b0f3a5bd83 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 22 May 2014 10:16:21 +0300 Subject: [PATCH] Remove all conduit deps in cabal files --- wai-app-static/wai-app-static.cabal | 1 - wai-extra/wai-extra.cabal | 6 ------ wai-frontend-monadcgi/wai-frontend-monadcgi.cabal | 2 -- wai-handler-launch/wai-handler-launch.cabal | 4 ---- wai-websockets/wai-websockets.cabal | 2 -- warp-tls/warp-tls.cabal | 3 --- 6 files changed, 18 deletions(-) diff --git a/wai-app-static/wai-app-static.cabal b/wai-app-static/wai-app-static.cabal index a06b41cf..f68fd1b6 100644 --- a/wai-app-static/wai-app-static.cabal +++ b/wai-app-static/wai-app-static.cabal @@ -39,7 +39,6 @@ library , base64-bytestring >= 0.1 , byteable , cryptohash >= 0.11 - , cryptohash-conduit >= 0.1.0 , system-filepath >= 0.4 , system-fileio >= 0.3 , http-date diff --git a/wai-extra/wai-extra.cabal b/wai-extra/wai-extra.cabal index 78e7519f..38be9ef3 100644 --- a/wai-extra/wai-extra.cabal +++ b/wai-extra/wai-extra.cabal @@ -35,10 +35,6 @@ Library , data-default , fast-logger >= 2.1 && < 2.2 , wai-logger >= 2.0 && < 2.2 - , conduit >= 1.0 && < 1.2 - , conduit-extra >= 0.1 && < 1.2 - , zlib-conduit >= 0.5 && < 1.2 - , blaze-builder-conduit >= 0.5 && < 1.2 , ansi-terminal , resourcet >= 0.4.6 && < 1.2 , void >= 0.5 @@ -95,10 +91,8 @@ test-suite tests , zlib-bindings , blaze-builder >= 0.2.1.4 && < 0.4 , data-default - , conduit , fast-logger >= 2.1 , resourcet - , conduit-extra ghc-options: -Wall test-suite spec diff --git a/wai-frontend-monadcgi/wai-frontend-monadcgi.cabal b/wai-frontend-monadcgi/wai-frontend-monadcgi.cabal index 3f9a08df..ecf5f583 100644 --- a/wai-frontend-monadcgi/wai-frontend-monadcgi.cabal +++ b/wai-frontend-monadcgi/wai-frontend-monadcgi.cabal @@ -16,8 +16,6 @@ library , bytestring , containers >= 0.2 , cgi - , conduit >= 0.5 && < 1.2 - , conduit-extra , http-types , transformers , case-insensitive diff --git a/wai-handler-launch/wai-handler-launch.cabal b/wai-handler-launch/wai-handler-launch.cabal index fe9110f9..ee0ad7fc 100644 --- a/wai-handler-launch/wai-handler-launch.cabal +++ b/wai-handler-launch/wai-handler-launch.cabal @@ -19,10 +19,6 @@ Library , transformers >= 0.2.2 && < 0.4 , bytestring >= 0.9.1.4 , blaze-builder >= 0.2.1.4 && < 0.4 - , conduit >= 0.5 && < 1.2 - , conduit-extra >= 0.0 && < 1.2 - , blaze-builder-conduit >= 0.5 && < 1.2 - , zlib-conduit >= 0.5 && < 1.2 if os(windows) c-sources: windows.c diff --git a/wai-websockets/wai-websockets.cabal b/wai-websockets/wai-websockets.cabal index 9ea5685a..d71ead7a 100644 --- a/wai-websockets/wai-websockets.cabal +++ b/wai-websockets/wai-websockets.cabal @@ -19,7 +19,6 @@ flag example Library Build-Depends: base >= 3 && < 5 , bytestring >= 0.9.1.4 - , conduit >= 0.5 && < 1.2 , wai >= 3.0 && < 3.1 , blaze-builder >= 0.2.1.4 && < 0.4 , case-insensitive >= 0.2 @@ -37,7 +36,6 @@ Executable wai-websockets-example else buildable: False Build-Depends: base >= 3 && < 5 - , conduit , wai-websockets , websockets , warp diff --git a/warp-tls/warp-tls.cabal b/warp-tls/warp-tls.cabal index 7a63157c..ddb71cf2 100644 --- a/warp-tls/warp-tls.cabal +++ b/warp-tls/warp-tls.cabal @@ -18,9 +18,6 @@ Library , wai >= 3.0 && < 3.1 , warp >= 3.0 && < 3.1 , transformers >= 0.2 - , conduit >= 0.5 && < 1.2 - , conduit-extra - , network-conduit >= 0.6 && < 1.2 , data-default-class >= 0.0.1 , tls >= 1.2.1 , network >= 2.2.1