From bc5f82dfc26cb9135b419dc706178f4696fdaefe Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 11 Dec 2015 07:46:40 -0500 Subject: [PATCH] Fixup pointfree package. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fd6d521369f..d844f2a047a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -940,4 +940,8 @@ self: super: { # https://github.com/mainland/language-c-quote/issues/57 language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; }; + + # The package doesn't yet compile with new HSE: https://github.com/bmillwood/pointfree/pull/13 + pointfree = super.pointfree.override { haskell-src-exts = self.haskell-src-exts_1_16_0_1; }; + } 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 35fd547d334..00e12b01564 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -92,7 +92,6 @@ self: super: { utf8-string = overrideCabal super.utf8-string (drv: { postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; }); - pointfree = doJailbreak super.pointfree; # acid-state/safecopy#25 acid-state/safecopy#26 safecopy = dontCheck (super.safecopy);