From b1038365960693a013d7026f25d026a1fd098062 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 11 Nov 2016 17:40:32 -0400 Subject: turn off redundant constraints warnings in cabal file ghc 7 does not support -fno-warn-redundant-constraints so this can't be done on a per-module basis. It would be good to revert this commit when dropping support for ghc 7. --- propellor.cabal | 2 ++ src/Propellor/Container.hs | 1 - src/Propellor/EnsureProperty.hs | 1 - src/Propellor/Info.hs | 1 - src/Propellor/PropAccum.hs | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/propellor.cabal b/propellor.cabal index 7d145024..db70942a 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -63,6 +63,8 @@ Executable propellor-config Library GHC-Options: -Wall -fno-warn-tabs -O0 + if impl(ghc >= 8.0) + GHC-Options: -fno-warn-redundant-constraints Extensions: TypeOperators Hs-Source-Dirs: src Build-Depends: diff --git a/src/Propellor/Container.hs b/src/Propellor/Container.hs index 5c365f59..26194456 100644 --- a/src/Propellor/Container.hs +++ b/src/Propellor/Container.hs @@ -1,5 +1,4 @@ {-# LANGUAGE DataKinds, TypeFamilies #-} -{-# OPTIONS_GHC -fno-warn-redundant-constraints #-} module Propellor.Container where diff --git a/src/Propellor/EnsureProperty.hs b/src/Propellor/EnsureProperty.hs index e8602047..30dfd5ad 100644 --- a/src/Propellor/EnsureProperty.hs +++ b/src/Propellor/EnsureProperty.hs @@ -3,7 +3,6 @@ {-# LANGUAGE PolyKinds #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE UndecidableInstances #-} -{-# OPTIONS_GHC -fno-warn-redundant-constraints #-} module Propellor.EnsureProperty ( ensureProperty diff --git a/src/Propellor/Info.hs b/src/Propellor/Info.hs index 75f0b76a..3d7f07a5 100644 --- a/src/Propellor/Info.hs +++ b/src/Propellor/Info.hs @@ -1,5 +1,4 @@ {-# LANGUAGE PackageImports, TypeFamilies, DataKinds, PolyKinds #-} -{-# OPTIONS_GHC -fno-warn-redundant-constraints #-} module Propellor.Info ( osDebian, diff --git a/src/Propellor/PropAccum.hs b/src/Propellor/PropAccum.hs index c7ef946a..5d1d3afb 100644 --- a/src/Propellor/PropAccum.hs +++ b/src/Propellor/PropAccum.hs @@ -4,7 +4,6 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE DataKinds #-} -{-# OPTIONS_GHC -fno-warn-redundant-constraints #-} module Propellor.PropAccum ( host -- cgit v1.2.3