diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix index c3f9dae52f3..c67f924ee7a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix @@ -66,6 +66,14 @@ self: super: { # official upstream bugtracker but I've emailed this patch to the maintainer patches = [ ./patches/options-amp.patch ]; }); + chell = overrideCabal super.chell (drv: { + # edited cabal file simply makes a stricter base bound + editedCabalFile = null; + + # See https://github.com/shlevy/chell/tree/AMP. There is no + # official upstream bugtracker but I've emailed this patch to the maintainer + patches = [ ./patches/chell-amp.patch ]; + }); # bos/attoparsec#92 attoparsec = dontCheck super.attoparsec; diff --git a/pkgs/development/haskell-modules/patches/chell-amp.patch b/pkgs/development/haskell-modules/patches/chell-amp.patch new file mode 100644 index 00000000000..53dd8eedc39 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/chell-amp.patch @@ -0,0 +1,20 @@ +commit 9ed27a3941b1d95833f0da403d90732c7ca7dad4 +Author: Shea Levy +Date: Mon Jan 12 09:31:28 2015 -0500 + + Future-proof for the AMP + + See https://www.haskell.org/haskellwiki/Functor-Applicative-Monad_Proposal + +diff --git a/lib/Test/Chell.hs b/lib/Test/Chell.hs +index 85d601a..2a72e2e 100644 +--- a/lib/Test/Chell.hs ++++ b/lib/Test/Chell.hs +@@ -118,6 +118,7 @@ module Test.Chell + , testOptionTimeout + ) where + ++import Prelude hiding (pure) + import qualified Control.Applicative + import qualified Control.Exception + import Control.Exception (Exception)