diff options
| author | Peter Simons <simons@cryp.to> | 2017-03-02 19:07:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-02 19:07:12 +0100 |
| commit | 027ffb6429caee45335094e7674a39fab11579ec (patch) | |
| tree | 60492194db22bc34d494829be40b2ea255c0f126 /pkgs/development | |
| parent | 4b77d425aa5970f39f0637894075d2df8c1575c8 (diff) | |
| parent | 1a4ec414a4eb9e0ac5ef219705068ccf4341ddef (diff) | |
| download | nixlib-027ffb6429caee45335094e7674a39fab11579ec.tar nixlib-027ffb6429caee45335094e7674a39fab11579ec.tar.gz nixlib-027ffb6429caee45335094e7674a39fab11579ec.tar.bz2 nixlib-027ffb6429caee45335094e7674a39fab11579ec.tar.lz nixlib-027ffb6429caee45335094e7674a39fab11579ec.tar.xz nixlib-027ffb6429caee45335094e7674a39fab11579ec.tar.zst nixlib-027ffb6429caee45335094e7674a39fab11579ec.zip | |
Merge pull request #23252 from ljli/ghc7103-pkgs-fixes
haskell ghc710x packages fixes
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 2c1888b5eef6..6a7fe29b80fa 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -42,6 +42,10 @@ self: super: { # Build jailbreak-cabal with the latest version of Cabal. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; }; + gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_2_0; }; + + megaparsec = addBuildDepend super.megaparsec self.fail; + Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f"; |