From 951bb21c1b450de6f29fe4bb23fcc835c092180d Mon Sep 17 00:00:00 2001 From: Matt Parsons Date: Fri, 24 Jan 2020 13:23:26 -0700 Subject: [PATCH] remove upper bounds (#171) * remove upper bounds * work with stackage nightly * Add nightly build --- .travis.yml | 5 +++++ esqueleto.cabal | 6 +++--- examples/Main.hs | 2 +- stack-nightly.yaml | 4 ++++ stack-nightly.yaml.lock | 12 ++++++++++++ test/Common/Test.hs | 2 +- test/PostgreSQL/MigrateJSON.hs | 2 ++ test/expected-compile-failures/src/Lib.hs | 2 +- 8 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 stack-nightly.yaml create mode 100644 stack-nightly.yaml.lock diff --git a/.travis.yml b/.travis.yml index f8a627f..aab4d95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,11 @@ env: - GHCVER=8.2 - GHCVER=8.4 - GHCVER=8.6 + - GHCVER=nightly + +jobs: + allow_failures: + - GHCVER=nightly install: - export STACK_YAML=stack-$GHCVER.yaml diff --git a/esqueleto.cabal b/esqueleto.cabal index c785ae6..4882743 100644 --- a/esqueleto.cabal +++ b/esqueleto.cabal @@ -95,7 +95,7 @@ test-suite mysql , resourcet >=1.2 , tagged >=0.2 , text >=0.11 && <1.3 - , time >=1.5.0.1 && <=1.8.0.2 + , time , transformers >=0.2 , unliftio , unordered-containers >=0.2 @@ -132,7 +132,7 @@ test-suite postgresql , resourcet >=1.2 , tagged >=0.2 , text >=0.11 && <1.3 - , time >=1.5.0.1 && <=1.8.0.2 + , time , transformers >=0.2 , unliftio , unordered-containers >=0.2 @@ -166,7 +166,7 @@ test-suite sqlite , resourcet >=1.2 , tagged >=0.2 , text >=0.11 && <1.3 - , time >=1.5.0.1 && <=1.8.0.2 + , time , transformers >=0.2 , unliftio , unordered-containers >=0.2 diff --git a/examples/Main.hs b/examples/Main.hs index d1dd822..8f914d0 100644 --- a/examples/Main.hs +++ b/examples/Main.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE DerivingStrategies, FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE GADTs #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} diff --git a/stack-nightly.yaml b/stack-nightly.yaml new file mode 100644 index 0000000..8785ae5 --- /dev/null +++ b/stack-nightly.yaml @@ -0,0 +1,4 @@ +resolver: nightly-2020-01-24 +packages: + - '.' + - 'examples' diff --git a/stack-nightly.yaml.lock b/stack-nightly.yaml.lock new file mode 100644 index 0000000..afb31ae --- /dev/null +++ b/stack-nightly.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + size: 467884 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2020/1/24.yaml + sha256: 55c1a4fc9222bc3b8cf91461f38e2641da675a7296f06528f47340c19d0c6e85 + original: nightly-2020-01-24 diff --git a/test/Common/Test.hs b/test/Common/Test.hs index 4ca1c1f..1ae2059 100644 --- a/test/Common/Test.hs +++ b/test/Common/Test.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-unused-binds #-} {-# OPTIONS_GHC -fno-warn-deprecations #-} {-# LANGUAGE ConstraintKinds - , CPP + , CPP, DerivingStrategies, StandaloneDeriving , TypeApplications , PartialTypeSignatures , UndecidableInstances diff --git a/test/PostgreSQL/MigrateJSON.hs b/test/PostgreSQL/MigrateJSON.hs index 447de65..41bab89 100644 --- a/test/PostgreSQL/MigrateJSON.hs +++ b/test/PostgreSQL/MigrateJSON.hs @@ -1,6 +1,8 @@ {-# LANGUAGE FlexibleContexts , GADTs , GeneralizedNewtypeDeriving + , DerivingStrategies + , StandaloneDeriving , MultiParamTypeClasses , OverloadedStrings , QuasiQuotes diff --git a/test/expected-compile-failures/src/Lib.hs b/test/expected-compile-failures/src/Lib.hs index db80dc9..3b08a4d 100644 --- a/test/expected-compile-failures/src/Lib.hs +++ b/test/expected-compile-failures/src/Lib.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE UndecidableInstances #-} +{-# LANGUAGE UndecidableInstances, DerivingStrategies #-} module Lib where import Control.Monad.IO.Class (MonadIO)