diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-26 15:40:19 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-26 15:40:19 -0400 |
| commit | 80e2c5892ee0ebfd8da6d36b6683373d0b9b156c (patch) | |
| tree | d2d49b560875e4c69bccae594044ba2101408b01 | |
| parent | 4b148a2c29a78cc07930d665283e5691a5d2156d (diff) | |
| parent | af3d814089f3ecda5ac3057dca48709c0b58363f (diff) | |
Merge branch 'master' into joeyconfig
4 files changed, 28 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_8a3eac770c1bee9295272c46f022a03c._comment b/doc/forum/Error_building_on_remote_host/comment_4_8a3eac770c1bee9295272c46f022a03c._comment new file mode 100644 index 00000000..5129fb5d --- /dev/null +++ b/doc/forum/Error_building_on_remote_host/comment_4_8a3eac770c1bee9295272c46f022a03c._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="mithrandi" + avatar="http://cdn.libravatar.org/avatar/869963bdf99b541c9f0bbfb04b0320f1" + subject="comment 4" + date="2017-07-26T01:03:02Z" + content=""" +Oh, so it is! Must have misread something earlier. +"""]] 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 |