[Git][haskell-team/package-plan][master] 2 commits: patches for bsb-http-chunked

Clint Adams gitlab at salsa.debian.org
Fri Apr 13 18:31:59 BST 2018


Clint Adams pushed to branch master at Debian Haskell Group / package-plan


Commits:
a8db085e by Clint Adams at 2018-04-13T12:57:20-04:00
patches for bsb-http-chunked

- - - - -
326c952b by Clint Adams at 2018-04-13T13:31:53-04:00
ugh

- - - - -


9 changed files:

- packages.txt
- + patches/bsb-http-chunked/0.0.0.2/no-bytestring-builder
- + patches/bsb-http-chunked/0.0.0.2/series
- − patches/statestack/0.2.0.5/newer-base-and-transformers-compat
- − patches/statestack/0.2.0.5/series
- − patches/tagged/0.8.5/newer-th
- − patches/tagged/0.8.5/series
- + patches/websockets/0.12.4.0/no-bytestring-builder
- + patches/websockets/0.12.4.0/series


Changes:

=====================================
packages.txt
=====================================
--- a/packages.txt
+++ b/packages.txt
@@ -921,7 +921,7 @@ web-routes-hsp 0.24.6.1 key
 web-routes-th 0.22.6.3 key
 websockets 0.12.4.0
 weigh 0.0.7
-werewolf 1.5.1.1
+werewolf 1.5.2.0 ignore # BROKEN: LTS 11: newer aeson
 with-location 0.1.0
 wizards 1.0.2
 wl-pprint-extras 3.5.0.5
@@ -956,8 +956,8 @@ yaml 0.8.29
 yesod 1.6.0
 yesod-auth 1.6.2
 yesod-auth-hashdb 1.7
-yesod-auth-oauth 1.4.2
-yesod-auth-oauth2 0.3.0
+yesod-auth-oauth 1.6.0
+yesod-auth-oauth2 0.4.1.0
 yesod-bin 1.6.0 binary=yesod
 yesod-core 1.6.2
 yesod-default 1.2.0


=====================================
patches/bsb-http-chunked/0.0.0.2/no-bytestring-builder
=====================================
--- /dev/null
+++ b/patches/bsb-http-chunked/0.0.0.2/no-bytestring-builder
@@ -0,0 +1,9 @@
+--- a/bsb-http-chunked.cabal
++++ b/bsb-http-chunked.cabal
+@@ -43,5 +43,4 @@
+                      Blaze.ByteString.Builder.Internal.Write
+ 
+   build-depends:     base >= 4.3 && < 4.12,
+-                     bytestring >= 0.9 && < 0.11,
+-                     bytestring-builder < 0.11
++                     bytestring >= 0.10.4


=====================================
patches/bsb-http-chunked/0.0.0.2/series
=====================================
--- /dev/null
+++ b/patches/bsb-http-chunked/0.0.0.2/series
@@ -0,0 +1 @@
+no-bytestring-builder


=====================================
patches/statestack/0.2.0.5/newer-base-and-transformers-compat deleted
=====================================
--- a/patches/statestack/0.2.0.5/newer-base-and-transformers-compat
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/statestack.cabal
-+++ b/statestack.cabal
-@@ -19,7 +19,7 @@
- Library
-   Default-language:    Haskell2010
-   Exposed-modules:     Control.Monad.StateStack
--  Build-depends:       base >= 4.2 && < 4.10,
-+  Build-depends:       base >= 4.2 && < 4.12,
-                        mtl >= 2.1 && < 2.3,
-                        transformers >= 0.3 && < 0.6,
--                       transformers-compat >= 0.4 && < 0.6
-+                       transformers-compat >= 0.4 && < 0.7


=====================================
patches/statestack/0.2.0.5/series deleted
=====================================
--- a/patches/statestack/0.2.0.5/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-base-and-transformers-compat


=====================================
patches/tagged/0.8.5/newer-th deleted
=====================================
--- a/patches/tagged/0.8.5/newer-th
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tagged.cabal
-+++ b/tagged.cabal
-@@ -57,7 +57,7 @@
- 
-   if impl(ghc>=7.6)
-     exposed-modules: Data.Proxy.TH
--    build-depends: template-haskell >= 2.8 && < 2.12
-+    build-depends: template-haskell >= 2.8 && < 2.14
- 
-   if flag(deepseq)
-     build-depends: deepseq >= 1.1 && < 1.5


=====================================
patches/tagged/0.8.5/series deleted
=====================================
--- a/patches/tagged/0.8.5/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-th


=====================================
patches/websockets/0.12.4.0/no-bytestring-builder
=====================================
--- /dev/null
+++ b/patches/websockets/0.12.4.0/no-bytestring-builder
@@ -0,0 +1,42 @@
+--- a/websockets.cabal
++++ b/websockets.cabal
+@@ -84,7 +84,6 @@
+     base64-bytestring >= 0.1    && < 1.1,
+     binary            >= 0.8.1  && < 0.10,
+     bytestring        >= 0.9    && < 0.11,
+-    bytestring-builder             < 0.11,
+     case-insensitive  >= 0.3    && < 1.3,
+     containers        >= 0.3    && < 0.6,
+     network           >= 2.3    && < 2.7,
+@@ -141,7 +140,6 @@
+     base64-bytestring >= 0.1    && < 1.1,
+     binary            >= 0.8.1  && < 0.10,
+     bytestring        >= 0.9    && < 0.11,
+-    bytestring-builder             < 0.11,
+     case-insensitive  >= 0.3    && < 1.3,
+     containers        >= 0.3    && < 0.6,
+     network           >= 2.3    && < 2.7,
+@@ -167,7 +165,6 @@
+     base64-bytestring >= 0.1    && < 1.1,
+     binary            >= 0.8.1  && < 0.10,
+     bytestring        >= 0.9    && < 0.11,
+-    bytestring-builder             < 0.11,
+     case-insensitive  >= 0.3    && < 1.3,
+     containers        >= 0.3    && < 0.6,
+     network           >= 2.3    && < 2.7,
+@@ -195,7 +192,6 @@
+     base64-bytestring >= 0.1    && < 1.1,
+     binary            >= 0.8.1  && < 0.10,
+     bytestring        >= 0.9    && < 0.11,
+-    bytestring-builder             < 0.11,
+     case-insensitive  >= 0.3    && < 1.3,
+     containers        >= 0.3    && < 0.6,
+     network           >= 2.3    && < 2.7,
+@@ -221,7 +217,6 @@
+         base64-bytestring >= 0.1    && < 1.1,
+         binary            >= 0.8.1  && < 0.10,
+         bytestring        >= 0.9    && < 0.11,
+-        bytestring-builder             < 0.11,
+         case-insensitive  >= 0.3    && < 1.3,
+         containers        >= 0.3    && < 0.6,
+         network           >= 2.3    && < 2.7,


=====================================
patches/websockets/0.12.4.0/series
=====================================
--- /dev/null
+++ b/patches/websockets/0.12.4.0/series
@@ -0,0 +1 @@
+no-bytestring-builder



View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/compare/54647cbb368160fd7d984e8188f6c2567a698db7...326c952b69339ea385baa2a863551ede84359db8

---
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/compare/54647cbb368160fd7d984e8188f6c2567a698db7...326c952b69339ea385baa2a863551ede84359db8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180413/ba042a45/attachment-0001.html>


More information about the Pkg-haskell-commits mailing list