[Pkg-haskell-commits] [package-plan] 01/01: patches for hledger-web
Clint Adams
clint at moszumanska.debian.org
Wed Jun 11 10:40:23 UTC 2014
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch conduit-1.1
in repository package-plan.
commit 284e1a5aeffaa1dbb28be40fbdae138951a04c0b
Author: Clint Adams <clint at debian.org>
Date: Wed Jun 11 06:40:11 2014 -0400
patches for hledger-web
---
packages.txt | 2 +-
patches/hledger-web/0.22.6/newer-wai.diff | 24 ++++++++++
patches/hledger-web/0.22.6/no-network-conduit.diff | 54 ++++++++++++++++++++++
patches/hledger-web/0.22.6/series | 2 +
4 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/packages.txt b/packages.txt
index f1892fd..dbf61c5 100644
--- a/packages.txt
+++ b/packages.txt
@@ -297,7 +297,7 @@ hjsmin 0.1.4.6
hledger 0.22.2
hledger-interest 1.4.3 binary
hledger-lib 0.22.2
-hledger-web 0.22.6 binary needs update for newer wai (https://github.com/simonmichael/hledger/issues/192)
+hledger-web 0.22.6 binary
hlint 1.8.61
hmatrix 0.15.0.0
hoauth 0.3.5
diff --git a/patches/hledger-web/0.22.6/newer-wai.diff b/patches/hledger-web/0.22.6/newer-wai.diff
new file mode 100644
index 0000000..a8e42c6
--- /dev/null
+++ b/patches/hledger-web/0.22.6/newer-wai.diff
@@ -0,0 +1,24 @@
+--- a/hledger-web.cabal
++++ b/hledger-web.cabal
+@@ -140,8 +140,8 @@
+ , transformers
+ , wai
+ , wai-extra
+- , wai-handler-launch >= 1.3 && < 2.1
+- , warp >= 1.3 && < 2.2
++ , wai-handler-launch >= 3.0 && < 3.1
++ , warp >= 3.0 && < 3.1
+ , yaml
+ , yesod >= 1.2 && < 1.3
+ , yesod-core
+@@ -232,8 +232,8 @@
+ , transformers
+ , wai
+ , wai-extra
+- , wai-handler-launch >= 1.3 && < 2.1
+- , warp >= 1.3 && < 2.2
++ , wai-handler-launch >= 3.0 && < 3.1
++ , warp >= 3.0 && < 3.1
+ , yaml
+ , yesod >= 1.2 && < 1.3
+ , yesod-core
diff --git a/patches/hledger-web/0.22.6/no-network-conduit.diff b/patches/hledger-web/0.22.6/no-network-conduit.diff
new file mode 100644
index 0000000..e76174f
--- /dev/null
+++ b/patches/hledger-web/0.22.6/no-network-conduit.diff
@@ -0,0 +1,54 @@
+--- a/hledger-web.cabal
++++ b/hledger-web.cabal
+@@ -120,6 +120,7 @@
+ , bytestring
+ , clientsession
+ , cmdargs >= 0.10 && < 0.11
++ , conduit-extra
+ , data-default
+ , directory
+ , filepath
+@@ -128,7 +129,6 @@
+ , http-conduit
+ , http-client >= 0.2 && < 0.4
+ , HUnit
+- , network-conduit
+ , old-locale
+ , parsec
+ , regexpr >= 0.5.1
+@@ -212,6 +212,7 @@
+ , bytestring
+ , clientsession
+ , cmdargs >= 0.10 && < 0.11
++ , conduit-extra
+ , data-default
+ , directory
+ , filepath
+@@ -220,7 +221,6 @@
+ , http-conduit
+ , http-client >= 0.2 && < 0.4
+ , HUnit
+- , network-conduit
+ , old-locale
+ , parsec
+ , regexpr >= 0.5.1
+--- a/Hledger/Web/Main.hs
++++ b/Hledger/Web/Main.hs
+@@ -15,7 +15,7 @@
+ -- import Yesod.Default.Main (defaultMain)
+ import Settings -- (parseExtra)
+ import Application (makeApplication)
+-import Data.Conduit.Network (HostPreference(HostIPv4))
++import Data.Conduit.Network ()
+ import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort)
+ import Network.Wai.Handler.Launch (runUrlPort)
+ --
+@@ -63,7 +63,7 @@
+ app <- makeApplication opts j' AppConfig{appEnv = Development
+ ,appPort = p
+ ,appRoot = pack u
+- ,appHost = HostIPv4
++ ,appHost = "*4"
+ ,appExtra = Extra "" Nothing
+ }
+ if server_ opts
diff --git a/patches/hledger-web/0.22.6/series b/patches/hledger-web/0.22.6/series
new file mode 100644
index 0000000..7701a28
--- /dev/null
+++ b/patches/hledger-web/0.22.6/series
@@ -0,0 +1,2 @@
+no-network-conduit.diff
+newer-wai.diff
--
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