JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskell-hpack: use latest version to fix build on ghc-8.8.x

Browse Source
This commit is contained in:
Peter Simons 2019-10-13 11:13:17 +02:00
parent 4a5c24ff6e
commit 33366cce14
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1202,7 +1202,7 @@ self: super: {
hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_1; }; hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_1; };
# https://github.com/sol/hpack/issues/366 # https://github.com/sol/hpack/issues/366
hpack = self.hpack_0_32_0; hpack = self.hpack_0_33_0;
# QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7 # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7
graphviz = dontCheck super.graphviz; graphviz = dontCheck super.graphviz;

6
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@ -103,12 +103,6 @@ self: super: {
sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5"; sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
}); });
# https://github.com/sol/hpack/issues/371
hpack = appendPatch super.hpack (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hpack-0.32.0.patch";
sha256 = "11ccl9f7vwbf5cpzknlyvrwgkzpajk4vq9jk9yb5f9la9ggwb244";
});
# Upstream ships a broken Setup.hs file. # Upstream ships a broken Setup.hs file.
csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; }); csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });