From 0fa44a5633ead1849b8dee08a7944787ecc8279a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2015 14:00:01 +0200 Subject: [PATCH] Haskell packages brainfuck and unlambda have been fixed upstream. --- .../brainfuck-fix-ghc710.patch | 19 ------------- .../configuration-ghc-7.10.x.nix | 4 --- .../haskell-modules/unlambda-fix-ghc710.patch | 28 ------------------- 3 files changed, 51 deletions(-) delete mode 100644 pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch delete mode 100644 pkgs/development/haskell-modules/unlambda-fix-ghc710.patch diff --git a/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch b/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch deleted file mode 100644 index ae3397fa573..00000000000 --- a/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru3 brainfuck-0.1-old/Language/Brainfuck.hs brainfuck-0.1/Language/Brainfuck.hs ---- brainfuck-0.1-old/Language/Brainfuck.hs 2015-04-17 21:17:34.568721144 +0300 -+++ brainfuck-0.1/Language/Brainfuck.hs 2015-04-17 21:19:17.065872395 +0300 -@@ -19,6 +19,8 @@ - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -} - -+{-# LANGUAGE FlexibleContexts #-} -+ - module Language.Brainfuck where - - import Data.Array.IO -@@ -287,4 +289,4 @@ - - halt = if debug - then putStrLn "Machine Halted.\n" -- else putStrLn "\n" -\ No newline at end of file -+ else putStrLn "\n" 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 ea362254b2f..ef663ba2ca8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -181,10 +181,6 @@ self: super: { in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 self.webkitgtk3-javascriptcore ]; - # FIXME: remove with the next Hackage update - brainfuck = appendPatch super.brainfuck ./brainfuck-fix-ghc710.patch; - unlambda = appendPatch super.unlambda ./unlambda-fix-ghc710.patch; - # https://github.com/BNFC/bnfc/issues/137 BNFC = markBrokenVersion "2.7.1" super.BNFC; cubical = dontDistribute super.cubical; diff --git a/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch b/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch deleted file mode 100644 index 51c453557aa..00000000000 --- a/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru3 unlambda-0.1.3-old/Language/Unlambda.hs unlambda-0.1.3/Language/Unlambda.hs ---- unlambda-0.1.3-old/Language/Unlambda.hs 2015-04-17 21:16:32.415751612 +0300 -+++ unlambda-0.1.3/Language/Unlambda.hs 2015-04-17 21:25:38.210123501 +0300 -@@ -29,6 +29,7 @@ - import Prelude hiding(catch) - #endif - import Control.Exception (catch, IOException) -+import Control.Monad (liftM, ap) - - ------------------------------------------------------------------------ - -- Abstract syntax -@@ -85,6 +86,16 @@ - - type Cont a = (Maybe Char, Int) -> a -> IO Exp - -+instance Functor Eval where -+ -+ fmap = liftM -+ -+instance Applicative Eval where -+ -+ pure = return -+ -+ (<*>) = ap -+ - instance Monad Eval where - - (Eval cp1) >>= f = Eval $ \dat1 cont2 ->