use Response Files for HPC arguments; delete unnecessary patch

Author: peterbecich

lib/cover-project.nix

@@ -72,9 +72,9 @@ in pkgs.runCommand "project-coverage-report"
       local tixFile=$3
 
       local hpcMarkupCmd=("hpc" "markup" "--destdir=$destDir")
-      hpcMarkupCmd+=("--srcdirs-from=${srcDirsFile}")
-      hpcMarkupCmd+=("--hpcdirs-from=${mixDirsFile}")
-      hpcMarkupCmd+=("--includes-from=$modulesFile")
+      hpcMarkupCmd+=("--srcdir=@${srcDirsFile}")
+      hpcMarkupCmd+=("--hpcdir=@${mixDirsFile}")
+      hpcMarkupCmd+=("--include=@$modulesFile")
       hpcMarkupCmd+=("$tixFile")
 
       echo "''${hpcMarkupCmd[@]}"

overlays/bootstrap.nix

@@ -216,7 +216,6 @@ in {
                 ++ fromUntil "8.10"   "9.2"    ./patches/ghc/ghc-8.10-global-unique-counters-in-rts.patch # backport of https://gitlab.haskell.org/ghc/ghc/-/commit/9a28680d2e23e7b25dd7254a439aea31dfae32d5
                 ++ fromUntil "9.2"    "9.3"    ./patches/ghc/ghc-9.2-global-unique-counters-in-rts.patch # backport of https://gitlab.haskell.org/ghc/ghc/-/commit/9a28680d2e23e7b25dd7254a439aea31dfae32d5
                 ++ fromUntil "8.10"   "9.1"    ./patches/ghc/issue-18708.patch              # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6554
-                ++ fromUntil "8.10"   "9.0"    ./patches/ghc/hpc-dirsfrom.patch             # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8194
                 # the following is a partial reversal of https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4391, to address haskell.nix#1227
                 ++ final.lib.optional (versionAtLeast "8.10" && versionLessThan "9.0" && final.targetPlatform.isAarch64) ./patches/ghc/mmap-next.patch
                 ++ final.lib.optional (versionAtLeast "8.10" && versionLessThan "9.0" && final.targetPlatform.isAndroid) ./patches/ghc/rts-android-jemalloc-qemu.patch