[DHG_packages] 01/01: wreq: patch to build with more versions of aeson-pretty

Clint Adams clint at moszumanska.debian.org
Sat Oct 29 20:41:32 UTC 2016


This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch master
in repository DHG_packages.

commit a54631445dd302ed0307c0e5012b6a0044443175
Author: Clint Adams <clint at debian.org>
Date:   Sat Oct 29 16:39:53 2016 -0400

    wreq: patch to build with more versions of aeson-pretty
---
 p/haskell-wreq/debian/changelog                      |  6 ++++++
 .../debian/patches/aeson-pretty-portability          | 20 ++++++++++++++++++++
 p/haskell-wreq/debian/patches/series                 |  1 +
 3 files changed, 27 insertions(+)

diff --git a/p/haskell-wreq/debian/changelog b/p/haskell-wreq/debian/changelog
index bc86f30..9d80f4f 100644
--- a/p/haskell-wreq/debian/changelog
+++ b/p/haskell-wreq/debian/changelog
@@ -1,3 +1,9 @@
+haskell-wreq (0.4.1.0-4) unstable; urgency=medium
+
+  * Patch to build with more versions of aeson-pretty.
+
+ -- Clint Adams <clint at debian.org>  Sat, 29 Oct 2016 16:39:33 -0400
+
 haskell-wreq (0.4.1.0-3) unstable; urgency=medium
 
   * Upload to unstable as part of GHC 8 transition.
diff --git a/p/haskell-wreq/debian/patches/aeson-pretty-portability b/p/haskell-wreq/debian/patches/aeson-pretty-portability
new file mode 100644
index 0000000..14717b3
--- /dev/null
+++ b/p/haskell-wreq/debian/patches/aeson-pretty-portability
@@ -0,0 +1,20 @@
+--- a/httpbin/HttpBin/Server.hs
++++ b/httpbin/HttpBin/Server.hs
+@@ -8,7 +8,7 @@
+ import Control.Applicative ((<$>))
+ import Control.Monad.IO.Class (liftIO)
+ import Data.Aeson (Value(..), eitherDecode, object, toJSON)
+-import Data.Aeson.Encode.Pretty (Config(..), encodePretty')
++import Data.Aeson.Encode.Pretty (Config(..), defConfig, encodePretty')
+ import Data.ByteString.Char8 (pack)
+ import Data.CaseInsensitive (original)
+ import Data.Maybe (catMaybes, fromMaybe)
+@@ -133,7 +133,7 @@
+ 
+ writeJSON obj = do
+   modifyResponse $ setContentType "application/json"
+-  writeLBS . (<> "\n") . encodePretty' (Config 2 compare) . object $ obj
++  writeLBS . (<> "\n") . encodePretty' defConfig { confIndent = 2, confCompare = compare } . object $ obj
+ 
+ respond act = do
+   req <- getRequest
diff --git a/p/haskell-wreq/debian/patches/series b/p/haskell-wreq/debian/patches/series
index 1f23f04..8f9f099 100644
--- a/p/haskell-wreq/debian/patches/series
+++ b/p/haskell-wreq/debian/patches/series
@@ -1,2 +1,3 @@
 fix-doctests
 disable-network-tests
+aeson-pretty-portability

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git



More information about the Pkg-haskell-commits mailing list