mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 00:08:32 +01:00
haskell-chell: Fix for 7.10.1
This commit is contained in:
parent
c972ea1e8c
commit
2f5cd9ec85
2 changed files with 28 additions and 0 deletions
|
@ -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;
|
||||
|
|
20
pkgs/development/haskell-modules/patches/chell-amp.patch
Normal file
20
pkgs/development/haskell-modules/patches/chell-amp.patch
Normal file
|
@ -0,0 +1,20 @@
|
|||
commit 9ed27a3941b1d95833f0da403d90732c7ca7dad4
|
||||
Author: Shea Levy <shea@shealevy.com>
|
||||
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)
|
Loading…
Reference in a new issue