[Pkg-haskell-commits] darcs: haskell-hledger-web: Patch for newer conduit and WAI.
Clint Adams
clint at debian.org
Wed Jun 11 10:41:32 UTC 2014
Wed Jun 11 10:41:27 UTC 2014 Clint Adams <clint at debian.org>
* Patch for newer conduit and WAI.
M ./changelog +6
M ./control -5 +5
A ./patches/newer-wai.diff
A ./patches/no-network-conduit.diff
A ./patches/series
Wed Jun 11 10:41:27 UTC 2014 Clint Adams <clint at debian.org>
* Patch for newer conduit and WAI.
diff -rN -u old-haskell-hledger-web/changelog new-haskell-hledger-web/changelog
--- old-haskell-hledger-web/changelog 2014-06-11 10:41:32.003425224 +0000
+++ new-haskell-hledger-web/changelog 2014-06-11 10:41:32.003425224 +0000
@@ -1,3 +1,9 @@
+haskell-hledger-web (0.22.6-2) unstable; urgency=medium
+
+ * Patch for newer conduit and WAI.
+
+ -- Clint Adams <clint at debian.org> Wed, 11 Jun 2014 06:24:07 -0400
+
haskell-hledger-web (0.22.6-1) unstable; urgency=medium
* New upstream version.
diff -rN -u old-haskell-hledger-web/control new-haskell-hledger-web/control
--- old-haskell-hledger-web/control 2014-06-11 10:41:32.003425224 +0000
+++ new-haskell-hledger-web/control 2014-06-11 10:41:32.003425224 +0000
@@ -13,6 +13,7 @@
, libghc-clientsession-dev
, libghc-cmdargs-dev (>= 0.10)
, libghc-cmdargs-dev (<< 0.11)
+ , libghc-conduit-extra-dev
, libghc-data-default-dev
, libghc-hamlet-dev
, libghc-hjsmin-dev
@@ -25,7 +26,6 @@
, libghc-http-conduit-dev
, libghc-hunit-dev
, libghc-json-dev
- , libghc-network-conduit-dev
, libghc-parsec3-dev
, libghc-regexpr-dev (>= 0.5.1)
, libghc-safe-dev (>= 0.2)
@@ -34,10 +34,10 @@
, libghc-transformers-dev
, libghc-wai-dev
, libghc-wai-extra-dev
- , libghc-wai-handler-launch-dev (>= 1.3)
- , libghc-wai-handler-launch-dev (<< 2.1)
- , libghc-warp-dev (>= 1.3)
- , libghc-warp-dev (<< 2.2)
+ , libghc-wai-handler-launch-dev (>= 3.0)
+ , libghc-wai-handler-launch-dev (<< 3.1)
+ , libghc-warp-dev (>= 3.0)
+ , libghc-warp-dev (<< 3.1)
, libghc-yaml-dev
, libghc-yesod-dev (>= 1.2)
, libghc-yesod-dev (<< 1.3)
diff -rN -u old-haskell-hledger-web/patches/newer-wai.diff new-haskell-hledger-web/patches/newer-wai.diff
--- old-haskell-hledger-web/patches/newer-wai.diff 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hledger-web/patches/newer-wai.diff 2014-06-11 10:41:32.007425222 +0000
@@ -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 -rN -u old-haskell-hledger-web/patches/no-network-conduit.diff new-haskell-hledger-web/patches/no-network-conduit.diff
--- old-haskell-hledger-web/patches/no-network-conduit.diff 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hledger-web/patches/no-network-conduit.diff 2014-06-11 10:41:32.007425222 +0000
@@ -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 -rN -u old-haskell-hledger-web/patches/series new-haskell-hledger-web/patches/series
--- old-haskell-hledger-web/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hledger-web/patches/series 2014-06-11 10:41:32.007425222 +0000
@@ -0,0 +1,2 @@
+no-network-conduit.diff
+newer-wai.diff
More information about the Pkg-haskell-commits
mailing list