[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/20: gnu: ghc-diff: Patch to work with newer QuickCheck.
From: |
guix-commits |
Subject: |
17/20: gnu: ghc-diff: Patch to work with newer QuickCheck. |
Date: |
Fri, 1 Nov 2019 22:16:57 -0400 (EDT) |
samplet pushed a commit to branch wip-haskell-updates
in repository guix.
commit 85dd725b24d39dfecebc4d62757b8c2de8776e40
Author: Timothy Sample <address@hidden>
Date: Fri Nov 1 21:56:40 2019 -0400
gnu: ghc-diff: Patch to work with newer QuickCheck.
* gnu/packages/patches/ghc-diff-swap-cover-args.patch: New file.
* gnu/local.mk: Add it.
* gnu/packages/haskell-xyz.scm (ghc-diff): Use it.
---
gnu/local.mk | 1 +
gnu/packages/haskell-xyz.scm | 1 +
gnu/packages/patches/ghc-diff-swap-cover-args.patch | 20 ++++++++++++++++++++
3 files changed, 22 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 96b570a..e82200c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -875,6 +875,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gd-freetype-test-failure.patch \
%D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
+ %D%/packages/patches/ghc-diff-swap-cover-args.patch \
%D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch
\
%D%/packages/patches/ghc-haddock-library-unbundle.patch \
%D%/packages/patches/ghostscript-no-header-id.patch \
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 392f042..61825e7 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -2622,6 +2622,7 @@ and parsers with useful semantics.")
(method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/"
"Diff/Diff-" version ".tar.gz"))
+ (patches (search-patches "ghc-diff-swap-cover-args.patch"))
(sha256
(base32
"0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp"))))
diff --git a/gnu/packages/patches/ghc-diff-swap-cover-args.patch
b/gnu/packages/patches/ghc-diff-swap-cover-args.patch
new file mode 100644
index 0000000..724416f
--- /dev/null
+++ b/gnu/packages/patches/ghc-diff-swap-cover-args.patch
@@ -0,0 +1,20 @@
+The QuickCheck library swapped the order of the arguments of the 'cover'
+function in version 2.12. Version 0.3.4 of the Diff library still uses
+the old argument order. Swapping the argument order makes Diff work
+with newer versions of QuickCheck.
+
+See <https://github.com/commercialhaskell/stackage/issues/4289> for the
+upstream bug report.
+
+diff -ruN a/test/Test.hs b/test/Test.hs
+--- a/test/Test.hs 2016-04-23 01:21:45.000000000 -0400
++++ b/test/Test.hs 2019-11-01 19:13:04.590770903 -0400
+@@ -134,7 +134,7 @@
+ prop_ppDiffR (DiffInput le ri) =
+ let haskDiff=ppDiff $ getGroupedDiff le ri
+ utilDiff= unsafePerformIO (runDiff (unlines le) (unlines ri))
+- in cover (haskDiff == utilDiff) 90 "exact match" $
++ in cover 90 (haskDiff == utilDiff) "exact match" $
+ classify (haskDiff == utilDiff) "exact match"
+ (div ((length haskDiff)*100) (length utilDiff) < 110)
-- less than 10% bigger
+ where
- 06/20: gnu: ghc-charset: Update Cabal file to r1., (continued)
- 06/20: gnu: ghc-charset: Update Cabal file to r1., guix-commits, 2019/11/01
- 10/20: gnu: ghc-gtk2hs-buildtools: Update to 0.13.5.4., guix-commits, 2019/11/01
- 02/20: squash! gnu: Add ghc-splitmix., guix-commits, 2019/11/01
- 04/20: squash! gnu: ghc-math-functions: Update to 0.3.3.0., guix-commits, 2019/11/01
- 05/20: gnu: ghc-contravariant-extras: Update Cabal file to r1., guix-commits, 2019/11/01
- 08/20: gnu: ghc-cryptohash-md5: Update Cabal file to r4., guix-commits, 2019/11/01
- 07/20: gnu: ghc-deepseq-generics: Update Cabal file to r4., guix-commits, 2019/11/01
- 09/20: gnu: ghc-cryptohash-sha1: Update Cabal file to r4., guix-commits, 2019/11/01
- 11/20: squash! gnu: ghc-hedgehog: Update to 1.0.1., guix-commits, 2019/11/01
- 13/20: squash! gnu: ghc-libmpd: Update to 0.9.0.10., guix-commits, 2019/11/01
- 17/20: gnu: ghc-diff: Patch to work with newer QuickCheck.,
guix-commits <=
- 15/20: gnu: ghc-split: Update Cabal file to r2., guix-commits, 2019/11/01
- 16/20: squash! gnu: ghc-zip-archive: Update to 0.4.1., guix-commits, 2019/11/01
- 12/20: squash! gnu: ghc-haskell-src-meta: Update to 0.8.3., guix-commits, 2019/11/01
- 18/20: squash! gnu: ghc-extra: Update to 1.6.18., guix-commits, 2019/11/01
- 20/20: gnu: ghc-httpd-shed: Fix build with newer ghc-network., guix-commits, 2019/11/01
- 19/20: gnu: Add ghc-network-bsd., guix-commits, 2019/11/01
- 14/20: squash! gnu: ghc-vault: Update to 0.3.1.3., guix-commits, 2019/11/01