diff options
| author | Peter Simons <simons@cryp.to> | 2019-10-13 11:13:17 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-10-13 14:27:17 +0200 |
| commit | 33366cce1474da1fa9140ddf4aca7db5493ba042 (patch) | |
| tree | a79f22bdfe795e5c84b7bd50df69c1ece7c78b41 /pkgs/development/haskell-modules | |
| parent | 4a5c24ff6e09ad994ba681925c16aad03b53201d (diff) | |
| download | nixlib-33366cce1474da1fa9140ddf4aca7db5493ba042.tar nixlib-33366cce1474da1fa9140ddf4aca7db5493ba042.tar.gz nixlib-33366cce1474da1fa9140ddf4aca7db5493ba042.tar.bz2 nixlib-33366cce1474da1fa9140ddf4aca7db5493ba042.tar.lz nixlib-33366cce1474da1fa9140ddf4aca7db5493ba042.tar.xz nixlib-33366cce1474da1fa9140ddf4aca7db5493ba042.tar.zst nixlib-33366cce1474da1fa9140ddf4aca7db5493ba042.zip | |
haskell-hpack: use latest version to fix build on ghc-8.8.x
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 369296abd8fb..4505c73c9f91 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1202,7 +1202,7 @@ self: super: { hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_1; }; # 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 graphviz = dontCheck super.graphviz; 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 2b95f0f5f787..292a703b13c0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -103,12 +103,6 @@ self: super: { 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. csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; }); |