hpc patch and test fixes from #1484#1620

hamishmack merged 4 commits intomasterinput-output-hk/haskell.nix:masterfrom

hkm/hpc-patch-onlyinput-output-hk/haskell.nix:hkm/hpc-patch-onlyCopy head branch name to clipboard