[Pkg-haskell-commits] [package-plan] 01/01: Remove notmuch-web patches
Joachim Breitner
nomeata at moszumanska.debian.org
Sat May 23 19:45:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch master
in repository package-plan.
commit eb38216278f9c9ff3414a89cdc4a9422d8c93a7c
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Sat May 23 21:45:08 2015 +0200
Remove notmuch-web patches
---
patches/notmuch-web/0.2.0/config-in-etc | 40 ------------------
patches/notmuch-web/0.2.0/newer-resourcet.diff | 48 ----------------------
.../notmuch-web/0.2.0/no-attoparsec-conduit.diff | 32 ---------------
patches/notmuch-web/0.2.0/series | 4 --
patches/notmuch-web/0.2.0/testsuite-http-code | 12 ------
5 files changed, 136 deletions(-)
diff --git a/patches/notmuch-web/0.2.0/config-in-etc b/patches/notmuch-web/0.2.0/config-in-etc
deleted file mode 100644
index e694e24..0000000
--- a/patches/notmuch-web/0.2.0/config-in-etc
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/main.hs
-+++ b/main.hs
-@@ -27,7 +27,7 @@
- import System.Environment (getArgs)
- import System.Exit (exitWith, ExitCode(..))
- import System.IO (hSetEcho, hFlush, stdin, stdout, hPutStrLn, stderr)
--import Yesod.Default.Config (fromArgs)
-+import Yesod.Default.Config (fromArgsSettings, configSettings, ConfigSettings(csParseExtra, csFile))
- import Yesod.Default.Main (defaultMain)
-
- genPassword :: IO ()
-@@ -51,4 +51,7 @@
- a <- getArgs
- if "--make-password" `elem` a
- then genPassword
-- else defaultMain (fromArgs parseExtra) makeApplication
-+ else defaultMain etchack makeApplication
-+ where
-+ etchack = fromArgsSettings $ \env -> return (configSettings env) { csParseExtra = parseExtra
-+ , csFile = const (return "/etc/notmuch-web/settings.yml") }
---- a/notmuch-web.cabal
-+++ b/notmuch-web.cabal
-@@ -146,7 +146,7 @@
- , warp
- , xss-sanitize >= 0.3.4
- , yaml
-- , yesod >= 1.2 && < 1.3
-+ , yesod >= 1.2.2 && < 1.3
- , yesod-auth
- , yesod-static >= 1.2.1 && < 1.3
- else
-@@ -194,7 +194,7 @@
- , warp
- , xss-sanitize >= 0.3.4
- , yaml
-- , yesod >= 1.2 && < 1.3
-+ , yesod >= 1.2.2 && < 1.3
- , yesod-auth
- , yesod-static >= 1.2.1 && < 1.3
-
diff --git a/patches/notmuch-web/0.2.0/newer-resourcet.diff b/patches/notmuch-web/0.2.0/newer-resourcet.diff
deleted file mode 100644
index a99d18b..0000000
--- a/patches/notmuch-web/0.2.0/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/patches/notmuch-web/0.2.0/no-attoparsec-conduit.diff b/patches/notmuch-web/0.2.0/no-attoparsec-conduit.diff
deleted file mode 100644
index c9df68b..0000000
--- a/patches/notmuch-web/0.2.0/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/patches/notmuch-web/0.2.0/series b/patches/notmuch-web/0.2.0/series
deleted file mode 100644
index e9443ab..0000000
--- a/patches/notmuch-web/0.2.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-testsuite-http-code
-config-in-etc
-no-attoparsec-conduit.diff
-newer-resourcet.diff
diff --git a/patches/notmuch-web/0.2.0/testsuite-http-code b/patches/notmuch-web/0.2.0/testsuite-http-code
deleted file mode 100644
index ac28087..0000000
--- a/patches/notmuch-web/0.2.0/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"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git
More information about the Pkg-haskell-commits
mailing list