summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2017-08-23 11:48:18 -0400
committerJoey Hess2017-08-23 11:48:18 -0400
commit5ec42dd1b78c5d60d53c00d6494511c4b2adb943 (patch)
treebd9f8312508e0a11c006be85fed366c615c266ae
parent3a7bfdb84fc6b0aa0e6ca3580580e4403a8e0f59 (diff)
Add Typeable instance to Bootstrapper, fixing build with old versions of ghc. (Previous attempt was incomplete.)
-rw-r--r--debian/changelog2
-rw-r--r--doc/forum/propellor_4.7.6_does_not_compile_on_jessie/comment_1_c35f458b4c958f6397fe726f5676b700._comment7
-rw-r--r--src/Propellor/Bootstrap.hs2
3 files changed, 10 insertions, 1 deletions
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 <id@joeyh.name> 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)