From 0a23ae75450cb4938af34fdd591a0605244a62b9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 2 Nov 2017 10:30:13 -0400 Subject: Add Typeable instance to OriginUrl, fixing build with old versions of ghc. --- debian/changelog | 7 +++++++ .../comment_2_a194d36b2f95f3f9949b606b22deb8d1._comment | 10 ++++++++++ src/Propellor/Property/PropellorRepo.hs | 4 +++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 doc/forum/4.9.0_fail_to_build_on_jessie/comment_2_a194d36b2f95f3f9949b606b22deb8d1._comment 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 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/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) -- cgit v1.2.3