[package-plan] 01/02: Remove unused patches
Ilias Tsitsimpis
iliastsi-guest at moszumanska.debian.org
Mon Jan 23 18:09:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
iliastsi-guest pushed a commit to branch master
in repository package-plan.
commit 36250d5e0ad545873e048e5a28a9c4b4762aa8c1
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date: Fri Jan 20 12:28:14 2017 +0200
Remove unused patches
---
patches/git-annex/6.20161012/newer-persistent | 11 --
patches/git-annex/6.20161012/series | 1 -
patches/haxr/3000.11.1.2/no-mtl-compat | 12 --
patches/haxr/3000.11.1.2/series | 1 -
patches/haxr/3000.11.1.3/no-mtl-compat | 12 --
patches/haxr/3000.11.1.3/series | 1 -
patches/haxr/3000.11.1.4/no-mtl-compat | 12 --
patches/haxr/3000.11.1.4/series | 1 -
patches/haxr/3000.11.1.5/no-mtl-compat | 12 --
patches/haxr/3000.11.1.5/series | 1 -
patches/haxr/3000.11.1.6/no-mtl-compat | 12 --
patches/haxr/3000.11.1.6/series | 1 -
patches/hledger-ui/0.27.5/newer-vty | 11 --
patches/hledger-ui/0.27.5/series | 1 -
patches/hledger-web/0.27/newer-hledger | 35 ----
patches/hledger-web/0.27/series | 1 -
patches/http2/1.0.4/no-bytestring-builder | 52 ------
patches/http2/1.0.4/series | 1 -
patches/http2/1.5.3/no-bytestring-builder | 50 ------
patches/http2/1.5.3/series | 1 -
patches/http2/1.6.0/no-bytestring-builder | 50 ------
patches/http2/1.6.0/series | 1 -
patches/http2/1.6.1/no-bytestring-builder | 50 ------
patches/http2/1.6.1/series | 1 -
patches/io-streams/1.3.2.0/no-bytestring-builder | 20 ---
patches/io-streams/1.3.2.0/series | 1 -
patches/lambdabot-core/5.0.3/newer-dependent-map | 79 ---------
patches/lambdabot-core/5.0.3/series | 1 -
.../0.5.1.2/no-bytestring-builder | 10 --
patches/postgresql-simple/0.5.1.2/series | 1 -
.../0.5.1.3/no-bytestring-builder | 10 --
patches/postgresql-simple/0.5.1.3/series | 1 -
.../0.5.2.0/no-bytestring-builder | 12 --
patches/postgresql-simple/0.5.2.0/series | 1 -
patches/tasty-golden/2.2.2.4/series | 1 -
patches/tasty-golden/2.2.2.4/use-temporary | 19 ---
patches/tasty-golden/2.3.0.1/series | 1 -
patches/tasty-golden/2.3.0.1/use-temporary | 19 ---
patches/tasty-golden/2.3.1/series | 1 -
patches/tasty-golden/2.3.1/use-temporary | 17 --
patches/text-show/2.1.1/series | 3 -
patches/text-show/2.1.2/series | 2 -
patches/wai-app-file-cgi/2.0.4/0001-WAI-3.0.patch | 183 ---------------------
.../2.0.4/no-attoparsec-conduit.diff | 10 --
patches/wai-app-file-cgi/2.0.4/series | 2 -
.../3.0.1/no-attoparsec-conduit.diff | 10 --
patches/wai-app-file-cgi/3.0.1/series | 1 -
.../3.0.7/no-attoparsec-conduit.diff | 12 --
patches/wai-app-file-cgi/3.0.7/series | 1 -
.../3.0.9/no-attoparsec-conduit.diff | 12 --
patches/wai-app-file-cgi/3.0.9/series | 1 -
patches/wai/3.0.4.0/no-bytestring-builder | 12 --
patches/wai/3.0.4.0/series | 1 -
patches/wai/3.2.0/no-bytestring-builder | 12 --
patches/wai/3.2.0/series | 1 -
...aze-builder-conduit-and-no-network-conduit.diff | 18 --
patches/warp/2.1.5.2/series | 1 -
patches/warp/3.1.3.1/no-bytestring-builder | 22 ---
patches/warp/3.1.3.1/series | 1 -
patches/warp/3.2.3/no-bytestring-builder | 22 ---
patches/warp/3.2.3/series | 1 -
patches/warp/3.2.6/no-bytestring-builder | 22 ---
patches/warp/3.2.6/series | 1 -
patches/warp/3.2.7/no-bytestring-builder | 22 ---
patches/warp/3.2.7/series | 1 -
patches/wl-pprint-terminfo/3.7.1.3/no-nats | 14 --
patches/wl-pprint-terminfo/3.7.1.3/series | 1 -
67 files changed, 914 deletions(-)
diff --git a/patches/git-annex/6.20161012/newer-persistent b/patches/git-annex/6.20161012/newer-persistent
deleted file mode 100644
index a268f07..0000000
--- a/patches/git-annex/6.20161012/newer-persistent
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/git-annex.cabal
-+++ b/git-annex.cabal
-@@ -362,7 +362,7 @@ Executable git-annex
- -- Old version needed due to
- -- https://github.com/prowdsponsor/esqueleto/issues/137
- -- and also temporarily to make ghc 8 builds work
-- persistent (< 2.5),
-+ persistent >= 2.6 && <2.7,
- persistent-template,
- aeson,
- unordered-containers,
diff --git a/patches/git-annex/6.20161012/series b/patches/git-annex/6.20161012/series
deleted file mode 100644
index 2883011..0000000
--- a/patches/git-annex/6.20161012/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-persistent
diff --git a/patches/haxr/3000.11.1.2/no-mtl-compat b/patches/haxr/3000.11.1.2/no-mtl-compat
deleted file mode 100644
index f50af19..0000000
--- a/patches/haxr/3000.11.1.2/no-mtl-compat
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/haxr.cabal
-+++ b/haxr.cabal
-@@ -34,8 +34,7 @@
- Library
- Build-depends: base < 5,
- base-compat >= 0.8 && < 0.9,
-- mtl,
-- mtl-compat,
-+ mtl >= 2.2.1,
- network < 2.7,
- http-streams,
- HsOpenSSL,
diff --git a/patches/haxr/3000.11.1.2/series b/patches/haxr/3000.11.1.2/series
deleted file mode 100644
index cc4c0b8..0000000
--- a/patches/haxr/3000.11.1.2/series
+++ /dev/null
@@ -1 +0,0 @@
-no-mtl-compat
diff --git a/patches/haxr/3000.11.1.3/no-mtl-compat b/patches/haxr/3000.11.1.3/no-mtl-compat
deleted file mode 100644
index ec78d8e..0000000
--- a/patches/haxr/3000.11.1.3/no-mtl-compat
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/haxr.cabal
-+++ b/haxr.cabal
-@@ -34,8 +34,7 @@
- Library
- Build-depends: base < 5,
- base-compat >= 0.8 && < 0.10,
-- mtl,
-- mtl-compat,
-+ mtl >= 2.2.1,
- network < 2.7,
- http-streams,
- HsOpenSSL,
diff --git a/patches/haxr/3000.11.1.3/series b/patches/haxr/3000.11.1.3/series
deleted file mode 100644
index cc4c0b8..0000000
--- a/patches/haxr/3000.11.1.3/series
+++ /dev/null
@@ -1 +0,0 @@
-no-mtl-compat
diff --git a/patches/haxr/3000.11.1.4/no-mtl-compat b/patches/haxr/3000.11.1.4/no-mtl-compat
deleted file mode 100644
index 9697dd4..0000000
--- a/patches/haxr/3000.11.1.4/no-mtl-compat
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/haxr.cabal
-+++ b/haxr.cabal
-@@ -35,8 +35,7 @@
- Library
- Build-depends: base < 5,
- base-compat >= 0.8 && < 0.10,
-- mtl,
-- mtl-compat,
-+ mtl >= 2.2.1,
- network < 2.7,
- http-streams,
- HsOpenSSL,
diff --git a/patches/haxr/3000.11.1.4/series b/patches/haxr/3000.11.1.4/series
deleted file mode 100644
index cc4c0b8..0000000
--- a/patches/haxr/3000.11.1.4/series
+++ /dev/null
@@ -1 +0,0 @@
-no-mtl-compat
diff --git a/patches/haxr/3000.11.1.5/no-mtl-compat b/patches/haxr/3000.11.1.5/no-mtl-compat
deleted file mode 100644
index 9697dd4..0000000
--- a/patches/haxr/3000.11.1.5/no-mtl-compat
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/haxr.cabal
-+++ b/haxr.cabal
-@@ -35,8 +35,7 @@
- Library
- Build-depends: base < 5,
- base-compat >= 0.8 && < 0.10,
-- mtl,
-- mtl-compat,
-+ mtl >= 2.2.1,
- network < 2.7,
- http-streams,
- HsOpenSSL,
diff --git a/patches/haxr/3000.11.1.5/series b/patches/haxr/3000.11.1.5/series
deleted file mode 100644
index cc4c0b8..0000000
--- a/patches/haxr/3000.11.1.5/series
+++ /dev/null
@@ -1 +0,0 @@
-no-mtl-compat
diff --git a/patches/haxr/3000.11.1.6/no-mtl-compat b/patches/haxr/3000.11.1.6/no-mtl-compat
deleted file mode 100644
index 9697dd4..0000000
--- a/patches/haxr/3000.11.1.6/no-mtl-compat
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/haxr.cabal
-+++ b/haxr.cabal
-@@ -35,8 +35,7 @@
- Library
- Build-depends: base < 5,
- base-compat >= 0.8 && < 0.10,
-- mtl,
-- mtl-compat,
-+ mtl >= 2.2.1,
- network < 2.7,
- http-streams,
- HsOpenSSL,
diff --git a/patches/haxr/3000.11.1.6/series b/patches/haxr/3000.11.1.6/series
deleted file mode 100644
index cc4c0b8..0000000
--- a/patches/haxr/3000.11.1.6/series
+++ /dev/null
@@ -1 +0,0 @@
-no-mtl-compat
diff --git a/patches/hledger-ui/0.27.5/newer-vty b/patches/hledger-ui/0.27.5/newer-vty
deleted file mode 100644
index 114e419..0000000
--- a/patches/hledger-ui/0.27.5/newer-vty
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/hledger-ui.cabal
-+++ b/hledger-ui.cabal
-@@ -71,7 +71,7 @@ executable hledger-ui
- , split >= 0.1 && < 0.3
- , transformers
- , vector
-- , vty >= 5.2 && < 5.6
-+ , vty >= 5.2 && < 5.12
- if impl(ghc >= 7.4)
- build-depends: pretty-show >= 1.6.4
- if flag(old-locale)
diff --git a/patches/hledger-ui/0.27.5/series b/patches/hledger-ui/0.27.5/series
deleted file mode 100644
index 287fa77..0000000
--- a/patches/hledger-ui/0.27.5/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-vty
diff --git a/patches/hledger-web/0.27/newer-hledger b/patches/hledger-web/0.27/newer-hledger
deleted file mode 100644
index de95c98..0000000
--- a/patches/hledger-web/0.27/newer-hledger
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/hledger-web.cabal
-+++ b/hledger-web.cabal
-@@ -129,8 +129,8 @@ library
- if flag(dev) || flag(library-only)
- cpp-options: -DDEVELOPMENT
- build-depends:
-- hledger-lib == 0.27
-- , hledger == 0.27
-+ hledger-lib == 0.27.1
-+ , hledger == 0.27.1
- , base >= 4 && < 5
- , base-compat >= 0.8.1
- , blaze-html
-@@ -202,8 +202,8 @@ executable hledger-web
- if flag(dev)
- cpp-options: -DDEVELOPMENT
- build-depends:
-- hledger-lib == 0.27
-- , hledger == 0.27
-+ hledger-lib == 0.27.1
-+ , hledger == 0.27.1
- , base >= 4 && < 5
- , base-compat >= 0.8.1
- , blaze-html
-@@ -255,8 +255,8 @@ test-suite test
- ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
- cpp-options: -DVERSION="0.27"
- build-depends:
-- hledger-lib == 0.27
-- , hledger == 0.27
-+ hledger-lib == 0.27.1
-+ , hledger == 0.27.1
- , base >= 4 && < 5
- , base-compat >= 0.8.1
- , blaze-html
diff --git a/patches/hledger-web/0.27/series b/patches/hledger-web/0.27/series
deleted file mode 100644
index c9ff34b..0000000
--- a/patches/hledger-web/0.27/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-hledger
diff --git a/patches/http2/1.0.4/no-bytestring-builder b/patches/http2/1.0.4/no-bytestring-builder
deleted file mode 100644
index 8787e74..0000000
--- a/patches/http2/1.0.4/no-bytestring-builder
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: haskell-http2/http2.cabal
-===================================================================
---- haskell-http2.orig/http2.cabal 2015-08-15 20:25:11.463990503 +0200
-+++ haskell-http2/http2.cabal 2015-08-15 20:28:03.616423219 +0200
-@@ -60,7 +60,6 @@
- Build-Depends: base >= 4.6 && < 5
- , array
- , bytestring >= 0.10
-- , bytestring-builder
- , containers >= 0.5
- , mwc-random
- , stm
-@@ -93,7 +92,6 @@
- Build-Depends: base >= 4 && < 5
- , array
- , bytestring
-- , bytestring-builder
- , containers
- , hex
- , hspec >= 1.3
-@@ -116,7 +114,6 @@
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , containers
- , directory
- , filepath
-@@ -165,7 +162,6 @@
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , containers
- , hex
- , text
-@@ -186,7 +182,6 @@
- , aeson
- , array
- , bytestring
-- , bytestring-builder
- , containers
- , hex
- , text
-@@ -208,7 +203,6 @@
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , containers
- , directory
- , filepath
diff --git a/patches/http2/1.0.4/series b/patches/http2/1.0.4/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/http2/1.0.4/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/http2/1.5.3/no-bytestring-builder b/patches/http2/1.5.3/no-bytestring-builder
deleted file mode 100644
index 06b81d7..0000000
--- a/patches/http2/1.5.3/no-bytestring-builder
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/http2.cabal 2016-05-26 00:14:32.217604284 -0400
-+++ b/http2.cabal 2016-05-26 00:14:39.597610033 -0400
-@@ -81,7 +81,6 @@
- Build-Depends: base >= 4.6 && < 5
- , array
- , bytestring >= 0.10
-- , bytestring-builder
- , containers >= 0.5
- , psqueues
- , stm
-@@ -113,7 +112,6 @@
- Build-Depends: base >= 4 && < 5
- , array
- , bytestring
-- , bytestring-builder
- , containers
- , hex
- , hspec >= 1.3
-@@ -135,7 +133,6 @@
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , containers
- , directory
- , filepath
-@@ -184,7 +181,6 @@
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , containers
- , hex
- , text
-@@ -205,7 +201,6 @@
- , aeson
- , array
- , bytestring
-- , bytestring-builder
- , containers
- , hex
- , text
-@@ -227,7 +222,6 @@
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , containers
- , directory
- , filepath
diff --git a/patches/http2/1.5.3/series b/patches/http2/1.5.3/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/http2/1.5.3/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/http2/1.6.0/no-bytestring-builder b/patches/http2/1.6.0/no-bytestring-builder
deleted file mode 100644
index e1e1b0f..0000000
--- a/patches/http2/1.6.0/no-bytestring-builder
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/http2.cabal
-+++ b/http2.cabal
-@@ -81,7 +81,6 @@ Library
- Build-Depends: base >= 4.6 && < 5
- , array
- , bytestring >= 0.10
-- , bytestring-builder
- , case-insensitive
- , containers >= 0.5
- , psqueues
-@@ -114,7 +113,6 @@ Test-Suite spec
- Build-Depends: base >= 4 && < 5
- , array
- , bytestring
-- , bytestring-builder
- , case-insensitive
- , containers
- , hex
-@@ -137,7 +135,6 @@ Test-Suite hpack
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , case-insensitive
- , containers
- , directory
-@@ -187,7 +184,6 @@ Executable hpack-encode
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , case-insensitive
- , containers
- , hex
-@@ -209,7 +205,6 @@ Executable hpack-debug
- , aeson
- , array
- , bytestring
-- , bytestring-builder
- , case-insensitive
- , containers
- , hex
-@@ -232,7 +227,6 @@ Executable hpack-stat
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , case-insensitive
- , containers
- , directory
diff --git a/patches/http2/1.6.0/series b/patches/http2/1.6.0/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/http2/1.6.0/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/http2/1.6.1/no-bytestring-builder b/patches/http2/1.6.1/no-bytestring-builder
deleted file mode 100644
index e1e1b0f..0000000
--- a/patches/http2/1.6.1/no-bytestring-builder
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/http2.cabal
-+++ b/http2.cabal
-@@ -81,7 +81,6 @@ Library
- Build-Depends: base >= 4.6 && < 5
- , array
- , bytestring >= 0.10
-- , bytestring-builder
- , case-insensitive
- , containers >= 0.5
- , psqueues
-@@ -114,7 +113,6 @@ Test-Suite spec
- Build-Depends: base >= 4 && < 5
- , array
- , bytestring
-- , bytestring-builder
- , case-insensitive
- , containers
- , hex
-@@ -137,7 +135,6 @@ Test-Suite hpack
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , case-insensitive
- , containers
- , directory
-@@ -187,7 +184,6 @@ Executable hpack-encode
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , case-insensitive
- , containers
- , hex
-@@ -209,7 +205,6 @@ Executable hpack-debug
- , aeson
- , array
- , bytestring
-- , bytestring-builder
- , case-insensitive
- , containers
- , hex
-@@ -232,7 +227,6 @@ Executable hpack-stat
- , aeson-pretty
- , array
- , bytestring
-- , bytestring-builder
- , case-insensitive
- , containers
- , directory
diff --git a/patches/http2/1.6.1/series b/patches/http2/1.6.1/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/http2/1.6.1/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/io-streams/1.3.2.0/no-bytestring-builder b/patches/io-streams/1.3.2.0/no-bytestring-builder
deleted file mode 100644
index 3d16c19..0000000
--- a/patches/io-streams/1.3.2.0/no-bytestring-builder
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: haskell-io-streams/io-streams.cabal
-===================================================================
---- haskell-io-streams.orig/io-streams.cabal 2015-08-15 20:34:13.426298999 +0200
-+++ haskell-io-streams/io-streams.cabal 2015-08-15 20:35:38.632619684 +0200
-@@ -120,7 +120,6 @@
- Build-depends: base >= 4 && <5,
- attoparsec >= 0.10 && <0.14,
- bytestring >= 0.9 && <0.11,
-- bytestring-builder >= 0.10 && <0.11,
- network >= 2.3 && <2.7,
- primitive >= 0.2 && <0.7,
- process >= 1.1 && <1.3,
-@@ -201,7 +200,6 @@
- Build-depends: base >= 4 && <5,
- attoparsec >= 0.10 && <0.14,
- bytestring >= 0.9 && <0.11,
-- bytestring-builder >= 0.10 && <0.11,
- deepseq >= 1.2 && <1.5,
- directory >= 1.1 && <2,
- filepath >= 1.2 && <2,
diff --git a/patches/io-streams/1.3.2.0/series b/patches/io-streams/1.3.2.0/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/io-streams/1.3.2.0/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/lambdabot-core/5.0.3/newer-dependent-map b/patches/lambdabot-core/5.0.3/newer-dependent-map
deleted file mode 100644
index c1766f1..0000000
--- a/patches/lambdabot-core/5.0.3/newer-dependent-map
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/lambdabot-core.cabal
-+++ b/lambdabot-core.cabal
-@@ -67,12 +67,12 @@
- Lambdabot.Util.Serial
- Lambdabot.Util.Signals
-
-- build-depends: base >= 4.4 && < 5,
-+ build-depends: base >= 4.8 && < 5,
- binary >= 0.5,
- bytestring >= 0.9,
- containers >= 0.4,
-- dependent-map == 0.1.*,
-- dependent-sum == 0.2.*,
-+ dependent-map == 0.2.*,
-+ dependent-sum == 0.3.*,
- dependent-sum-template >= 0.0.0.1,
- directory >= 1.1,
- edit-distance >= 0.2,
---- a/src/Lambdabot/Monad.hs
-+++ b/src/Lambdabot/Monad.hs
-@@ -55,6 +55,7 @@
- import Control.Monad.State
- import Control.Monad.Trans.Control
- import qualified Data.Dependent.Map as D
-+import Data.Functor.Identity (Identity(..))
- import Data.IORef
- import qualified Data.Map as M
- import qualified Data.Set as S
-@@ -69,11 +70,11 @@
- data IRCRState = IRCRState
- { ircInitDoneMVar :: MVar ()
- , ircQuitMVar :: MVar ()
-- , ircConfig :: D.DMap Config
-+ , ircConfig :: D.DMap Config Identity
- }
-
- -- | Default ro state
--initRoState :: [D.DSum Config] -> IO IRCRState
-+initRoState :: [D.DSum Config Identity] -> IO IRCRState
- initRoState configuration = do
- quitMVar <- newEmptyMVar
- initDoneMVar <- newEmptyMVar
-@@ -81,7 +82,7 @@
- return IRCRState
- { ircQuitMVar = quitMVar
- , ircInitDoneMVar = initDoneMVar
-- , ircConfig = D.fromListWithKey (flip . mergeConfig) configuration
-+ , ircConfig = D.fromListWithKey (liftA2 . flip . mergeConfig) configuration
- }
-
- reportInitDone :: MonadIO m => IRCRState -> m ()
-@@ -225,7 +226,7 @@
- lift $ writeIORef ref x
-
- instance MonadConfig LB where
-- getConfig k = liftM (maybe (getConfigDefault k) id . D.lookup k) (lb (askLB ircConfig))
-+ getConfig k = liftM (maybe (getConfigDefault k) id . fmap runIdentity . D.lookup k) (lb (askLB ircConfig))
-
- instance MonadLogging LB where
- getCurrentLogger = getConfig lbRootLoggerPath
---- a/src/Lambdabot/Main.hs
-+++ b/src/Lambdabot/Main.hs
-@@ -25,6 +25,7 @@
-
- import Control.Exception.Lifted as E
- import Data.Dependent.Sum
-+import Data.Functor.Identity (Identity)
- import Data.List
- import Data.Typeable
- import Data.Version
-@@ -63,7 +64,7 @@
- -- Also, handle any fatal exceptions (such as non-recoverable signals),
- -- (i.e. print a message and exit). Non-fatal exceptions should be dealt
- -- with in the mainLoop or further down.
--lambdabotMain :: LB () -> [DSum Config] -> IO ExitCode
-+lambdabotMain :: LB () -> [DSum Config Identity] -> IO ExitCode
- lambdabotMain initialise cfg = withSocketsDo . withIrcSignalCatch $ do
- rost <- initRoState cfg
- r <- try $ evalLB (do setupLogging
diff --git a/patches/lambdabot-core/5.0.3/series b/patches/lambdabot-core/5.0.3/series
deleted file mode 100644
index b4c4258..0000000
--- a/patches/lambdabot-core/5.0.3/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-dependent-map
diff --git a/patches/postgresql-simple/0.5.1.2/no-bytestring-builder b/patches/postgresql-simple/0.5.1.2/no-bytestring-builder
deleted file mode 100644
index dfc0cab..0000000
--- a/patches/postgresql-simple/0.5.1.2/no-bytestring-builder
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/postgresql-simple.cabal
-+++ b/postgresql-simple.cabal
-@@ -58,7 +58,6 @@
- attoparsec >= 0.10.3,
- base >= 4.4 && < 5,
- bytestring >= 0.9,
-- bytestring-builder,
- case-insensitive,
- containers,
- hashable,
diff --git a/patches/postgresql-simple/0.5.1.2/series b/patches/postgresql-simple/0.5.1.2/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/postgresql-simple/0.5.1.2/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/postgresql-simple/0.5.1.3/no-bytestring-builder b/patches/postgresql-simple/0.5.1.3/no-bytestring-builder
deleted file mode 100644
index dfc0cab..0000000
--- a/patches/postgresql-simple/0.5.1.3/no-bytestring-builder
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/postgresql-simple.cabal
-+++ b/postgresql-simple.cabal
-@@ -58,7 +58,6 @@
- attoparsec >= 0.10.3,
- base >= 4.4 && < 5,
- bytestring >= 0.9,
-- bytestring-builder,
- case-insensitive,
- containers,
- hashable,
diff --git a/patches/postgresql-simple/0.5.1.3/series b/patches/postgresql-simple/0.5.1.3/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/postgresql-simple/0.5.1.3/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/postgresql-simple/0.5.2.0/no-bytestring-builder b/patches/postgresql-simple/0.5.2.0/no-bytestring-builder
deleted file mode 100644
index 34af159..0000000
--- a/patches/postgresql-simple/0.5.2.0/no-bytestring-builder
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: haskell-postgresql-simple/postgresql-simple.cabal
-===================================================================
---- haskell-postgresql-simple.orig/postgresql-simple.cabal 2016-06-01 12:53:58.863704622 +0200
-+++ haskell-postgresql-simple/postgresql-simple.cabal 2016-06-01 12:53:58.859704518 +0200
-@@ -59,7 +59,6 @@
- attoparsec >= 0.10.3,
- base >= 4.4 && < 5,
- bytestring >= 0.9,
-- bytestring-builder,
- case-insensitive,
- containers,
- hashable,
diff --git a/patches/postgresql-simple/0.5.2.0/series b/patches/postgresql-simple/0.5.2.0/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/postgresql-simple/0.5.2.0/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/tasty-golden/2.2.2.4/series b/patches/tasty-golden/2.2.2.4/series
deleted file mode 100644
index 7bb70c9..0000000
--- a/patches/tasty-golden/2.2.2.4/series
+++ /dev/null
@@ -1 +0,0 @@
-use-temporary
diff --git a/patches/tasty-golden/2.2.2.4/use-temporary b/patches/tasty-golden/2.2.2.4/use-temporary
deleted file mode 100644
index 93d00ea..0000000
--- a/patches/tasty-golden/2.2.2.4/use-temporary
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: tasty-golden-2.2.2.4/tasty-golden.cabal
-===================================================================
---- tasty-golden-2.2.2.4.orig/tasty-golden.cabal 2014-08-03 19:33:04.015287189 +0200
-+++ tasty-golden-2.2.2.4/tasty-golden.cabal 2014-08-03 19:37:03.255279185 +0200
-@@ -43,7 +43,7 @@
- mtl,
- optparse-applicative,
- filepath,
-- temporary-rc,
-+ temporary (>= 1.2.0.3),
- tagged,
- deepseq,
- containers,
-@@ -67,4 +67,4 @@
- , filepath
- , directory
- , process
-- , temporary-rc
-+ , temporary (>= 1.2.0.3)
diff --git a/patches/tasty-golden/2.3.0.1/series b/patches/tasty-golden/2.3.0.1/series
deleted file mode 100644
index 7bb70c9..0000000
--- a/patches/tasty-golden/2.3.0.1/series
+++ /dev/null
@@ -1 +0,0 @@
-use-temporary
diff --git a/patches/tasty-golden/2.3.0.1/use-temporary b/patches/tasty-golden/2.3.0.1/use-temporary
deleted file mode 100644
index 93d00ea..0000000
--- a/patches/tasty-golden/2.3.0.1/use-temporary
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: tasty-golden-2.2.2.4/tasty-golden.cabal
-===================================================================
---- tasty-golden-2.2.2.4.orig/tasty-golden.cabal 2014-08-03 19:33:04.015287189 +0200
-+++ tasty-golden-2.2.2.4/tasty-golden.cabal 2014-08-03 19:37:03.255279185 +0200
-@@ -43,7 +43,7 @@
- mtl,
- optparse-applicative,
- filepath,
-- temporary-rc,
-+ temporary (>= 1.2.0.3),
- tagged,
- deepseq,
- containers,
-@@ -67,4 +67,4 @@
- , filepath
- , directory
- , process
-- , temporary-rc
-+ , temporary (>= 1.2.0.3)
diff --git a/patches/tasty-golden/2.3.1/series b/patches/tasty-golden/2.3.1/series
deleted file mode 100644
index 7bb70c9..0000000
--- a/patches/tasty-golden/2.3.1/series
+++ /dev/null
@@ -1 +0,0 @@
-use-temporary
diff --git a/patches/tasty-golden/2.3.1/use-temporary b/patches/tasty-golden/2.3.1/use-temporary
deleted file mode 100644
index 3f354b8..0000000
--- a/patches/tasty-golden/2.3.1/use-temporary
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/tasty-golden.cabal
-+++ b/tasty-golden.cabal
-@@ -43,7 +43,7 @@
- mtl,
- optparse-applicative,
- filepath,
-- temporary,
-+ temporary >= 1.2.0.3,
- tagged,
- deepseq,
- containers,
-@@ -67,4 +67,4 @@
- , filepath
- , directory
- , process
-- , temporary-rc
-+ , temporary >= 1.2.0.3
diff --git a/patches/text-show/2.1.1/series b/patches/text-show/2.1.1/series
deleted file mode 100644
index ee334ee..0000000
--- a/patches/text-show/2.1.1/series
+++ /dev/null
@@ -1,3 +0,0 @@
-no-nats
-no-bytestring-builder
-errorcallwithlocation
diff --git a/patches/text-show/2.1.2/series b/patches/text-show/2.1.2/series
deleted file mode 100644
index 32559cf..0000000
--- a/patches/text-show/2.1.2/series
+++ /dev/null
@@ -1,2 +0,0 @@
-no-nats
-no-bytestring-builder
diff --git a/patches/wai-app-file-cgi/2.0.4/0001-WAI-3.0.patch b/patches/wai-app-file-cgi/2.0.4/0001-WAI-3.0.patch
deleted file mode 100644
index 4200142..0000000
--- a/patches/wai-app-file-cgi/2.0.4/0001-WAI-3.0.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 458d3a8df5409e94612519739003e08304864482 Mon Sep 17 00:00:00 2001
-From: Michael Snoyman <michael at snoyman.com>
-Date: Sun, 15 Jun 2014 09:14:17 +0300
-Subject: [PATCH 1/3] WAI 3.0
-
----
- Network/Wai/Application/Classic/CGI.hs | 21 +++++++++++----------
- Network/Wai/Application/Classic/File.hs | 6 +++---
- Network/Wai/Application/Classic/Redirect.hs | 7 +++----
- Network/Wai/Application/Classic/RevProxy.hs | 13 +++++++------
- wai-app-file-cgi.cabal | 3 ++-
- 5 files changed, 26 insertions(+), 24 deletions(-)
-
---- a/Network/Wai/Application/Classic/CGI.hs
-+++ b/Network/Wai/Application/Classic/CGI.hs
-@@ -5,8 +5,8 @@ module Network.Wai.Application.Classic.C
- ) where
-
- import Blaze.ByteString.Builder (Builder)
--import qualified Control.Exception as E (SomeException, IOException, try, catch)
--import Control.Monad (when)
-+import qualified Control.Exception as E (SomeException, IOException, try, catch, bracket)
-+import Control.Monad (when, (<=<))
- import Data.ByteString (ByteString)
- import qualified Data.ByteString.Char8 as BS (readInt, unpack, tail)
- import Data.Conduit
-@@ -15,6 +15,7 @@ import qualified Data.Conduit.List as CL
- import Network.HTTP.Types
- import Network.SockAddr
- import Network.Wai
-+import Network.Wai.Conduit
- import Network.Wai.Application.Classic.Conduit
- import Network.Wai.Application.Classic.Field
- import Network.Wai.Application.Classic.Header
-@@ -41,15 +42,15 @@ The program to link this library must ig
- > installHandler sigCHLD Ignore Nothing
- -}
- cgiApp :: ClassicAppSpec -> CgiAppSpec -> CgiRoute -> Application
--cgiApp cspec spec cgii req = case method of
-- Right GET -> cgiApp' False cspec spec cgii req
-- Right POST -> cgiApp' True cspec spec cgii req
-- _ -> return $ responseLBS methodNotAllowed405 textPlainHeader "Method Not Allowed\r\n" -- xxx
-+cgiApp cspec spec cgii req respond = case method of
-+ Right GET -> cgiApp' False cspec spec cgii req respond
-+ Right POST -> cgiApp' True cspec spec cgii req respond
-+ _ -> respond $ responseLBS methodNotAllowed405 textPlainHeader "Method Not Allowed\r\n" -- xxx
- where
- method = parseMethod $ requestMethod req
-
- cgiApp' :: Bool -> ClassicAppSpec -> CgiAppSpec -> CgiRoute -> Application
--cgiApp' body cspec spec cgii req = responseSourceBracket setup teardown cgi
-+cgiApp' body cspec spec cgii req respond = E.bracket setup teardown (respond <=< cgi)
- where
- setup = execProcess cspec spec cgii req
- teardown (rhdl,whdl,pid) = do
-@@ -66,9 +67,9 @@ cgiApp' body cspec spec cgii req = respo
- type TRYPATH = Either E.IOException String
-
- toCGI :: Handle -> Request -> IO ()
--toCGI whdl req = requestBody req $$ CB.sinkHandle whdl
-+toCGI whdl req = sourceRequestBody req $$ CB.sinkHandle whdl
-
--fromCGI :: Handle -> ClassicAppSpec -> Request -> IO (Status, RequestHeaders, Source IO (Flush Builder))
-+fromCGI :: Handle -> ClassicAppSpec -> Request -> IO Response
- fromCGI rhdl cspec req = do
- (src', hs) <- cgiHeader `E.catch` recover
- let (st, hdr, hasBody) = case check hs of
-@@ -78,7 +79,7 @@ fromCGI rhdl cspec req = do
- logger cspec req st Nothing
- let src | hasBody = src'
- | otherwise = CL.sourceNull
-- return (st, hdr', src)
-+ return $ responseSource st hdr' src
- where
- check hs = lookup hContentType hs >> case lookup hStatus hs of
- Nothing -> Just (ok200, hs)
---- a/Network/Wai/Application/Classic/File.hs
-+++ b/Network/Wai/Application/Classic/File.hs
-@@ -57,7 +57,7 @@ If-Modified-Since:, Range:, If-Range:, I
- -}
-
- fileApp :: ClassicAppSpec -> FileAppSpec -> FileRoute -> Application
--fileApp cspec spec filei req = do
-+fileApp cspec spec filei req respond = do
- RspSpec st body <- case method of
- Right GET -> processGET hinfo ishtml rfile
- Right HEAD -> processHEAD hinfo ishtml rfile
-@@ -67,8 +67,8 @@ fileApp cspec spec filei req = do
- BodyStatus -> bodyStatus st
- BodyFileNoBody hdr -> bodyFileNoBody st hdr
- BodyFile hdr afile rng -> bodyFile st hdr afile rng
-- liftIO $ logger cspec req st mlen
-- return response
-+ logger cspec req st mlen
-+ respond response
- where
- reqidx = indexRequestHeader (requestHeaders req)
- hinfo = HandlerInfo spec req reqidx file langs
---- a/Network/Wai/Application/Classic/Redirect.hs
-+++ b/Network/Wai/Application/Classic/Redirect.hs
-@@ -4,7 +4,6 @@ module Network.Wai.Application.Classic.R
- redirectApp
- ) where
-
--import Control.Monad.IO.Class (liftIO)
- import Data.ByteString.Char8
- import Network.HTTP.Types
- import Network.Wai
-@@ -13,9 +12,9 @@ import Network.Wai.Application.Classic.P
- import Network.Wai.Application.Classic.Types
-
- redirectApp :: ClassicAppSpec -> RedirectRoute -> Application
--redirectApp cspec route req = do
-- liftIO $ logger cspec req status Nothing
-- return $ responseLBS status hdr ""
-+redirectApp cspec route req respond = do
-+ logger cspec req status Nothing
-+ respond $ responseLBS status hdr ""
- where
- path = fromByteString $ rawPathInfo req
- src = redirectSrc route
---- a/Network/Wai/Application/Classic/RevProxy.hs
-+++ b/Network/Wai/Application/Classic/RevProxy.hs
-@@ -4,6 +4,7 @@ module Network.Wai.Application.Classic.R
-
- import Blaze.ByteString.Builder (Builder)
- import Control.Applicative
-+import Control.Exception (bracket)
- import Control.Monad
- import Control.Monad.IO.Class (liftIO)
- import Data.ByteString (ByteString)
-@@ -14,7 +15,7 @@ import Data.Default.Class
- import qualified Network.HTTP.Client as H
- import qualified Network.HTTP.Conduit as H
- import Network.HTTP.Types
--import Network.Wai
-+import Network.Wai.Conduit
- import Network.Wai.Application.Classic.Conduit
- import Network.Wai.Application.Classic.EventSource
- import Network.Wai.Application.Classic.Field
-@@ -27,7 +28,7 @@ import Network.Wai.Application.Classic.T
- -- | Relaying any requests as reverse proxy.
-
- revProxyApp :: ClassicAppSpec -> RevProxyAppSpec -> RevProxyRoute -> Application
--revProxyApp cspec spec route req = responseSourceBracket setup teardown proxy
-+revProxyApp cspec spec route req respond = bracket setup teardown proxy
- where
- setup = H.responseOpen httpClientRequest mgr
- teardown = H.responseClose
-@@ -38,7 +39,7 @@ revProxyApp cspec spec route req = respo
- ct = lookup hContentType hdr
- src = toSource ct clientBody
- logger cspec req status (fromIntegral <$> mlen)
-- return (status, hdr, src)
-+ respond $ responseSource status hdr src
-
- httpClientRequest = reqToHReq req route
- mgr = revProxyManager spec
-@@ -86,9 +87,9 @@ reqToHReq req route = def {
- Just (63, q') -> q' -- '?' is 63
- _ -> q
-
--bodyToHBody :: RequestBodyLength -> Source IO ByteString -> H.RequestBody
--bodyToHBody ChunkedBody src = H.requestBodySourceChunkedIO src
--bodyToHBody (KnownLength len) src = H.requestBodySourceIO (fromIntegral len) src
-+bodyToHBody :: RequestBodyLength -> IO ByteString -> H.RequestBody
-+bodyToHBody ChunkedBody src = H.RequestBodyStreamChunked ($ src)
-+bodyToHBody (KnownLength len) src = H.RequestBodyStream (fromIntegral len) ($ src)
-
- ----------------------------------------------------------------
-
---- a/wai-app-file-cgi.cabal
-+++ b/wai-app-file-cgi.cabal
-@@ -60,7 +60,8 @@ Library
- , text
- , transformers
- , unix
-- , wai >= 2.0
-+ , wai >= 3.0 && < 3.1
-+ , wai-conduit
- , word8
-
- Test-Suite doctest
diff --git a/patches/wai-app-file-cgi/2.0.4/no-attoparsec-conduit.diff b/patches/wai-app-file-cgi/2.0.4/no-attoparsec-conduit.diff
deleted file mode 100644
index 61ee7c6..0000000
--- a/patches/wai-app-file-cgi/2.0.4/no-attoparsec-conduit.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/wai-app-file-cgi.cabal
-+++ b/wai-app-file-cgi.cabal
-@@ -36,7 +36,6 @@
- Build-Depends: base >= 4 && < 5
- , array
- , attoparsec >= 0.10.0.0
-- , attoparsec-conduit
- , blaze-builder
- , blaze-html
- , bytestring
diff --git a/patches/wai-app-file-cgi/2.0.4/series b/patches/wai-app-file-cgi/2.0.4/series
deleted file mode 100644
index 6787482..0000000
--- a/patches/wai-app-file-cgi/2.0.4/series
+++ /dev/null
@@ -1,2 +0,0 @@
-no-attoparsec-conduit.diff
-0001-WAI-3.0.patch
diff --git a/patches/wai-app-file-cgi/3.0.1/no-attoparsec-conduit.diff b/patches/wai-app-file-cgi/3.0.1/no-attoparsec-conduit.diff
deleted file mode 100644
index 61ee7c6..0000000
--- a/patches/wai-app-file-cgi/3.0.1/no-attoparsec-conduit.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/wai-app-file-cgi.cabal
-+++ b/wai-app-file-cgi.cabal
-@@ -36,7 +36,6 @@
- Build-Depends: base >= 4 && < 5
- , array
- , attoparsec >= 0.10.0.0
-- , attoparsec-conduit
- , blaze-builder
- , blaze-html
- , bytestring
diff --git a/patches/wai-app-file-cgi/3.0.1/series b/patches/wai-app-file-cgi/3.0.1/series
deleted file mode 100644
index 89ad6b7..0000000
--- a/patches/wai-app-file-cgi/3.0.1/series
+++ /dev/null
@@ -1 +0,0 @@
-no-attoparsec-conduit.diff
diff --git a/patches/wai-app-file-cgi/3.0.7/no-attoparsec-conduit.diff b/patches/wai-app-file-cgi/3.0.7/no-attoparsec-conduit.diff
deleted file mode 100644
index f0600f6..0000000
--- a/patches/wai-app-file-cgi/3.0.7/no-attoparsec-conduit.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: wai-app-file-cgi-3.0.7/wai-app-file-cgi.cabal
-===================================================================
---- wai-app-file-cgi-3.0.7.orig/wai-app-file-cgi.cabal 2015-05-22 09:21:52.746446082 +0200
-+++ wai-app-file-cgi-3.0.7/wai-app-file-cgi.cabal 2015-05-22 09:21:52.742446013 +0200
-@@ -36,7 +36,6 @@
- Build-Depends: base >= 4 && < 5
- , array
- , attoparsec >= 0.10.0.0
-- , attoparsec-conduit
- , blaze-builder
- , blaze-html
- , bytestring
diff --git a/patches/wai-app-file-cgi/3.0.7/series b/patches/wai-app-file-cgi/3.0.7/series
deleted file mode 100644
index 89ad6b7..0000000
--- a/patches/wai-app-file-cgi/3.0.7/series
+++ /dev/null
@@ -1 +0,0 @@
-no-attoparsec-conduit.diff
diff --git a/patches/wai-app-file-cgi/3.0.9/no-attoparsec-conduit.diff b/patches/wai-app-file-cgi/3.0.9/no-attoparsec-conduit.diff
deleted file mode 100644
index f0600f6..0000000
--- a/patches/wai-app-file-cgi/3.0.9/no-attoparsec-conduit.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: wai-app-file-cgi-3.0.7/wai-app-file-cgi.cabal
-===================================================================
---- wai-app-file-cgi-3.0.7.orig/wai-app-file-cgi.cabal 2015-05-22 09:21:52.746446082 +0200
-+++ wai-app-file-cgi-3.0.7/wai-app-file-cgi.cabal 2015-05-22 09:21:52.742446013 +0200
-@@ -36,7 +36,6 @@
- Build-Depends: base >= 4 && < 5
- , array
- , attoparsec >= 0.10.0.0
-- , attoparsec-conduit
- , blaze-builder
- , blaze-html
- , bytestring
diff --git a/patches/wai-app-file-cgi/3.0.9/series b/patches/wai-app-file-cgi/3.0.9/series
deleted file mode 100644
index 89ad6b7..0000000
--- a/patches/wai-app-file-cgi/3.0.9/series
+++ /dev/null
@@ -1 +0,0 @@
-no-attoparsec-conduit.diff
diff --git a/patches/wai/3.0.4.0/no-bytestring-builder b/patches/wai/3.0.4.0/no-bytestring-builder
deleted file mode 100644
index 1e22f6e..0000000
--- a/patches/wai/3.0.4.0/no-bytestring-builder
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/wai.cabal
-+++ b/wai.cabal
-@@ -20,8 +20,7 @@
-
- Library
- Build-Depends: base >= 4 && < 5
-- , bytestring >= 0.9.1.4
-- , bytestring-builder >= 0.10.4.0 && < 0.10.7
-+ , bytestring >= 0.10.4
- , blaze-builder >= 0.2.1.4 && < 0.5
- , network >= 2.2.1.5
- , http-types >= 0.7
diff --git a/patches/wai/3.0.4.0/series b/patches/wai/3.0.4.0/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/wai/3.0.4.0/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/wai/3.2.0/no-bytestring-builder b/patches/wai/3.2.0/no-bytestring-builder
deleted file mode 100644
index 3413ebc..0000000
--- a/patches/wai/3.2.0/no-bytestring-builder
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/wai.cabal
-+++ b/wai.cabal
-@@ -20,8 +20,7 @@
-
- Library
- Build-Depends: base >= 4 && < 5
-- , bytestring >= 0.10
-- , bytestring-builder >= 0.10.4.0 && < 0.10.7
-+ , bytestring >= 0.10.4
- , blaze-builder >= 0.2.1.4 && < 0.5
- , network >= 2.2.1.5
- , http-types >= 0.7
diff --git a/patches/wai/3.2.0/series b/patches/wai/3.2.0/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/wai/3.2.0/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/warp/2.1.5.2/no-blaze-builder-conduit-and-no-network-conduit.diff b/patches/warp/2.1.5.2/no-blaze-builder-conduit-and-no-network-conduit.diff
deleted file mode 100644
index 540cec8..0000000
--- a/patches/warp/2.1.5.2/no-blaze-builder-conduit-and-no-network-conduit.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/warp.cabal
-+++ b/warp.cabal
-@@ -39,7 +39,6 @@
- Build-Depends: base >= 3 && < 5
- , array
- , blaze-builder >= 0.3.3 && < 0.4
-- , blaze-builder-conduit >= 0.5 && < 1.2
- , bytestring >= 0.9.1.4
- , case-insensitive >= 0.2
- , conduit >= 0.5 && < 1.2
-@@ -47,7 +46,6 @@
- , ghc-prim
- , http-types >= 0.7
- , lifted-base >= 0.1
-- , network-conduit >= 0.5 && < 1.2
- , simple-sendfile >= 0.2.7 && < 0.3
- , transformers >= 0.2.2
- , unix-compat >= 0.2
diff --git a/patches/warp/2.1.5.2/series b/patches/warp/2.1.5.2/series
deleted file mode 100644
index 8d82af9..0000000
--- a/patches/warp/2.1.5.2/series
+++ /dev/null
@@ -1 +0,0 @@
-no-blaze-builder-conduit-and-no-network-conduit.diff
diff --git a/patches/warp/3.1.3.1/no-bytestring-builder b/patches/warp/3.1.3.1/no-bytestring-builder
deleted file mode 100644
index e3521f8..0000000
--- a/patches/warp/3.1.3.1/no-bytestring-builder
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/warp.cabal
-+++ b/warp.cabal
-@@ -35,8 +35,7 @@
- , array
- , auto-update >= 0.1.1 && < 0.2
- , blaze-builder >= 0.4
-- , bytestring >= 0.9.1.4
-- , bytestring-builder
-+ , bytestring >= 0.10.4
- , case-insensitive >= 0.2
- , containers
- , ghc-prim
-@@ -133,8 +132,7 @@
- , array
- , auto-update
- , blaze-builder >= 0.4
-- , bytestring >= 0.9.1.4
-- , bytestring-builder
-+ , bytestring >= 0.10.4
- , case-insensitive >= 0.2
- , ghc-prim
- , HTTP
diff --git a/patches/warp/3.1.3.1/series b/patches/warp/3.1.3.1/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/warp/3.1.3.1/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/warp/3.2.3/no-bytestring-builder b/patches/warp/3.2.3/no-bytestring-builder
deleted file mode 100644
index eff55d3..0000000
--- a/patches/warp/3.2.3/no-bytestring-builder
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/warp.cabal
-+++ b/warp.cabal
-@@ -36,8 +36,7 @@
- , array
- , auto-update >= 0.1.3 && < 0.2
- , blaze-builder >= 0.4
-- , bytestring >= 0.9.1.4
-- , bytestring-builder
-+ , bytestring >= 0.10.4
- , case-insensitive >= 0.2
- , containers
- , ghc-prim
-@@ -138,8 +137,7 @@
- , array
- , auto-update
- , blaze-builder >= 0.4
-- , bytestring >= 0.9.1.4
-- , bytestring-builder
-+ , bytestring >= 0.10.4
- , case-insensitive >= 0.2
- , ghc-prim
- , HTTP
diff --git a/patches/warp/3.2.3/series b/patches/warp/3.2.3/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/warp/3.2.3/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/warp/3.2.6/no-bytestring-builder b/patches/warp/3.2.6/no-bytestring-builder
deleted file mode 100644
index 92b7b9a..0000000
--- a/patches/warp/3.2.6/no-bytestring-builder
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/warp.cabal
-+++ b/warp.cabal
-@@ -37,8 +37,7 @@ Library
- , async
- , auto-update >= 0.1.3 && < 0.2
- , blaze-builder >= 0.4
-- , bytestring >= 0.9.1.4
-- , bytestring-builder
-+ , bytestring >= 0.10.4
- , case-insensitive >= 0.2
- , containers
- , ghc-prim
-@@ -143,8 +142,7 @@ Test-Suite spec
- , array
- , auto-update
- , blaze-builder >= 0.4
-- , bytestring >= 0.9.1.4
-- , bytestring-builder
-+ , bytestring >= 0.10.4
- , case-insensitive >= 0.2
- , ghc-prim
- , HTTP
diff --git a/patches/warp/3.2.6/series b/patches/warp/3.2.6/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/warp/3.2.6/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/warp/3.2.7/no-bytestring-builder b/patches/warp/3.2.7/no-bytestring-builder
deleted file mode 100644
index 92b7b9a..0000000
--- a/patches/warp/3.2.7/no-bytestring-builder
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/warp.cabal
-+++ b/warp.cabal
-@@ -37,8 +37,7 @@ Library
- , async
- , auto-update >= 0.1.3 && < 0.2
- , blaze-builder >= 0.4
-- , bytestring >= 0.9.1.4
-- , bytestring-builder
-+ , bytestring >= 0.10.4
- , case-insensitive >= 0.2
- , containers
- , ghc-prim
-@@ -143,8 +142,7 @@ Test-Suite spec
- , array
- , auto-update
- , blaze-builder >= 0.4
-- , bytestring >= 0.9.1.4
-- , bytestring-builder
-+ , bytestring >= 0.10.4
- , case-insensitive >= 0.2
- , ghc-prim
- , HTTP
diff --git a/patches/warp/3.2.7/series b/patches/warp/3.2.7/series
deleted file mode 100644
index d61cbb2..0000000
--- a/patches/warp/3.2.7/series
+++ /dev/null
@@ -1 +0,0 @@
-no-bytestring-builder
diff --git a/patches/wl-pprint-terminfo/3.7.1.3/no-nats b/patches/wl-pprint-terminfo/3.7.1.3/no-nats
deleted file mode 100644
index 7f7d7de..0000000
--- a/patches/wl-pprint-terminfo/3.7.1.3/no-nats
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/wl-pprint-terminfo.cabal
-+++ b/wl-pprint-terminfo.cabal
-@@ -46,10 +46,9 @@
- other-extensions: TypeFamilies
-
- build-depends:
-- base == 4.*,
-+ base >= 4.8 && < 5,
- bytestring >= 0.9.1 && < 0.11,
- containers >= 0.4 && < 0.6,
-- nats >= 0.1 && < 2,
- semigroups >= 0.9 && < 1,
- wl-pprint-extras >= 3.4 && < 4,
- terminfo >= 0.3.2 && < 0.5,
diff --git a/patches/wl-pprint-terminfo/3.7.1.3/series b/patches/wl-pprint-terminfo/3.7.1.3/series
deleted file mode 100644
index ddd7d5b..0000000
--- a/patches/wl-pprint-terminfo/3.7.1.3/series
+++ /dev/null
@@ -1 +0,0 @@
-no-nats
--
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