From 5ec42dd1b78c5d60d53c00d6494511c4b2adb943 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 23 Aug 2017 11:48:18 -0400 Subject: Add Typeable instance to Bootstrapper, fixing build with old versions of ghc. (Previous attempt was incomplete.) --- debian/changelog | 2 ++ .../comment_1_c35f458b4c958f6397fe726f5676b700._comment | 7 +++++++ src/Propellor/Bootstrap.hs | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 doc/forum/propellor_4.7.6_does_not_compile_on_jessie/comment_1_c35f458b4c958f6397fe726f5676b700._comment diff --git a/debian/changelog b/debian/changelog index 9de29229..f6ed0d58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ propellor (4.7.7) UNRELEASED; urgency=medium mostly supersceded by Borg. * Obnam module is deprecated and will warn when used. Obnam has been retired by its author. + * Add Typeable instance to Bootstrapper, fixing build with old versions + of ghc. (Previous attempt was incomplete.) -- Joey Hess Wed, 23 Aug 2017 11:41:01 -0400 diff --git a/doc/forum/propellor_4.7.6_does_not_compile_on_jessie/comment_1_c35f458b4c958f6397fe726f5676b700._comment b/doc/forum/propellor_4.7.6_does_not_compile_on_jessie/comment_1_c35f458b4c958f6397fe726f5676b700._comment new file mode 100644 index 00000000..98b2d00a --- /dev/null +++ b/doc/forum/propellor_4.7.6_does_not_compile_on_jessie/comment_1_c35f458b4c958f6397fe726f5676b700._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-08-23T15:41:55Z" + content=""" +I've added a typeable instance for Bootstrapper which should fix that. +"""]] diff --git a/src/Propellor/Bootstrap.hs b/src/Propellor/Bootstrap.hs index 21d29bcc..08af6878 100644 --- a/src/Propellor/Bootstrap.hs +++ b/src/Propellor/Bootstrap.hs @@ -33,7 +33,7 @@ type ShellCommand = String -- `OSOnly` uses the OS's native packages of Cabal and all of propellor's -- build dependencies. It may not work on all systems. data Bootstrapper = Robustly Builder | OSOnly - deriving (Show) + deriving (Show, Typeable) data Builder = Cabal | Stack deriving (Show, Typeable) -- cgit v1.2.3