From 4442dc458e086ef1195e279cc4fb331f0a898cdc Mon Sep 17 00:00:00 2001 From: George Wilson Date: Fri, 22 Jun 2018 09:53:50 +1000 Subject: [PATCH 1/2] The tests depend on the main package, so we don't need to list those in other-modules --- geodetics.cabal | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/geodetics.cabal b/geodetics.cabal index dbac9a4..dea749a 100644 --- a/geodetics.cabal +++ b/geodetics.cabal @@ -61,19 +61,8 @@ test-suite GeodeticTest array >= 0.4, checkers hs-source-dirs: - src, test ghc-options: -Wall -rtsopts other-modules: - ArbitraryInstances, - Main, - Geodetics.Altitude, - Geodetics.Ellipsoids - Geodetics.Geodetic, - Geodetics.Grid, - Geodetics.LatLongParser, - Geodetics.Path, - Geodetics.Stereographic, - Geodetics.TransverseMercator, - Geodetics.UK + ArbitraryInstances Default-Language: Haskell2010 From f89cca400282679d6ba4de42e84f8736972c34b6 Mon Sep 17 00:00:00 2001 From: George Wilson Date: Fri, 22 Jun 2018 09:54:15 +1000 Subject: [PATCH 2/2] Prevent attempted building on GHC 7.8 (it doesn't work) and fix the build on 7.10 with a conditional semigroups dependency --- geodetics.cabal | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/geodetics.cabal b/geodetics.cabal index dea749a..1caee6a 100644 --- a/geodetics.cabal +++ b/geodetics.cabal @@ -30,9 +30,11 @@ source-repository head library hs-source-dirs: src build-depends: - base >= 4.6 && < 5, + base >= 4.7 && < 5, dimensional >= 1.0, array >= 0.4 + if !impl(ghc>=8.0) + build-depends: semigroups >= 0.9 && < 0.19 ghc-options: -Wall exposed-modules: Geodetics.Altitude,