diff options
Diffstat (limited to 'p/haskell-notmuch-web/debian/patches')
5 files changed, 0 insertions, 132 deletions
diff --git a/p/haskell-notmuch-web/debian/patches/newer-resourcet.diff b/p/haskell-notmuch-web/debian/patches/newer-resourcet.diff deleted file mode 100644 index 6a1012ef6..000000000 --- a/p/haskell-notmuch-web/debian/patches/newer-resourcet.diff +++ /dev/null @@ -1,48 +0,0 @@ ---- a/src/NotmuchCmd.hs -+++ b/src/NotmuchCmd.hs -@@ -54,6 +54,7 @@ - import Control.Exception (Exception, throw) - import Control.Applicative - import Control.Monad.IO.Class (MonadIO(..)) -+import Control.Monad.Trans.Resource (MonadResource, runResourceT) - import Data.Aeson - import Data.Aeson.Types (Parser) - import Data.ByteString (ByteString) ---- a/notmuch-web.cabal -+++ b/notmuch-web.cabal -@@ -134,6 +134,7 @@ - , process-conduit >= 0.5 - , pwstore-fast - , random -+ , resourcet - , tagsoup - , template-haskell - , text -@@ -181,6 +182,7 @@ - , process-conduit >= 0.5 - , pwstore-fast - , random -+ , resourcet - , tagsoup - , template-haskell - , text ---- a/src/Handler/Abook.hs -+++ b/src/Handler/Abook.hs -@@ -18,6 +18,7 @@ - - import Import - import Control.Exception.Lifted (try) -+import Control.Monad.Trans.Resource (runResourceT) - import Data.Conduit.Process - import System.Exit (ExitCode(..)) - import qualified Data.Text as T ---- a/src/Handler/View.hs -+++ b/src/Handler/View.hs -@@ -28,6 +28,7 @@ - import Handler.Tags - - import Blaze.ByteString.Builder (fromByteString) -+import Control.Monad.Trans.Resource (ResourceT) - import Text.Blaze.Html.Renderer.Text (renderHtml) - import Text.Markdown - import qualified Data.ByteString as B diff --git a/p/haskell-notmuch-web/debian/patches/no-attoparsec-conduit.diff b/p/haskell-notmuch-web/debian/patches/no-attoparsec-conduit.diff deleted file mode 100644 index 60743f079..000000000 --- a/p/haskell-notmuch-web/debian/patches/no-attoparsec-conduit.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- a/notmuch-web.cabal -+++ b/notmuch-web.cabal -@@ -107,13 +107,13 @@ - - , aeson - , attoparsec -- , attoparsec-conduit - , blaze-builder - , blaze-html - , blaze-markup - , bytestring - , case-insensitive - , conduit -+ , conduit-extra - , containers - , directory - , data-default -@@ -154,13 +154,13 @@ - - , aeson - , attoparsec -- , attoparsec-conduit - , blaze-builder - , blaze-html - , blaze-markup - , bytestring - , case-insensitive - , conduit -+ , conduit-extra - , containers - , data-default - , directory diff --git a/p/haskell-notmuch-web/debian/patches/process-conduit-package-import b/p/haskell-notmuch-web/debian/patches/process-conduit-package-import deleted file mode 100644 index 4b815996f..000000000 --- a/p/haskell-notmuch-web/debian/patches/process-conduit-package-import +++ /dev/null @@ -1,36 +0,0 @@ -Index: haskell-notmuch-web-0.2.0/src/Handler/Abook.hs -=================================================================== ---- haskell-notmuch-web-0.2.0.orig/src/Handler/Abook.hs 2014-08-13 17:59:00.461227724 +0200 -+++ haskell-notmuch-web-0.2.0/src/Handler/Abook.hs 2014-08-13 17:59:09.321227397 +0200 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE PackageImports #-} - {- - Copyright (C) 2013 John Lenz <lenz@math.uic.edu> - -@@ -19,7 +20,7 @@ - import Import - import Control.Exception.Lifted (try) - import Control.Monad.Trans.Resource (runResourceT) --import Data.Conduit.Process -+import "process-conduit" Data.Conduit.Process - import System.Exit (ExitCode(..)) - import qualified Data.Text as T - import qualified Data.Vector as V -Index: haskell-notmuch-web-0.2.0/src/NotmuchCmd.hs -=================================================================== ---- haskell-notmuch-web-0.2.0.orig/src/NotmuchCmd.hs 2014-08-13 17:59:00.461227724 +0200 -+++ haskell-notmuch-web-0.2.0/src/NotmuchCmd.hs 2014-08-13 17:59:00.461227724 +0200 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE PackageImports #-} - {- - Copyright (C) 2013 John Lenz <lenz@math.uic.edu> - -@@ -60,7 +61,7 @@ - import Data.ByteString (ByteString) - import Data.Conduit - import Data.Conduit.Attoparsec (sinkParser) --import Data.Conduit.Process -+import "process-conduit" Data.Conduit.Process - import Data.Monoid ((<>)) - import Data.Time.Calendar (Day(..)) - import Data.Time.Clock diff --git a/p/haskell-notmuch-web/debian/patches/series b/p/haskell-notmuch-web/debian/patches/series deleted file mode 100644 index 5cf474499..000000000 --- a/p/haskell-notmuch-web/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -testsuite-http-code -no-attoparsec-conduit.diff -newer-resourcet.diff -process-conduit-package-import diff --git a/p/haskell-notmuch-web/debian/patches/testsuite-http-code b/p/haskell-notmuch-web/debian/patches/testsuite-http-code deleted file mode 100644 index ac2808703..000000000 --- a/p/haskell-notmuch-web/debian/patches/testsuite-http-code +++ /dev/null @@ -1,12 +0,0 @@ -Index: haskell-notmuch-web-0.2.0/tests/HomeTest.hs -=================================================================== ---- haskell-notmuch-web-0.2.0.orig/tests/HomeTest.hs 2014-03-11 08:53:21.497243833 +0100 -+++ haskell-notmuch-web-0.2.0/tests/HomeTest.hs 2014-03-11 08:53:42.005243076 +0100 -@@ -11,6 +11,6 @@ - ydescribe "Basic home page tests" $ - yit "main page redirects to the login page" $ do - get HomeR -- statusIs 303 -+ statusIs 302 - get ("/auth/login" :: String) - bodyContains "Password" |