From e83e2023da77ecaa9aaba15bc9bd48757f73b3a9 Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Mon, 25 Dec 2017 20:23:13 +0900 Subject: Workaround for GHC-8.4.x * Adds missing Semigroup instances * Adds `semigroups` to the deps of `hmatrix` * Hides conflicting names from import list with base >= 4.11 * `(Prelude.<>)` and `GHC.TypeNats.Mod` --- packages/gsl/src/Numeric/GSL/Fitting.hs | 4 ++++ packages/gsl/src/Numeric/GSL/Random.hs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'packages/gsl/src') diff --git a/packages/gsl/src/Numeric/GSL/Fitting.hs b/packages/gsl/src/Numeric/GSL/Fitting.hs index 9a2f665..8f2eae3 100644 --- a/packages/gsl/src/Numeric/GSL/Fitting.hs +++ b/packages/gsl/src/Numeric/GSL/Fitting.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {- | @@ -58,6 +59,9 @@ import Numeric.GSL.Internal import Foreign.Ptr(FunPtr, freeHaskellFunPtr) import Foreign.C.Types import System.IO.Unsafe(unsafePerformIO) +#if MIN_VERSION_base(4,11,0) +import Prelude hiding ((<>)) +#endif ------------------------------------------------------------------------- diff --git a/packages/gsl/src/Numeric/GSL/Random.hs b/packages/gsl/src/Numeric/GSL/Random.hs index aad9ad9..20a6c31 100644 --- a/packages/gsl/src/Numeric/GSL/Random.hs +++ b/packages/gsl/src/Numeric/GSL/Random.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} ----------------------------------------------------------------------------- -- | -- Module : Numeric.GSL.Random @@ -30,7 +31,9 @@ import Numeric.LinearAlgebra.HMatrix hiding ( randn ) import System.Random(randomIO) - +#if MIN_VERSION_base(4,11,0) +import Prelude hiding ((<>)) +#endif type Seed = Int -- cgit v1.2.3