From b17e6126389b9276bc8c50ea677ca9f2c0b27724 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 25 Jul 2017 17:27:36 -0700 Subject: Commit Debian 3.0 (quilt) metadata [dgit (3.12) quilt-fixup] --- .../patches/fix-build-with-quickcheck-2.8.2.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 debian/patches/fix-build-with-quickcheck-2.8.2.patch (limited to 'debian/patches/fix-build-with-quickcheck-2.8.2.patch') diff --git a/debian/patches/fix-build-with-quickcheck-2.8.2.patch b/debian/patches/fix-build-with-quickcheck-2.8.2.patch new file mode 100644 index 0000000..3e3a0cd --- /dev/null +++ b/debian/patches/fix-build-with-quickcheck-2.8.2.patch @@ -0,0 +1,34 @@ +From: Joey Hess +Date: Sun, 24 Jan 2016 14:15:00 -0400 +X-Dgit-Generated: 1.20151215-1.1 1ecd24cc076b15e085529d41e5a873e334f75167 +Subject: Fix build with QuickCheck 2.8.2 + +It added some instances I had also implemented. + +--- + +--- git-repair-1.20151215.orig/Utility/QuickCheck.hs ++++ git-repair-1.20151215/Utility/QuickCheck.hs +@@ -6,7 +6,7 @@ + -} + + {-# OPTIONS_GHC -fno-warn-orphans #-} +-{-# LANGUAGE TypeSynonymInstances #-} ++{-# LANGUAGE TypeSynonymInstances, CPP #-} + + module Utility.QuickCheck + ( module X +@@ -21,11 +21,13 @@ import qualified Data.Set as S + import Control.Applicative + import Prelude + ++#if ! MIN_VERSION_QuickCheck(2,8,2) + instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (M.Map k v) where + arbitrary = M.fromList <$> arbitrary + + instance (Arbitrary v, Eq v, Ord v) => Arbitrary (S.Set v) where + arbitrary = S.fromList <$> arbitrary ++#endif + + {- Times before the epoch are excluded. -} + instance Arbitrary POSIXTime where -- cgit v1.2.3