[Git][haskell-team/DHG_packages][master] esqueleto: patch for newer persistent

[Clint Adams]

Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
82d6963a by Clint Adams at 2018-04-17T20:32:51-04:00
esqueleto: patch for newer persistent

- - - - -


4 changed files:

- p/haskell-esqueleto/debian/changelog
- p/haskell-esqueleto/debian/control
- + p/haskell-esqueleto/debian/patches/newer-persistent
- + p/haskell-esqueleto/debian/patches/series


Changes:

=====================================
p/haskell-esqueleto/debian/changelog
=====================================
--- a/p/haskell-esqueleto/debian/changelog
+++ b/p/haskell-esqueleto/debian/changelog
@@ -1,3 +1,9 @@
+haskell-esqueleto (2.5.3-3) unstable; urgency=medium
+
+  * Patch for newer persistent.
+
+ -- Clint Adams <clint at debian.org>  Tue, 17 Apr 2018 20:32:40 -0400
+
 haskell-esqueleto (2.5.3-2) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]


=====================================
p/haskell-esqueleto/debian/control
=====================================
--- a/p/haskell-esqueleto/debian/control
+++ b/p/haskell-esqueleto/debian/control
@@ -10,14 +10,14 @@ Build-Depends: debhelper (>= 9),
  ghc-prof,
  libghc-blaze-html-dev,
  libghc-blaze-html-prof,
- libghc-conduit-dev (>= 1.1),
+ libghc-conduit-dev (>= 1.3),
  libghc-conduit-prof,
  libghc-monad-logger-dev,
  libghc-monad-logger-prof,
- libghc-persistent-dev (>= 2.5),
- libghc-persistent-dev (<< 2.8),
+ libghc-persistent-dev (>= 2.8),
+ libghc-persistent-dev (<< 2.9),
  libghc-persistent-prof,
- libghc-resourcet-dev (>= 1.1),
+ libghc-resourcet-dev (>= 1.2),
  libghc-resourcet-prof,
  libghc-tagged-dev (>= 0.2),
  libghc-tagged-prof,


=====================================
p/haskell-esqueleto/debian/patches/newer-persistent
=====================================
--- /dev/null
+++ b/p/haskell-esqueleto/debian/patches/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)


=====================================
p/haskell-esqueleto/debian/patches/series
=====================================
--- /dev/null
+++ b/p/haskell-esqueleto/debian/patches/series
@@ -0,0 +1 @@
+newer-persistent



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/82d6963aed967d18bf789dcdf19f057b79bfb1f2

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/82d6963aed967d18bf789dcdf19f057b79bfb1f2
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/52095d57/attachment-0001.html>