Commit 82c0b224 authored by Clint Adams's avatar Clint Adams
Browse files

esqueleto: new upstream git snapshot

parent 82d6963a

p/haskell-esqueleto/debian/changelog

+6 −0
Original line number Diff line number Diff line 
haskell-esqueleto (2.5.3.git20180402-1) unstable; urgency=medium



  * New upstream git snapshot.



 -- Clint Adams <clint@debian.org>  Tue, 17 Apr 2018 21:51:37 -0400



haskell-esqueleto (2.5.3-3) unstable; urgency=medium



  * Patch for newer persistent.

p/haskell-esqueleto/debian/control

+3 −4
Original line number Diff line number Diff line
@@ -24,18 +24,16 @@ Build-Depends: debhelper (>= 9), 
 libghc-text-dev (>= 0.11),

 libghc-text-dev (<< 1.3),

 libghc-text-prof,

 libghc-unliftio-dev,

 libghc-unliftio-prof,

 libghc-unordered-containers-dev (>= 0.2),

 libghc-unordered-containers-prof,

 libghc-hunit-dev,

 libghc-quickcheck2-dev,

 libghc-hspec-dev (>= 1.8),

 libghc-monad-control-dev,

 libghc-monad-logger-dev (>= 0.3),

 libghc-persistent-dev,

 libghc-persistent-sqlite-dev (>= 2.1.3),

 libghc-persistent-template-dev (>= 2.1),

 libghc-resourcet-dev,

 libghc-text-dev,

Build-Depends-Indep: ghc-doc,

 libghc-blaze-html-doc,

 libghc-conduit-doc,
@@ -44,6 +42,7 @@ Build-Depends-Indep: ghc-doc, 
 libghc-resourcet-doc,

 libghc-tagged-doc,

 libghc-text-doc,

 libghc-unliftio-doc,

 libghc-unordered-containers-doc,

Standards-Version: 4.1.4

Homepage: https://github.com/bitemyapp/esqueleto

p/haskell-esqueleto/debian/patches/disable-network-tests

0 → 100644
+73 −0
Original line number Diff line number Diff line 
--- a/esqueleto.cabal

+++ b/esqueleto.cabal

@@ -61,70 +61,6 @@

       Paths_esqueleto

   default-language: Haskell2010

 

-test-suite mysql

-  type: exitcode-stdio-1.0

-  main-is: MySQL/Test.hs

-  hs-source-dirs:

-      test

-  ghc-options: -Wall

-  build-depends:

-      base >=4.8 && <5.0

-    , blaze-html

-    , bytestring

-    , conduit >=1.3

-    , containers

-    , esqueleto

-    , hspec

-    , monad-logger

-    , mysql

-    , mysql-simple

-    , persistent >=2.8.0 && <2.9

-    , persistent-mysql

-    , persistent-template

-    , resourcet >=1.2

-    , tagged >=0.2

-    , text >=0.11 && <1.3

-    , time >=1.5.0.1 && <=1.8.0.2

-    , transformers >=0.2

-    , unliftio

-    , unordered-containers >=0.2

-  other-modules:

-      Common.Test

-      Paths_esqueleto

-  default-language: Haskell2010

-

-test-suite postgresql

-  type: exitcode-stdio-1.0

-  main-is: PostgreSQL/Test.hs

-  hs-source-dirs:

-      test

-  ghc-options: -Wall

-  build-depends:

-      base >=4.8 && <5.0

-    , blaze-html

-    , bytestring

-    , conduit >=1.3

-    , containers

-    , esqueleto

-    , hspec

-    , monad-logger

-    , persistent >=2.8.0 && <2.9

-    , persistent-postgresql

-    , persistent-template

-    , postgresql-libpq

-    , postgresql-simple

-    , resourcet >=1.2

-    , tagged >=0.2

-    , text >=0.11 && <1.3

-    , time >=1.5.0.1 && <=1.8.0.2

-    , transformers >=0.2

-    , unliftio

-    , unordered-containers >=0.2

-  other-modules:

-      Common.Test

-      Paths_esqueleto

-  default-language: Haskell2010

-

 test-suite sqlite

   type: exitcode-stdio-1.0

   main-is: SQLite/Test.hs

p/haskell-esqueleto/debian/patches/fake-version

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- a/esqueleto.cabal

+++ b/esqueleto.cabal

@@ -5,7 +5,7 @@

 -- hash: 34b1b8836c9ae7acb038d0e808674ddb4c2ab696d37e5b117f61acad02ed6daf

 

 name:           esqueleto

-version:        2.6.0

+version:        2.5.999.1

 synopsis:       Type-safe EDSL for SQL queries on persistent backends.

 description:    @esqueleto@ is a bare bones, type-safe EDSL for SQL queries that works with unmodified @persistent@ SQL backends.  Its language closely resembles SQL, so you don't have to learn new concepts, just new syntax, and it's fairly easy to predict the generated SQL and optimize it for your backend. Most kinds of errors committed when writing SQL are caught as compile-time errors---although it is possible to write type-checked @esqueleto@ queries that fail at runtime.

                 .

p/haskell-esqueleto/debian/patches/newer-persistent

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
From 7808bc982cd09530d2128c601f8e98156b756905 Mon Sep 17 00:00:00 2001

From: Matt Parsons <parsonsmatt@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)