Merge branch 'master' of https://git.joeyh.name/git/propellor into sbuild-overhaul

5 files changed, 57 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 91b4b3e2..06a333be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+propellor (4.9.1) UNRELEASED; urgency=medium
+
+  * Add Typeable instance to OriginUrl, fixing build with old versions
+    of ghc.
+
+ -- Joey Hess <id@joeyh.name>  Thu, 02 Nov 2017 10:28:44 -0400
+
 propellor (4.9.0) unstable; urgency=medium
 
   * When the ipv4 and ipv6 properties are used with a container, avoid
diff --git a/doc/forum/4.9.0_fail_to_build_on_jessie.mdwn b/doc/forum/4.9.0_fail_to_build_on_jessie.mdwn
new file mode 100644
index 00000000..915ddb74
--- /dev/null
+++ b/doc/forum/4.9.0_fail_to_build_on_jessie.mdwn
@@ -0,0 +1,26 @@
+Hello while trying to build propellor on jessie, I got this error message
+
+
+    picca@irdrx1:~/.propellor$ propellor
+    Preprocessing executable 'propellor-config' for propellor-4.9.0...
+    [105 of 120] Compiling Propellor.Property.PropellorRepo ( src/Propellor/Property/PropellorRepo.hs, dist/build/propellor-config/propellor-config-tmp/Propellor/Property/PropellorRepo.o )
+
+    src/Propellor/Property/PropellorRepo.hs:17:37:
+    No instance for (Typeable OriginUrl) arising from a use of `toInfo'
+    Possible fix: add an instance declaration for (Typeable OriginUrl)
+    In the second argument of `setInfoProperty', namely
+      `(toInfo (InfoVal (OriginUrl u)))'
+    In the expression:
+      setInfoProperty p (toInfo (InfoVal (OriginUrl u)))
+    In an equation for `hasOriginUrl':
+        hasOriginUrl u
+          = setInfoProperty p (toInfo (InfoVal (OriginUrl u)))
+          where
+              p :: Property UnixLike
+              p = property ("propellor repo url " ++ u)
+                  $ do { curru <- liftIO getRepoUrl;
+                         .... }
+Resolving dependencies...
+
+
+Cheers
diff --git a/doc/forum/4.9.0_fail_to_build_on_jessie/comment_1_b0381ff1096d4410817ea111d39b6b5e._comment b/doc/forum/4.9.0_fail_to_build_on_jessie/comment_1_b0381ff1096d4410817ea111d39b6b5e._comment
new file mode 100644
index 00000000..a2be2cbc
--- /dev/null
+++ b/doc/forum/4.9.0_fail_to_build_on_jessie/comment_1_b0381ff1096d4410817ea111d39b6b5e._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="picca"
+ avatar="http://cdn.libravatar.org/avatar/7e61c80d28018b10d31f6db7dddb864c"
+ subject="comment 1"
+ date="2017-11-02T08:29:32Z"
+ content="""
+I needed to add Typable and the LANGUAGE DeriveDataTypeable extension.
+
+
+thanks
+"""]]
diff --git a/doc/forum/4.9.0_fail_to_build_on_jessie/comment_2_a194d36b2f95f3f9949b606b22deb8d1._comment b/doc/forum/4.9.0_fail_to_build_on_jessie/comment_2_a194d36b2f95f3f9949b606b22deb8d1._comment
new file mode 100644
index 00000000..47f938dc
--- /dev/null
+++ b/doc/forum/4.9.0_fail_to_build_on_jessie/comment_2_a194d36b2f95f3f9949b606b22deb8d1._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2017-11-02T14:29:29Z"
+ content="""
+Indeed, this will probably keep biting it for different data types
+as they're added, since the new ghc builds without the explicit instance.
+
+I've fixed this one in git now.
+"""]]
diff --git a/src/Propellor/Property/PropellorRepo.hs b/src/Propellor/Property/PropellorRepo.hs
index 504ff395..825efdfd 100644
--- a/src/Propellor/Property/PropellorRepo.hs
+++ b/src/Propellor/Property/PropellorRepo.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+
 module Propellor.Property.PropellorRepo where
 
 import Propellor.Base
@@ -24,4 +26,4 @@ hasOriginUrl u = setInfoProperty p (toInfo (InfoVal (OriginUrl u)))
 			else makeChange $ setRepoUrl u
 
 newtype OriginUrl = OriginUrl String
-	deriving (Show)
+	deriving (Show, Typeable)