From ca03dfb45b6a542bc0c5e917d2d33a0baab754c2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 15 Aug 2014 17:17:19 -0400 Subject: Switched from the old haskell HTTP library to http-conduit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The hoary old HTTP library was only used when checking if an url exists, when curl was not available. It had many problems, including not supporting https at all. Now, this is done using http-conduit for all urls that it supports. Falls back to curl for any url that http-conduit doesn't like (probably ftp etc, but could also be an url that its parser chokes on for whatever reason). This adds a new dependency on http-conduit, but webdav support already indirectly depended on that, and the s3-aws branch also uses it. This opens up the possibility of using http-conduit for large file downloads, but for now I've left it using wget/curl. This commit was sponsored by Paul Tötterman. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 522b7c5cc..1106bc89d 100644 --- a/debian/control +++ b/debian/control @@ -46,6 +46,7 @@ Build-Depends: libghc-dns-dev, libghc-case-insensitive-dev, libghc-http-types-dev, + libghc-http-conduit-dev, libghc-blaze-builder-dev, libghc-crypto-api-dev, libghc-network-multicast-dev, @@ -55,7 +56,6 @@ Build-Depends: libghc-gnutls-dev (>= 0.1.4), libghc-xml-types-dev, libghc-async-dev, - libghc-http-dev, libghc-feed-dev (>= 0.3.9.2), libghc-regex-tdfa-dev [!mipsel !s390], libghc-regex-compat-dev [mipsel s390], -- cgit v1.2.3 From 93750026c32bb2558883a773c41ca9f1b277f213 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 17 Aug 2014 14:37:14 -0400 Subject: fix lower bounds on version of exceptions This is needed only because of the new MonadMask needed for bracket in the new version. Ifdefing it everywhere is not practical, since the Setup.hs uses it. --- debian/control | 2 +- git-annex.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 1106bc89d..d43e370ac 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: libghc-dav-dev (>= 1.0) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc], libghc-quickcheck2-dev, libghc-monad-control-dev (>= 0.3), - libghc-exceptions-dev, + libghc-exceptions-dev (>= 0.6), libghc-transformers-dev, libghc-unix-compat-dev, libghc-dlist-dev, diff --git a/git-annex.cabal b/git-annex.cabal index 3b5e45929..919eaa14e 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -97,7 +97,7 @@ Executable git-annex Build-Depends: MissingH, hslogger, directory, filepath, containers, utf8-string, network (>= 2.0), mtl (>= 2), bytestring, old-locale, time, dataenc, SHA, process, json, - base (>= 4.5 && < 4.9), monad-control, exceptions (>= 0.5), transformers, + base (>= 4.5 && < 4.9), monad-control, exceptions (>= 0.6), transformers, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process, SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3), data-default, case-insensitive, http-conduit, http-types -- cgit v1.2.3 From 7924eb9422a949bbca80d7abc516eba0d9467f14 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Aug 2014 18:47:31 -0700 Subject: no lsof build-dep on hurd No assistant there --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index d43e370ac..e3f16c81f 100644 --- a/debian/control +++ b/debian/control @@ -64,7 +64,7 @@ Build-Depends: libghc-tasty-quickcheck-dev [!mipsel !sparc], libghc-tasty-rerun-dev [!mipsel !sparc], libghc-optparse-applicative-dev [!sparc], - lsof [!kfreebsd-i386 !kfreebsd-amd64], + lsof [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any], ikiwiki, perlmagick, git (>= 1:1.8.4), -- cgit v1.2.3 From ed1cda7799c491d07b9385ed8ea5b8c35bf8770b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 30 Aug 2014 09:09:47 -0700 Subject: update arch deps sparc no longer supports yesod (and is probably not going to be a release arch anyway) tasty is now built on mipsel. --- debian/control | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index e3f16c81f..39c0e279e 100644 --- a/debian/control +++ b/debian/control @@ -31,16 +31,16 @@ Build-Depends: libghc-stm-dev (>= 2.3), libghc-dbus-dev (>= 0.10.3) [linux-any], 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], - libghc-yesod-default-dev [i386 amd64 kfreebsd-amd64 powerpc sparc], - libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], - libghc-shakespeare-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], - libghc-clientsession-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], - libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], - libghc-warp-tls-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], - libghc-wai-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], - libghc-wai-extra-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], + libghc-yesod-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-yesod-static-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-yesod-default-dev [i386 amd64 kfreebsd-amd64 powerpc], + libghc-hamlet-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-shakespeare-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-clientsession-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-warp-tls-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-wai-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], + libghc-wai-extra-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc], libghc-securemem-dev, libghc-byteable-dev, libghc-dns-dev, @@ -59,10 +59,10 @@ Build-Depends: libghc-feed-dev (>= 0.3.9.2), libghc-regex-tdfa-dev [!mipsel !s390], libghc-regex-compat-dev [mipsel s390], - libghc-tasty-dev (>= 0.7) [!mipsel !sparc], - libghc-tasty-hunit-dev [!mipsel !sparc], - libghc-tasty-quickcheck-dev [!mipsel !sparc], - libghc-tasty-rerun-dev [!mipsel !sparc], + libghc-tasty-dev (>= 0.7) [!sparc], + libghc-tasty-hunit-dev [!sparc], + libghc-tasty-quickcheck-dev [!sparc], + libghc-tasty-rerun-dev [!sparc], libghc-optparse-applicative-dev [!sparc], lsof [!kfreebsd-i386 !kfreebsd-amd64 !hurd-any], ikiwiki, -- cgit v1.2.3