diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-09 20:49:55 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-09-10 16:55:05 +0200 |
| commit | b4693f4a58b977c92282c81d3032f5be990e866a (patch) | |
| tree | 38d2d1b75a7fa43c166b366933459deffb1f5e3b /gnu/packages/haskell.scm | |
| parent | 77bd6accabe03a9e570697bd12b64ef4e9cffe20 (diff) | |
gnu: GHC: Adjust tests for grep 3.8.
This fixes a test failure introduced in commit
c527b0ce23c5d9228d29c5f90892aa5f05e77347.
* gnu/packages/patches/ghc-testsuite-grep-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/haskell.scm (ghc-8.6, ghc-8.8, ghc-8.10)[native-inputs]: Patch
the 'ghc-testsuite' input.
Diffstat (limited to 'gnu/packages/haskell.scm')
| -rw-r--r-- | gnu/packages/haskell.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 7f0e3e8cb4..ed2eaea984 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -763,7 +763,8 @@ interactive environment for the functional language Haskell.") (uri (string-append "https://www.haskell.org/ghc/dist/" version "/" name "-" version "-testsuite.tar.xz")) - (patches (search-patches "ghc-testsuite-dlopen-pie.patch")) + (patches (search-patches "ghc-testsuite-dlopen-pie.patch" + "ghc-testsuite-grep-compat.patch")) (sha256 (base32 "0pw9r91g2np3i806g2f4f8z4jfdd7mx226cmdizk4swa7av1qf91")) @@ -844,7 +845,8 @@ interactive environment for the functional language Haskell.") (uri (string-append "https://www.haskell.org/ghc/dist/" version "/ghc-" version "-testsuite.tar.xz")) - (patches (search-patches "ghc-testsuite-dlopen-pie.patch")) + (patches (search-patches "ghc-testsuite-dlopen-pie.patch" + "ghc-testsuite-grep-compat.patch")) (sha256 (base32 "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z")) @@ -902,7 +904,8 @@ interactive environment for the functional language Haskell.") (uri (string-append "https://www.haskell.org/ghc/dist/" version "/ghc-" version "-testsuite.tar.xz")) - (patches (search-patches "ghc-testsuite-dlopen-pie.patch")) + (patches (search-patches "ghc-testsuite-dlopen-pie.patch" + "ghc-testsuite-grep-compat.patch")) (sha256 (base32 "1zl25gg6bpx5601k8h3cqnns1xfc0nqgwnh8jvn2s65ra3f2g1nz")) |