[Git][haskell-team/DHG_packages][master] esqueleto: new upstream git snapshot
Clint Adams
gitlab at salsa.debian.org
Wed Apr 18 03:27:13 BST 2018
Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
82c0b224 by Clint Adams at 2018-04-17T22:25:58-04:00
esqueleto: new upstream git snapshot
- - - - -
6 changed files:
- p/haskell-esqueleto/debian/changelog
- p/haskell-esqueleto/debian/control
- + p/haskell-esqueleto/debian/patches/disable-network-tests
- + p/haskell-esqueleto/debian/patches/fake-version
- − 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.git20180402-1) unstable; urgency=medium
+
+ * New upstream git snapshot.
+
+ -- Clint Adams <clint at 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
=====================================
--- a/p/haskell-esqueleto/debian/control
+++ b/p/haskell-esqueleto/debian/control
@@ -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
=====================================
--- /dev/null
+++ b/p/haskell-esqueleto/debian/patches/disable-network-tests
@@ -0,0 +1,73 @@
+--- 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
=====================================
--- /dev/null
+++ b/p/haskell-esqueleto/debian/patches/fake-version
@@ -0,0 +1,11 @@
+--- 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 deleted
=====================================
--- a/p/haskell-esqueleto/debian/patches/newer-persistent
+++ /dev/null
@@ -1,43 +0,0 @@
-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
=====================================
--- a/p/haskell-esqueleto/debian/patches/series
+++ b/p/haskell-esqueleto/debian/patches/series
@@ -1 +1,2 @@
-newer-persistent
+fake-version
+disable-network-tests
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/82c0b224e096cd68faca2756350463bde23da8b5
---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/82c0b224e096cd68faca2756350463bde23da8b5
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/e647d458/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list