From de0fadd2c25a904c7a5fcbbceb175d5305d9e738 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 May 2019 13:36:41 +0000 Subject: [PATCH] ghc-8.8.x: patch regex-base, regex-posix, and exceptions to fix the build --- .../haskell-modules/configuration-ghc-8.8.x.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index c37870fc050..6d0c10c2486 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -48,6 +48,7 @@ self: super: { cryptohash-sha256 = doJailbreak super.cryptohash-sha256; doctest = doJailbreak super.doctest; split = doJailbreak super.split; + test-framework = doJailbreak super.test-framework; # These packages don't work and need patching and/or an update. primitive = overrideSrc (doJailbreak super.primitive) { @@ -96,9 +97,15 @@ self: super: { }); regex-base = appendPatch super.regex-base (pkgs.fetchpatch { url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch"; - sha256 = "138yrp3x5cnvncimrnhnkawz6clyk7fj3sr3y93l5szfr11kcv1l"; + sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1"; + }); + regex-posix = appendPatch super.regex-posix (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch"; + sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2"; + }); + exceptions = appendPatch (doJailbreak super.exceptions) (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/exceptions-0.10.1.patch"; + sha256 = "0427jg027dcckiy21zk29c49fzx4q866rqbabmh4wvqwwkz8yk37"; }); - - }