summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2017-07-26 15:40:19 -0400
committerJoey Hess2017-07-26 15:40:19 -0400
commit80e2c5892ee0ebfd8da6d36b6683373d0b9b156c (patch)
treed2d49b560875e4c69bccae594044ba2101408b01 /src
parent4b148a2c29a78cc07930d665283e5691a5d2156d (diff)
parentaf3d814089f3ecda5ac3057dca48709c0b58363f (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Bootstrap.hs4
1 files changed, 3 insertions, 1 deletions
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