From 66663c0610dd33465cdb95dfc66e44a973088c43 Mon Sep 17 00:00:00 2001 From: defanor Date: Fri, 23 Feb 2018 23:52:03 +0300 Subject: Get rid of DeepSeq That was a hacky fix, now it's fixed in the redland bindings. --- Text/Pandoc/Readers/RDF.hs | 4 +--- pancake.cabal | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Text/Pandoc/Readers/RDF.hs b/Text/Pandoc/Readers/RDF.hs index 0d9aa26..e2b21d0 100644 --- a/Text/Pandoc/Readers/RDF.hs +++ b/Text/Pandoc/Readers/RDF.hs @@ -48,7 +48,6 @@ import System.Directory ( getXdgDirectory, XdgDirectory(..) , createDirectoryIfMissing ) import Control.Monad (zipWithM) import Data.Maybe (mapMaybe) -import Control.DeepSeq import Redland @@ -159,8 +158,7 @@ readRDF bu rf t = do createDirectoryIfMissing True cacheDir withWSMU "hashes" [("hash-type", "bdb"), ("dir", cacheDir)] "rdf-cache" "" (uriToString id bu "") $ \world' _ model' _ -> do - r <- mapM (readTriple (world', model')) $ prepareTriples triples - r `deepseq` pure r + mapM (readTriple (world', model')) $ prepareTriples triples readTriple :: ( ForeignPtr RedlandWorld , ForeignPtr RedlandModel) -> Triple diff --git a/pancake.cabal b/pancake.cabal index 488d3ca..f44a162 100644 --- a/pancake.cabal +++ b/pancake.cabal @@ -48,7 +48,6 @@ executable pancake , bytestring >= 0.10.8.1 && < 1 , containers >= 0.5.7.1 && < 1 , data-default >= 0.7.1.1 && < 1 - , deepseq >= 1.4.2.0 && < 2 , directory >= 1.2.6.2 && < 2 , filepath >= 1.4.1.0 && < 2 , haskeline >= 0.7 && < 1 @@ -61,7 +60,7 @@ executable pancake , pandoc-types >= 1.17.0.5 && < 2 , parsec >= 3.1.11 && < 4 , process >= 1.6 && < 2 - , redland >= 0.2 && < 0.3 + , redland >= 0.2.0.1 && < 0.3 , regex-base >= 0.93.2 && < 1 , regex-tdfa >= 1.2.2 && < 2 , terminfo >= 0.4.0.2 && < 1 -- cgit v1.2.3