[Pkg-haskell-commits] darcs: haskell-yesod-core: drop patches
Joachim Breitner
mail at joachim-breitner.de
Mon Dec 22 15:23:19 UTC 2014
Sun Dec 21 20:42:14 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* drop patches
R ./patches/no-attoparsec-conduit-and-no-network-conduit.diff
R ./patches/no-wai-test.diff
R ./patches/series
R ./patches/
Sun Dec 21 20:42:14 UTC 2014 Joachim Breitner <mail at joachim-breitner.de>
* drop patches
diff -rN -u old-haskell-yesod-core/patches/no-attoparsec-conduit-and-no-network-conduit.diff new-haskell-yesod-core/patches/no-attoparsec-conduit-and-no-network-conduit.diff
--- old-haskell-yesod-core/patches/no-attoparsec-conduit-and-no-network-conduit.diff 2014-12-22 15:23:18.963053487 +0000
+++ new-haskell-yesod-core/patches/no-attoparsec-conduit-and-no-network-conduit.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
---- a/yesod-core.cabal
-+++ b/yesod-core.cabal
-@@ -60,7 +60,6 @@
- , conduit >= 1.0.11
- , resourcet >= 0.4.9 && < 1.2
- , lifted-base >= 0.1.2
-- , attoparsec-conduit
- , blaze-html >= 0.5
- , blaze-markup >= 0.5.1
- , data-default
-@@ -125,7 +124,6 @@
- , containers
- , lifted-base
- , resourcet
-- , network-conduit
- , network
- , async
- , conduit-extra
diff -rN -u old-haskell-yesod-core/patches/no-wai-test.diff new-haskell-yesod-core/patches/no-wai-test.diff
--- old-haskell-yesod-core/patches/no-wai-test.diff 2014-12-22 15:23:18.963053487 +0000
+++ new-haskell-yesod-core/patches/no-wai-test.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-Index: yesod-core-1.2.19/yesod-core.cabal
-===================================================================
---- yesod-core-1.2.19.orig/yesod-core.cabal 2014-08-06 22:57:35.698862404 +0200
-+++ yesod-core-1.2.19/yesod-core.cabal 2014-08-06 22:58:01.134861448 +0200
-@@ -27,7 +27,7 @@
- , time >= 1.1.4
- , yesod-routes >= 1.2 && < 1.3
- , wai >= 1.4
-- , wai-extra >= 1.3
-+ , wai-extra >= 3.0
- , bytestring >= 0.9.1.4
- , text >= 0.7
- , template-haskell
-@@ -106,7 +106,6 @@
- cpp-options: -DTEST
- build-depends: base
- ,hspec >= 1.3
-- ,wai-test >= 1.3.0.5
- ,wai >= 3.0
- ,yesod-core
- ,bytestring
-@@ -129,7 +128,7 @@
- , conduit-extra
- , shakespeare
- , streaming-commons
-- , wai-extra
-+ , wai-extra >= 3.0
- ghc-options: -Wall
- extensions: TemplateHaskell
-
diff -rN -u old-haskell-yesod-core/patches/series new-haskell-yesod-core/patches/series
--- old-haskell-yesod-core/patches/series 2014-12-22 15:23:18.963053487 +0000
+++ new-haskell-yesod-core/patches/series 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-no-attoparsec-conduit-and-no-network-conduit.diff
-no-wai-test.diff
More information about the Pkg-haskell-commits
mailing list