diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-02 16:53:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-02 16:53:00 -0400 |
| commit | 04a1c379598759f3f9e0024c9402919a344073e5 (patch) | |
| tree | 6e69c0867e64a7d13e997ad88809abbd49c6ab04 /standalone | |
| parent | 957526da9849e5b8e7f8e050d65b9f63141636c0 (diff) | |
persistent no longer needs no-th patch
Diffstat (limited to 'standalone')
| -rwxr-xr-x | standalone/android/install-haskell-packages | 1 | ||||
| -rw-r--r-- | standalone/no-th/haskell-patches/persistent_1.1.5.1_0001-disable-TH.patch | 41 |
2 files changed, 0 insertions, 42 deletions
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index 29be5f95b..5dfc767cd 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -89,7 +89,6 @@ EOF # patched entropy # needed for newer version, not current pinned version patched vector patched stm-chans - patched persistent patched profunctors patched skein patched lens diff --git a/standalone/no-th/haskell-patches/persistent_1.1.5.1_0001-disable-TH.patch b/standalone/no-th/haskell-patches/persistent_1.1.5.1_0001-disable-TH.patch deleted file mode 100644 index cd86ccd2d..000000000 --- a/standalone/no-th/haskell-patches/persistent_1.1.5.1_0001-disable-TH.patch +++ /dev/null @@ -1,41 +0,0 @@ -From aae3ace106cf26c931cc94c96fb6fbfe83f950f2 Mon Sep 17 00:00:00 2001 -From: dummy <dummy@example.com> -Date: Wed, 15 Oct 2014 17:05:37 +0000 -Subject: [PATCH] avoid TH - ---- - Database/Persist/Sql/Raw.hs | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/Database/Persist/Sql/Raw.hs b/Database/Persist/Sql/Raw.hs -index 3ac2ca9..bcc2011 100644 ---- a/Database/Persist/Sql/Raw.hs -+++ b/Database/Persist/Sql/Raw.hs -@@ -11,7 +11,7 @@ import Data.IORef (writeIORef, readIORef, newIORef) - import Control.Exception (throwIO) - import Control.Monad (when, liftM) - import Data.Text (Text, pack) --import Control.Monad.Logger (logDebugS) -+--import Control.Monad.Logger (logDebugS) - import Data.Int (Int64) - import Control.Monad.Trans.Class (lift) - import qualified Data.Text as T -@@ -23,7 +23,6 @@ rawQuery :: (MonadSqlPersist m, MonadResource m) - -> [PersistValue] - -> Source m [PersistValue] - rawQuery sql vals = do -- lift $ $logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals - conn <- lift askSqlConn - bracketP - (getStmtConn conn sql) -@@ -35,7 +34,6 @@ rawExecute x y = liftM (const ()) $ rawExecuteCount x y - - rawExecuteCount :: MonadSqlPersist m => Text -> [PersistValue] -> m Int64 - rawExecuteCount sql vals = do -- $logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals - stmt <- getStmt sql - res <- liftIO $ stmtExecute stmt vals - liftIO $ stmtReset stmt --- -2.1.1 - |