attempt to refresh all patches needing a refresh

23 files changed, 87 insertions, 103 deletions

diff --git a/p/c2hs/debian/patches/01_fix-stylesheet-path-for-debian.diff b/p/c2hs/debian/patches/01_fix-stylesheet-path-for-debian.diff
index 2c98a912f..c0ad6e1c3 100644
--- a/p/c2hs/debian/patches/01_fix-stylesheet-path-for-debian.diff
+++ b/p/c2hs/debian/patches/01_fix-stylesheet-path-for-debian.diff
@@ -1,10 +1,8 @@
 ## 01_fix-stylesheet-path-for-debian.dpatch by Arjan Oosting <arjan@debian.org>
 
-Index: c2hs-0.16.0/doc/Makefile
-===================================================================
---- c2hs-0.16.0.orig/doc/Makefile
-+++ c2hs-0.16.0/doc/Makefile
-@@ -35,7 +35,7 @@
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -35,7 +35,7 @@ XSLTPROC_HTML_PARAMS=\
  	--param use.id.as.filename 1 \
  	--stringparam base.dir $(XSLTPROC_HTML_OUTDIR) \
  	--stringparam html.stylesheet $(XSLTPROC_HTML_CSS)
diff --git a/p/c2hs/debian/patches/02_fix-docbookx-dtd.diff b/p/c2hs/debian/patches/02_fix-docbookx-dtd.diff
index 3f7c95425..9294f3cfd 100644
--- a/p/c2hs/debian/patches/02_fix-docbookx-dtd.diff
+++ b/p/c2hs/debian/patches/02_fix-docbookx-dtd.diff
@@ -3,10 +3,8 @@
 # Debian Version : 0.16.1
 # Date : Mon,  7 Sep 2009 16:14:58 +1000
 
-Index: c2hs-0.16.0/doc/c2hs.xml
-===================================================================
---- c2hs-0.16.0.orig/doc/c2hs.xml
-+++ c2hs-0.16.0/doc/c2hs.xml
+--- a/doc/c2hs.xml
++++ b/doc/c2hs.xml
 @@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="UTF8"?>
  <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
diff --git a/p/c2hs/debian/patches/03_fix-man-page.diff b/p/c2hs/debian/patches/03_fix-man-page.diff
index 5d26abbec..e66cc22fa 100644
--- a/p/c2hs/debian/patches/03_fix-man-page.diff
+++ b/p/c2hs/debian/patches/03_fix-man-page.diff
@@ -1,10 +1,8 @@
 ## 03_fix-man-page.dpatch by Arjan Oosting <arjan@debian.org>
 
-Index: c2hs-0.16.0/doc/man1/c2hs.1
-===================================================================
---- c2hs-0.16.0.orig/doc/man1/c2hs.1
-+++ c2hs-0.16.0/doc/man1/c2hs.1
-@@ -106,7 +106,7 @@
+--- a/doc/man1/c2hs.1
++++ b/doc/man1/c2hs.1
+@@ -106,7 +106,7 @@ files and will run
  automatically, passing the appropriate flags.
  
  When used directly, 
diff --git a/p/haskell-aeson/debian/patches/th-option.diff b/p/haskell-aeson/debian/patches/th-option.diff
index 9784f6e58..1b7d92ad9 100644
--- a/p/haskell-aeson/debian/patches/th-option.diff
+++ b/p/haskell-aeson/debian/patches/th-option.diff
@@ -1,8 +1,8 @@
 --- a/aeson.cabal
 +++ b/aeson.cabal
-@@ -70,6 +70,10 @@
-   default: False
-   manual: False
+@@ -78,6 +78,10 @@ flag cffi
+   default: True
+   manual: True
  
 +flag th
 +  description: build TH bits
@@ -10,8 +10,8 @@
 +
  library
    default-language: Haskell2010
- 
-@@ -79,12 +83,14 @@
+   hs-source-dirs: .
+@@ -88,12 +92,14 @@ library
      Data.Aeson.Parser
      Data.Aeson.Text
      Data.Aeson.Types
diff --git a/p/haskell-aeson/debian/patches/threaded-option.diff b/p/haskell-aeson/debian/patches/threaded-option.diff
index 91e7b8e8f..b3a0df430 100644
--- a/p/haskell-aeson/debian/patches/threaded-option.diff
+++ b/p/haskell-aeson/debian/patches/threaded-option.diff
@@ -1,6 +1,6 @@
 --- a/aeson.cabal
 +++ b/aeson.cabal
-@@ -74,6 +74,10 @@
+@@ -82,6 +82,10 @@ flag th
    description: build TH bits
    default: True
  
@@ -10,10 +10,10 @@
 +
  library
    default-language: Haskell2010
- 
-@@ -157,6 +161,10 @@
-   include-dirs: include
-   c-sources:  cbits/unescape_string.c
+   hs-source-dirs: .
+@@ -174,6 +178,10 @@ library
+     hs-source-dirs: ffi
+     other-modules: Data.Aeson.Parser.UnescapeFFI
  
 +  if flag(threaded)
 +    ghc-options: -threaded
@@ -21,4 +21,4 @@
 +
  test-suite tests
    default-language: Haskell2010
-   type:           exitcode-stdio-1.0
+   type: exitcode-stdio-1.0
diff --git a/p/haskell-cryptonite/debian/patches/crypto-buffer-alignment.patch b/p/haskell-cryptonite/debian/patches/crypto-buffer-alignment.patch
index 91d1aef44..c7695f5b9 100644
--- a/p/haskell-cryptonite/debian/patches/crypto-buffer-alignment.patch
+++ b/p/haskell-cryptonite/debian/patches/crypto-buffer-alignment.patch
@@ -8,12 +8,10 @@ Bug-Upstream: https://github.com/haskell-crypto/cryptonite/issues/108
 Bug-Debian: https://bugs.debian.org/841983
 Forwarded-Upstream: yes
 
-Index: haskell-cryptonite-0.21/cbits/cryptonite_sha3.c
-===================================================================
---- haskell-cryptonite-0.21.orig/cbits/cryptonite_sha3.c
-+++ haskell-cryptonite-0.21/cbits/cryptonite_sha3.c
-@@ -129,8 +129,8 @@ void cryptonite_sha3_update(struct sha3_
- 		uint64_t tramp[200 - 2 * (224 / 8)];
+--- a/cbits/cryptonite_sha3.c
++++ b/cbits/cryptonite_sha3.c
+@@ -135,8 +135,8 @@ void cryptonite_sha3_update(struct sha3_
+ 		uint64_t tramp[SHA3_BUF_SIZE_MAX/8];
  		ASSERT_ALIGNMENT(tramp, 8);
  		for (; len >= ctx->bufsz; len -= ctx->bufsz, data += ctx->bufsz) {
 -			memcpy(tramp, data, ctx->bufsz / 8);
diff --git a/p/haskell-distributive/debian/patches/no-transformers-compat.diff b/p/haskell-distributive/debian/patches/no-transformers-compat.diff
index af246c46a..827456589 100644
--- a/p/haskell-distributive/debian/patches/no-transformers-compat.diff
+++ b/p/haskell-distributive/debian/patches/no-transformers-compat.diff
@@ -1,6 +1,6 @@
 --- a/distributive.cabal
 +++ b/distributive.cabal
-@@ -37,8 +37,7 @@ library
+@@ -52,8 +52,7 @@ library
    build-depends:
      base                >= 4   && < 5,
      base-orphans        >= 0.5 && < 1,
diff --git a/p/haskell-hledger-lib/debian/patches/no-mtl-compat.patch b/p/haskell-hledger-lib/debian/patches/no-mtl-compat.patch
index 0fcbf1af5..44d07a1c6 100644
--- a/p/haskell-hledger-lib/debian/patches/no-mtl-compat.patch
+++ b/p/haskell-hledger-lib/debian/patches/no-mtl-compat.patch
@@ -1,24 +1,24 @@
 --- a/hledger-lib.cabal
 +++ b/hledger-lib.cabal
-@@ -74,7 +74,6 @@
+@@ -73,7 +73,6 @@ library
      , hashtables >= 1.2
-     , megaparsec >=5.0 && < 5.2
+     , megaparsec >=5.0 && < 5.3
      , mtl
 -    , mtl-compat
      , old-time
      , pretty-show >=1.6.4
      , regex-tdfa
-@@ -172,7 +171,6 @@
+@@ -167,7 +166,6 @@ test-suite doctests
      , hashtables >= 1.2
-     , megaparsec >=5.0 && < 5.2
+     , megaparsec >=5.0 && < 5.3
      , mtl
 -    , mtl-compat
      , old-time
      , pretty-show >=1.6.4
      , regex-tdfa
-@@ -261,7 +259,6 @@
+@@ -252,7 +250,6 @@ test-suite hunittests
      , hashtables >= 1.2
-     , megaparsec >=5.0 && < 5.2
+     , megaparsec >=5.0 && < 5.3
      , mtl
 -    , mtl-compat
      , old-time
diff --git a/p/haskell-hledger/debian/patches/no-mtl-compat.patch b/p/haskell-hledger/debian/patches/no-mtl-compat.patch
index 8eb378304..370580c43 100644
--- a/p/haskell-hledger/debian/patches/no-mtl-compat.patch
+++ b/p/haskell-hledger/debian/patches/no-mtl-compat.patch
@@ -1,14 +1,14 @@
 --- a/hledger.cabal
 +++ b/hledger.cabal
-@@ -102,7 +102,6 @@ library
+@@ -103,7 +103,6 @@ library
      , haskeline >=0.6 && <=0.8
      , HUnit
      , mtl
 -    , mtl-compat
      , old-time
-     , megaparsec >=5.0 && < 5.2
+     , megaparsec >=5.0 && < 5.3
      , regex-tdfa
-@@ -185,7 +184,6 @@ executable hledger
+@@ -188,7 +187,6 @@ executable hledger
      , haskeline >=0.6 && <=0.8
      , HUnit
      , mtl
@@ -16,7 +16,7 @@
      , old-time
      , parsec >=3
      , regex-tdfa
-@@ -246,7 +244,6 @@ test-suite test
+@@ -250,7 +248,6 @@ test-suite test
      , haskeline >=0.6 && <=0.8
      , HUnit
      , mtl
diff --git a/p/haskell-hoogle/debian/patches/global_database b/p/haskell-hoogle/debian/patches/global_database
index 7e81e6d9e..f61d764a1 100644
--- a/p/haskell-hoogle/debian/patches/global_database
+++ b/p/haskell-hoogle/debian/patches/global_database
@@ -4,8 +4,6 @@ Description: Use Debian's hoogle database
 Author: Ilias Tsitsimpis <i.tsitsimpis@gmail.com>
 Forwarded: no, Debian specific
 
-Index: b/src/Action/CmdLine.hs
-===================================================================
 --- a/src/Action/CmdLine.hs
 +++ b/src/Action/CmdLine.hs
 @@ -80,8 +80,16 @@ getCmdLine args = do
diff --git a/p/haskell-hoogle/debian/patches/remove_embedded_copies b/p/haskell-hoogle/debian/patches/remove_embedded_copies
index cd2ca67ee..da3907207 100644
--- a/p/haskell-hoogle/debian/patches/remove_embedded_copies
+++ b/p/haskell-hoogle/debian/patches/remove_embedded_copies
@@ -2,8 +2,6 @@ Description: Remove embedded copies of JS libraries
 Author: Ilias Tsitsimpis <i.tsitsimpis@gmail.com>
 Forwarded: no, Debian specific
 
-Index: b/hoogle.cabal
-===================================================================
 --- a/hoogle.cabal
 +++ b/hoogle.cabal
 @@ -29,9 +29,6 @@ data-files:
diff --git a/p/haskell-io-streams/debian/patches/no-bytestring-builder b/p/haskell-io-streams/debian/patches/no-bytestring-builder
index 5d188f16b..05ffe53fc 100644
--- a/p/haskell-io-streams/debian/patches/no-bytestring-builder
+++ b/p/haskell-io-streams/debian/patches/no-bytestring-builder
@@ -1,6 +1,6 @@
 --- a/io-streams.cabal
 +++ b/io-streams.cabal
-@@ -120,7 +120,6 @@
+@@ -122,7 +122,6 @@ Library
    Build-depends:     base               >= 4     && <5,
                       attoparsec         >= 0.10  && <0.14,
                       bytestring         >= 0.9   && <0.11,
@@ -8,7 +8,7 @@
                       network            >= 2.3   && <2.7,
                       primitive          >= 0.2   && <0.7,
                       process            >= 1.1   && <1.7,
-@@ -201,7 +200,6 @@
+@@ -205,7 +204,6 @@ Test-suite testsuite
    Build-depends:     base               >= 4     && <5,
                       attoparsec         >= 0.10  && <0.14,
                       bytestring         >= 0.9   && <0.11,
diff --git a/p/haskell-lens/debian/patches/flag-test-templates b/p/haskell-lens/debian/patches/flag-test-templates
index 3e30a790a..c0dffdb5e 100644
--- a/p/haskell-lens/debian/patches/flag-test-templates
+++ b/p/haskell-lens/debian/patches/flag-test-templates
@@ -1,9 +1,7 @@
-Index: haskell-lens/lens.cabal
-===================================================================
---- haskell-lens.orig/lens.cabal	2015-08-15 14:18:19.157739242 +0200
-+++ haskell-lens/lens.cabal	2015-08-15 14:18:19.153739174 +0200
-@@ -145,6 +145,11 @@
-   default: True
+--- a/lens.cabal
++++ b/lens.cabal
+@@ -148,6 +148,11 @@ flag dump-splices
+   default: False
    manual: True
  
 +-- You can disable the templates test suite with -f-test-templates
@@ -14,7 +12,7 @@ Index: haskell-lens/lens.cabal
  -- You can disable the doctests test suite with -f-test-doctests
  flag test-doctests
    default: True
-@@ -327,6 +332,9 @@
+@@ -340,6 +345,9 @@ test-suite templates
    ghc-options: -Wall -threaded
    hs-source-dirs: tests
  
diff --git a/p/haskell-lens/debian/patches/fudge-doctest-nonascii.diff b/p/haskell-lens/debian/patches/fudge-doctest-nonascii.diff
index 6892176c3..f27912d9a 100644
--- a/p/haskell-lens/debian/patches/fudge-doctest-nonascii.diff
+++ b/p/haskell-lens/debian/patches/fudge-doctest-nonascii.diff
@@ -1,8 +1,6 @@
-Index: haskell-lens/src/Data/Complex/Lens.hs
-===================================================================
---- haskell-lens.orig/src/Data/Complex/Lens.hs	2015-08-15 14:18:16.089686794 +0200
-+++ haskell-lens/src/Data/Complex/Lens.hs	2015-08-15 14:18:16.085686726 +0200
-@@ -35,7 +35,7 @@
+--- a/src/Data/Complex/Lens.hs
++++ b/src/Data/Complex/Lens.hs
+@@ -46,7 +46,7 @@ import Control.Applicative
  
  -- $setup
  -- >>> import Debug.SimpleReflect
@@ -11,7 +9,7 @@ Index: haskell-lens/src/Data/Complex/Lens.hs
  
  -- | Access the 'realPart' of a 'Complex' number.
  --
-@@ -101,7 +101,7 @@
+@@ -120,7 +120,7 @@ _magnitude f c = setMag <$> f r
  
  -- | Access the 'phase' of a 'Complex' number.
  --
@@ -20,7 +18,7 @@ Index: haskell-lens/src/Data/Complex/Lens.hs
  -- True
  --
  -- This isn't /quite/ a legal 'Lens'. Notably the
-@@ -123,7 +123,7 @@
+@@ -142,7 +142,7 @@ _phase f c = setPhase <$> f theta
  -- >>> (2.0 :+ 3.0) & _conjugate . _imagPart -~ 1
  -- 2.0 :+ 4.0
  --
diff --git a/p/haskell-monad-logger/debian/patches/use-template-haskell-loc b/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
index 040508c01..137beb5fa 100644
--- a/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
+++ b/p/haskell-monad-logger/debian/patches/use-template-haskell-loc
@@ -2,7 +2,7 @@ Author: Joachim Breitner <nomeata@debian.org>
 
 --- a/Control/Monad/Logger.hs
 +++ b/Control/Monad/Logger.hs
-@@ -93,6 +93,8 @@
+@@ -96,6 +96,8 @@ module Control.Monad.Logger
  
  #if WITH_TEMPLATE_HASKELL
  import Language.Haskell.TH.Syntax (Lift (lift), Q, Exp, Loc (..), qLocation)
@@ -11,7 +11,7 @@ Author: Joachim Breitner <nomeata@debian.org>
  #endif
  
  import Data.Monoid (Monoid)
-@@ -185,16 +187,6 @@
+@@ -188,16 +190,6 @@ instance Lift LogLevel where
      lift LevelError = [|LevelError|]
      lift (LevelOther x) = [|LevelOther $ pack $(lift $ unpack x)|]
  
@@ -30,7 +30,7 @@ Author: Joachim Breitner <nomeata@debian.org>
  -- | A @Monad@ which has the ability to log messages in some manner.
 --- a/monad-logger.cabal
 +++ b/monad-logger.cabal
-@@ -44,13 +44,11 @@
+@@ -44,13 +44,11 @@ library
                       , bytestring
                       , blaze-builder
                       , exceptions
diff --git a/p/haskell-parsers/debian/patches/disable-doctests b/p/haskell-parsers/debian/patches/disable-doctests
index 370905398..0cf626310 100644
--- a/p/haskell-parsers/debian/patches/disable-doctests
+++ b/p/haskell-parsers/debian/patches/disable-doctests
@@ -1,6 +1,6 @@
 --- a/parsers.cabal
 +++ b/parsers.cabal
-@@ -58,6 +58,7 @@
+@@ -70,6 +70,7 @@ library
  
  -- Verify the results of the examples
  test-suite doctests
diff --git a/p/haskell-sandi/debian/patches/no-tasty-th b/p/haskell-sandi/debian/patches/no-tasty-th
index 00f6bb1e9..4ab0cf768 100644
--- a/p/haskell-sandi/debian/patches/no-tasty-th
+++ b/p/haskell-sandi/debian/patches/no-tasty-th
@@ -1,6 +1,6 @@
 --- a/sandi.cabal
 +++ b/sandi.cabal
-@@ -71,8 +71,7 @@
+@@ -71,8 +71,7 @@ test-suite sandi-tests
          HUnit,
          tasty,
          tasty-hunit,
@@ -17,7 +17,7 @@
  -- Copyright: (c) Magnus Therning, 2013
  -- License: BSD3, found in the LICENSE file
  
-@@ -12,7 +11,6 @@
+@@ -12,7 +11,6 @@ import qualified Data.ByteString.Char8 a
  import Data.Word (Word8)
  
  import Test.Tasty
@@ -25,7 +25,7 @@
  import Test.Tasty.HUnit
  import Test.Tasty.QuickCheck
  
-@@ -45,4 +43,9 @@
+@@ -45,4 +43,9 @@ prop_b16_encdec :: [Word8] -> Bool
  prop_b16_encdec ws = BS.pack ws == fromRight (B16.decode $ B16.encode $ BS.pack ws)
  
  tests :: TestTree
@@ -43,7 +43,7 @@
  -- Copyright: (c) Magnus Therning, 2013
  -- License: BSD3, found in the LICENSE file
  
-@@ -12,7 +11,6 @@
+@@ -12,7 +11,6 @@ import qualified Data.ByteString.Char8 a
  import Data.Word (Word8)
  
  import Test.Tasty
@@ -51,7 +51,7 @@
  import Test.Tasty.HUnit
  import Test.Tasty.QuickCheck
  
-@@ -49,4 +47,9 @@
+@@ -49,4 +47,9 @@ prop_encdec :: [Word8] -> Bool
  prop_encdec ws = BS.pack ws == fromRight (B32H.decode $ B32H.encode $ BS.pack ws)
  
  tests :: TestTree
@@ -69,7 +69,7 @@
  -- Copyright: (c) Magnus Therning, 2013
  -- License: BSD3, found in the LICENSE file
  
-@@ -12,7 +11,6 @@
+@@ -12,7 +11,6 @@ import qualified Data.ByteString.Char8 a
  import Data.Word (Word8)
  
  import Test.Tasty
@@ -77,7 +77,7 @@
  import Test.Tasty.HUnit
  import Test.Tasty.QuickCheck
  
-@@ -49,4 +47,9 @@
+@@ -49,4 +47,9 @@ prop_encdec :: [Word8] -> Bool
  prop_encdec ws = BS.pack ws == fromRight (B32.decode $ B32.encode $ BS.pack ws)
  
  tests :: TestTree
@@ -95,7 +95,7 @@
  -- Copyright: (c) Magnus Therning, 2013
  -- License: BSD3, found in the LICENSE file
  
-@@ -12,7 +11,6 @@
+@@ -12,7 +11,6 @@ import qualified Data.ByteString.Char8 a
  import Data.Word (Word8)
  
  import Test.Tasty
@@ -103,7 +103,7 @@
  import Test.Tasty.HUnit
  import Test.Tasty.QuickCheck
  
-@@ -50,4 +48,10 @@
+@@ -50,4 +48,10 @@ prop_encdec :: [Word8] -> Bool
  prop_encdec ws = BS.pack ws == fromRight (B64.decode $ B64.encode $ BS.pack ws)
  
  tests :: TestTree
@@ -122,7 +122,7 @@
  -- Copyright: (c) Magnus Therning, 2013
  -- License: BSD3, found in the LICENSE file
  
-@@ -12,7 +11,6 @@
+@@ -12,7 +11,6 @@ import qualified Data.ByteString.Char8 a
  import Data.Word (Word8)
  
  import Test.Tasty
@@ -130,7 +130,7 @@
  import Test.Tasty.HUnit
  import Test.Tasty.QuickCheck
  
-@@ -50,4 +48,10 @@
+@@ -50,4 +48,10 @@ prop_encdec :: [Word8] -> Bool
  prop_encdec ws = BS.pack ws == fromRight (B64U.decode $ B64U.encode $ BS.pack ws)
  
  tests :: TestTree
@@ -149,7 +149,7 @@
  -- Copyright: (c) Magnus Therning, 2013
  -- License: BSD3, found in the LICENSE file
  
-@@ -12,7 +11,6 @@
+@@ -12,7 +11,6 @@ import qualified Data.ByteString.Char8 a
  import Data.Word (Word8)
  
  import Test.Tasty
@@ -157,7 +157,7 @@
  import Test.Tasty.HUnit
  import Test.Tasty.QuickCheck
  
-@@ -59,4 +57,10 @@
+@@ -59,4 +57,10 @@ prop_encdec :: [Word8] -> Bool
  prop_encdec ws = BS.pack ws == fromRight (B85.decode $ B85.encode $ BS.pack ws)
  
  tests :: TestTree
@@ -176,7 +176,7 @@
  -- Copyright: (c) Magnus Therning, 2013-2015
  -- License: BSD3, found in the LICENSE file
  
-@@ -12,7 +11,6 @@
+@@ -12,7 +11,6 @@ import qualified Data.ByteString.Char8 a
  import Data.Word (Word8)
  
  import Test.Tasty
@@ -184,7 +184,7 @@
  import Test.Tasty.HUnit
  import Test.Tasty.QuickCheck
  
-@@ -48,4 +46,9 @@
+@@ -48,4 +46,9 @@ prop_encdec :: [Word8] -> Bool
  prop_encdec ws = BS.pack ws == fromRight (QP.decode $ QP.encode $ BS.pack ws)
  
  tests :: TestTree
@@ -202,7 +202,7 @@
  -- Copyright: (c) Magnus Therning, 2013
  -- License: BSD3, found in the LICENSE file
  
-@@ -12,7 +11,6 @@
+@@ -12,7 +11,6 @@ import qualified Data.ByteString.Char8 a
  import Data.Word (Word8)
  
  import Test.Tasty
@@ -210,7 +210,7 @@
  import Test.Tasty.HUnit
  import Test.Tasty.QuickCheck
  
-@@ -40,4 +38,8 @@
+@@ -40,4 +38,8 @@ prop_encdec :: [Word8] -> Bool
  prop_encdec ws = BS.pack ws == fromRight (Uu.decode $ Uu.encode $ BS.pack ws)
  
  tests :: TestTree
@@ -227,7 +227,7 @@
  -- Copyright: (c) Magnus Therning, 2013
  -- License: BSD3, found in the LICENSE file
  
-@@ -12,7 +11,6 @@
+@@ -12,7 +11,6 @@ import qualified Data.ByteString.Char8 a
  import Data.Word (Word8)
  
  import Test.Tasty
@@ -235,7 +235,7 @@
  import Test.Tasty.HUnit
  import Test.Tasty.QuickCheck
  
-@@ -40,4 +38,8 @@
+@@ -40,4 +38,8 @@ prop_encdec :: [Word8] -> Bool
  prop_encdec ws = BS.pack ws == fromRight (Xx.decode $ Xx.encode $ BS.pack ws)
  
  tests :: TestTree
@@ -252,7 +252,7 @@
  -- Copyright: (c) Magnus Therning, 2013
  -- License: BSD3, found in the LICENSE file
  
-@@ -12,7 +11,6 @@
+@@ -12,7 +11,6 @@ import qualified Data.ByteString.Char8 a
  import Data.Word (Word8)
  
  import Test.Tasty
@@ -260,7 +260,7 @@
  import Test.Tasty.QuickCheck
  import Test.Tasty.HUnit
  
-@@ -56,4 +54,10 @@
+@@ -56,4 +54,10 @@ prop_encdec :: [Word8] -> Bool
  prop_encdec ws = BS.pack ws == fromRight (Y.decode $ Y.encode $ BS.pack ws)
  
  tests :: TestTree
diff --git a/p/haskell-snap-core/debian/patches/no-bytestring-builder b/p/haskell-snap-core/debian/patches/no-bytestring-builder
index 8014b2006..73fdb8127 100644
--- a/p/haskell-snap-core/debian/patches/no-bytestring-builder
+++ b/p/haskell-snap-core/debian/patches/no-bytestring-builder
@@ -1,6 +1,6 @@
 --- a/snap-core.cabal
 +++ b/snap-core.cabal
-@@ -126,7 +126,6 @@
+@@ -133,7 +133,6 @@ Library
      attoparsec                >= 0.12    && < 0.14,
      base                      >= 4       && < 5,
      bytestring                >= 0.9     && < 0.11,
@@ -8,7 +8,7 @@
      case-insensitive          >= 1.1     && < 1.3,
      containers                >= 0.3     && < 1.0,
      directory                 >= 1       && < 2,
-@@ -220,7 +219,6 @@
+@@ -243,7 +242,6 @@ Test-suite testsuite
      attoparsec,
      base,
      bytestring,
diff --git a/p/haskell-text-show/debian/patches/no-bytestring-builder b/p/haskell-text-show/debian/patches/no-bytestring-builder
index a64affed6..d386d0fd1 100644
--- a/p/haskell-text-show/debian/patches/no-bytestring-builder
+++ b/p/haskell-text-show/debian/patches/no-bytestring-builder
@@ -1,6 +1,6 @@
 --- a/text-show.cabal
 +++ b/text-show.cabal
-@@ -165,7 +165,6 @@
+@@ -165,7 +165,6 @@ library
                       , base-compat         >= 0.8.1  && < 1
                       , bifunctors          >= 5.1    && < 6
                       , bytestring          >= 0.9    && < 0.11
@@ -8,15 +8,15 @@
                       , containers          >= 0.1    && < 0.6
                       , contravariant       >= 0.5    && < 2
                       , generic-deriving    >= 1.11   && < 2
-@@ -361,7 +360,6 @@
-                      , base-orphans         >= 0.5.2  && < 1
+@@ -359,7 +358,6 @@ test-suite spec
+                      , base-orphans         >= 0.6    && < 0.7
                       , bifunctors           >= 5.1    && < 6
                       , bytestring           >= 0.9    && < 0.11
 -                     , bytestring-builder
                       , containers           >= 0.1    && < 0.6
                       , contravariant        >= 0.5    && < 2
                       , deriving-compat      >= 0.3.4  && < 1
-@@ -419,7 +417,6 @@
+@@ -416,7 +414,6 @@ benchmark bench
                       , base-compat         >= 0.8.1  && < 1
                       , bifunctors          >= 5.1    && < 6
                       , bytestring          >= 0.9    && < 0.11
diff --git a/p/haskell-text-show/debian/patches/no-nats b/p/haskell-text-show/debian/patches/no-nats
index 1ee33baea..3ae298acf 100644
--- a/p/haskell-text-show/debian/patches/no-nats
+++ b/p/haskell-text-show/debian/patches/no-nats
@@ -1,6 +1,6 @@
 --- a/text-show.cabal
 +++ b/text-show.cabal
-@@ -171,7 +171,6 @@
+@@ -171,7 +171,6 @@ library
                       , generic-deriving    >= 1.11   && < 2
                       , ghc-prim
                       , integer-gmp
@@ -8,15 +8,15 @@
                       , semigroups          >= 0.17   && < 1
                       , tagged              >= 0.4.4  && < 1
                       , text                >= 0.11.1 && < 1.3
-@@ -370,7 +369,6 @@
+@@ -368,7 +367,6 @@ test-suite spec
                       , ghc-prim
                       , hspec                >= 2      && < 3
                       , integer-gmp
 -                     , nats                 >= 0.1    && < 2
                       , QuickCheck           >= 2.9    && < 3
                       , quickcheck-instances >= 0.1    && < 0.4
-                      , semigroups           >= 0.17   && < 1
-@@ -429,7 +427,6 @@
+                      , semigroups           >= 0.18.3 && < 1
+@@ -426,7 +424,6 @@ benchmark bench
                       , generic-deriving    >= 1.11   && < 2
                       , ghc-prim
                       , integer-gmp
diff --git a/p/haskell-typed-process/debian/patches/no--N b/p/haskell-typed-process/debian/patches/no--N
index 54128a9b7..f0077136a 100644
--- a/p/haskell-typed-process/debian/patches/no--N
+++ b/p/haskell-typed-process/debian/patches/no--N
@@ -1,6 +1,6 @@
---- haskell-typed-process.orig/typed-process.cabal
-+++ haskell-typed-process/typed-process.cabal
-@@ -43,7 +43,7 @@
+--- a/typed-process.cabal
++++ b/typed-process.cabal
+@@ -43,7 +43,7 @@ test-suite typed-process-test
                       , http-conduit >= 2.1.10
                       , temporary
                       , typed-process
diff --git a/p/haskell-typed-process/debian/patches/no-network-tests b/p/haskell-typed-process/debian/patches/no-network-tests
index 08fd4f31a..b9bbe8fa7 100644
--- a/p/haskell-typed-process/debian/patches/no-network-tests
+++ b/p/haskell-typed-process/debian/patches/no-network-tests
@@ -1,6 +1,6 @@
 --- a/test/System/Process/TypedSpec.hs
 +++ b/test/System/Process/TypedSpec.hs
-@@ -74,18 +74,3 @@
+@@ -74,18 +74,3 @@ spec = do
  
      it "checked exit code" $
          runProcess_ "false" `shouldThrow` \ExitCodeException{} -> True
diff --git a/p/haskell-vector/debian/patches/no_ann_without_ghci b/p/haskell-vector/debian/patches/no_ann_without_ghci
index 76630f941..beab2d84b 100644
--- a/p/haskell-vector/debian/patches/no_ann_without_ghci
+++ b/p/haskell-vector/debian/patches/no_ann_without_ghci
@@ -7,7 +7,7 @@ Forwarded: no
 
 --- a/Data/Vector/Fusion/Stream/Monadic.hs
 +++ b/Data/Vector/Fusion/Stream/Monadic.hs
-@@ -95,8 +95,10 @@
+@@ -99,8 +99,10 @@ import Data.Word ( Word8, Word16, Word32
  #if __GLASGOW_HASKELL__ >= 708
  import GHC.Types ( SPEC(..) )
  #elif __GLASGOW_HASKELL__ >= 700
@@ -18,7 +18,7 @@ Forwarded: no
  
  #include "vector.h"
  #include "MachDeps.h"
-@@ -104,9 +106,11 @@
+@@ -112,9 +114,11 @@ import Data.Int  ( Int64 )
  #if __GLASGOW_HASKELL__ < 708
  data SPEC = SPEC | SPEC2
  #if __GLASGOW_HASKELL__ >= 700