[Git][haskell-team/package-plan][master] 2 commits: patch esqueleto
Clint Adams
gitlab at salsa.debian.org
Wed Apr 18 13:32:09 BST 2018
Clint Adams pushed to branch master at Debian Haskell Group / package-plan
Commits:
8ce86a18 by Clint Adams at 2018-04-17T20:34:32-04:00
patch esqueleto
- - - - -
682bb678 by Clint Adams at 2018-04-18T08:30:29-04:00
patch werewolf
- - - - -
9 changed files:
- packages.txt
- + patches/esqueleto/2.5.3/newer-persistent
- + patches/esqueleto/2.5.3/series
- − patches/werewolf/1.5.1.1/newer-aeson-and-lens
- − patches/werewolf/1.5.1.1/newer-directory
- − patches/werewolf/1.5.1.1/newer-extra-and-monadrandom
- − patches/werewolf/1.5.1.1/series
- + patches/werewolf/1.5.2.0/newer-deps
- + patches/werewolf/1.5.2.0/series
Changes:
=====================================
packages.txt
=====================================
--- a/packages.txt
+++ b/packages.txt
@@ -248,7 +248,7 @@ enummapset-th 0.6.1.1
equivalence 0.3.2
erf 2.0.0.0
errors 2.2.5
-esqueleto 2.5.3 ignore # BROKEN: LTS 11: newer persistent
+esqueleto 2.5.3
exact-pi 0.4.1.3
exceptions 0.8.3
exception-transformers 0.4.0.6
@@ -296,7 +296,7 @@ ghc-mtl 1.2.1.0
ghc-paths 0.1.0.9
ghc-syb-utils 0.2.3.3
gio 0.13.4.0
-git-annex 6.20180316 binary key -f-ConcurrentOutput ignore # BROKEN: LTS 11: via esqueleto
+git-annex 6.20180316 binary key -f-ConcurrentOutput
github 0.19
github-backup 1.20170301 binary key ignore # BROKEM: LTS 11: newer github
gitit 0.12.2.1 key ignore # BROKEN: LTS 11: newer time
@@ -937,7 +937,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.2.0 ignore # BROKEN: LTS 11: newer aeson
+werewolf 1.5.2.0
with-location 0.1.0
wizards 1.0.2
wl-pprint-annotated 0.1.0.0
=====================================
patches/esqueleto/2.5.3/newer-persistent
=====================================
--- /dev/null
+++ b/patches/esqueleto/2.5.3/newer-persistent
@@ -0,0 +1,43 @@
+From 7808bc982cd09530d2128c601f8e98156b756905 Mon Sep 17 00:00:00 2001
+From: Matt Parsons <parsonsmatt at gmail.com>
+Date: Fri, 19 Jan 2018 09:59:35 -0700
+Subject: [PATCH] Compatibility with new persistent
+
+---
+ esqueleto.cabal | 6 +++---
+ stack-8.2.yaml | 36 ++++++++++++++++++++++++++++++++++++
+ test/Test.hs | 2 +-
+ 3 files changed, 40 insertions(+), 4 deletions(-)
+ create mode 100644 stack-8.2.yaml
+
+--- a/esqueleto.cabal
++++ b/esqueleto.cabal
+@@ -66,14 +66,14 @@
+ base >= 4.8 && < 5.0
+ , bytestring
+ , text >= 0.11 && < 1.3
+- , persistent >= 2.5 && < 2.8
++ , persistent >= 2.8 && < 2.9
+ , transformers >= 0.2
+ , unordered-containers >= 0.2
+ , tagged >= 0.2
+
+ , monad-logger
+- , conduit >= 1.1
+- , resourcet >= 1.1
++ , conduit >= 1.3
++ , resourcet >= 1.2
+ , blaze-html
+ hs-source-dirs: src/
+ if impl(ghc >= 8.0)
+--- a/test/Test.hs
++++ b/test/Test.hs
+@@ -1465,7 +1465,7 @@
+ insert' v = flip Entity v <$> insert v
+
+
+-type RunDbMonad m = ( MonadBaseControl IO m, MonadIO m, MonadLogger m
++type RunDbMonad m = ( R.MonadUnliftIO m, MonadIO m, MonadLogger m
+ , R.MonadThrow m )
+
+ #if defined (WITH_POSTGRESQL) || defined (WITH_MYSQL)
=====================================
patches/esqueleto/2.5.3/series
=====================================
--- /dev/null
+++ b/patches/esqueleto/2.5.3/series
@@ -0,0 +1 @@
+newer-persistent
=====================================
patches/werewolf/1.5.1.1/newer-aeson-and-lens deleted
=====================================
--- a/patches/werewolf/1.5.1.1/newer-aeson-and-lens
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: b/werewolf.cabal
-===================================================================
---- a/werewolf.cabal
-+++ b/werewolf.cabal
-@@ -349,13 +349,13 @@ executable werewolf
- QuasiQuotes,
- Rank2Types
- build-depends:
-- aeson >= 0.8 && < 0.12,
-+ aeson >= 0.8 && < 1.2,
- base >= 4.8 && < 5,
- containers == 0.5.*,
- directory > 1.2,
- extra >= 1.4 && < 1.6,
- filepath == 1.4.*,
-- lens >= 4.12 && < 4.15,
-+ lens >= 4.12 && < 4.16,
- MonadRandom >= 0.4 && < 0.6,
- mtl == 2.2.*,
- optparse-applicative >= 0.11 && < 0.14,
-@@ -387,12 +387,12 @@ library
- Rank2Types,
- TemplateHaskell
- build-depends:
-- aeson >= 0.8 && < 0.12,
-+ aeson >= 0.8 && < 1.2,
- base >= 4.8 && < 5,
- containers == 0.5.*,
- extra >= 1.4 && < 1.6,
- interpolate == 0.1.*,
-- lens >= 4.12 && < 4.15,
-+ lens >= 4.12 && < 4.16,
- mtl == 2.2.*,
- template-haskell >= 2.10 && < 2.12,
- text == 1.2.*,
-Index: b/src/Game/Werewolf/Game.hs
-===================================================================
---- a/src/Game/Werewolf/Game.hs
-+++ b/src/Game/Werewolf/Game.hs
-@@ -131,7 +131,7 @@ makeLenses ''Game
- makePrisms ''Stage
-
- #if __GLASGOW_HASKELL__ >= 800
--activity :: Contravariant f => (Activity -> f Activity) -> Stage -> f Stage
-+activity :: (Functor f, Contravariant f) => (Activity -> f Activity) -> Stage -> f Stage
- #else
- activity :: Getter Stage Activity
- #endif
=====================================
patches/werewolf/1.5.1.1/newer-directory deleted
=====================================
--- a/patches/werewolf/1.5.1.1/newer-directory
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Bump directory bounds on buildds.
-Author: Bhavani Shankar <bhavi at ubuntu.com>
-
-Index: b/werewolf.cabal
-===================================================================
---- a/werewolf.cabal
-+++ b/werewolf.cabal
-@@ -352,7 +352,7 @@ executable werewolf
- aeson >= 0.8 && < 0.12,
- base >= 4.8 && < 5,
- containers == 0.5.*,
-- directory == 1.2.*,
-+ directory > 1.2,
- extra == 1.4.*,
- filepath == 1.4.*,
- lens >= 4.12 && < 4.15,
=====================================
patches/werewolf/1.5.1.1/newer-extra-and-monadrandom deleted
=====================================
--- a/patches/werewolf/1.5.1.1/newer-extra-and-monadrandom
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: b/werewolf.cabal
-===================================================================
---- a/werewolf.cabal
-+++ b/werewolf.cabal
-@@ -353,10 +353,10 @@ executable werewolf
- base >= 4.8 && < 5,
- containers == 0.5.*,
- directory > 1.2,
-- extra == 1.4.*,
-+ extra >= 1.4 && < 1.6,
- filepath == 1.4.*,
- lens >= 4.12 && < 4.15,
-- MonadRandom == 0.4.*,
-+ MonadRandom >= 0.4 && < 0.6,
- mtl == 2.2.*,
- optparse-applicative >= 0.11 && < 0.14,
- random-shuffle,
-@@ -390,7 +390,7 @@ library
- aeson >= 0.8 && < 0.12,
- base >= 4.8 && < 5,
- containers == 0.5.*,
-- extra == 1.4.*,
-+ extra >= 1.4 && < 1.6,
- interpolate == 0.1.*,
- lens >= 4.12 && < 4.15,
- mtl == 2.2.*,
=====================================
patches/werewolf/1.5.1.1/series deleted
=====================================
--- a/patches/werewolf/1.5.1.1/series
+++ /dev/null
@@ -1,3 +0,0 @@
-newer-directory
-newer-extra-and-monadrandom
-newer-aeson-and-lens
=====================================
patches/werewolf/1.5.2.0/newer-deps
=====================================
--- /dev/null
+++ b/patches/werewolf/1.5.2.0/newer-deps
@@ -0,0 +1,45 @@
+Description: Bump directory bounds on buildds.
+Author: Bhavani Shankar <bhavi at ubuntu.com>
+
+--- a/werewolf.cabal
++++ b/werewolf.cabal
+@@ -349,16 +349,16 @@
+ QuasiQuotes,
+ Rank2Types
+ build-depends:
+- aeson >= 0.8 && < 1.2,
++ aeson >= 0.8 && < 1.3,
+ base >= 4.8 && < 5,
+ containers == 0.5.*,
+ directory > 1.2,
+- extra >= 1.4 && < 1.6,
++ extra >= 1.4 && < 1.7,
+ filepath == 1.4.*,
+- lens >= 4.12 && < 4.16,
++ lens >= 4.12 && < 4.17,
+ MonadRandom >= 0.4 && < 0.6,
+ mtl == 2.2.*,
+- optparse-applicative >= 0.11 && < 0.14,
++ optparse-applicative >= 0.11 && < 0.15,
+ random-shuffle,
+ text == 1.2.*,
+ transformers >= 0.4 && < 0.6,
+@@ -387,13 +387,13 @@
+ Rank2Types,
+ TemplateHaskell
+ build-depends:
+- aeson >= 0.8 && < 1.2,
++ aeson >= 0.8 && < 1.3,
+ base >= 4.8 && < 5,
+ containers == 0.5.*,
+- extra >= 1.4 && < 1.6,
+- interpolate == 0.1.*,
+- lens >= 4.12 && < 4.16,
++ extra >= 1.4 && < 1.7,
++ interpolate >= 0.1,
++ lens >= 4.12 && < 4.17,
+ mtl == 2.2.*,
+- template-haskell >= 2.10 && < 2.12,
++ template-haskell >= 2.10 && < 2.13,
+ text == 1.2.*,
+ transformers >= 0.4 && < 0.6
=====================================
patches/werewolf/1.5.2.0/series
=====================================
--- /dev/null
+++ b/patches/werewolf/1.5.2.0/series
@@ -0,0 +1 @@
+newer-deps
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/compare/7a815ddc9788f360cebb515c08c281fbbfa55d25...682bb67890bc6141702a2be977866fa8119c5691
---
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/compare/7a815ddc9788f360cebb515c08c281fbbfa55d25...682bb67890bc6141702a2be977866fa8119c5691
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/20180418/29bf0566/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list