From b59fd85dd6ed185b0bc347cbd42dc69301cbf784 Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Mon, 27 Feb 2017 23:56:26 +0100 Subject: [PATCH 1/2] haskell: ghc710x packages: fix gtk2hs-buildtools --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 ++ 1 file changed, 2 insertions(+) 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..ee0fcccd6331 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,8 @@ 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; }; + Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f"; From 1a4ec414a4eb9e0ac5ef219705068ccf4341ddef Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Mon, 27 Feb 2017 23:56:55 +0100 Subject: [PATCH 2/2] haskell: ghc710x packages: fix megaparsec --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 2 ++ 1 file changed, 2 insertions(+) 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 ee0fcccd6331..6a7fe29b80fa 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -44,6 +44,8 @@ self: super: { 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";