From 3395e8ff9672f9751e7ed2ec80b0c225395bc8d5 Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Wed, 28 Feb 2018 13:50:34 -0600 Subject: [PATCH] Actually correct hpackification, Makefile edits --- Makefile | 10 ++-- esqueleto.cabal | 76 +++++++++++++++-------------- package.yaml | 124 +++++++++++++++++++----------------------------- 3 files changed, 91 insertions(+), 119 deletions(-) diff --git a/Makefile b/Makefile index fd5f70b..863396d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,8 @@ -build: build-7.10 +build: + stack build -build-7.10: - STACK_YAML="stack-7.10.yaml" stack build - -build-8.0: - STACK_YAML="stack-8.0.yaml" stack build +build-tests: + stack build --test --no-run-tests ghci: stack ghci diff --git a/esqueleto.cabal b/esqueleto.cabal index 0bce27e..60d42d0 100644 --- a/esqueleto.cabal +++ b/esqueleto.cabal @@ -2,7 +2,7 @@ -- -- see: https://github.com/sol/hpack -- --- hash: e5ab42806c413de0b3f9c18b155779bf6d71f87bcfec2fda5c109bf2f4adb4a2 +-- hash: 34b1b8836c9ae7acb038d0e808674ddb4c2ab696d37e5b117f61acad02ed6daf name: esqueleto version: 2.6.0 @@ -43,6 +43,7 @@ library , text >=0.11 && <1.3 , time >=1.5.0.1 && <=1.8.0.2 , transformers >=0.2 + , unliftio , unordered-containers >=0.2 if impl(ghc >=8.0) ghc-options: -Wall -Wno-redundant-constraints @@ -50,11 +51,11 @@ library ghc-options: -Wall exposed-modules: Database.Esqueleto + Database.Esqueleto.Internal.Language + Database.Esqueleto.Internal.Sql Database.Esqueleto.MySQL Database.Esqueleto.PostgreSQL Database.Esqueleto.SQLite - Database.Esqueleto.Internal.Language - Database.Esqueleto.Internal.Sql other-modules: Database.Esqueleto.Internal.PersistentImport Paths_esqueleto @@ -67,29 +68,28 @@ test-suite mysql test ghc-options: -Wall build-depends: - HUnit - , QuickCheck - , base - , conduit + base >=4.8 && <5.0 + , blaze-html + , bytestring + , conduit >=1.3 , containers , esqueleto , hspec - , monad-control , monad-logger , mysql , mysql-simple - , persistent + , persistent >=2.8.0 && <2.9 , persistent-mysql , persistent-template - , resourcet - , text - , time - , transformers + , 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 - PostgreSQL.Test - SQLite.Test Paths_esqueleto default-language: Haskell2010 @@ -100,29 +100,28 @@ test-suite postgresql test ghc-options: -Wall build-depends: - HUnit - , QuickCheck - , base - , conduit + base >=4.8 && <5.0 + , blaze-html + , bytestring + , conduit >=1.3 , containers , esqueleto , hspec - , monad-control , monad-logger - , persistent + , persistent >=2.8.0 && <2.9 , persistent-postgresql , persistent-template , postgresql-libpq , postgresql-simple - , resourcet - , text - , time - , transformers + , 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 - MySQL.Test - SQLite.Test Paths_esqueleto default-language: Haskell2010 @@ -133,26 +132,25 @@ test-suite sqlite test ghc-options: -Wall build-depends: - HUnit - , QuickCheck - , base - , conduit + base >=4.8 && <5.0 + , blaze-html + , bytestring + , conduit >=1.3 , containers , esqueleto , hspec - , monad-control , monad-logger - , persistent + , persistent >=2.8.0 && <2.9 , persistent-sqlite , persistent-template - , resourcet - , text - , time - , transformers + , 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 - MySQL.Test - PostgreSQL.Test Paths_esqueleto default-language: Haskell2010 diff --git a/package.yaml b/package.yaml index b781188..6a0d565 100644 --- a/package.yaml +++ b/package.yaml @@ -41,29 +41,31 @@ copyright: (c) 2012-2016 Felipe Almeida Lessa license: BSD3 homepage: https://github.com/bitemyapp/esqueleto git: git://github.com/bitemyapp/esqueleto.git + dependencies: -- monad-logger + - base >=4.8 && <5.0 + - blaze-html + - bytestring + - conduit >=1.3 + - monad-logger + - persistent >=2.8.0 && <2.9 + - 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 + library: source-dirs: src/ exposed-modules: - - Database.Esqueleto - - Database.Esqueleto.MySQL - - Database.Esqueleto.PostgreSQL - - Database.Esqueleto.SQLite - - Database.Esqueleto.Internal.Language - - Database.Esqueleto.Internal.Sql - dependencies: - - base >=4.8 && <5.0 - - bytestring - - text >=0.11 && <1.3 - - persistent >=2.8.0 && <2.9 - - transformers >=0.2 - - unordered-containers >=0.2 - - tagged >=0.2 - - conduit >=1.3 - - resourcet >=1.2 - - time >=1.5.0.1 && <=1.8.0.2 - - blaze-html + - Database.Esqueleto + - Database.Esqueleto.Internal.Language + - Database.Esqueleto.Internal.Sql + - Database.Esqueleto.MySQL + - Database.Esqueleto.PostgreSQL + - Database.Esqueleto.SQLite when: - condition: impl(ghc >=8.0) then: @@ -75,73 +77,47 @@ library: tests: mysql: - main: MySQL/Test.hs + main: 'MySQL/Test.hs' source-dirs: test ghc-options: -Wall dependencies: - - base - - persistent - - transformers - - resourcet - - text - - conduit - - containers - - HUnit - - QuickCheck - - hspec - - monad-control - - time - - esqueleto - - mysql-simple - - mysql - - persistent-mysql - - persistent-template - - monad-control - - unliftio + - containers + - esqueleto + - hspec + - mysql-simple + - mysql + - persistent-mysql + - persistent-template + other-modules: + - Common.Test + - Paths_esqueleto sqlite: main: SQLite/Test.hs source-dirs: test ghc-options: -Wall dependencies: - - base - - persistent - - transformers - - resourcet - - text - - conduit - - containers - - HUnit - - QuickCheck - - hspec - - monad-control - - time - - esqueleto - - persistent-sqlite - - persistent-template - - unliftio + - containers + - esqueleto + - hspec + - persistent-sqlite + - persistent-template + other-modules: + - Common.Test + - Paths_esqueleto postgresql: main: PostgreSQL/Test.hs source-dirs: test ghc-options: -Wall dependencies: - - base - - persistent - - transformers - - resourcet - - text - - conduit - - containers - - HUnit - - QuickCheck - - hspec - - monad-control - - time - - esqueleto - - postgresql-simple - - postgresql-libpq - - persistent-postgresql - - persistent-template - - monad-control - - unliftio + - containers + - esqueleto + - hspec + - persistent-postgresql + - persistent-template + - postgresql-libpq + - postgresql-simple + other-modules: + - Common.Test + - Paths_esqueleto