diff -Nru haskell-heist-1.1/debian/changelog haskell-heist-1.1.0.1/debian/changelog --- haskell-heist-1.1/debian/changelog 2018-10-01 10:47:32.000000000 +0000 +++ haskell-heist-1.1.0.1/debian/changelog 2019-09-06 16:07:15.000000000 +0000 @@ -1,3 +1,15 @@ +haskell-heist (1.1.0.1-2) unstable; urgency=medium + + * Lower dependency bounds + + -- Gianfranco Costamagna Fri, 06 Sep 2019 18:07:15 +0200 + +haskell-heist (1.1.0.1-1) unstable; urgency=medium + + * New upstream release + + -- Clint Adams Mon, 29 Jul 2019 21:00:54 -0400 + haskell-heist (1.1-4) unstable; urgency=medium * Remove build dependency on libghc-mtl-dev (provided by ghc-8.4.3) diff -Nru haskell-heist-1.1/debian/control haskell-heist-1.1.0.1/debian/control --- haskell-heist-1.1/debian/control 2018-10-01 10:47:32.000000000 +0000 +++ haskell-heist-1.1.0.1/debian/control 2019-09-06 16:07:12.000000000 +0000 @@ -12,7 +12,7 @@ ghc-prof, haskell-devscripts (>= 0.13), libghc-aeson-dev (>= 0.6), - libghc-aeson-dev (<< 1.4), + libghc-aeson-dev (<< 1.5), libghc-aeson-prof, libghc-attoparsec-dev, libghc-attoparsec-dev (<< 0.14), @@ -56,7 +56,7 @@ libghc-random-dev (>= 1.0.1.0), libghc-random-prof, libghc-statistics-dev (>= 0.11), - libghc-statistics-dev (<< 0.15), + libghc-statistics-dev (<< 0.16), libghc-test-framework-dev, libghc-test-framework-hunit-dev, libghc-transformers-base-dev, diff -Nru haskell-heist-1.1/heist.cabal haskell-heist-1.1.0.1/heist.cabal --- haskell-heist-1.1/heist.cabal 2018-04-09 13:12:51.000000000 +0000 +++ haskell-heist-1.1.0.1/heist.cabal 2018-10-23 05:34:56.000000000 +0000 @@ -1,5 +1,5 @@ name: heist -version: 1.1 +version: 1.1.0.1 synopsis: An Haskell template system supporting both HTML5 and XML. description: Heist is a powerful template system that supports both HTML5 and XML. @@ -38,7 +38,8 @@ GHC == 7.10.3, GHC == 8.0.1, GHC == 8.2.2, - GHC == 8.4.1 + GHC == 8.4.3, + GHC == 8.6.1 extra-source-files: .ghci, @@ -159,13 +160,13 @@ Heist.Interpreted.Internal build-depends: - aeson >= 0.6 && < 1.4, + aeson >= 0.6 && < 1.5, attoparsec >= 0.10 && < 0.14, - base >= 4.5 && < 4.12, + base >= 4.5 && < 4.13, blaze-builder >= 0.2 && < 0.5, blaze-html >= 0.4 && < 0.10, bytestring >= 0.9 && < 0.11, - containers >= 0.2 && < 0.6, + containers >= 0.2 && < 0.7, directory >= 1.1 && < 1.4, directory-tree >= 0.10 && < 0.13, dlist >= 0.5 && < 0.9, @@ -218,8 +219,8 @@ build-depends: HUnit >= 1.2 && < 2, - QuickCheck >= 2 && < 2.12, - lens >= 4.3 && < 4.17, + QuickCheck >= 2 && < 2.13, + lens >= 4.3 && < 4.18, test-framework >= 0.4 && < 0.9, test-framework-hunit >= 0.2.7 && < 0.4, test-framework-quickcheck2 >= 0.2.12.1 && < 0.4, @@ -253,6 +254,9 @@ if !impl(ghc >= 8.0) build-depends: semigroups >= 0.16 && < 0.19 + if impl(ghc >= 7.8) && impl(ghc < 7.10) + build-depends: transformers-compat >= 0.3 && < 0.7 + ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -threaded Extensions: OverloadedStrings @@ -263,7 +267,8 @@ build-depends: HUnit, - criterion >= 1.0 && < 1.5, + criterion >= 1.0 && < 1.6, + criterion-measurement >= 0.1 && < 0.2, test-framework, test-framework-hunit, @@ -287,7 +292,7 @@ mtl, process, random, - statistics >= 0.11 && < 0.15, + statistics >= 0.11 && < 0.16, text, time, transformers, @@ -299,6 +304,9 @@ if !impl(ghc >= 8.0) build-depends: semigroups >= 0.16 && < 0.19 + if impl(ghc >= 7.8) && impl(ghc < 7.10) + build-depends: transformers-compat + ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -threaded -fno-warn-unused-do-bind -rtsopts diff -Nru haskell-heist-1.1/src/Heist/Internal/Types/HeistState.hs haskell-heist-1.1.0.1/src/Heist/Internal/Types/HeistState.hs --- haskell-heist-1.1/src/Heist/Internal/Types/HeistState.hs 2018-04-09 13:12:51.000000000 +0000 +++ haskell-heist-1.1.0.1/src/Heist/Internal/Types/HeistState.hs 2018-10-23 05:34:56.000000000 +0000 @@ -33,6 +33,9 @@ #else import Control.Monad.Error (MonadError (..)) #endif +#if MIN_VERSION_base(4,9,0) +import qualified Control.Monad.Fail as Fail +#endif import Control.Monad.Fix (MonadFix (..)) import Control.Monad.Reader (MonadReader (..)) import Control.Monad.State.Strict (MonadState (..), StateT) @@ -398,6 +401,14 @@ {-# INLINE (>>=) #-} +#if MIN_VERSION_base(4,9,0) +------------------------------------------------------------------------------ +-- | MonadFail instance +instance Fail.MonadFail m => Fail.MonadFail (HeistT n m) where + fail = lift . Fail.fail +#endif + + ------------------------------------------------------------------------------ -- | MonadIO instance instance MonadIO m => MonadIO (HeistT n m) where