[DHG_packages] 01/01: esqueleto: more complete patch for persistent 2.6

[Clint Adams]

This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch experimental
in repository DHG_packages.

commit 42e854f93df7ac0b51c0cc155a61ad2fdebc8ff3
Author: Clint Adams <clint at debian.org>
Date:   Sat Oct 22 19:25:18 2016 -0400

    esqueleto: more complete patch for persistent 2.6
---
 p/haskell-esqueleto/debian/changelog               |  6 +++
 p/haskell-esqueleto/debian/control                 |  2 +-
 .../debian/patches/newer-persistent                | 50 +++++++++++++++++++++-
 3 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/p/haskell-esqueleto/debian/changelog b/p/haskell-esqueleto/debian/changelog
index 5567bad..a9c373b 100644
--- a/p/haskell-esqueleto/debian/changelog
+++ b/p/haskell-esqueleto/debian/changelog
@@ -1,3 +1,9 @@
+haskell-esqueleto (2.4.3-3) experimental; urgency=medium
+
+  * More complete patch for persistent 2.6 compatibility.
+
+ -- Clint Adams <clint at debian.org>  Sat, 22 Oct 2016 19:25:09 -0400
+
 haskell-esqueleto (2.4.3-2) experimental; urgency=medium
 
   * Incompletely patch for newer persistent.  This will break.
diff --git a/p/haskell-esqueleto/debian/control b/p/haskell-esqueleto/debian/control
index 053fae1..79453d1 100644
--- a/p/haskell-esqueleto/debian/control
+++ b/p/haskell-esqueleto/debian/control
@@ -6,7 +6,7 @@ Section: haskell
 Build-Depends: debhelper (>= 9),
  haskell-devscripts (>= 0.10),
  cdbs,
- ghc,
+ ghc (>= 8),
  ghc-prof,
  libghc-blaze-html-dev,
  libghc-blaze-html-prof,
diff --git a/p/haskell-esqueleto/debian/patches/newer-persistent b/p/haskell-esqueleto/debian/patches/newer-persistent
index 605ed14..3492f07 100644
--- a/p/haskell-esqueleto/debian/patches/newer-persistent
+++ b/p/haskell-esqueleto/debian/patches/newer-persistent
@@ -1,7 +1,11 @@
 --- a/esqueleto.cabal
 +++ b/esqueleto.cabal
-@@ -66,7 +66,7 @@ library
-       base                 >= 4.5     && < 4.9
+@@ -63,10 +63,10 @@
+   other-modules:
+     Database.Esqueleto.Internal.PersistentImport
+   build-depends:
+-      base                 >= 4.5     && < 4.9
++      base                 >= 4.5     && < 4.10
      , bytestring
      , text                 >= 0.11    && < 1.3
 -    , persistent           >= 2.1.1.7 && < 2.3
@@ -9,3 +13,45 @@
      , transformers         >= 0.2
      , unordered-containers >= 0.2
      , tagged               >= 0.2
+--- a/src/Database/Esqueleto.hs
++++ b/src/Database/Esqueleto.hs
+@@ -430,8 +430,8 @@
+ 
+ -- | Synonym for 'Database.Persist.Store.delete' that does not
+ -- clash with @esqueleto@'s 'delete'.
+-deleteKey :: ( PersistStore (PersistEntityBackend val)
++deleteKey :: ( PersistStoreWrite b
+              , MonadIO m
+-             , PersistEntity val )
+-          => Key val -> ReaderT (PersistEntityBackend val) m ()
++             , PersistRecordBackend val b)
++          => Key val -> ReaderT b m ()
+ deleteKey = Database.Persist.delete
+--- a/src/Database/Esqueleto/Internal/PersistentImport.hs
++++ b/src/Database/Esqueleto/Internal/PersistentImport.hs
+@@ -5,7 +5,7 @@
+   ) where
+ 
+ import Database.Persist.Sql hiding
+-  ( BackendSpecificFilter, Filter(..), PersistQuery(..), SelectOpt(..)
++  ( BackendSpecificFilter, Filter(..), PersistQueryRead(..), SelectOpt(..)
+   , Update(..), delete, deleteWhereCount, updateWhereCount, selectList
+   , selectKeysList, deleteCascadeWhere, (=.), (+=.), (-=.), (*=.), (/=.)
+   , (==.), (!=.), (<.), (>.), (<=.), (>=.), (<-.), (/<-.), (||.)
+--- a/test/Test.hs
++++ b/test/Test.hs
+@@ -1395,11 +1395,10 @@
+ ----------------------------------------------------------------------
+ 
+ 
+-insert' :: ( Functor m
+-           , PersistStore (PersistEntityBackend val)
++insert' :: ( PersistStoreWrite b
+            , MonadIO m
+-           , PersistEntity val )
+-        => val -> ReaderT (PersistEntityBackend val) m (Entity val)
++           , PersistRecordBackend val b)
++        => val -> ReaderT b m (Entity val)
+ insert' v = flip Entity v <$> insert v
+ 
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git