From a9cee5dfd68797e837d68f8a15f24c793e03cdee Mon Sep 17 00:00:00 2001 From: Lucas DiCioccio Date: Sat, 27 Apr 2024 21:57:10 +0200 Subject: [PATCH] Mask liftA2 only since base-4.19 --- dhall/src/Dhall/Import/Headers.hs | 2 +- dhall/src/Dhall/Marshal/Decode.hs | 2 +- dhall/src/Dhall/Parser/Combinators.hs | 2 +- dhall/src/Dhall/Parser/Expression.hs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dhall/src/Dhall/Import/Headers.hs b/dhall/src/Dhall/Import/Headers.hs index e87f524e7..4cd31c38b 100644 --- a/dhall/src/Dhall/Import/Headers.hs +++ b/dhall/src/Dhall/Import/Headers.hs @@ -10,7 +10,7 @@ module Dhall.Import.Headers , toOriginHeaders ) where -#if (MIN_VERSION_base(4,10,0)) +#if (MIN_VERSION_base(4,19,0)) import Control.Applicative (Alternative (..)) #else import Control.Applicative (Alternative (..), liftA2) diff --git a/dhall/src/Dhall/Marshal/Decode.hs b/dhall/src/Dhall/Marshal/Decode.hs index c6ccf050d..e5003a7b3 100644 --- a/dhall/src/Dhall/Marshal/Decode.hs +++ b/dhall/src/Dhall/Marshal/Decode.hs @@ -136,7 +136,7 @@ module Dhall.Marshal.Decode ) where -#if (MIN_VERSION_base(4,10,0)) +#if (MIN_VERSION_base(4,19,0)) import Control.Applicative (empty) #else import Control.Applicative (empty, liftA2) diff --git a/dhall/src/Dhall/Parser/Combinators.hs b/dhall/src/Dhall/Parser/Combinators.hs index 43721c267..10f86431f 100644 --- a/dhall/src/Dhall/Parser/Combinators.hs +++ b/dhall/src/Dhall/Parser/Combinators.hs @@ -23,7 +23,7 @@ module Dhall.Parser.Combinators ) where -#if (MIN_VERSION_base(4,10,0)) +#if (MIN_VERSION_base(4,19,0)) import Control.Applicative (Alternative (..)) #else import Control.Applicative (Alternative (..), liftA2) diff --git a/dhall/src/Dhall/Parser/Expression.hs b/dhall/src/Dhall/Parser/Expression.hs index 6226f240f..4dc39bf19 100644 --- a/dhall/src/Dhall/Parser/Expression.hs +++ b/dhall/src/Dhall/Parser/Expression.hs @@ -8,7 +8,7 @@ -- | Parsing Dhall expressions. module Dhall.Parser.Expression where -#if (MIN_VERSION_base(4,10,0)) +#if (MIN_VERSION_base(4,19,0)) import Control.Applicative (Alternative (..), optional) #else import Control.Applicative (Alternative (..), liftA2, optional)