ghc-8.8.x: patch zlib, optparse-applicative, HTTP, and hackage-security to fix their builds

1 files changed, 20 insertions, 2 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 fca0896546f..8693b235211 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -49,6 +49,8 @@ self: super: {
   doctest = doJailbreak super.doctest;
   split = doJailbreak super.split;
   test-framework = doJailbreak super.test-framework;
+  hashable = doJailbreak super.hashable;
+  async = doJailbreak super.async;
 
   # These packages don't work and need patching and/or an update.
   primitive = overrideSrc (doJailbreak super.primitive) {
@@ -65,10 +67,10 @@ self: super: {
     sha256 = "1inbfpamfdpi3yfac59j5xpaq5fvh5g1ca8hlbpic1bizd3s03i0";
   })) (drv: {
     configureFlags = ["-f-old-time"];
+    editedCabalFile = null;
     preConfigure = ''
-      sha256sum tar.cabal
       cp -v ${pkgs.fetchurl {url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/tar-0.5.1.0.cabal"; sha256 = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x";}} tar.cabal
-      sha256sum tar.cabal
+      sed -i -e 's/time < 1.9/time < 2/' tar.cabal
     '';
   });
   resolv = overrideCabal (overrideSrc super.resolv {
@@ -115,5 +117,21 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/logict-0.6.0.2.patch";
     sha256 = "0my2n0r9pb35994q0xka96fv5jdpjdfwqppi5lily3rgzkajsixn";
   });
+  zlib = appendPatch super.zlib (pkgs.fetchpatch {
+    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/zlib-0.6.2.patch";
+    sha256 = "13fy730z9ihyc9kw3qkh642mi0bdbd7bz01dksj1zz845pr9jjif";
+  });
+  optparse-applicative = appendPatch super.optparse-applicative (pkgs.fetchpatch {
+    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
+    sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y";
+  });
+  HTTP = appendPatch (doJailbreak super.HTTP) (pkgs.fetchpatch {
+    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/HTTP-4000.3.13.patch";
+    sha256 = "1fadi529x7dnmbfmls5969qfn9d4z954nc4lbqxmrwgirphkpmn4";
+  });
+  hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch {
+    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
+    sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
+  });
 
 }