diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-03-18 19:40:52 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-03-18 19:40:52 -0400 |
| commit | 4ceba4a8c007c9a5c4692c5425114139b47aecdf (patch) | |
| tree | 023a30df483f39678749ed7b38094a75e7da1f62 | |
| parent | 01f6936a600f2bf0bea1e9c82fcb6164e31a3cd3 (diff) | |
| parent | 8b0e3caa9b32f49ec6bb49e777d5a35e3a7e0561 (diff) | |
Merge branch 'master' into joeyconfig
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/Propellor/Types.hs | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index f81adf77..9c9b793f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +propellor (4.0.1) UNRELEASED; urgency=medium + + * Fix build with pre-AMP ghc. + + -- Joey Hess <id@joeyh.name> Sat, 18 Mar 2017 19:40:35 -0400 + propellor (4.0.0) unstable; urgency=medium * Added Monoid instances for Property and RevertableProperty. diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs index 690c153a..155662c2 100644 --- a/src/Propellor/Types.hs +++ b/src/Propellor/Types.hs @@ -44,6 +44,8 @@ module Propellor.Types ( ) where import Data.Monoid +import Control.Applicative +import Prelude import Propellor.Types.Core import Propellor.Types.Info |