[Git][haskell-team/package-plan][master] 3 commits: io-streams: Refresh patches

[Ilias Tsitsimpis]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / package-plan


Commits:
cac5dcd0 by Ilias Tsitsimpis at 2021-04-11T19:48:53+03:00
io-streams: Refresh patches

- - - - -
a814d84b by Ilias Tsitsimpis at 2021-04-11T19:49:46+03:00
Update git-annex to 8.20210223

- - - - -
d467b238 by Ilias Tsitsimpis at 2021-04-11T19:54:21+03:00
snap-core: Refresh patches

- - - - -


3 changed files:

- packages.txt
- patches/io-streams/1.5.1.0/no-bytestring-builder
- patches/snap-core/1.0.4.2/no-bytestring-builder


Changes:

=====================================
packages.txt
=====================================
@@ -343,7 +343,7 @@ gi-gtk-hs 0.3.9 ahead
 gi-harfbuzz 0.0.3
 gio 0.13.8.1
 gi-pango 1.0.23 ahead
-git-annex 8.20201127 binary key -f-ConcurrentOutput
+git-annex 8.20210223 binary key -f-ConcurrentOutput
 githash 0.1.4.0
 github 0.23
 github-backup 1.20200721 binary key


=====================================
patches/io-streams/1.5.1.0/no-bytestring-builder
=====================================
@@ -3,7 +3,7 @@ Index: b/io-streams.cabal
 --- a/io-streams.cabal
 +++ b/io-streams.cabal
 @@ -122,7 +122,6 @@ Library
-   Build-depends:     base               >= 4     && <5,
+   Build-depends:     base               >= 4     && <4.15,
                       attoparsec         >= 0.10  && <0.14,
                       bytestring         >= 0.9   && <0.11,
 -                     bytestring-builder >= 0.10  && <0.11,


=====================================
patches/snap-core/1.0.4.2/no-bytestring-builder
=====================================
@@ -1,20 +1,22 @@
 Description: patch out use of bytestring-builder
 
+Index: b/snap-core.cabal
+===================================================================
 --- a/snap-core.cabal
 +++ b/snap-core.cabal
-@@ -134,7 +134,6 @@
-     attoparsec                >= 0.12    && < 0.14,
-     base                      >= 4       && < 5,
-     bytestring                >= 0.9     && < 0.11,
--    bytestring-builder        >= 0.10.4  && < 0.11,
-     case-insensitive          >= 1.1     && < 1.3,
-     containers                >= 0.3     && < 1.0,
-     directory                 >= 1       && < 2,
-@@ -247,7 +246,6 @@
-     attoparsec,
-     base,
-     bytestring,
--    bytestring-builder,
-     case-insensitive,
-     containers,
-     directory,
+@@ -135,7 +135,6 @@ Library
+     attoparsec                >= 0.12    && < 0.14,
+     base                      >= 4       && < 5,
+     bytestring                >= 0.9     && < 0.12,
+-    bytestring-builder        >= 0.10.4  && < 0.11,
+     case-insensitive          >= 1.1     && < 1.3,
+     containers                >= 0.3     && < 1.0,
+     directory                 >= 1       && < 2,
+@@ -248,7 +247,6 @@ Test-suite testsuite
+     attoparsec,
+     base,
+     bytestring,
+-    bytestring-builder,
+     case-insensitive,
+     containers,
+     directory,



View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/compare/6063498d859d427b2311ed7d6ad2d30e91b31f9d...d467b2384809b3704102934e24bb5e05ee659b10

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/compare/6063498d859d427b2311ed7d6ad2d30e91b31f9d...d467b2384809b3704102934e24bb5e05ee659b10
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/20210411/51d5a496/attachment-0001.htm>