diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-10 23:32:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-10 23:32:56 -0400 |
| commit | 7be93ff4de1b3cb5fb072feb126e02042d58b44b (patch) | |
| tree | 55cc5ff0403fe22a7d590a184ac33774dfadef8e /standalone | |
| parent | 45adb5ca9da81ae202f1da09ddfdb2e1053c064f (diff) | |
remove no longer needed patch
Diffstat (limited to 'standalone')
| -rw-r--r-- | standalone/android/haskell-patches/SafeSemaphore_fix-build-with-new-base.patch | 36 | ||||
| -rwxr-xr-x | standalone/android/install-haskell-packages | 1 |
2 files changed, 0 insertions, 37 deletions
diff --git a/standalone/android/haskell-patches/SafeSemaphore_fix-build-with-new-base.patch b/standalone/android/haskell-patches/SafeSemaphore_fix-build-with-new-base.patch deleted file mode 100644 index a79ca519a..000000000 --- a/standalone/android/haskell-patches/SafeSemaphore_fix-build-with-new-base.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 010db89634eb0f64e7961581e65da3acbb2b9f3d Mon Sep 17 00:00:00 2001 -From: foo <foo@bar> -Date: Sat, 21 Sep 2013 22:05:41 +0000 -Subject: [PATCH] fix build with new base - ---- - src/Control/Concurrent/MSampleVar.hs | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/src/Control/Concurrent/MSampleVar.hs b/src/Control/Concurrent/MSampleVar.hs -index d029c64..16ad6c5 100644 ---- a/src/Control/Concurrent/MSampleVar.hs -+++ b/src/Control/Concurrent/MSampleVar.hs -@@ -30,7 +30,7 @@ module Control.Concurrent.MSampleVar - import Control.Monad(void,join) - import Control.Concurrent.MVar(MVar,newMVar,newEmptyMVar,tryTakeMVar,takeMVar,putMVar,withMVar,isEmptyMVar) - import Control.Exception(mask_) --import Data.Typeable(Typeable1(typeOf1),mkTyCon,mkTyConApp) -+import Data.Typeable(mkTyConApp) - - -- | - -- Sample variables are slightly different from a normal 'MVar': -@@ -62,10 +62,6 @@ data MSampleVar a = MSampleVar { readQueue :: MVar () - , lockedStore :: MVar (MVar a) } - deriving (Eq) - --instance Typeable1 MSampleVar where -- typeOf1 _ = mkTyConApp tc [] -- where tc = mkTyCon "MSampleVar" -- - - -- | 'newEmptySV' allocates a new MSampleVar in an empty state. No futher - -- allocation is done when using the 'MSampleVar'. --- -1.7.10.4 - diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index c56f3b250..19e6b5c1c 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -72,7 +72,6 @@ install_pkgs () { patched zlib patched MissingH patched bloomfilter - patched SafeSemaphore patched distributive patched comonad patched iproute |