diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-01-02 18:21:29 +0000 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-01-02 18:21:29 +0000 |
| commit | 82194f4c43cd5055d964b60a7c4244376e20f5af (patch) | |
| tree | 078e887e995a6b0ab5ef20a267d73889f3eaa0eb /debian/patches/fix-build-with-quickcheck-2.8.2.patch | |
| parent | e2a73456824281a8c41813f168b435a95cf7d389 (diff) | |
| download | git-repair-82194f4c43cd5055d964b60a7c4244376e20f5af.tar.gz | |
drop patches merged upstream
Diffstat (limited to 'debian/patches/fix-build-with-quickcheck-2.8.2.patch')
| -rw-r--r-- | debian/patches/fix-build-with-quickcheck-2.8.2.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/debian/patches/fix-build-with-quickcheck-2.8.2.patch b/debian/patches/fix-build-with-quickcheck-2.8.2.patch deleted file mode 100644 index 3e3a0cd..0000000 --- a/debian/patches/fix-build-with-quickcheck-2.8.2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Joey Hess <joeyh@joeyh.name> -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 |