summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-07-22 14:33:39 +0800
committerSean Whitton <spwhitton@spwhitton.name>2018-07-22 14:33:39 +0800
commita359c2841a68bb7fe6182fddc8e84abb7a463040 (patch)
tree405ba59aec2689cc0616a2afcc211e4aedf11c06
parentb1f333aba25719c1c61346a6161d8964523265e9 (diff)
downloadgit-repair-debian/1.20151215-1.2.tar.gz
Commit Debian 3.0 (quilt) metadatadebian/1.20151215-1.2archive/debian/1.20151215-1.2
[dgit (5.10~bpo9+1) quilt-fixup]
-rw-r--r--debian/patches/patch-duplicate-arbitrary-instance-out-o.patch20
-rw-r--r--debian/patches/series1
2 files changed, 21 insertions, 0 deletions
diff --git a/debian/patches/patch-duplicate-arbitrary-instance-out-o.patch b/debian/patches/patch-duplicate-arbitrary-instance-out-o.patch
new file mode 100644
index 0000000..1334809
--- /dev/null
+++ b/debian/patches/patch-duplicate-arbitrary-instance-out-o.patch
@@ -0,0 +1,20 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+Date: Sun, 22 Jul 2018 14:30:36 +0800
+X-Dgit-Generated: 1.20151215-1.2 5e47ead106bebfd076d950934fbe11d9f1ef552c
+Subject: patch duplicate Arbitrary instance out of Utility/QuickCheck.hs
+
+
+---
+
+--- git-repair-1.20151215.orig/Utility/QuickCheck.hs
++++ git-repair-1.20151215/Utility/QuickCheck.hs
+@@ -33,9 +33,6 @@ instance (Arbitrary v, Eq v, Ord v) => A
+ instance Arbitrary POSIXTime where
+ arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral
+
+-instance Arbitrary EpochTime where
+- arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral
+-
+ {- Pids are never negative, or 0. -}
+ instance Arbitrary ProcessID where
+ arbitrary = arbitrarySizedBoundedIntegral `suchThat` (> 0)
diff --git a/debian/patches/series b/debian/patches/series
index 965db20..ae13db9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
fix-build-with-quickcheck-2.8.2.patch
split-out-module-to-work-around-badly-na.patch
patch-common.hs-to-avoid-duplicate-impor.patch
+patch-duplicate-arbitrary-instance-out-o.patch