diff options
author | Hiromi ISHII <konn.jinro@gmail.com> | 2017-12-25 20:23:13 +0900 |
---|---|---|
committer | Hiromi ISHII <konn.jinro@gmail.com> | 2017-12-25 20:23:13 +0900 |
commit | e83e2023da77ecaa9aaba15bc9bd48757f73b3a9 (patch) | |
tree | f7aae740fa7129c4641cf05a9e00260e48cd92bb /packages/gsl/src | |
parent | 87c7682bbfd17308749d5e9568f1ffa25390ce79 (diff) |
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`
Diffstat (limited to 'packages/gsl/src')
-rw-r--r-- | packages/gsl/src/Numeric/GSL/Fitting.hs | 4 | ||||
-rw-r--r-- | packages/gsl/src/Numeric/GSL/Random.hs | 5 |
2 files changed, 8 insertions, 1 deletions
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 @@ | |||
1 | {-# LANGUAGE CPP #-} | ||
1 | {-# LANGUAGE FlexibleContexts #-} | 2 | {-# LANGUAGE FlexibleContexts #-} |
2 | 3 | ||
3 | {- | | 4 | {- | |
@@ -58,6 +59,9 @@ import Numeric.GSL.Internal | |||
58 | import Foreign.Ptr(FunPtr, freeHaskellFunPtr) | 59 | import Foreign.Ptr(FunPtr, freeHaskellFunPtr) |
59 | import Foreign.C.Types | 60 | import Foreign.C.Types |
60 | import System.IO.Unsafe(unsafePerformIO) | 61 | import System.IO.Unsafe(unsafePerformIO) |
62 | #if MIN_VERSION_base(4,11,0) | ||
63 | import Prelude hiding ((<>)) | ||
64 | #endif | ||
61 | 65 | ||
62 | ------------------------------------------------------------------------- | 66 | ------------------------------------------------------------------------- |
63 | 67 | ||
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 @@ | |||
1 | {-# LANGUAGE CPP #-} | ||
1 | ----------------------------------------------------------------------------- | 2 | ----------------------------------------------------------------------------- |
2 | -- | | 3 | -- | |
3 | -- Module : Numeric.GSL.Random | 4 | -- Module : Numeric.GSL.Random |
@@ -30,7 +31,9 @@ import Numeric.LinearAlgebra.HMatrix hiding ( | |||
30 | randn | 31 | randn |
31 | ) | 32 | ) |
32 | import System.Random(randomIO) | 33 | import System.Random(randomIO) |
33 | 34 | #if MIN_VERSION_base(4,11,0) | |
35 | import Prelude hiding ((<>)) | ||
36 | #endif | ||
34 | 37 | ||
35 | type Seed = Int | 38 | type Seed = Int |
36 | 39 | ||