diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-25 21:10:11 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-25 21:10:11 -0400 |
| commit | 27e5d0c6c20d95221bb5e6d96de720c52f03fdf4 (patch) | |
| tree | d821b1cccd13c5954b3b0dd7b2e535c525c6188a | |
| parent | 2cbd328ce130e9634d5986645f609976d27c6165 (diff) | |
Add Typeable instance to Bootstrapper, fixing build with old versions of ghc.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | doc/forum/Error_building_on_remote_host/comment_4_c2e07d9bfba84fbdcf408a09965d6cb6._comment | 10 | ||||
| -rw-r--r-- | src/Propellor/Bootstrap.hs | 4 |
3 files changed, 20 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 948a44b4..9e1c15c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +propellor (4.5.3) UNRELEASED; urgency=medium + + * Add Typeable instance to Bootstrapper, fixing build with old versions + of ghc. + + -- Joey Hess <id@joeyh.name> Tue, 25 Jul 2017 21:01:23 -0400 + propellor (4.5.2) unstable; urgency=medium * Added Rsync.installed property. diff --git a/doc/forum/Error_building_on_remote_host/comment_4_c2e07d9bfba84fbdcf408a09965d6cb6._comment b/doc/forum/Error_building_on_remote_host/comment_4_c2e07d9bfba84fbdcf408a09965d6cb6._comment new file mode 100644 index 00000000..7d8f26fe --- /dev/null +++ b/doc/forum/Error_building_on_remote_host/comment_4_c2e07d9bfba84fbdcf408a09965d6cb6._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 4""" + date="2017-07-26T00:52:20Z" + content=""" +Interesting that it works on newer ghc without an explict +`Typeable Bootstrapper` instance. + +I've added the missing instance. +"""]] diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index 21f051c9..21d29bcc 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE DeriveDataTypeable #-} + module Propellor.Bootstrap ( Bootstrapper(..), Builder(..), @@ -34,7 +36,7 @@ data Bootstrapper = Robustly Builder | OSOnly deriving (Show) data Builder = Cabal | Stack - deriving (Show) + deriving (Show, Typeable) defaultBootstrapper :: Bootstrapper defaultBootstrapper = Robustly Cabal |