summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-07-07 12:31:27 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-07-07 12:31:27 -0400
commit35ac42167b3f3a629d79454bb01b5d7a71d01426 (patch)
treedbe8aa500f264e69b636f15bfc8dd4117be0e4de
parent5fa2ec4a7c99f4f3ec9c9fbecc55d7d12cb71df6 (diff)
network-conduit build dep in cabal was spuriious, remove5.20140707
-rw-r--r--debian/control1
-rw-r--r--git-annex.cabal2
2 files changed, 1 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index 0da23c08a..e37f7d05e 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,6 @@ Build-Depends:
libghc-hinotify-dev [linux-any],
libghc-stm-dev (>= 2.3),
libghc-dbus-dev (>= 0.10.3) [linux-any],
- libghc-network-conduit-dev,
libghc-fdo-notify-dev (>= 0.3) [linux-any],
libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc],
diff --git a/git-annex.cabal b/git-annex.cabal
index 75d65e1d6..8e1de9353 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -191,7 +191,7 @@ Executable git-annex
yesod, yesod-default, yesod-static, yesod-form, yesod-core,
http-types, transformers, wai, wai-extra, warp, warp-tls,
blaze-builder, crypto-api, hamlet, clientsession,
- template-haskell, data-default, aeson, network-conduit,
+ template-haskell, data-default, aeson,
shakespeare
CPP-Options: -DWITH_WEBAPP
if flag(Webapp) && flag (Webapp-secure)